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

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

@@ -14,9 +14,8 @@
 </ion-header>
 
 <ion-content class="pt-10 height-100">
-  
+
   <div *ngIf="pdfSrc" class="height-100">
-    <iframe id="iframe" src="https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=https://equilibrium.dyndns.info/FileShare/merged_fastview.pdf" height="100%" width="100%" title="Iframe Example"></iframe>
+    <iframe id="iframe" src="https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=https://equilibrium.dyndns.info/FileShare/merged_fastview.pdf&caches=12321231231f23123" height="100%" width="100%" title="Iframe Example"></iframe>
   </div>
-    
 </ion-content>

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

@@ -1,14 +1,3 @@
 ion-content {
     background-color: #ececec;
-}
-
-.ng2-pdf-viewer-container {
-    padding-top: 10px;
-}
-
-#pdf-container {
-    canvas {
-        width:  100%;
-        height:  100%;
-    }
 }

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

@@ -10,7 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class DocumentViewerPage implements OnInit {
 
-  pdfSrc = 'http://laptop-46/FileShare/Test_25MB.pdf';
+  pdfSrc = null;
   task = null
   DocId = null
   fileName = ''
@@ -24,10 +24,7 @@ export class DocumentViewerPage implements OnInit {
       this.task = this.navParams.get('task') || null;
       this.DocId = this.navParams.get('DocId');
 
-      if(this.navParams.get('pdfSrc')) {
-        this.pdfSrc = this.navParams.get('pdfSrc') || null;
-      }
-
+      this.pdfSrc = 'https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file='
       
     }
   
@@ -41,169 +38,6 @@ export class DocumentViewerPage implements OnInit {
 
     })
 
-    // this.setPdfViewer()
-
-
-    // setTimeout(() => {
-      
-    //   document.getElementById('iframe')['contentWindow'].postMessage(
-    //     {
-    //       sender: "get_page_button1",
-    //       message: 'url'
-    //   }, "*")
-
-    // }, 3000)
-
-  }
-
-
-  setPdfViewer() {
-    setTimeout( async () => {
-        
-      // If absolute URL from the remote server is provided, configure the CORS
-      // header on that server.
-      var url = 'http://192.168.0.87:3000/000634977.pdf';
-
-      const pdfjsWorker = await import('pdfjs-dist/build/pdf.worker.entry');
-      // Loaded via <script> tag, create shortcut to access PDF.js exports.
-      var pdfjsLib = await import('pdfjs-dist/build/pdf');
-
-      // The workerSrc property shall be specified.
-      // pdfjsLib.GlobalWorkerOptions.workerSrc = '//mozilla.github.io/pdf.js/build/pdf.worker.js';
-      pdfjsLib.GlobalWorkerOptions.workerSrc = pdfjsWorker;
-
-      var pdfDoc = null,
-        pageNum = 1,
-        pageRendering = false,
-        pageNumPending = null,
-        scale = 0.8,
-        canvas: any = document.getElementById('the-canvas'),
-        ctx = canvas.getContext('2d');
-
-      /**
-       * Get page info from document, resize canvas accordingly, and render page.
-       * @param num Page number.
-       */
-      function renderPage(num) {
-        pageRendering = true;
-        // Using promise to fetch the page
-        pdfDoc.getPage(num).then(function(page) {
-          var viewport = page.getViewport({scale: scale});
-          canvas.height = viewport.height;
-          canvas.width = viewport.width;
-
-          // Render PDF page into canvas context
-          var renderContext = {
-            canvasContext: ctx,
-            viewport: viewport
-          };
-          var renderTask = page.render(renderContext);
-
-          // Wait for rendering to finish
-          renderTask.promise.then(function() {
-            pageRendering = false;
-            if (pageNumPending !== null) {
-              // New page rendering is pending
-              renderPage(pageNumPending);
-              pageNumPending = null;
-            }
-          });
-        });
-
-        // Update page counters
-        // document.getElementById('page_num').textContent = num;
-      }
-
-      /**
-       * If another page rendering in progress, waits until the rendering is
-       * finised. Otherwise, executes rendering immediately.
-       */
-      function queueRenderPage(num) {
-        if (pageRendering) {
-          pageNumPending = num;
-        } else {
-          renderPage(num);
-        }
-      }
-
-      /**
-       * Displays previous page.
-       */
-      function onPrevPage() {
-        if (pageNum <= 1) {
-          return;
-        }
-        pageNum--;
-        queueRenderPage(pageNum);
-      }
-
-      document.getElementById('prev').addEventListener('click', onPrevPage);
-
-      /**
-       * Displays next page.
-       */
-      function onNextPage() {
-        if (pageNum >= pdfDoc.numPages) {
-          return;
-        }
-        pageNum++;
-        queueRenderPage(pageNum);
-      }
-
-      document.getElementById('next').addEventListener('click', onNextPage);
-
-      var currPage = 1; //Pages are 1-based not 0-based
-      var numPages = 0;
-      var thePDF = null;
-
-
-      function handlePages(page)
-      {
-          //This gives us the page's dimensions at full scale
-          var viewport = page.getViewport( 1 );
-
-          //We'll create a canvas for each page to draw it on
-          var canvas = document.createElement( "canvas" );
-          canvas.style.display = "block";
-          var context = canvas.getContext('2d');
-          canvas.height = viewport.height;
-          canvas.width = viewport.width;
-
-          //Draw it on the canvas
-          page.render({canvasContext: context, viewport: viewport});
-
-          //Add it to the web page
-          document.querySelector('#pdf-container').appendChild( canvas );
-
-          //Move to next page
-          currPage++;
-          if ( thePDF !== null && currPage <= numPages )
-          {
-              thePDF.getPage( currPage ).then( handlePages );
-          }
-      }
-
-      /**
-       * Asynchronously downloads PDF.
-       */        
-      pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
-
-          pdfDoc = pdfDoc_;
-          thePDF = pdfDoc_
-
-          pdfDoc.getPage(1).then(function(page) {
-            // you can now use *page* here
-            // alert('first page')
-          });
-
-          // Initial/first page rendering
-          renderPage(pageNum);
-
-          numPages  = pdfDoc.numPages;
-          pdfDoc.getPage( 1 ).then( handlePages );
-        });
-
-    }, 100)
   }
 
   close() {

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

@@ -65,7 +65,7 @@
             </div>
           </div>
       </ion-list>
-  
+      
     </div>
   
   </div>

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';
@@ -501,7 +501,6 @@ export class AgendaPage implements OnInit {
 
               (response:any) => {
 
-
                 // calendar
                 this.CalendarStore.removeRange(startTime, endTime, 'md')
 
@@ -546,9 +545,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')
 
@@ -604,6 +600,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();
@@ -655,6 +653,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();
@@ -779,8 +779,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

@@ -149,6 +149,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({
@@ -162,6 +165,9 @@ export class ViewEventPage implements OnInit {
         }, 1500);
         this.goBack();
         this.toastService.successMessage('Evento apagado');
+      }, ()=>{},
+      ()=>{
+        loader.remove();
       });
   }
 

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -161,7 +161,7 @@ export class DespachoPage implements OnInit {
   viewDocument(docId:string) {
     this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
-      const browser = this.iab.create('https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=https://equilibrium.dyndns.info/FileShare/merged_fastview.pdf', "_blank", 'location=yes,x=0,y=200,width=437,height=650,fullscreen=no');
+      const browser = this.iab.create(url,"_blank");
       browser.show();
     });
   }

src/app/pages/gabinete-digital/despachos/despachos.page.ts

@@ -16,9 +16,7 @@ export class DespachosPage implements OnInit {
   constructor (
     private router: Router,
     private despachoRule: DespachoService
-  ) {
-      
-    }
+  ) {}
 
   ngOnInit() {
 

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -305,20 +305,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) {

src/app/services/notifications.service.ts

@@ -3,7 +3,7 @@
 ///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
 import { Injectable, NgZone } from '@angular/core';
 import { ActivatedRoute } from '@angular/router'
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
@@ -11,7 +11,6 @@ import { Token } from '../models/token.model';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
 import { NavigationExtras,Router } from '@angular/router';
 import { ToastService } from '../services/toast.service';
-import { Optional } from '@angular/core';
 import { JsonStore } from './jsonStore.service';
 import { synchro } from './socket/synchro.service';
 import { v4 as uuidv4 } from 'uuid'

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Editar Evento</ion-label>
+          <ion-label class="title">Editar Evento aganda</ion-label>
         </div>
       </div>
       <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -13,8 +13,6 @@
 
 <ion-content>
   <div class="main-content">
-
-
     <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
       <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
@@ -284,7 +282,7 @@
       </ion-label>
     </div>
 
-    <div class="d-flex container-div width-100"  *ngFor="let document of postEvent.Attachments; let i = index" >
+    <div class="d-flex container-div width-100"  *ngFor="let document of loadedEventAttachments; let i = index" >
       <ion-list class="width-100 list"  *ngIf="!document.remove">
         <ion-item class="width-100">
         <ion-label class="width-100">
@@ -296,7 +294,6 @@
             <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)" >
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
-
           </p>
           <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -125,6 +125,8 @@ export class EditEventPage implements OnInit {
     }
 
 
+    this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
+
     this.getRecurrenceTypes();
 
     this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
@@ -268,15 +270,18 @@ export class EditEventPage implements OnInit {
 
     this.clearPostEvent.emit();
     this.deleteTemporaryData();
-    this.close();
 
-    this.saveDocument()
+    await this.saveDocument()
+
+    this.close();
   }
 
 
-  saveDocument() {
+  async saveDocument() {
 
-    this.loadedEventAttachments.forEach((e)=>{
+    console.log(this.loadedEventAttachments)
+
+    await this.loadedEventAttachments.forEach( async (e)=>{
 
       const id: any = e.Id
       const remove = e['remove']
@@ -329,8 +334,6 @@ export class EditEventPage implements OnInit {
   }
 
 
-
-
   saveTemporaryData() {
 
     window['temp.path:/home/agenda/edit-event.component.ts'] = {
@@ -413,7 +416,6 @@ export class EditEventPage implements OnInit {
         console.log( this.loadedEventAttachments)
         this.loadedEventAttachments.push(ApplicationIdDocumentToSave)
 
-
       }
     });
   }

src/app/shared/agenda/view-event/view-event.page.html

@@ -92,7 +92,7 @@
               <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
             </div>
 
-            <div (click)="docIndex(i);openTaskOptions()" class="doc-options">
+            <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
               <ion-icon src="assets/images/icons-menu.svg"  ></ion-icon>
             </div>
 
@@ -100,8 +100,6 @@
         </li>
       </ion-list>
     </div>
-    <!-- <div class="line"></div> -->
   </div>
 
-
 </ion-content>

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

@@ -6,9 +6,13 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from 'src/app/models/event.model';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
+import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document';
+import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
+import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { SearchedDocumentOptionsPage } from '../../popover/searched-document-options/searched-document-options.page';
 
 @Component({
   selector: 'app-view-event',
@@ -17,14 +21,15 @@ import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-eve
 })
 export class ViewEventPage implements OnInit {
 
-  loadedEvent: Event;
+  loadedEvent: any;
   isEventEdited: boolean;
   eventBody: EventBody;
   loadedAttachments:any;
   pageId: string;
   showLoader: boolean;
-
+  task: ExpedientTaskModalPageNavParamsTask;
   minDate: Date;
+  LoadedDocument:any = null;
 
   customDate:any;
   today:any;
@@ -47,9 +52,8 @@ export class ViewEventPage implements OnInit {
     private processes: ProcessesService,
     private modalController: ModalController,
     public popoverController: PopoverController,
-    private toastService: ToastService,
-  )
-  {
+    private toastService: ToastService
+  ) {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
     this.eventBody = { BodyType : "1", Text : ""};
@@ -57,19 +61,16 @@ export class ViewEventPage implements OnInit {
   }
 
   ngOnInit() {
-
-    /* console.log(this.eventId); */
     this.loadEvent();
-    //this.getAttachments();
   }
 
-  doRefresh(ev){
+  doRefresh(ev) {
     this.loadEvent();
     ev.target.complete();
   }
 
   ngOnChanges(changes: any): void {
-    this.loadedAttachments = null;
+    this.loadedEvent.Attachments = null;
     this.loadEvent();
   }
 
@@ -118,12 +119,27 @@ export class ViewEventPage implements OnInit {
   async deleteEvent() {
 
     if (this.loadedEvent.IsRecurring) {
+      const loader = this.toastService.loading()
 
-    } else {
       this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
         this.toastService.successMessage('Evento apagado');
         this.close();
+      },()=>{},
+      ()=>{
+        loader.remove();
       });
+    } else {
+
+      const loader = this.toastService.loading()
+
+      this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
+        this.toastService.successMessage('Evento apagado');
+        this.close();
+      },()=>{},
+      ()=>{
+        loader.remove();
+      });
+
     }
 
   }
@@ -143,7 +159,6 @@ export class ViewEventPage implements OnInit {
 
   }
 
-
   async editEvent() {
     this.viewEventDetailDismiss.emit({
       type: 'edit',
@@ -161,51 +176,204 @@ export class ViewEventPage implements OnInit {
     });
   }
 
+  async LoadDocumentDetails() {
+    
+
+    const docId = this.loadedEvent.Attachments[ this.dicIndex].Id
+    const applicationId = this.loadedEvent.Attachments[ this.dicIndex].ApplicationId
+
+    console.log(this.loadedEvent.Attachments[ this.dicIndex])
+
+
+    this.processes.GetDocumentDetails(docId, applicationId).subscribe( async(res)=> {
+      alert('loads')
+      console.log(res);
+
+      this.LoadedDocument = res;
+
+      this.LoadedDocument.Subject = this.LoadedDocument.Assunto
+
+      let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
+
+      console.log(res)
+      this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
+
+      let task: ExpedientTaskModalPageNavParamsTask
+      let document: SearchDocumentDetails = this.LoadedDocument
+      let folder: SearchFolderDetails = this.LoadedDocument
+
+      if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) {
+        task = {
+          serialNumber: folder.DispatchNumber,
+          taskStartDate: folder.DateDispatch,
+          isEvent: true,
+          workflowInstanceDataFields: {
+            FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
+            Subject: folder.Assunto,
+            SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
+            SourceType: 'FOLDER',
+            SourceID: folder.folderId,
+            DispatchNumber: folder.DispatchNumber
+          },
+        }
+      } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
+        task = {
+          serialNumber: document.DocId,
+          taskStartDate: document.DocDate,
+          isEvent: true,
+          workflowInstanceDataFields: {
+            FolderID: null,
+            Subject: document.Assunto,
+            DispatchNumber: null,
+            SourceSecFsID: document.ApplicationID || document.ApplicationId,
+            SourceType: 'DOC',
+            SourceID: document.DocId,
+          }
+        }
+      } else {
+        console.log('unexpected ApplicationID')
+      }
+
+      this.task = task
+      console.log('this.task = task', this.task)
+
+
+      this.task = task
+
+      const popover = await this.popoverController.create({
+        component: SearchedDocumentOptionsPage,
+        cssClass: 'exp-options',
+        componentProps: {
+          task: this.task,
+          LoadedDocument: this.LoadedDocument
+        },
+        translucent: true
+      });
+      await popover.present()
+  
+      popover.onDidDismiss().then((res:any) => {
+        if(res.data.component == 'openBookMeetingModal') {
+          this.openBookMeetingModal()
+        } else if(res.data.component == 'openExpedientActionsModal') {
+          this.openExpedientActionsModal(res.data.taskAction)
+        } else {
+          console.log(res.data)
+          console.log('component not found')
+        }
+      });
+
+      
+    });
+
+  }
+
   async openTaskOptions() {
 
-    const doc = this.loadedAttachments[ this.dicIndex];
+    let task: ExpedientTaskModalPageNavParamsTask
+    let document: SearchDocumentDetails = this.loadedEvent.Attachments[ this.dicIndex];
+    let folder: SearchFolderDetails = this.loadedEvent.Attachments[ this.dicIndex];
 
-    let customTask;
-
-    if(doc.ApplicationID == 361 || doc.ApplicationId == 361) {
-      customTask = {
-        serialNumber: doc.DispatchNumber,
-        taskStartDate: doc.DateDispatch,
+    if(this.loadedEvent.Attachments[this.dicIndex].ApplicationID == 361 || this.loadedEvent.Attachments[this.dicIndex].ApplicationId == 361) {
+      task = {
+        serialNumber: folder.DispatchNumber,
+        taskStartDate: folder.DateDispatch,
         isEvent: true,
         workflowInstanceDataFields: {
-          FsId: doc.ApplicationID,
-          FolderID: null,
-          DocId: doc.DispatchNumber,
-          Subject: doc.Assunto
+          FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
+          Subject: folder.Assunto,
+          SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
+          SourceType: 'FOLDER',
+          SourceID: folder.folderId,
+          DispatchNumber: folder.DispatchNumber
         },
       }
-    } else if (doc.ApplicationID == 8 || doc.ApplicationId == 8) {
-      customTask = {
-        serialNumber: doc.DocId,
-        taskStartDate: doc.DocDate,
+    } else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
+      task = {
+        serialNumber: document.DocId,
+        taskStartDate: document.DocDate,
         isEvent: true,
         workflowInstanceDataFields: {
-          FsId: doc.ApplicationID || doc.ApplicationId,
           FolderID: null,
-          DocId: doc.DocId,
-          Subject: doc.Assunto
+          Subject: document.Assunto,
+          DispatchNumber: null,
+          SourceSecFsID: document.ApplicationID || document.ApplicationId,
+          SourceType: 'DOC',
+          SourceID: document.DocId,
         }
       }
     }
 
-    console.log(doc)
-    customTask.Status = ''
+    this.task = task
 
-    const popover = await this.modalController.create({
-      component: OptsExpedientePage,
-      cssClass: 'model aside-modal search-submodal',
+    const popover = await this.popoverController.create({
+      component: SearchedDocumentOptionsPage,
+      cssClass: 'exp-options',
       componentProps: {
-        fulltask: customTask,
-        task: customTask
+        task: this.task,
+        LoadedDocument: this.LoadedDocument
       },
-      //translucent: true
+      translucent: true
     });
-    return await popover.present();
+    await popover.present()
+
+    popover.onDidDismiss().then((res:any) => {
+      if(res.data.component == 'openBookMeetingModal') {
+        this.openBookMeetingModal()
+      } else if(res.data.component == 'openExpedientActionsModal') {
+        this.openExpedientActionsModal(res.data.taskAction)
+      } else {
+        console.log(res.data)
+        console.log('component not found')
+      }
+    });
+
+  }
+
+  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,
+      },
+      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,
+        aplicationId: this.loadedEvent.ApplicationId || this.loadedEvent.ApplicationID
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then( async(res)=>{});
+
   }
 
 }

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html

@@ -8,7 +8,7 @@
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar evento por aprovar::.</ion-label>
+              <ion-label class="title">Editar evento por aprovar</ion-label>
             </div>
           </div>
         </ion-header>

src/assets/www/pdfjs/build/pdf.js

@@ -10016,6 +10016,8 @@ function getDocument(src) {
 
   var docId = task.docId;
   worker.promise.then(function () {
+
+    
     if (task.destroyed) {
       throw new Error('Loading aborted');
     }