Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into pdfviewer

src/app/app-routing.module.ts

@@ -195,6 +195,10 @@ const routes = [
   {
     path: 'document-viewer',
     loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule)
+  },
+  {
+    path: 'view-document',
+    loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule)
   },
 
 

src/app/home/home.page.ts

@@ -95,7 +95,7 @@ export class HomePage implements OnInit {
 
 
   }
-  
+
   goto(url) {
     this.router.navigate([url])
   }
@@ -106,10 +106,10 @@ export class HomePage implements OnInit {
     /* this.network.checkNetworkConnection;
     this.network.checkNetworkDisconnection; */
     // console.log('Active route ', this.router.url)
-    
+
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-      this.webnotification.webconnection();
-      this.webnotification.onReceviNotificationWeb();
+      /* this.webnotification.webconnection();
+      this.webnotification.onReceviNotificationWeb(); */
     } else {
       this.mobilefirstConnect();
       this.notificationsService.getAndpostToken2();
@@ -132,13 +132,13 @@ export class HomePage implements OnInit {
     if(window['WLAuthorizationManager']) {
       if(window['WLAuthorizationManager'].obtainAccessToken) {
         window['WLAuthorizationManager'].obtainAccessToken("").then((token) => {
-  
+
           console.log('MobileFirst Server connect: Success ' + token);
-    
+
           var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
             WLResourceRequest.GET
           );
-    
+
           resourceRequest.setQueryParameter("name", "world");
           resourceRequest.send().then(
             (response) => {
@@ -178,7 +178,7 @@ export class HomePage implements OnInit {
 
 
     synchro.registerCallback('Offline',()=>{
-      
+
     })
 
     synchro.conected
@@ -186,7 +186,7 @@ export class HomePage implements OnInit {
     synchro.registerCallback('Notification', (DataArray)=> {
 
       this.webNotificationPopupService.sendNotification(DataArray)
-      
+
       this.storageService.get('Notifications').then((data:any)=>{
         data.push(DataArray)
         this.storageService.store("Notifications", data)
@@ -196,7 +196,7 @@ export class HomePage implements OnInit {
         a.push(DataArray)
         this.storageService.store("Notifications",a)
       })
-      
+
     }, 'any')
 
 
@@ -204,7 +204,7 @@ export class HomePage implements OnInit {
     document.addEventListener('pause', function () {
       // console.log('App going to background');
     });
-  
+
     document.addEventListener('resume', function () {
       // console.log('App coming to foreground');
     });

src/app/modals/chat-options-features/chat-options-features.page.html

@@ -7,7 +7,7 @@
   <div class="buttons">
     <button (click)="takePicture()" full class="btn-cancel hide-desktop" shape="round" >Tirar Fotografia</button>
     <button (click)="addPicture()" full class="btn-cancel" shape="round" >Anexar Fotografia</button>
-    <button hidden (click)="addDocument()" class="btn-cancel" shape="round" >Documento</button>
+    <button (click)="addDocument()" class="btn-cancel" shape="round" >Documento</button>
     <button (click)="addDocGestaoDocumental()" class="btn-cancel" shape="round" >Anexar Documento (G.D.)</button>
     <div class="solid"></div>
     <button (click)="bookMeeting()" class="btn-cancel" shape="round" >Novo Evento</button>

src/app/modals/profile/edit-profile/edit-profile.page.html

@@ -64,7 +64,7 @@
             </div>
 
           </ion-col>
-          <ion-col class="align-center d-flex">
+          <ion-col hidden class="align-center d-flex">
             <div (click)="addFingerprint()" class="d-flex align-center">
               <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
               Impressão Digital

src/app/modals/view-document/view-document-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ViewDocumentPage } from './view-document.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewDocumentPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewDocumentPageRoutingModule {}

src/app/modals/view-document/view-document.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewDocumentPageRoutingModule } from './view-document-routing.module';
+
+import { ViewDocumentPage } from './view-document.page';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    FontAwesomeModule,
+    ViewDocumentPageRoutingModule
+  ],
+  declarations: [ViewDocumentPage]
+})
+export class ViewDocumentPageModule {}

src/app/modals/view-document/view-document.page.html

@@ -0,0 +1,25 @@
+<ion-header class="ion-no-border">
+  <ion-toolbar class="d-flex">
+    <div class="d-flex align-items-center px-20 pt-20 font-25">
+      <div class="left cursor-pointer" (click)="close()">
+        <!-- <ion-icon class="font-35" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon> -->
+        <fa-icon icon="chevron-left" class="menu-icon"></fa-icon>
+      </div>
+
+      <div class="middle">
+        {{file.title}}
+      </div>
+
+      <div class="right cursor-pointer">
+        <fa-icon icon="ellipsis-v" class="menu-icon"></fa-icon>
+      </div>
+
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="pt-10 height-100">
+  <div class="height-100">
+    <iframe id="iframe" [src]="trustedUrl" height="100%" width="100%" title="Iframe Example"></iframe>
+  </div>
+</ion-content>

src/app/modals/view-document/view-document.page.scss

@@ -0,0 +1,11 @@
+.left{
+  float: left;
+}
+.middle{
+  float: left;
+  padding-left: 5px !important;
+}
+.right{
+  float: right;
+  margin-left: auto;
+}

src/app/modals/view-document/view-document.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewDocumentPage } from './view-document.page';
+
+describe('ViewDocumentPage', () => {
+  let component: ViewDocumentPage;
+  let fixture: ComponentFixture<ViewDocumentPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewDocumentPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewDocumentPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/modals/view-document/view-document.page.ts

@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ModalController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-view-document',
+  templateUrl: './view-document.page.html',
+  styleUrls: ['./view-document.page.scss'],
+})
+export class ViewDocumentPage implements OnInit {
+
+  url: string;
+  a:string = "https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=";
+  viewerUrl: string;
+  trustedUrl: any;
+  file:any;
+
+  constructor(
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private sanitazer: DomSanitizer,
+  ) {
+
+    this.file = this.navParams.get('file');
+    this.url = this.file.title_link;
+    console.log(this.url);
+
+   }
+
+  ngOnInit() {
+    this.viewerUrl = this.url.replace("webTRIX.Viewer.Branch1/pdfjs/web/viewpdf.aspx?file=/webTRIX.Viewer.Branch1/arq/637690403731947760.pdf&i", "FileShare/pdfjs/web/viewer.html?file");
+    this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(this.viewerUrl);
+    console.log(this.trustedUrl);
+  }
+
+  close() {
+    this.modalController.dismiss();
+  }
+
+}

src/app/pages/chat/chat.page.scss

@@ -45,6 +45,7 @@ ion-content{
 
   .aside-wrapper{
     margin: 0 !important;
+    overflow: auto;
 
     .title-content{
       padding: 30px 20px 0 20px !important;
@@ -52,6 +53,7 @@ ion-content{
 
     .aside{
       padding: 0 !important;
+      overflow: auto;
     }
   }
 

src/app/pages/chat/group-messages/group-messages.page.html

@@ -66,10 +66,11 @@
                 <div>
                   <div class="file">
                     <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div class="file-details add-ellipsis" *ngIf="msg.file">
-                      <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
+                    <div (click)="viewDocument(file)" 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>
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>
@@ -118,29 +119,6 @@
   </ion-fab>
 
 </ion-content>
-<!--
-<ion-footer>
-  <ion-toolbar>
-    <ion-row align-items-center class="row">
-      <ion-col size="1">
-        <ion-label class="ion-no-padding" lines="none">
-          <ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
-        </ion-label>
-      </ion-col>
-      <ion-col size="9">
-        <ion-item class="ion-no-padding type-message" lines="none">
-          <ion-textarea placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
-        </ion-item>
-      </ion-col>
-      <ion-col size="2">
-        <ion-label>
-          <ion-icon (click)="sendMessage()" class="chat-icon-send" src="assets/icon/icons-chat-send.svg"></ion-icon>
-        </ion-label>
-      </ion-col>
-    </ion-row>
-  </ion-toolbar>
-</ion-footer> -->
 
 <ion-footer>
   <div class="container width-100 d-flex">

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -18,6 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { environment } from 'src/environments/environment';
 import { NewEventPage } from '../../agenda/new-event/new-event.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 @Component({
   selector: 'app-group-messages',
@@ -364,8 +365,28 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     };
   }
 
-  viewDocument(url:string){
-    this.fileService.viewDocumentByUrl(url);
+  viewDocument(file:any){
+    if(file.type == "file"){
+      let fullUrl = "https://www.tabularium.pt" + file.title_link;
+      this.fileService.viewDocumentByUrl(fullUrl);
+    }
+    else{
+      this.fileService.viewDocumentByUrl(file.title_link);
+      //this.openViewDocumentModal(file);
+    }
+  }
+
+  async openViewDocumentModal(file:any){
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        file: file,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
   }
 
   async bookMeeting() {

src/app/pages/chat/messages/messages.page.html

@@ -64,10 +64,11 @@
                 <div>
                   <div class="file">
                     <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div class="file-details add-ellipsis" *ngIf="msg.file">
-                      <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
+                    <div (click)="viewDocument(file)" 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>
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>

src/app/pages/chat/messages/messages.page.ts

@@ -2,6 +2,7 @@ import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnIn
 import {ActivatedRoute, Router} from '@angular/router'
 import { GestureController, Gesture, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { map } from 'rxjs/operators';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
 import { AlertService } from 'src/app/services/alert.service';
@@ -273,8 +274,28 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     })
   }
 
-  viewDocument(url:string){
-    this.fileService.viewDocumentByUrl(url);
+  viewDocument(file:any){
+    if(file.type == "file"){
+      let fullUrl = "https://www.tabularium.pt" + file.title_link;
+      this.fileService.viewDocumentByUrl(fullUrl);
+    }
+    else{
+      this.fileService.viewDocumentByUrl(file.title_link);
+      //this.openViewDocumentModal(file);
+    }
+  }
+
+  async openViewDocumentModal(file:any){
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        file: file,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
   }
 
   getChatMembers() {

src/app/services/auth.service.ts

@@ -65,7 +65,7 @@ export class AuthService {
     }
 
     SetSession(response: LoginUserRespose, user:UserForm) {
-      const session: UserSession = Object.assign(SessionStore.user, response) 
+      const session: UserSession = Object.assign(SessionStore.user, response)
 
       if (response) {
         if( session.RoleID == 100000014) {
@@ -102,6 +102,8 @@ export class AuthService {
         console.log('Login to Rocket chat OK');
         this.ValidatedUserChat = responseChat;
         localStorage.setItem('userChat', JSON.stringify(responseChat));
+        localStorage.setItem('Meteor.loginToken', JSON.stringify(responseChat['data'].userId));
+        localStorage.setItem('Meteor.userId', JSON.stringify(responseChat['data'].authToken));
         this.storageService.store(AuthConnstants.AUTH, responseChat);
         return true;
       }

src/app/services/chat.service.ts

@@ -49,6 +49,22 @@ export class ChatService {
         }); */
     }
 
+    getDocumentDetails(url:string){
+      let headersc = new HttpHeaders();
+      headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
+      headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
+      // headersc = headersc.set("Host", "www.tabularium.pt");
+      // headersc = headersc.set("Origin", "http://localhost:8100");
+      // headersc = headersc.set("Referer", "http://localhost:8100/");
+      let optionsc = {
+        headers: headersc,
+      };
+      let fullUrl = "https://www.tabularium.pt/" + url;
+      return this.http.get(fullUrl, optionsc).subscribe(()=>{
+        //this.fileService.viewDocumentByUrl(url)
+      });
+    }
+
     getAllChannels(){
       return this.http.get(environment.apiChatUrl+'channels.list', this.options);
     }
@@ -113,6 +129,14 @@ export class ChatService {
       return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts);
     }
 
+    uploadFile(formData:any, rid:string){
+      let url = environment.apiChatUrl+'rooms.upload/'+rid;
+      let opts = {
+        headers: this.headers,
+      }
+      return this.http.post(url, formData, opts);
+    }
+
     deleteMessage(body:any){
       let opts = {
         headers: this.headers,

src/app/services/functions/file.service.ts

@@ -21,6 +21,8 @@ export class FileService {
   documents:SearchList[] = [];
   showLoader: boolean;
 
+  files: Set<File>;
+
   constructor(
     private camera: Camera,
     private fileLoaderService: FileLoaderService,
@@ -160,33 +162,12 @@ export class FileService {
 
       console.log(file);
 
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
+      const formData = new FormData();
+      formData.append('file', file, file.name);
 
-      let body = {
-        "message":
-        {
-          "rid": roomId,
-          "msg": "",
-          "attachments": [{
-            "title": this.capturedImageTitle,
-            "text": "",
-            "title_link": this.capturedImage,
-            "title_link_download": true,
-            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-            "message_link": this.capturedImage,
-          }],
-          "file":{
-            "name": this.capturedImageTitle,
-            "type": "application/pdf",
-          }
-        }
-      }
-
-      this.chatService.sendMessage(body).subscribe(res=> {
+      this.chatService.uploadFile(formData, roomId).subscribe(res=> {
+        console.log(res);
         loader.remove();
-        //console.log(res);
       },(error) => {
         loader.remove();
       });
@@ -233,6 +214,7 @@ export class FileService {
               "title_link_download": true,
               //"thumb_url": "assets/images/webtrix-logo.png",
               "message_link": url_no_options,
+              "type": "webtrix"
             }],
             "file":{
               "name": res.data.selected.Assunto,

src/app/shared/chat/group-messages/group-messages.page.html

@@ -59,10 +59,11 @@
                 <div>
                   <div class="file">
                     <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div class="file-details add-ellipsis" *ngIf="msg.file">
-                      <span (click)="viewDocument(file.title_link)" class="cursor-pointer">
+                    <div (click)="viewDocument(file)" 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>
                       </span>
                       <ion-label class="file-title">{{file.title}}</ion-label>
@@ -126,9 +127,31 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
+      <!-- <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
         <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
-      </button>
+      </button> -->
+      <ion-fab horizontal="start" vertical="bottom" slot="fixed">
+        <ion-fab-button color="light" size="small">
+          <ion-icon name="add"></ion-icon>
+        </ion-fab-button>
+        <ion-fab-list side="top">
+          <ion-fab-button (click)="bookMeeting()" color="light">
+            <ion-icon name="calendar"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addFileWebtrix()" color="light">
+            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addFile()" color="light">
+            <ion-icon name="document"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addImage()" color="light">
+            <ion-icon name="image"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
+            <ion-icon name="camera"></ion-icon>
+          </ion-fab-button>
+        </ion-fab-list>
+      </ion-fab>
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -17,6 +17,7 @@ import { SearchPage } from 'src/app/pages/search/search.page';
 import { SearchList } from 'src/app/models/search-document';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { FileService } from 'src/app/services/functions/file.service';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 
 /*
@@ -89,7 +90,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   }
   ngOnChanges(changes: SimpleChanges): void {
-    //this.getRoomInfo();
+    this.getRoomInfo();
     //this.scrollToBottom();
   }
 
@@ -607,8 +608,48 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     });
   }
 
-  viewDocument(url:string){
-    this.fileService.viewDocumentByUrl(url);
+  viewDocument(file:any){
+    if(file.type == "file"){
+      let fullUrl = "https://www.tabularium.pt" + file.title_link;
+      this.fileService.viewDocumentByUrl(fullUrl);
+    }
+    else{
+      this.fileService.viewDocumentByUrl(file.title_link);
+      //this.openViewDocumentModal(file);
+    }
+  }
+
+  async openViewDocumentModal(file:any){
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        file: file,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  takePicture(){
+    this.fileService.addCameraPictureToChat(this.roomId);
+  }
+  addImage(){
+    this.fileService.addPictureToChat(this.roomId);
+  }
+  addFile(){
+    this.fileService.addDocumentToChat(this.roomId);
+  }
+  addFileWebtrix(){
+    this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+  }
+  bookMeeting(){
+    let data = {
+      roomId: this.roomId,
+      members: this.members
+    }
+    this.openNewEventPage.emit(data);
   }
 
   async _openChatOptions() {

src/app/shared/chat/messages/messages.page.html

@@ -51,8 +51,8 @@
                 <div>
                   <div class="file">
                     <!-- <canvas id="pdf_canvas"></canvas> -->
-                    <div class="file-details add-ellipsis" *ngIf="msg.file">
-                      <span *ngIf="msg.file.type" (click)="viewDocument(file.title_link)" class="cursor-pointer">
+                    <div (click)="viewDocument(file)" 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>
@@ -99,9 +99,33 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openSendMessageOptions()">
+      <!-- <button class="btn-no-color" (click)="openSendMessageOptions()">
         <ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
-      </button>
+      </button> -->
+
+      <ion-fab horizontal="start" vertical="bottom" slot="fixed">
+        <ion-fab-button color="light" size="small">
+          <ion-icon name="add"></ion-icon>
+        </ion-fab-button>
+        <ion-fab-list side="top">
+          <ion-fab-button (click)="bookMeeting()" color="light">
+            <ion-icon name="calendar"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addFileWebtrix()" color="light">
+            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addFile()" color="light">
+            <ion-icon name="document"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button (click)="addImage()" color="light">
+            <ion-icon name="image"></ion-icon>
+          </ion-fab-button>
+          <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
+            <ion-icon name="camera"></ion-icon>
+          </ion-fab-button>
+        </ion-fab-list>
+      </ion-fab>
+
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">

src/app/shared/chat/messages/messages.page.ts

@@ -14,6 +14,8 @@ import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
 import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { FileService } from 'src/app/services/functions/file.service';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 @Component({
   selector: 'app-messages',
@@ -68,6 +70,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private timeService: TimeService,
     private fileService: FileService,
     private gestureController: GestureController,
+    private http:HttpClient,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
 
@@ -239,8 +242,28 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     })
   }
 
-  viewDocument(url:string){
-    this.fileService.viewDocumentByUrl(url);
+  viewDocument(file:any){
+    if(file.type == "file"){
+      let fullUrl = "https://www.tabularium.pt" + file.title_link;
+      this.fileService.viewDocumentByUrl(fullUrl);
+    }
+    else{
+      this.fileService.viewDocumentByUrl(file.title_link);
+      //this.openViewDocumentModal(file);
+    }
+  }
+
+  async openViewDocumentModal(file:any){
+    const modal = await this.modalController.create({
+      component: ViewDocumentPage,
+      componentProps: {
+        file: file,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
   }
 
   getChatMembers() {
@@ -356,6 +379,28 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
 
+  takePicture(){
+    this.fileService.addCameraPictureToChat(this.roomId);
+  }
+  addImage(){
+    this.fileService.addPictureToChat(this.roomId);
+  }
+  addFile(){
+    this.fileService.addDocumentToChat(this.roomId);
+  }
+  addFileWebtrix(){
+    this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+  }
+  bookMeeting(){
+    let data = {
+      roomId: this.roomId,
+      members: this.members
+    }
+    this.openNewEventPage.emit(data);
+  }
+
+
+
   async _openChatOptions() {
 
     const enterAnimation = (baseEl: any) => {