This commit is contained in:
tiago.kayaya
2021-07-13 09:31:42 +01:00
parent f457952220
commit f1d706a0d5
4 changed files with 32 additions and 40 deletions
@@ -192,18 +192,6 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div> </div>
<div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1"> <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
<!-- <ion-datetime
placeholder="Última ocorrência"
[(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
displayFormat="DD MMM YYYY"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
max="2045"
>
</ion-datetime> -->
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
<!-- [formControl]="dateControlOccurrence" -->
<mat-form-field class="date-hour-picker"> <mat-form-field class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="occurrrence" <input matInput [ngxMatDatetimePicker]="occurrrence"
@@ -102,13 +102,12 @@ export class EditEventPage implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private toastService: ToastService ) { private toastService: ToastService ) {
//this.dateControlOccurrence = this.postEvent.EventRecurrence.LastOccurrence;
} }
ngOnInit() { ngOnInit() {
console.log(this.postEvent); console.log(this.postEvent);
this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence));
if(!this.restoreTemporaryData()) { if(!this.restoreTemporaryData()) {
// clear // clear
@@ -152,9 +151,14 @@ export class EditEventPage implements OnInit {
this.restoreDatepickerData(); this.restoreDatepickerData();
this.getRecurrenceTypes(); this.getRecurrenceTypes();
this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString();
setTimeout(() => { setTimeout(() => {
this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString();
console.log(this.selectedRecurringType);
}, 1000); }, 1000);
} }
close() { close() {
@@ -209,9 +213,9 @@ export class EditEventPage implements OnInit {
dateEnd: new FormControl(this.dateEnd, [ dateEnd: new FormControl(this.dateEnd, [
Validators.required Validators.required
]), ]),
IsRecurring: new FormControl(this.postEvent.IsRecurring, [ /* IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required Validators.required
]), ]), */
participantes: new FormControl(this.taskParticipants, [ participantes: new FormControl(this.taskParticipants, [
Validators.required Validators.required
]), ]),
@@ -352,8 +352,8 @@ export class NewEventPage implements OnInit {
if (this.postEvent) { if (this.postEvent) {
this.dateControlStart = new FormControl(moment(this.postEvent.StartDate, "DD MM YYYY hh:mm")); this.dateControlStart = new FormControl(moment(this.postEvent.StartDate, "DD MM YYYY hh:mm"));
this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate, "DD MM YYYY hh:mm")); this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate, "DD MM YYYY hh:mm"));
this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY hh:mm"))
} }
} }
async save() { async save() {
@@ -93,7 +93,7 @@ export class ViewEventPage implements OnInit {
loadEvent(){ loadEvent(){
this.eventsService.getEvent(this.eventId).subscribe(res => { this.eventsService.getEvent(this.eventId).subscribe(res => {
this.loadedEvent = res; this.loadedEvent = res;
// console.log(res); console.log(res);
this.today = new Date(res.StartDate); this.today = new Date(res.StartDate);
// console.log(new Date(this.today)); // console.log(new Date(this.today));
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);