From 5501b4a583d1346cce3c8e8b13524adbd3ab3148 Mon Sep 17 00:00:00 2001
From: "EQUILIBRIUM\\hirondino.van-dunem"
 <hirondino.van-dunem@equilibrium.co.ao>
Date: Wed, 22 Jun 2022 16:35:47 +0100
Subject: [PATCH] define date of last occurrence on agenda new and edit
 function in mobile and tablet

---
 capacitor.config.json                         |  3 +-
 .../agenda/edit-event/edit-event.page.ts      | 44 ++++++++++++++++++-
 .../pages/agenda/new-event/new-event.page.ts  | 41 +++++++++++++++++
 .../agenda/view-event/view-event.page.html    |  5 +--
 .../agenda/edit-event/edit-event.page.ts      |  2 +-
 5 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/capacitor.config.json b/capacitor.config.json
index 2f2d032bf..ae8649dcb 100644
--- a/capacitor.config.json
+++ b/capacitor.config.json
@@ -1,5 +1,6 @@
 {
   "server": {
-    "url": "http://192.168.0.95:8100"
+    "url": "http://192.168.0.57:8101",
+    "originalUrl": "http://192.168.0.95:8100"
   }
 }
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 070ad2b19..2477d9883 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -68,6 +68,7 @@ export class EditEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 5;
   public stepSecond = 5;
+  currentDate = new Date();
 
   loadedEventAttachments: Attachment[] = [];
   taskParticipants: any = [];
@@ -98,7 +99,7 @@ export class EditEventPage implements OnInit {
     this.isEventEdited = false;
     /* this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''}; */
     this.postEvent = this.navParams.get('event');
-    
+    console.log(this.postEvent);
 
     this.caller = this.navParams.get('caller');
     this.initCalendarName = this.postEvent.CalendarName;
@@ -171,6 +172,8 @@ export class EditEventPage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev?:any) {
+
+    this.calculetedLastOccurrence(ev);
     
     if(ev.length > 1){
       
@@ -181,6 +184,45 @@ export class EditEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
 
   runValidation() {
     this.validateFrom  = true
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 36493bc87..b0a017e59 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -198,6 +198,8 @@ export class NewEventPage implements OnInit {
   }
 
   onSelectedRecurringChanged(ev:any) {
+
+    this.calculetedLastOccurrence(ev);
     
     if(ev.length > 1) {
       
@@ -208,6 +210,45 @@ export class NewEventPage implements OnInit {
     }
   }
 
+  calculetedLastOccurrence(type:number){
+    console.log(type);
+    var valor; 
+    var opcao: boolean;
+    if (type == 0) {
+      valor = 7;
+      opcao = true;
+    } else if(type == 1){
+      valor = 30;
+      opcao = true;
+    } else if(type == 2){
+      valor = 1;
+      opcao = false;
+    }else if(type == 3){
+      valor = 5;
+      opcao = false;
+    }
+    this.defineLastOccurrence(valor, opcao);
+  }
+
+
+  defineLastOccurrence(valor:number, opcao:boolean){
+    var time = new Date(this.postEvent.EndDate);
+    if (opcao == true) {
+      time.setDate(time.getDate() + valor);
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    } else {
+      time = new Date(
+        time.getFullYear() + valor, 
+        time.getMonth(), 
+        time.getDate(), 
+        time.getHours(), 
+        time.getMinutes()
+      );
+      this.postEvent.EventRecurrence.LastOccurrence = time;
+    }
+    
+  }
+
 
   runValidation() {
     this.validateFrom  = true;
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 7fb0e358a..4d6b15b26 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -57,13 +57,12 @@
             <ion-label>
               <p>{{customDate}}</p>
               <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
-              <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
-              <p *ngIf="loadedEvent.IsRecurring">
+              <p>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
                 <span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
-                <span *ngIf="loadedEvent.EventRecurrence.Type == -1">Nunca</span>
+                <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>
               </p>
             </ion-label>
           </div>
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 34b210462..700551ecf 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -129,7 +129,7 @@ export class EditEventPage implements OnInit {
 
     this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
 
-    this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
+    // this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
 
     setTimeout(() => {
       this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();