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,
     });