From 3a3ba605ddede4d2e58cc501783f0640b36f2001 Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Wed, 6 Jul 2022 09:12:57 +0100
Subject: [PATCH] validated the last ocurrence date

---
 src/app/pages/agenda/edit-event/edit-event.page.html  | 3 +++
 src/app/pages/agenda/edit-event/edit-event.page.ts    | 3 +++
 src/app/pages/agenda/new-event/new-event.page.html    | 3 +++
 src/app/pages/agenda/new-event/new-event.page.ts      | 7 ++++++-
 src/app/shared/agenda/edit-event/edit-event.page.html | 1 +
 src/app/shared/agenda/edit-event/edit-event.page.ts   | 2 +-
 src/app/shared/agenda/new-event/new-event.page.html   | 1 +
 src/app/shared/agenda/new-event/new-event.page.ts     | 2 +-
 8 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index e1d94b8c6..f5b50e398 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -134,6 +134,7 @@
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
                     [(ngModel)]="postEvent.StartDate"
+                    [min]="currentDate"
                     [max]="maxDate"
                     [disabled]="disabled"
                   >
@@ -162,6 +163,7 @@
                   <input matInput [ngxMatDatetimePicker]="fim"
                     placeholder="Choose a date"
                     [(ngModel)]="postEvent.EndDate"
+                    [min]="currentDate"
                     [max]="maxDate"
                     [disabled]="disabled"
                   >
@@ -213,6 +215,7 @@
                     placeholder="Choose a date"
                     [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
                     [disabled]="disabled"
+                    [min]="postEvent.EndDate"
                   >
                   <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index fe0787edf..5542f0d12 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -247,6 +247,9 @@ export class EditEventPage implements OnInit {
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok': null, [
+        Validators.required
+      ]),
       Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
         Validators.required
       ]),
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 454ce5e1e..b38f22fc6 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -122,6 +122,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -153,6 +154,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EndDate"
               [disabled]="disabled"
+              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim
@@ -202,6 +204,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
               [disabled]="disabled"
+              [min]="postEvent.EndDate"
             >
             <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index b4608bc1a..69db82f7a 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -50,6 +50,7 @@ export class NewEventPage implements OnInit {
   public stepMinute = 5;
   public stepSecond = 5;
   public color: ThemePalette = 'primary';
+  currentDate = new Date();
 
   Form: FormGroup;
   validateFrom = false
@@ -279,7 +280,7 @@ export class NewEventPage implements OnInit {
       CalendarName: new FormControl(this.postEvent.CalendarName, [
         Validators.required
       ]),
-      Date: new FormControl(this.dateValid, [
+      Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
         Validators.required
       ]),
       Categories: new FormControl(this.postEvent.Category, [
@@ -288,6 +289,10 @@ export class NewEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok': null, [
+        Validators.required
+      ]),
+      
 
     })
   }
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index f533c3b11..e3aaa8e7b 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -198,6 +198,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
               [disabled]="disabled"
+              [min]="postEvent.EndDate"
             >
             <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 3f2742d3b..237473091 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -183,7 +183,7 @@ export class EditEventPage implements OnInit {
       Categories: new FormControl(this.postEvent.Category, [
         Validators.required
       ]),
-      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok': null, [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index ee61b03c9..1ea144c69 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -211,6 +211,7 @@
               placeholder="Choose a date"
               [(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
               [disabled]="disabled"
+              [min]="postEvent.EndDate"
             >
             <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #occurrrence
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 16ed46908..63b0667f0 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -265,7 +265,7 @@ export class NewEventPage implements OnInit {
       dateEnd: new FormControl(this.postEvent.EndDate, [
         Validators.required
       ]),
-      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence, [
+      dateOccurrence: new FormControl(this.postEvent.EventRecurrence.Type.toString() == '-1' ? ['ok']: this.postEvent.EventRecurrence.LastOccurrence && new Date(this.postEvent.EventRecurrence.LastOccurrence).getTime() > new Date(this.postEvent.EndDate).getTime() ? 'ok': null, [
         Validators.required
       ]),
       participantes: new FormControl(this.taskParticipants, [