From fa5f67453e09964b075a84aa6850e3a221af4703 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 22 Dec 2021 10:31:10 +0100
Subject: [PATCH] add history in chat to record meeting created!

---
 src/app/app-routing.module.ts                 |   4 +
 src/app/home/home-routing.module.ts           |   4 +
 .../view-event/view-event-routing.module.ts   |  17 +
 .../modals/view-event/view-event.module.ts    |  20 +
 .../modals/view-event/view-event.page.html    | 128 ++++++
 .../modals/view-event/view-event.page.scss    | 301 +++++++++++++
 .../modals/view-event/view-event.page.spec.ts |  24 +
 src/app/modals/view-event/view-event.page.ts  | 419 ++++++++++++++++++
 src/app/pages/chat/chat.page.html             |   4 +-
 src/app/pages/chat/chat.page.ts               |   7 +-
 .../group-messages/group-messages.page.html   |  11 +-
 .../group-messages/group-messages.page.scss   |  39 +-
 .../group-messages/group-messages.page.ts     |  22 +
 .../pages/chat/messages/messages.page.html    |  11 +-
 .../pages/chat/messages/messages.page.scss    |  31 ++
 src/app/pages/chat/messages/messages.page.ts  |  21 +-
 .../chat/chat-methods.service.spec.ts         |  16 +
 src/app/services/chat/chat-methods.service.ts |  31 ++
 src/app/services/chat/methods.service.spec.ts |  16 +
 src/app/services/chat/methods.service.ts      |  11 +
 .../shared/agenda/new-event/new-event.page.ts |  41 +-
 .../group-messages/group-messages.page.html   |  11 +-
 .../group-messages/group-messages.page.scss   |  29 ++
 .../group-messages/group-messages.page.ts     |  22 +
 .../shared/chat/messages/messages.page.html   |  19 +-
 .../shared/chat/messages/messages.page.scss   |  28 ++
 src/app/shared/chat/messages/messages.page.ts |  30 +-
 src/environments/environment.ts               |   4 +-
 28 files changed, 1268 insertions(+), 53 deletions(-)
 create mode 100644 src/app/modals/view-event/view-event-routing.module.ts
 create mode 100644 src/app/modals/view-event/view-event.module.ts
 create mode 100644 src/app/modals/view-event/view-event.page.html
 create mode 100644 src/app/modals/view-event/view-event.page.scss
 create mode 100644 src/app/modals/view-event/view-event.page.spec.ts
 create mode 100644 src/app/modals/view-event/view-event.page.ts
 create mode 100644 src/app/services/chat/chat-methods.service.spec.ts
 create mode 100644 src/app/services/chat/chat-methods.service.ts
 create mode 100644 src/app/services/chat/methods.service.spec.ts
 create mode 100644 src/app/services/chat/methods.service.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 69db837c9..fd22251dd 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -227,6 +227,10 @@ const routes = [
     path: 'view-media',
     loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule)
   },
+  {
+    path: 'view-event',
+    loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule)
+  },
 
 
 
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 564db5b3e..2964c13c1 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -355,6 +355,10 @@ const routes: Routes = [
               },
             ]
           },
+          {
+            path:':eventId/:caller',
+            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
+          },
 
         ],
 
diff --git a/src/app/modals/view-event/view-event-routing.module.ts b/src/app/modals/view-event/view-event-routing.module.ts
new file mode 100644
index 000000000..37a7a0172
--- /dev/null
+++ b/src/app/modals/view-event/view-event-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ViewEventPage } from './view-event.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewEventPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewEventPageRoutingModule {}
diff --git a/src/app/modals/view-event/view-event.module.ts b/src/app/modals/view-event/view-event.module.ts
new file mode 100644
index 000000000..0840d1de0
--- /dev/null
+++ b/src/app/modals/view-event/view-event.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventPageRoutingModule } from './view-event-routing.module';
+
+import { ViewEventPage } from './view-event.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ViewEventPageRoutingModule
+  ],
+  declarations: [ViewEventPage]
+})
+export class ViewEventPageModule {}
diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html
new file mode 100644
index 000000000..368c471d6
--- /dev/null
+++ b/src/app/modals/view-event/view-event.page.html
@@ -0,0 +1,128 @@
+<ion-header class="ion-no-border">
+</ion-header>
+
+<ion-content class="container-wrapper main-content-l height-100 white  ">
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+
+  <div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
+    <div class="content d-flex flex-column width-100">
+      <div class="main-header  d-flex">
+        <div class="title-content  d-flex justify-between width-100">
+          <div class="left">
+            <button class="btn-no-color d-flex align-center" (click)="goBack()">
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+            </button>
+          </div>
+          <div class="middle">
+            <p class="title"><span>{{loadedEvent.Subject}}</span></p>
+          </div>
+          <div class="menu-options d-flex">
+            <button class="btn-no-color" (click)="editEvent()">
+              <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
+            </button>
+            <button class="btn-no-color" (click)="deleteEvent()">
+              <ion-icon class="delete"  name="trash-sharp"></ion-icon>
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <div class="overflow-y-auto">
+        <div class="upper-content ml-45">
+
+          <div class="content-location">
+            <span class="date">{{loadedEvent.Location}}</span>
+
+            <div *ngIf="loadedEvent.Organizer">
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
+              </div>
+
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
+              </div>
+            </div>
+
+          </div>
+
+          <div class="content-details">
+            <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">
+                <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>
+              </p>
+            </ion-label>
+          </div>
+        </div>
+        <div class="line"></div>
+        <div class="middle-content">
+          <div *ngIf="loadedEvent.Attendees">
+            <h5>Intervenientes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let attendee of loadedEvent.Attendees">
+                  <p>{{attendee.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="loadedEvent.Body.Text">
+            <h5>Detalhes</h5>
+            <ion-item lines="none" class="ion-no-margin ion-no-padding">
+              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+            </ion-item>
+            <div class="line"></div>
+          </div>
+        </div>
+
+        <div *ngIf="loadedEvent.Attachments" class="bottom-content width-100">
+          <h5>Documentos Anexados</h5>
+          <ion-list class="width-100">
+            <ion-item *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" class="ion-no-margin ion-no-padding">
+              <ion-label class="width-100 d-flex "  (click)="docIndex(i);LoadDocumentDetails()">
+                <p class="flex-grow-1" >
+                  <span class="attach-title-item d-block">{{attach.SourceName}}</span>
+                  <span class="span-left d-block">{{attach.Stakeholders}}</span>
+                </p>
+
+                <div class="d-flex pr-10">
+                  <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
+                </div>
+
+                <div (click)="docIndex(i);LoadDocumentDetails()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"  ></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"  ></ion-icon>
+                </div>
+
+              </ion-label>
+            </ion-item>
+          </ion-list>
+        </div>
+
+      </div>
+
+    </div>
+    <div class="aside-right flex-column height-100">
+      <div class="buttons">
+        <button (click)="editEvent()" full class="btn-ok" shape="round" >Editar</button>
+        <div class="solid"></div>
+        <button (click)="deleteEvent()" full class="btn-delete" shape="round" >Eliminar</button>
+      </div>
+    </div>
+
+  </div>
+</ion-content>
diff --git a/src/app/modals/view-event/view-event.page.scss b/src/app/modals/view-event/view-event.page.scss
new file mode 100644
index 000000000..acc6321ca
--- /dev/null
+++ b/src/app/modals/view-event/view-event.page.scss
@@ -0,0 +1,301 @@
+@import '~src/function.scss';
+ion-content{
+    --background:transparent;
+    /* --padding-top:0px;
+    --padding-start: 20px;
+    --padding-end: 20px;
+    font-size: 18px; */
+    overflow: auto;
+}
+ion-menu{
+    --height: 225px;
+  }
+.header-toolbar{
+   --background:transparent;
+   --opacity: 1;
+}
+  .main-header{
+    width: 100%; /* 400px */
+    font-family: Roboto;
+    background-color: #fff;
+    color:#000;
+    transform: translate3d(0, 1px, 0);
+
+    .title-content{
+      width: 100% !important;
+      margin: 0px auto;
+      padding: 0 !important;
+      background: #fff;
+      overflow: auto;
+
+      .left{
+        width: 37px;
+        float: left;
+        font-size: 35px;
+      }
+      .middle{
+        width: calc(100% - 138.5px) !important;
+        padding: 0 !important;
+        float: left;
+        margin: 0 !important;
+        overflow: auto;
+
+        p{
+          margin: 0 !important;
+        }
+      }
+      .header-icon-right{
+        width: 45px;
+        font-size: 45px;
+        float: right;
+      }
+      .menu-options{
+        width: fit-content;
+        height: fit-content;
+        align-items: flex-start;
+        justify-content: flex-start;
+        float: right;
+        padding: 1px;
+        margin-left: 15px;
+      }
+      .menu-options .edit{
+        font-size: 35px;
+        float: left;
+      }
+      .menu-options .delete{
+        padding: 7px;
+        font-size: 21px;
+        color:#fff;
+        background: #d30606;
+        border-radius: 20px;
+        margin-left: 10px;
+      }
+    }
+
+    .title{
+      font-size: 25px;
+    }
+
+  }
+  .main-content{
+    width: 100%;
+    font-family: Roboto;
+    background-color: #fff !important;
+    border-top-left-radius: 25px;
+    border-top-right-radius: 25px;
+    overflow:auto;
+
+    .content{
+      padding: 30px 20px 0 20px !important;
+      margin: 0;
+      float: left;
+    }
+
+    .upper-content{
+      width: calc(100%-50px);
+      margin-left: 50px;
+      font-size: 18px;
+
+        .content-location{
+          width: 100%;
+          margin: 0 auto;
+          padding: 0;
+          overflow: auto;
+
+          .date{
+            width: calc(100% - 105px);
+            float: left;
+          }
+
+
+        }
+
+        .location-detail{
+          width: 210px;
+          font-weight: 700;
+          font-size: 18px;
+          float: left;
+          margin: 5px 5px 5px 0px;
+        }
+        .button-mdgpr-Oficial{
+            width: 91px;
+            --border-radius: 20px;
+            --background: #ffb703;
+            margin-left: 5px;
+            float: left;
+        }
+        .button-mdgpr-Pessoal{
+          width: 91px;
+          --border-radius: 20px;
+          --background: #f05d5e;
+          margin-left: 5px;
+          float: left;
+        }
+
+        .button-pr-Oficial{
+          width: 91px;
+          --border-radius: 20px;
+          --background: #cbeecb;
+          margin-left: 5px;
+          float: left;
+      }
+      .button-pr-Pessoal{
+        width: 91px;
+        --border-radius: 20px;
+        --background: #cab0dc;
+        margin-left: 5px;
+        float: left;
+      }
+
+
+        .button-calendar-type ion-button{
+          height: 25px;
+        }
+        .button-edit-event {
+            width: 140px;
+            height: 44px;
+            border-radius: 22.5px;
+            --background: #e0e9ee;
+            --color:#061b52;
+        }
+        .content-details p{
+            font-size: 16px;
+        }
+      }
+      .line{
+        width: 100% !important;
+        margin-top: 15px;
+        border-top: 1px solid #d8d8d8;
+      }
+      .middle-conten{
+        width: 100% !important;
+        overflow: auto;
+
+        .middle-content h3, .middle-content p{
+          font-size: 16px;
+        }
+      }
+
+      .bottom-content{
+        margin: 0 auto;
+
+        .bottom-content h3{
+          font-size: 16px;
+          margin: 0 0 0 10px;
+        }
+        .attach-document{
+          font-size: 15px;
+          color: var(--title-text-color);
+          margin: 5px 5px 5px 10px;
+          padding: 5px;
+          float: left;
+        }
+        .attach-icon{
+          width: 37px;
+          font-size: 35px;
+          float: left;
+        }
+        .attach-title-item{
+          width: 100%;
+          font-size: 15px;
+          color: var(--title-text-color);
+        }
+        /* SPAN */
+        .span-left{
+          float: left;
+          font-size: 15x;
+        }
+        .span-right{
+        text-align: right;
+        float: right;
+        font-size: 13px;
+        }
+    }
+  }
+  .aside-right{
+    padding: 30px 20px 0 20px !important;
+
+    .arrow-right{
+      display: flex;
+      justify-content: flex-end;
+      margin-bottom: 20px;
+
+      .arrow-right-icon{
+          width: 37px;
+          float: right;
+          font-size: 35px;
+      }
+    }
+    .buttons{
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+
+      .btn-ok, .btn-cancel, .btn-delete{
+        height: auto !important;
+        font-size: 16px !important;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        padding: 15px !important;
+      }
+    }
+    .solid {
+      display: block;
+      width: 90%;
+      border-top: 1px solid #ebebeb;
+      margin: 0 auto !important;
+      margin-bottom: 10px !important;
+    }
+  }
+  textarea{
+    border:none;
+    --background:#fff !important;
+  }
+
+  @media only screen and (max-width: 800px) {
+    .content{
+      width: 100% !important;
+    }
+    .aside-right{
+      display: none;
+    }
+  }
+  @media only screen and (min-width: 801px) {
+    .menu-options{
+      display: none !important;
+    }
+    .content{
+      width: 65%;
+      border-right: 1px solid #d8d8d8;
+    }
+
+    .aside-right{
+      width: 35%;
+    }
+  }
+
+  @media only screen and (min-width: 1024px){
+    .content{
+      width: 70%;
+    }
+    .aside-right{
+      width: 30%;
+    }
+  }
+
+  @media only screen and (min-width: 1140px){
+    .content{
+      width: 75%;
+    }
+    .aside-right{
+      width: 25%;
+    }
+  }
+
+  .label{
+    border-radius: 20px;
+    background: #ffb703;
+    float: right;
+    padding: 5px 13.5px 5px 13.5px;
+    color: #fff;
+  }
diff --git a/src/app/modals/view-event/view-event.page.spec.ts b/src/app/modals/view-event/view-event.page.spec.ts
new file mode 100644
index 000000000..1af299407
--- /dev/null
+++ b/src/app/modals/view-event/view-event.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewEventPage } from './view-event.page';
+
+describe('ViewEventPage', () => {
+  let component: ViewEventPage;
+  let fixture: ComponentFixture<ViewEventPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewEventPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewEventPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts
new file mode 100644
index 000000000..04b31ebbb
--- /dev/null
+++ b/src/app/modals/view-event/view-event.page.ts
@@ -0,0 +1,419 @@
+import { Component, OnInit } from '@angular/core';
+import { AlertController, ModalController, PopoverController, Platform, NavParams } from '@ionic/angular';
+import { EventBody } from 'src/app/models/eventbody.model';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { EventsService } from 'src/app/services/events.service';
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
+import { Location } from '@angular/common'
+import { SqliteService } from 'src/app/services/sqlite.service';
+import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
+import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
+import { BackgroundService } from 'src/app/services/background.service';
+import { StorageService } from 'src/app/services/storage.service';
+import { ThemeService } from 'src/app/services/theme.service'
+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';
+
+
+@Component({
+  selector: 'app-view-event',
+  templateUrl: './view-event.page.html',
+  styleUrls: ['./view-event.page.scss'],
+})
+
+export class ViewEventPage implements OnInit {
+
+  loadedEvent: Event;
+  isEventEdited: boolean;
+  eventBody: EventBody;
+  loadedAttachments: any;
+  pageId: string;
+  showLoader: boolean;
+
+  minDate: Date;
+
+  profile: string;
+  eventId: string;
+  caller: string;
+  customDate: any;
+  today: any;
+
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+
+  dicIndex = 0;
+  isModal = false
+  header = true
+  task: ExpedientTaskModalPageNavParamsTask;
+  LoadedDocument: any = null;
+
+  constructor(
+    private modalController: ModalController,
+     private navParams: NavParams,
+    private eventsService: EventsService,
+    public alertController: AlertController,
+    private iab: InAppBrowser,
+    private processes: ProcessesService,
+    public popoverController: PopoverController,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private toastService: ToastService,
+    private location: Location,
+    public platform: Platform,
+    private sqliteservice: SqliteService,
+    private backgroundservice: BackgroundService,
+    private storage: StorageService,
+    public ThemeService: ThemeService
+  ) {
+    this.eventId = this.navParams.get('eventId');
+    this.isEventEdited = false;
+    this.loadedEvent = new Event();
+    this.eventBody = { BodyType: "1", Text: "" };
+    this.loadedEvent.Body = this.eventBody;
+
+  }
+
+  ngOnInit() {
+    this.loadEvent();
+
+    this.backgroundservice.registerBackService('Online', () => {
+      this.storage.get('eventEdit').then((req) => {
+        JSON.parse(req).forEach(element => {
+          this.eventsService.editEvent(element, 2, 3).subscribe((res) => {
+            this.storage.remove('eventEdit')
+            console.log('eventEdit synchnize', res)
+          })
+        });
+      })
+      this.storage.get('eventDelete').then((req) => {
+        JSON.parse(req).forEach(element => {
+          this.eventsService.editEvent(element, 2, 3).subscribe((res) => {
+            this.storage.remove('eventDelete')
+            console.log('eventEdit synchnize', res)
+          })
+        });
+      })
+      this.loadEvent();
+    });
+
+    window.onresize = (event) => {
+      // if not mobile remove all component
+      if (window.innerWidth >= 1024) {
+        this.modalController.dismiss(this.isEventEdited);
+      }
+    };
+
+  }
+
+  close() {
+
+    this.modalController.dismiss(this.isEventEdited);
+  }
+
+  goBack() {
+    this.close();
+  }
+
+  doRefresh(ev) {
+    this.loadEvent();
+    ev.target.complete();
+  }
+
+  loadEvent() {
+    const loader = this.toastService.loading();
+    this.eventsService.getEvent(this.eventId).subscribe(res => {
+      this.loadedEvent = res;
+      this.addEventToDb(res);
+      console.log('Loaded one event', 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) => {
+
+      console.log('errorstatus ss',error.status)
+
+      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.location.back();
+      }
+      loader.remove()
+    });
+  }
+
+  deleteEvent() {
+
+    const loader = this.toastService.loading()
+
+    this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
+      const alert = await this.alertController.create({
+        cssClass: 'my-custom-class',
+        header: 'Evento removido',
+        buttons: ['OK']
+      });
+
+      setTimeout(() => {
+        alert.dismiss();
+      }, 1500);
+      this.goBack();
+      this.toastService.successMessage('Evento apagado');
+    }, () => { },
+      () => {
+        loader.remove();
+      });
+
+      loader.remove();
+  }
+
+
+  async OpenDeleteEventModal() {
+
+    const modal = await this.modalController.create({
+      component: EliminateEventPage,
+      componentProps: {
+        eventId: this.loadedEvent.EventId,
+        caller: this.caller,
+      },
+      cssClass: 'discart-expedient-modal',
+
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+
+      if (res) {
+        setTimeout(() => {
+          /* this.loadEvent(); */
+          this.loadEvent()
+        }, 250);
+        this.isEventEdited = true;
+      }
+    });
+
+  }
+
+
+  async editEventDetail() {
+
+    const modal = await this.modalController.create({
+      component: EditEventPage,
+      componentProps: {
+        eventId: this.loadedEvent.EventId,
+        caller: this.caller,
+      },
+      cssClass: 'modal modal-desktop',
+
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+
+      if (res) {
+        setTimeout(() => {
+          /* this.loadEvent(); */
+          this.loadEvent()
+        }, 250);
+        this.isEventEdited = true;
+      }
+    });
+
+  }
+
+  async editEvent() {
+    console.log(this.loadedEvent);
+
+    let classs;
+    if (window.innerWidth <= 800) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: EditEventPage,
+      componentProps: {
+        event: this.loadedEvent,
+        caller: this.caller,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+
+      if (res) {
+        setTimeout(() => {
+          /* this.loadEvent(); */
+          this.loadEvent()
+        }, 250);
+        this.isEventEdited = true;
+      }
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index
+  }
+
+  async LoadDocumentDetails() {
+
+    const docId = this.loadedEvent.Attachments[this.dicIndex].SourceId
+    const applicationId: any = this.loadedEvent.Attachments[this.dicIndex].ApplicationId
+    const selectedDoc = this.loadedEvent.Attachments[this.dicIndex]
+
+    console.log('selectedDoc', selectedDoc)
+
+    this.task = {
+      serialNumber: '',
+      taskStartDate: '',
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FolderID: '',
+        Subject: selectedDoc.SourceName,
+        SourceSecFsID: selectedDoc.ApplicationId || selectedDoc['ApplicationID'],
+        SourceType: 'DOC',
+        SourceID: selectedDoc.SourceId,
+        DispatchNumber: ''
+      }
+    }
+
+
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        trustedUrl: '',
+        file: {
+          title: this.task.workflowInstanceDataFields.Subject,
+          url: '',
+          title_link: '',
+        },
+        Document: this.loadedEvent.Attachments[this.dicIndex],
+        applicationId: this.task.workflowInstanceDataFields.SourceSecFsID,
+        docId: selectedDoc.SourceId,
+        folderId: '',
+        task: this.task
+      },
+      cssClass: 'modal modal-desktop'
+    });
+    await modal.present();
+  }
+
+  async openBookMeetingModal() {
+
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: DocumentSetUpMeetingPage,
+      componentProps: {
+        subject: this.task.workflowInstanceDataFields.Subject,
+        document: this.loadedEvent.Attachments[this.dicIndex],
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res => {
+      //this.location.back();
+    });
+  }
+
+  // efetuar despacho
+  async openExpedientActionsModal(taskAction: any) {
+
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: this.task,
+        seachDocuments: this.loadedEvent.Attachments[this.dicIndex],
+        aplicationId: this.loadedEvent.Attachments[this.dicIndex].ApplicationId || this.loadedEvent.Attachments[this.dicIndex]['ApplicationID']
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async (res) => { });
+
+  }
+
+
+  addEventToDb(data) {
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+    } else {
+      let event = {
+        Attendees: JSON.stringify(data.Attendees) || JSON.stringify(''),
+        Body: JSON.stringify(data.Body) || JSON.stringify(''),
+        CalendarId: data.CalendarId,
+        CalendarName: data.CalendarName,
+        Category: data.Category,
+        EndDate: data.EndDate,
+        EventId: data.EventId,
+        EventRecurrence: JSON.stringify(data.EventRecurrence) || JSON.stringify(''),
+        EventType: data.EventType,
+        HasAttachments: data.HasAttachments,
+        IsAllDayEvent: data.IsAllDayEvent,
+        IsMeeting: data.IsMeeting,
+        IsRecurring: data.IsRecurring,
+        Location: data.Location,
+        Organizer: JSON.stringify(data.Organizer) || JSON.stringify(''),
+        StartDate: data.StartDate,
+        Subject: data.Subject,
+        TimeZone: data.TimeZone
+      }
+
+      this.sqliteservice.updateEvent(event);
+    }
+  }
+
+
+  getFromDb() {
+    const loader = this.toastService.loading();
+    this.sqliteservice.getEventById(this.eventId).then((event) => {
+      let arrayevent = [];
+      console.log('EVENT ATTENDEES',event[0].Attendees)
+      let elemet = {
+        Attendees: (typeof JSON.parse(event[0].Attendees) === 'undefined') ? "" : JSON.parse(event[0].Attendees),
+        Body: JSON.parse(event[0].Body) || "",
+        CalendarId: event[0].CalendarId,
+        CalendarName: event[0].CalendarName,
+        Category: event[0].Category,
+        EndDate: event[0].EndDate,
+        EventId: event[0].EventId,
+        EventRecurrence: JSON.parse(event[0].EventRecurrence) || "",
+        EventType: event[0].EventType,
+        HasAttachments: event[0].HasAttachments,
+        IsAllDayEvent: event[0].IsAllDayEvent,
+        IsMeeting: event[0].IsMeeting,
+        IsRecurring: event[0].IsRecurring,
+        Location: event[0].Location,
+        Organizer: JSON.parse(event[0].Organizer) || "",
+        StartDate: event[0].StartDate,
+        Subject: event[0].Subject,
+        TimeZone: event[0].TimeZone
+      }
+      arrayevent.push(elemet);
+      this.loadedEvent = arrayevent[0];
+      console.log("Event ditails local,", elemet)
+    })
+    loader.remove()
+  }
+}
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 31a2b15a3..78cc92b1a 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -131,11 +131,13 @@
       </div>
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">
+
         <app-empty-chat [texto]="emptyTextDescription"
           class="height-100 flex-column"
           [style.display]="showEmptyComponent ? 'flex' : 'none'"
           #messagecontainer>
         </app-empty-chat>
+
         <app-messages class=" height-100 flex-column"
           *ngIf="showMessages"
           [style.display]="showMessages ? 'flex' : 'none'"
@@ -195,6 +197,7 @@
 
         <app-new-event
           [profile]=""
+          [roomId]="groupRoomId"
           [selectedSegment]=segment
           [taskParticipants]="taskParticipants"
           [taskParticipantsCc]="taskParticipantsCc"
@@ -204,7 +207,6 @@
           (openAttendeesComponent)="openAttendeesComponent($event)"
           (cloneAllmobileComponent)="closeNewEventComponent()"
           [style.display]="showNewEvent ? 'flex' : 'none'"
-          [roomId]="groupRoomId"
           class=" height-100 flex-column">
         </app-new-event>
 
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 61c5b9e89..36c21e097 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -329,6 +329,7 @@ export class ChatPage implements OnInit {
         IsRequired: "true",
       }
     });
+    this.groupRoomId = data.roomId;
     this.closeAllDesktopComponents();
     if (window.innerWidth < 701) {
       console.log('Mobile');
@@ -410,7 +411,7 @@ export class ChatPage implements OnInit {
   getDirectMessagesDB() {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       this.storageservice.get("rooms").then((rooms) =>{
-        
+
         this.userDirectMessages = rooms.sort((a, b) => {
           var dateA = new Date(a._updatedAt).getTime();
           var dateB = new Date(b._updatedAt).getTime();
@@ -553,7 +554,7 @@ export class ChatPage implements OnInit {
         });
         }  */
         //console.log(res.ims);
-        
+
         //console.log(this.userDirectMessages);
 
         if (this.route.url != "/home/chat") {
@@ -620,7 +621,7 @@ export class ChatPage implements OnInit {
       })
     } else {
       this.sqlservice.getAllChatRoom().then((rooms: any) => {
-        
+
         let roomsArray = [];
         rooms.forEach(element => {
           let fddf = this.isJson(element.LastMessage);
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 cd041f368..3974560fd 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -57,7 +57,7 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -119,6 +119,15 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
+      <div *ngIf="msg.file" class="info-meeting">
+        <div *ngIf="msg.file.type == 'application/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 />
+          <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>
+        {{last ? scrollToBottom() : ''}}
+      </div>
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index c08d1b385..74c83990c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -235,6 +235,37 @@
     }
  }
 
+ .info-meeting{
+  /* width: 322px; */
+  width: em(422px);
+  background: var(--chat-alert-msg-color);
+  text-align: center;
+  font-size: 13px;
+  color: #262420;
+  padding: 10px;
+  margin: 10px auto;
+  line-height: 1.2rem;
+  /* margin: 15px 0px 15px 0px; */
+  border-radius: 8px;
+
+  .info-meeting-small{
+    font-size: 10px;
+    font-style: italic;
+  }
+  .info-meeting-medium{
+    font-size: 12px;
+  }
+  .info-meeting-normal{
+    color: #0782c9;
+    font-weight: 700;
+    text-decoration: underline;
+  }
+  .info-meeting-normal:hover{
+    text-decoration: underline;
+    color: #0782c9;
+  }
+ }
+
  ion-footer{
   padding-top: 7.5px;
   padding-bottom: 7.5px;
@@ -281,7 +312,7 @@
 .preview-slides {
   margin-top: 20%;
   background: #e6e6e6;
- 
+
   img {
       padding-top: 20px;
       padding-bottom: 20px;
@@ -299,15 +330,15 @@
 .image-card {
     overflow: visible;
 }
- 
+
 .image-card {
     z-index: 9;
 }
- 
+
 .backdrop {
     height: 200%;
     width: 100%;
     background: black;
     position: absolute;
     z-index: 10;
-}
\ No newline at end of file
+}
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 6a0063bdd..927576899 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 
 @Component({
   selector: 'app-group-messages',
@@ -166,6 +167,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.currentPosition = scroll;
   }
 
+  async goToEvent(eventId: any) {
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+    });
+  }
+
   ngOnDestroy() {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index eaf404443..02df0983c 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -51,7 +51,7 @@
   <div (click)="handleClick()" class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last"
     [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)">
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -91,6 +91,15 @@
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+      <div *ngIf="msg.file" class="info-meeting">
+        <div *ngIf="msg.file.type == 'application/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 />
+          <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>
+        {{last ? scrollToBottom() : ''}}
+      </div>
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index 8555d1822..1b91e6802 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -190,6 +190,37 @@
    }
  }
 
+ .info-meeting{
+  /* width: 322px; */
+  width: em(422px);
+  background: var(--chat-alert-msg-color);
+  text-align: center;
+  font-size: 13px;
+  color: #262420;
+  padding: 10px;
+  margin: 10px auto;
+  line-height: 1.2rem;
+  /* margin: 15px 0px 15px 0px; */
+  border-radius: 8px;
+
+  .info-meeting-small{
+    font-size: 10px;
+    font-style: italic;
+  }
+  .info-meeting-medium{
+    font-size: 12px;
+  }
+  .info-meeting-normal{
+    color: #0782c9;
+    font-weight: 700;
+    text-decoration: underline;
+  }
+  .info-meeting-normal:hover{
+    text-decoration: underline;
+    color: #0782c9;
+  }
+ }
+
  ion-footer{
   padding-top: 7.5px;
   padding-bottom: 7.5px;
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index e201c3700..0e72b5634 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -27,6 +27,7 @@ import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { elementAt } from 'rxjs-compat/operator/elementAt';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 
 const IMAGE_DIR = 'stored-images';
 
@@ -283,7 +284,25 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-
+  async goToEvent(eventId: any) {
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+    });
+  }
 
   onContentScrolled(e) {
     this.startPosition = e.srcElement.scrollTop;
diff --git a/src/app/services/chat/chat-methods.service.spec.ts b/src/app/services/chat/chat-methods.service.spec.ts
new file mode 100644
index 000000000..3e474e69d
--- /dev/null
+++ b/src/app/services/chat/chat-methods.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ChatMethodsService } from './chat-methods.service';
+
+describe('ChatMethodsService', () => {
+  let service: ChatMethodsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ChatMethodsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts
new file mode 100644
index 000000000..e22f6ddc0
--- /dev/null
+++ b/src/app/services/chat/chat-methods.service.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ChatService } from '../chat.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ChatMethodsService {
+
+  constructor(private chatService: ChatService) {
+  }
+
+  sendMessage(roomId:string, data:any) {
+
+    let body = {
+      "message":
+      {
+        "rid": roomId,
+        "msg":"",
+        "file":{
+          "type": "application/meeting",
+          "subject": data.subject,
+          "start_date": data.start,
+          "end_date": data.end,
+          "venue": data.venue,
+          "id": data.id,
+        }
+      }
+    }
+    this.chatService.sendMessage(body).subscribe(res=> {});
+  }
+}
diff --git a/src/app/services/chat/methods.service.spec.ts b/src/app/services/chat/methods.service.spec.ts
new file mode 100644
index 000000000..f8337c418
--- /dev/null
+++ b/src/app/services/chat/methods.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { MethodsService } from './methods.service';
+
+describe('MethodsService', () => {
+  let service: MethodsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(MethodsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/chat/methods.service.ts b/src/app/services/chat/methods.service.ts
new file mode 100644
index 000000000..d46b19283
--- /dev/null
+++ b/src/app/services/chat/methods.service.ts
@@ -0,0 +1,11 @@
+import { Injectable } from '@angular/core';
+import { ChatService } from '../chat.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MethodsService {
+
+  constructor(private chatService: ChatService) {
+  }
+}
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 dd837f708..4b2778ded 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -25,6 +25,7 @@ import { ViewChild } from '@angular/core';
 import {  FormGroup, Validators } from '@angular/forms';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { ThemeService } from 'src/app/services/theme.service'
+import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
 
 
 const moment = _rollupMoment || _moment;
@@ -70,6 +71,7 @@ export class NewEventPage implements OnInit {
   selectedRecurringType: any;
 
   @Input() profile:string;
+  @Input() roomId:string;
   @Input() selectedSegment: string;
   @Input() selectedDate: Date;
   @Input() taskParticipants: EventPerson[] = [];
@@ -120,7 +122,8 @@ export class NewEventPage implements OnInit {
     private toastService: ToastService,
     private userService: AuthService,
     private dateAdapter: DateAdapter<any>,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private chatMethodService: ChatMethodsService,
     // private translate: TranslateService
   ) {
     this.dateAdapter.setLocale('pt');
@@ -341,7 +344,6 @@ export class NewEventPage implements OnInit {
       return false
     }
 
-
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
     if(this.documents.length >= 0) {
@@ -353,27 +355,16 @@ export class NewEventPage implements OnInit {
     }
 
     if(this.loggeduser.Profile == 'MDGPR') {
-      // console.log('MD - Aqui');
-      // console.log(this.postEvent);
 
       this.showLoader = true;
-
       console.log(this.postEvent);
-
       let loader = this.toastService.loading();
-
       console.log(this.postEvent);
-
-
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(
         async (id) => {
-
           loader.remove()
-
           this.showLoader = false
-
           const eventId: any = id;
-
           const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
             return {
               SourceTitle: e.Assunto,
@@ -386,32 +377,30 @@ export class NewEventPage implements OnInit {
               SerialNumber: ''
             };
           });
-
           await DocumentToSave.forEach((attachments, i) => {
             this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
-
               if(DocumentToSave.length == (i+1)){
                 this.afterSave();
               }
             });
-
           });
-
-
           if(DocumentToSave.length == 0){
-
             this.afterSave();
           }
-
-          this.toastService._successMessage('Evento criado')
-
+          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);
         },
         error => {
-
           loader.remove()
           this.showLoader = false
           this.toastService._badRequest('Evento não criado')
-
       });
 
     }
@@ -439,19 +428,15 @@ export class NewEventPage implements OnInit {
 
           DocumentToSave.forEach((attachments, i) => {
             this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
-
               if(DocumentToSave.length == (i+1)){
                 this.afterSave();
               }
             });
-
           });
 
           if(DocumentToSave.length == 0){
-
             this.afterSave();
           }
-
           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 b548ea7e6..ff4c7537b 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -45,7 +45,7 @@
     </div>
 
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last">
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru'" >
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -111,6 +111,15 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
+      <div *ngIf="msg.file" class="info-meeting">
+        <div *ngIf="msg.file.type == 'application/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 />
+          <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>
+        {{last ? scrollToBottom() : ''}}
+      </div>
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index b07082ef1..55f9547af 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -125,6 +125,35 @@
      line-height: 1.2rem;
    }
   }
+
+  .info-meeting{
+    /* width: 322px; */
+    width: em(422px);
+    background: var(--chat-alert-msg-color);
+    text-align: center;
+    font-size: 13px;
+    color: #262420;
+    padding: 10px;
+    margin: 10px auto;
+    line-height: 1.2rem;
+    /* margin: 15px 0px 15px 0px; */
+    border-radius: 8px;
+
+    .info-meeting-small{
+      font-size: 10px;
+      font-style: italic;
+    }
+    .info-meeting-medium{
+      font-size: 12px;
+    }
+    .info-meeting-normal{
+      font-weight: 700;
+    }
+    .info-meeting-normal:hover{
+      text-decoration: underline;
+      color: #0782c9;
+    }
+   }
    .messages{
     font-size: 13px;
     font-family: Roboto;
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 7c07a530d..12c5a69bc 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -21,6 +21,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 
 /*
 import * as pdfjsLib from 'pdfjs-dist';
@@ -143,6 +144,27 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch(err) { }
   }
 
+  async goToEvent(eventId: any) {
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+    });
+  }
+
   ngAfterViewInit() {
     this.scrollChangeCallback = () => this.onContentScrolled(event);
     window.addEventListener('scroll', this.scrollChangeCallback, true);
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 2696dd5b9..09f89ba4b 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -38,7 +38,7 @@
   </ion-refresher>
   <div class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of chatMessageStore.message[roomId]; let last = last">
-      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45'>
+      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -57,15 +57,15 @@
                 <!-- <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)"> -->
                 <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
               </div>
-                <div>
-                  <div class="file">
-                    <!-- <canvas id="pdf_canvas"></canvas> -->
+              <!-- <div *ngIf="msg.file.type">
+                <div class="file">
                     <div (click)="viewDocument(msg, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <span *ngIf="msg.file.type">
                         <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
                         <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
                         <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
                         <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
+                        <ion-icon *ngIf="msg.file.type == 'application/meeting'" src="assets/icon/webtrix.svg"></ion-icon>
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>
                     </div>
@@ -76,13 +76,22 @@
                       <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
                       <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
                     </ion-label>
-                  </div>
                 </div>
+              </div> -->
             </div>
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+      <div *ngIf="msg.file" class="info-meeting">
+        <div *ngIf="msg.file.type == 'application/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 />
+          <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>
+        {{last ? scrollToBottom() : ''}}
+      </div>
     </div>
   </div>
   <ion-fab horizontal="end" vertical="bottom" slot="fixed">
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 6fdf6f95c..5dc3040c6 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -100,6 +100,34 @@
      border-radius: 8px;
      border: 1px solid red;
    }
+   .info-meeting{
+    /* width: 322px; */
+    width: em(422px);
+    background: var(--chat-alert-msg-color);
+    text-align: center;
+    font-size: 13px;
+    color: #262420;
+    padding: 10px;
+    margin: 10px auto;
+    line-height: 1.2rem;
+    /* margin: 15px 0px 15px 0px; */
+    border-radius: 8px;
+
+    .info-meeting-small{
+      font-size: 10px;
+      font-style: italic;
+    }
+    .info-meeting-medium{
+      font-size: 12px;
+    }
+    .info-meeting-normal{
+      font-weight: 700;
+    }
+    .info-meeting-normal:hover{
+      text-decoration: underline;
+      color: #0782c9;
+    }
+   }
 
    .messages{
     font-size: 13px;
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 45388dd48..59184d9b2 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -18,6 +18,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { ThemeService } from 'src/app/services/theme.service'
 import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 
 @Component({
   selector: 'app-messages',
@@ -74,7 +75,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private gestureController: GestureController,
     private http:HttpClient,
     public ThemeService: ThemeService,
-    private changeDetectorRef: ChangeDetectorRef
+    private changeDetectorRef: ChangeDetectorRef,
+    private router: Router,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
 
@@ -200,17 +202,33 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     return this.timeService.showDateDuration(start);
   }
 
+  async goToEvent(eventId: any) {
+    let classs;
+    if (window.innerWidth < 701) {
+      classs = 'modal modal-desktop'
+    } else {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      console.log(res);
+    });
+  }
+
   sendMessage() {
-
-    //this.synchro.$send({})
-
     let body = {
       "message":
       {
-        "rid": this.roomId, "msg": this.message
+        "rid": this.roomId, "msg": this.message,
       }
     }
-
     this.chatService.sendMessage(body).subscribe(res=> {
       this.scrollingOnce = true;
     });
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 98e1871b5..d49e7715f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
+  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
   domain: 'gabinetedigital.local', //gabinetedigital.local