From 8aea090a37e49fa72a92d4f5b89dfd0f86797685 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 17 Dec 2022 16:19:23 +0100
Subject: [PATCH] save

---
 src/app/pages/events/events.page.html               |  2 +-
 src/app/pages/events/events.page.ts                 | 13 +++++--------
 .../publications/new-action/new-action.page.html    |  2 --
 src/app/pages/search/search.page.ts                 | 10 +++++++++-
 .../publication/new-action/new-action.page.html     |  2 --
 .../publication/new-action/new-action.page.ts       | 11 +++++++++--
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 4a398e0d2..d8f7fe964 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -62,7 +62,7 @@
 
         <ion-list>
           <ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
-            (click)="goToEvent(event.EventId)"
+            (click)="goToEvent(event)"
           >
           <div class="d-flex  content-{{loggeduser.Profile}}-{{event.CalendarName}}">
 
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index e22c7f711..78c8864e2 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -460,18 +460,15 @@ export class EventsPage implements OnInit {
     });
   }
 
-  goToEvent(eventId: any) {
-    this.router.navigate(['/home/events', eventId, 'events']);
+  goToEvent(event: any) {
+    let navigationExtras: NavigationExtras = { queryParams: { CalendarId: event.CalendarId } }
+
+
+    this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras);
   }
 
   goToExpediente(SerialNumber: any) {
     this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
-    /* if (this.loggeduser.Profile == 'MDGPR') {
-      this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
-    }
-    else if (this.loggeduser.Profile == 'PR') {
-      this.router.navigate(['/home/events/expedientes-pr', SerialNumber, 'events']);
-    } */
   }
 
   viewExpedientListPage() {
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index b0a6b8150..e1410f6c7 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -35,7 +35,6 @@
           displayFormat="D MMM YYYY H:mm"
           minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-          min="{{minDate}}"
           max="2025">
         </ion-datetime>
 
@@ -43,7 +42,6 @@
           <input matInput [ngxMatDatetimePicker]="picker1"
             placeholder="Data inicio*"
             [formControl]="dateControlStart"
-            [min]="minDate"
             [disabled]="disabled"
           >
           <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 34cd15c99..2fab89b7d 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -259,6 +259,7 @@ export class SearchPage implements OnInit {
     if(this.type == "Agenda" ){
 
 
+      alert('agenda seach')
       this.showLoader = true;
 
 
@@ -287,7 +288,8 @@ export class SearchPage implements OnInit {
             this.loadWordCloud();
 
       },error => {
-        this.searchResult = "Registo não encontrado"
+        this.showLoader = false;
+        // this.searchResult = "Registo não encontrado"
         console.log(error)
       });
     }
@@ -551,6 +553,11 @@ export class SearchPage implements OnInit {
 
           this.loadWordCloud();
         },error => {
+          counter++;
+
+          if(counter ==2){
+            this.showLoader = false;
+          }
           this.searchResult = "Registo não encontrado"
           console.log(error)
         });
@@ -586,6 +593,7 @@ export class SearchPage implements OnInit {
         this.showLoader = false;
         this.loadWordCloud();
       },error => {
+        this.showLoader = false;
         this.searchResult = "Registo não encontrado"
         console.log(error)
       });
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index 826ca06c6..9f60cc61b 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -46,7 +46,6 @@
               placeholder="Data inicio*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
-              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
@@ -83,7 +82,6 @@
               placeholder="Data de fim*"
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
-              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index 71b3b0574..1cdfb3481 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -63,8 +63,15 @@ export class NewActionPage implements OnInit {
   }
 
   get dateValid() {
-    if (window.innerWidth > 700) {
-      return  new Date(this.folder.DateBegin).toLocaleString('pt')  <  new Date(this.folder.DateEnd).toLocaleString("pt")? ['ok'] : []
+    var validado: boolean;
+
+    if (window.innerWidth <= 800) {
+      if ((this.folder.DateBegin < this.folder.DateEnd) && (new Date(this.folder.DateBegin).getTime() > this.currentDate.getTime())) {
+        validado = true;
+      }else{
+        validado = false;
+      }
+      return validado == true ? ['ok']: [];
     } else {
       return ['ok']
     }