Last git pull made

src/app/pages/agenda/agenda.page.ts

@@ -8,7 +8,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { momentG }  from 'src/plugin/momentG';
 import { DomSanitizer } from "@angular/platform-browser";
 import { EventPerson } from 'src/app/models/eventperson.model';
-import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
 
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
@@ -547,9 +547,6 @@ export class AgendaPage implements OnInit {
             this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then(
               (response:any) => {
 
-                // calendar
-                // this.eventSource=[];
-
                 // clear the current month only
                 this.CalendarStore.removeRange(startTime, endTime, 'pr')
 
@@ -605,6 +602,8 @@ export class AgendaPage implements OnInit {
               this.CalendarStore.pushEvent(eventsList, 'pr');
 
               this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+              this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -656,6 +655,8 @@ export class AgendaPage implements OnInit {
 
 
               this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+              this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
 
               this.myCal.update();
               this.myCal.loadEvents();
@@ -780,8 +781,56 @@ export class AgendaPage implements OnInit {
 
   updateEventListBox() {
 
-    this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
-    this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
+    if(window.innerWidth < 800){
+
+      switch (this.segment) {
+        case "Combinado":
+
+          if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR' ) {
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
+          }
+          else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
+
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
+          }
+          else if(this.loggeduser.Profile == 'PR') {
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+          }
+        break;
+
+        case "Pessoal":
+          //Inicializa o array eventSource
+          if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
+          }
+          else{
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+          }
+          break;
+
+        case "Oficial":
+
+          if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {})
+
+          } else {
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+
+          }
+          break;
+
+      }
+    } else {
+      this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment:this.segment, selectedDate: this.eventSelectedDate})
+  
+    }
 
   }
 

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

@@ -172,6 +172,9 @@ export class ViewEventPage implements OnInit {
   }
 
   deleteEvent(){
+
+    const loader = this.toastService.loading()
+
     this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () =>
       {
         const alert = await this.alertController.create({
@@ -185,6 +188,9 @@ export class ViewEventPage implements OnInit {
         }, 1500);
         this.goBack();
         this.toastService.successMessage('Evento apagado');
+      }, ()=>{},
+      ()=>{
+        loader.remove();
       });
   }
 

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/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -359,20 +359,8 @@ export class ExpedienteDetailPage implements OnInit {
 
   async viewDocument(DocId:string) {
 
-    const modal = await this.modalController.create({
-      component: DocumentViewerPage,
-      cssClass: 'modal-desktop modal',
-      componentProps: {
-        DocId: DocId
-      }
-    });
-    await modal.present();
-    modal.onDidDismiss().then( async (res)=> {
-    });
+    this.expedienteService.viewDocument({ApplicationId:'361', DocId})
 
-
-
-    
   }
 
   // viewDocument(DocId:string) {