save

src/app/shared/agenda/new-event/new-event.page.html

@@ -213,7 +213,48 @@
       </div>
     </div>
 
-    <div *ngIf="Form && validateFrom" >
+    <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
+      <div class="ion-item-class-2 d-flex">
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+        </div>
+        <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">
+            <input matInput [ngxMatDatetimePicker]="occurrrence"
+              placeholder="Choose a date"
+              [formControl]="dateControlOccurrence"
+              [min]="endMinDate"
+              [disabled]="disabled"
+            >
+            <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #occurrrence
+              [showSpinners]="showSpinners"
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute"
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi"
+              >
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
+        </div>
+      </div>
+    </div>
+
+    <div *ngIf="Form && validateFrom" class="container-div width-100">
       <div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
         <div *ngIf="Form.get('participantes').errors?.required">
           Adicionar participante.
@@ -221,7 +262,7 @@
       </div>
     </div>
 
-    <div class="container-div">
+    <div class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>

src/app/shared/agenda/new-event/new-event.page.ts

@@ -93,6 +93,7 @@ export class NewEventPage implements OnInit {
   @ViewChild('picker') picker: any;
   @ViewChild('fim') fim: any;
   @ViewChild('inicio') inicio: any;
+  @ViewChild('occurrence') occurrence: any;
   @ViewChild('picker1') picker1: any;
 
   Form: FormGroup;
@@ -111,6 +112,7 @@ export class NewEventPage implements OnInit {
 
   public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
   public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+  public dateControlOccurrence = new FormControl(moment("DD MM YYYY hh"));
 
   showLoader = false
 
@@ -122,6 +124,10 @@ export class NewEventPage implements OnInit {
     return this.dateControlEnd.value
   }
 
+  get dateOccurrence () {
+    return this.dateControlOccurrence.value
+  }
+
   constructor(
     private modalController: ModalController,
     private eventService: EventsService,
@@ -251,6 +257,9 @@ export class NewEventPage implements OnInit {
       dateEnd: new FormControl(this.dateEnd, [
         Validators.required
       ]),
+      dateOccurrence: new FormControl(this.dateOccurrence, [
+        Validators.required
+      ]),
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
@@ -277,6 +286,13 @@ export class NewEventPage implements OnInit {
     }
   }
 
+  openLastOccurrence() {
+    let input: any = document.querySelector('#last-occurrence')
+    if(input) {
+      input.click()
+    }
+  }
+
   async getDoc(){
     const modal = await this.modalController.create({
       component: SearchPage,
@@ -328,6 +344,7 @@ export class NewEventPage implements OnInit {
     if (this.postEvent) {
       this.postEvent.StartDate = this.dateStart
       this.postEvent.EndDate = this.dateEnd
+      this.postEvent.EventRecurrence.LastOccurrence = this.dateOccurrence
     }
   }