Merge branch 'feature/viewer-attachment' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/viewer-attachment

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -279,13 +279,13 @@
           <div class="container-div width-100">
             <div (click)="addParticipantsCC()" class="ion-item-class-2 cursor-pointer">
               <div class="ion-icon-class">
-                <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
+                <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
               </div>
               <div class="ion-input-class-no-height d-flex">
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com Conhecimento*</ion-label>
+                      <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com Conhecimento</ion-label>
                       <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>
@@ -377,7 +377,7 @@
       </button>
     </ion-buttons>
     <ion-buttons  slot="end">
-      <button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
+      <button class="btn-cancel" fill="clear" color="#061b52" (click)="cancel()">
         <ion-label>Cancelar</ion-label>
       </button>
     </ion-buttons>

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -203,6 +203,10 @@ export class EditEventPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  cancel() {
+    this.modalController.dismiss({action:'cancel'});
+  }
+
   goBack() {
 
     this.router.navigate(['/home', this.caller]);
@@ -645,7 +649,7 @@ export class EditEventPage implements OnInit {
     if (horaMinuto[1] === '59') {
       horaMinuto[1] = '00';
       var novaString = partes[0] + ' ' + horaMinuto.join(':');
-      
+
       return novaString;
     }
     return string;

src/app/pages/agenda/view-event/view-event.page.html

@@ -18,6 +18,7 @@
           </div>
           <div class="middle d-flex align-center">
             <p class="title" style="font-size: 21.1px"><span>{{loadedEvent.Subject}}</span></p>
+            <!-- Event details page -->
           </div>
           <div class="menu-options d-flex">
             <button class="btn-no-color" (click)="editEvent()">

src/app/pages/agenda/view-event/view-event.page.ts

@@ -247,6 +247,37 @@ export class ViewEventPage implements OnInit {
 
   }
 
+  loadEvent1() {
+
+
+    if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
+      this.eventsService.getEvent(this.eventId).subscribe(res => {
+
+        res = this.dateService.fixDate(res as any)
+        this.loadedEvent = res;
+         this.setTimeZone()
+        // this.addEventToDb(res);
+      }, (error) => {
+      });
+    } else {
+
+
+      if(this.CalendarId) {
+        this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
+
+          res = this.dateService.fixDate(res as any)
+          this.loadedEvent = res;
+          this.setTimeZone()
+
+        }, (error) => {
+
+        });
+      }
+
+    }
+
+  }
+
   deleteYesOrNo() {
     this.alertController.create({
       header: 'Eliminar evento?',
@@ -364,14 +395,13 @@ export class ViewEventPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then((res) => {
 
-
       if (res) {
         setTimeout(() => {
           /* this.loadEvent(); */
-          this.loadEvent()
+          this.loadEvent1()
         }, 250);
         this.isEventEdited = true;
-        console.log('res', res)
+        console.log('res', res, res.data?.action, 'cancel')
       }
     });
 
@@ -399,7 +429,20 @@ export class ViewEventPage implements OnInit {
     modal.onDidDismiss().then((res) => {
 
 
-      if (res) {
+      if (res.data?.action == 'cancel') {
+        setTimeout(() => {
+          /* this.loadEvent(); */
+          this.loadEvent1()
+
+        }, 250);
+        this.isEventEdited = true;
+
+        if(res.data.Attendees?.length >= 1) {
+          this.loadedEvent.HasAttachments = true
+          this.getAttachments()
+        }
+        console.log('res', res)
+      } else {
         setTimeout(() => {
           /* this.loadEvent(); */
           this.loadEvent()