From 79cc94cbc90f2b13f8598f7087b5069acd415053 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 1 Aug 2022 15:24:58 +0100
Subject: [PATCH 1/9] remove false

---
 src/app/shared/chat/group-messages/group-messages.page.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 86584f9c3..ea89cfeae 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -233,7 +233,6 @@
   <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div> -->
 
   <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
-    {{ wsChatMethodsService.getGroupRoom(roomId).otherUserType }}
 
     <ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "wsChatMethodsService.getGroupRoom(roomId).name"

From e78de0e19369cf1f1dd58e5de44fad955a815fe8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 1 Aug 2022 15:47:04 +0100
Subject: [PATCH 2/9] theme

---
 src/app/shared/chat/group-messages/group-messages.page.html | 1 -
 src/app/shared/chat/messages/messages.page.html             | 4 ----
 src/global.scss                                             | 1 +
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index ea89cfeae..4887039c3 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -230,7 +230,6 @@
 </ion-content>
 
 <ion-footer>
-  <!-- <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div> -->
 
   <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true">
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 58e3a26c2..e127dbfe8 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -220,14 +220,10 @@
   <div class="width-100 pl-20 pr-20">
     <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>
     <div class=" audioDiv d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded">
-    <!-- <button class="audioButtonPlay" fill="clear" (click)="start(audioRecorded)" *ngIf="!isPlaying"> <ion-icon slot="icon-only" name="play"></ion-icon> </button>
-    <button class="audioButtonPlay" fill="clear" (click)="togglePlayer(true)" *ngIf="isPlaying"> <ion-icon slot="icon-only" name="pause"></ion-icon> </button> -->
     <div (click)="start(audioRecorded)" *ngIf="!isPlaying" > <ion-icon slot="icon-only" name="play"></ion-icon> </div>
     <div (click)="togglePlayer(isPlaying)" *ngIf="isPlaying"> <ion-icon slot="icon-only" name="pause"></ion-icon> </div>
-    <!-- <label>{{audioDuration}}</label> -->
     <ion-range #range [(ngModel)]="audioProgress" max="100" (mouseup)="seek()"></ion-range>
     </div>
-    <!-- <audio [src]="audioRecorded" class="d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded" controls controlsList="nodownload noplaybackrate"></audio> -->
   </div>
 
   <div class="container width-100 d-flex">
diff --git a/src/global.scss b/src/global.scss
index d19add06b..f0c15b50d 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1196,6 +1196,7 @@ ngx-mat-datetime-content{
   width: 100%;
   background: none;
   padding: 10px 5px 10px 5px;
+  color: black;
 }
 .menuButton:hover{
   background: #e6f6ff75;

From 75795d96286ba09b023993edcffb9807a9585a62 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 1 Aug 2022 16:20:26 +0100
Subject: [PATCH 3/9] improve create event from chat

---
 src/app/pages/chat/chat.page.html                |  3 +++
 src/app/pages/events/events.page.ts              |  2 ++
 .../shared/agenda/new-event/new-event.page.ts    | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 27c49e4f1..e669e2e7d 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -238,6 +238,7 @@
         </app-group-messages>
 
         <app-new-event
+          *ngIf="showNewEvent"
           [profile]=""
           [roomId]="groupRoomId"
           [selectedSegment]=segment
@@ -248,6 +249,8 @@
           (onAddEvent)="closeNewEventComponent()"
           (openAttendeesComponent)="openAttendeesComponent($event)"
           (cloneAllmobileComponent)="closeNewEventComponent()"
+          (setIntervenient)="setIntervenient($event)"
+          (setIntervenientCC)="setIntervenientCC($event)"
           [style.display]="showNewEvent ? 'flex' : 'none'"
           class=" height-100 flex-column">
         </app-new-event>
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 74923ea81..464764d4d 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -515,3 +515,5 @@ export class EventsPage implements OnInit {
 
 }
 
+
+
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 63b0667f0..94f84421d 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -488,10 +488,12 @@ export class NewEventPage implements OnInit {
     else if(this.loggeduser.Profile == 'PR') {
       
       const CalendarId = this.selectedCalendarId()
+      let loader = this.toastService.loading();
       
       this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe(
         (id) => {
           
+          loader.remove()
 
           const eventId: any =  id;
 
@@ -520,6 +522,10 @@ export class NewEventPage implements OnInit {
             this.afterSave();
           }
           this.toastService._successMessage('Evento criado')
+        },()=>{
+          loader.remove()
+          this.showLoader = false
+          this.toastService._badRequest('Evento não criado')
         });
     } else {
 
@@ -527,10 +533,12 @@ export class NewEventPage implements OnInit {
 
 
       const CalendarId = this.selectedCalendarId()
+      let loader = this.toastService.loading();
       
       this.eventService.postEventGeneric(this.postEvent, this.postEvent.CalendarName, CalendarId).subscribe(
         (id) => {
-          
+          loader.remove();
+
           const eventId: any =  id;
 
           const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
@@ -558,6 +566,10 @@ export class NewEventPage implements OnInit {
             this.afterSave();
           }
           this.toastService._successMessage('Evento criado')
+      },()=>{
+        loader.remove()
+        this.showLoader = false
+        this.toastService._badRequest('Evento não criado')
       });
 
     }
@@ -643,7 +655,7 @@ export class NewEventPage implements OnInit {
       return true;
     } else {
 
-      return false;
+      
     }
   }
 

From ace8c5edd1eeafa9f4672d1472b2fb8f375fcb98 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 1 Aug 2022 16:44:57 +0100
Subject: [PATCH 4/9] improve create event from chat

---
 .../shared/agenda/new-event/new-event.page.ts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

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 94f84421d..92284cd24 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -521,6 +521,16 @@ export class NewEventPage implements OnInit {
           if(DocumentToSave.length == 0){
             this.afterSave();
           }
+          this.toastService._successMessage('Evento criado');
+          let data = {
+            "subject": this.postEvent.Subject,
+            "start": this.postEvent.StartDate,
+            "end": this.postEvent.EndDate,
+            "venue": this.postEvent.Location,
+            "id": id,
+          }
+          this.chatMethodService.sendMessage(this.roomId,data);
+
           this.toastService._successMessage('Evento criado')
         },()=>{
           loader.remove()
@@ -565,6 +575,16 @@ export class NewEventPage implements OnInit {
           if(DocumentToSave.length == 0){
             this.afterSave();
           }
+
+          this.toastService._successMessage('Evento criado');
+          let data = {
+            "subject": this.postEvent.Subject,
+            "start": this.postEvent.StartDate,
+            "end": this.postEvent.EndDate,
+            "venue": this.postEvent.Location,
+            "id": id,
+          }
+          this.chatMethodService.sendMessage(this.roomId,data);
           this.toastService._successMessage('Evento criado')
       },()=>{
         loader.remove()

From f73ad083c9509439397c826e4d5538c6f538a095 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 2 Aug 2022 15:04:37 +0100
Subject: [PATCH 5/9] fix icons

---
 .../shared/chat/group-messages/group-messages.page.html    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 4887039c3..f64d7faed 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -112,10 +112,11 @@
                         <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                           <div *ngIf="!msg.attachments[0].image_url">
                             <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                              <ion-icon name="document" class="file-icon"></ion-icon>
+                              <ion-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                              <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" class="file-icon"></ion-icon>
                               <ion-label>{{file.title}}</ion-label>
-                              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                              <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                             </ion-item>
                           </div>
                           <div *ngIf="msg.attachments[0].image_url">

From 2141d4e0efe8a74f5f678ef05595ae9812c88c03 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 2 Aug 2022 15:08:01 +0100
Subject: [PATCH 6/9] fix icons

---
 src/app/pages/chat/group-messages/group-messages.page.html | 7 ++++---
 src/app/pages/chat/messages/messages.page.html             | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index aad78431d..468922cf8 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -108,10 +108,11 @@
                     <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <div *ngIf="!msg.attachments[0].image_url">
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                          <ion-icon name="document" class="file-icon"></ion-icon>
+                          <ion-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                          <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" class="file-icon"></ion-icon>
                           <ion-label>{{file.title}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                         </ion-item>
                       </div>
                       <div *ngIf="msg.attachments[0].image_url">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 210ea05b7..3f06827b5 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -107,10 +107,11 @@
 
                       <div *ngIf="!msg.attachments[0].image_url">
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                          <ion-icon name="document" class="file-icon"></ion-icon>
+                          <ion-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document" class="file-icon"></ion-icon>
+                          <ion-icon  *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg" class="file-icon"></ion-icon>
                           <ion-label>{{file.title}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
                         </ion-item>
                       </div>
 

From 88f01ee141162127bb0836544941f2a1d5457045 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 3 Aug 2022 16:31:03 +0100
Subject: [PATCH 7/9] open event

---
 src/app/modals/view-event/view-event.page.ts  | 63 ++++++++++++++-----
 .../group-messages/group-messages.page.html   |  4 +-
 .../group-messages/group-messages.page.ts     |  5 +-
 .../pages/chat/messages/messages.page.html    |  4 +-
 src/app/pages/chat/messages/messages.page.ts  |  6 +-
 .../shared/agenda/new-event/new-event.page.ts |  3 +
 .../group-messages/group-messages.page.html   |  4 +-
 .../group-messages/group-messages.page.ts     |  5 +-
 .../shared/chat/messages/messages.page.html   |  2 +-
 src/app/shared/chat/messages/messages.page.ts |  5 +-
 10 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts
index cf65032c3..f37748364 100644
--- a/src/app/modals/view-event/view-event.page.ts
+++ b/src/app/modals/view-event/view-event.page.ts
@@ -21,6 +21,7 @@ import { Event } from '../../models/event.model';
 import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { RouteService } from 'src/app/services/route.service';
+import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -54,6 +55,8 @@ export class ViewEventPage implements OnInit {
   header = true
   task: ExpedientTaskModalPageNavParamsTask;
   LoadedDocument: any = null;
+  CalendarId
+  sesseionStora = SessionStore
 
   constructor(
     private modalController: ModalController,
@@ -74,6 +77,7 @@ export class ViewEventPage implements OnInit {
     public ThemeService: ThemeService
   ) {
     this.eventId = this.navParams.get('eventId');
+    this.CalendarId = this.navParams.get('CalendarId');
     this.isEventEdited = false;
     this.loadedEvent = new Event();
     this.eventBody = { BodyType: "1", Text: "" };
@@ -127,24 +131,51 @@ export class ViewEventPage implements OnInit {
 
   loadEvent() {
     const loader = this.toastService.loading();
-    this.eventsService.getEvent(this.eventId).subscribe(res => {
-      this.loadedEvent = res;
-      this.addEventToDb(res);
-      /* this.today = new Date(res.StartDate);
-      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]); */
-      loader.remove()
-    }, (error) => {
-
-      if (error.status === 0) {
-        this.getFromDb();
-      } else {
-        this.toastService.badRequest('Este evento já não existe na sua agenda')
+    
+    if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
+      this.eventsService.getEvent(this.eventId).subscribe(res => {
+        this.loadedEvent = res;
+        this.addEventToDb(res);
+        
         loader.remove()
-        this.modalController.dismiss('Eevent not Foud');
-        this.RouteService.goBack();
+      }, (error) => {
+  
+        
+        if (error.status === 0) {
+          this.getFromDb();
+        } else {
+          this.toastService.badRequest('Este evento já não existe na sua agenda')
+          loader.remove()
+          this.modalController.dismiss('Eevent not Foud');
+          this.RouteService.goBack();
+        }
+        loader.remove()
+      });
+    } else {
+
+      
+      if(this.CalendarId) {
+        this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
+          this.loadedEvent = res;
+          this.addEventToDb(res);
+          
+          loader.remove()
+        }, (error) => {
+    
+          if (error.status === 0) {
+            this.getFromDb();
+          } else {
+            this.toastService.badRequest('Este evento já não existe na sua agenda')
+            loader.remove()
+            this.modalController.dismiss('Eevent not Foud');
+            this.RouteService.goBack();
+          }
+          loader.remove()
+        });
       }
-      loader.remove()
-    });
+
+    }
+
   }
 
   deleteEvent() {
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 468922cf8..cc652c9c0 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -160,7 +160,7 @@
       </div>
       <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
         <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
-        <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+        <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
         <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
         <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
       </div>
@@ -200,7 +200,7 @@
       <!-- <div *ngIf="msg.file">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 980185f06..1f0b3301e 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -325,7 +325,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.loadFiles();
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -336,7 +336,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 3f06827b5..16e5f7872 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -168,7 +168,7 @@
         </div>
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label class="info-meeting-medium">
@@ -186,7 +186,7 @@
       <div *ngIf="msg.file && msg.delate == false">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label class="info-meeting-medium">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 0a55bfca5..268e41527 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -338,7 +338,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
+
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -348,7 +349,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
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 0a52d766e..92494a5e2 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -459,6 +459,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
         },
@@ -512,6 +513,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
 
@@ -567,6 +569,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
           this.toastService._successMessage('Evento criado')
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index f64d7faed..cc1b4c7ec 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -165,7 +165,7 @@
         </div>
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
@@ -203,7 +203,7 @@
       <!-- <div *ngIf="msg.file" >
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index f5e2b4b96..6b66a249d 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -213,7 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch (err) { }
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -224,7 +224,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index e127dbfe8..6dd7d2e21 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -176,7 +176,7 @@
 
 
           <ion-label *ngIf="msg.delate == false" class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button *ngIf="msg.delate == false" (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button *ngIf="msg.delate == false" (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label *ngIf="msg.delate == false" class="info-meeting-medium">
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 7562a9514..0a3c0a29c 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -372,7 +372,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     return this.timeService.showDateDuration(start);
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -382,7 +382,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });

From fd2e6856a9af4b14ef5a651c09baa0ba1f71d2f8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 3 Aug 2022 16:45:52 +0100
Subject: [PATCH 8/9] save

---
 src/app/pages/chat/messages/messages.page.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 16e5f7872..e0ff11ec4 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -54,7 +54,6 @@
           <span class="time">{{msg.duration}}</span>
         </div>
         <div>
-          <!-- <div class="message-attachments"> -->
             <div class="file">
               <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
               <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
@@ -67,7 +66,6 @@
                 <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
               </ion-label>
             </div>
-          <!-- </div>     -->
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>

From 9299d391cdc7cb2c9dce90b1058f7b638f3b8621 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 4 Aug 2022 16:13:11 +0100
Subject: [PATCH 9/9] add loader

---
 src/app/pages/chat/messages/messages.page.html    | 14 ++++++++++----
 src/app/services/chat/message.service.ts          |  2 +-
 .../chat/group-messages/group-messages.page.html  | 14 ++++++++++----
 src/app/shared/chat/messages/messages.page.html   | 15 +++++++++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index e0ff11ec4..74142cdbb 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -85,8 +85,11 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                   </ion-item>
                 </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
@@ -134,8 +137,11 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                     </ion-item>
                   </div>
                   <div class="file audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index c0ee74133..d7cc38f89 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -56,7 +56,7 @@ export class MessageService {
   messageSend = false
   delate = false
   delateRequest = false
-  downloadLoader: boolean;
+  downloadLoader: boolean = false
 
   constructor(private storage: Storage,
     private NfService: NfService,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index cc1b4c7ec..d9fcd5d2d 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -89,8 +89,11 @@
                       <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                         <ion-icon name="image" class="file-icon"></ion-icon>
                         <ion-label>{{"Imagem"}}</ion-label>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+    
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                       </ion-item>
                     </div>
                   </div>
@@ -135,8 +138,11 @@
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                           <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                           <ion-label>{{"Mensagem de voz"}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+      
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                         </ion-item>
                       </div>
                       <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 6dd7d2e21..a66504622 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -90,8 +90,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    
                   </ion-item>
                 </div>
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
@@ -142,8 +146,11 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{'Mensagem de voz'}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                     </ion-item>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">