add viewer at agenda in events to approve

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

@@ -21,7 +21,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} </label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11</label>
         </div>
 
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
@@ -89,15 +89,15 @@
           </div>
         </div>
 
-        <div *ngIf="loadedAttachments" class="bottom-content width-100">
+        <div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
           <ion-list>
-            <h5>Documentos Anexados</h5>
+            <h5>Documentos Anexados {{loadedEvent.Documents.length}}</h5>
             <ion-item class="ion-no-margin ion-no-padding"
-            *ngFor="let attach of loadedAttachments"
+            *ngFor="let attachment of loadedEvent.Documents"
-            (click)="viewDocument(attach.SourceId)">
+            (click)="viewDocument(attachment.DocId, attachment)">
             <ion-label>
-              <p class="attach-title-item d-block">{{attach.SourceName}}</p>
+              <p class="attach-title-item d-block">{{attachment.Assunto}}</p>
-              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
+              <p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
             </ion-label>
           </ion-item>
           </ion-list>

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

@@ -9,6 +9,7 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
 import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ToastService } from 'src/app/services/toast.service';
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 
 @Component({
   selector: 'app-approve-event',
@@ -23,7 +24,7 @@ export class ApproveEventPage implements OnInit {
   customDate:any;
   today:any;
   show: boolean = false;
-  
+
   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"];
 
@@ -62,7 +63,7 @@ export class ApproveEventPage implements OnInit {
     this.getAttachments();
   }
 
-  ngOnChanges() {
+  /* ngOnChanges() {
     this.getTask();
     this.getAttachments();
 
@@ -76,7 +77,7 @@ export class ApproveEventPage implements OnInit {
       this.getAttachments();
     }, 10000)
 
-  }
+  } */
 
   notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -90,12 +91,12 @@ export class ApproveEventPage implements OnInit {
 
   getTask() {
     this.processes.GetTask(this.serialNumber).subscribe(res => {
-      // console.log(res);
+      console.log(res);
       this.loadedEvent = res;
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       // console.log(new Date(this.today));
       this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
-      
+
     })
   }
 
@@ -115,9 +116,9 @@ export class ApproveEventPage implements OnInit {
       loader.remove()
     }
 
-    /* this.approveEventDismiss.emit({ 
+    /* this.approveEventDismiss.emit({
       "serialNumber": serialNumber,
-      "action": "Aprovar", 
+      "action": "Aprovar",
       "saveData": {
         loadedEvent: this.loadedEvent,
         today: this.today,
@@ -127,7 +128,7 @@ export class ApproveEventPage implements OnInit {
   }
 
   async rejectTask(serialNumber:string) {
-  
+
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
 
@@ -144,20 +145,33 @@ export class ApproveEventPage implements OnInit {
     }
 
   }
-   
+
   async getAttachments() {
     this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
 
   }
 
-  viewDocument(sourceId) {
+  async viewDocument(DocId:string, Document) {
-    this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
+
-      /* console.log(res); */
+    const modal = await this.modalController.create({
-      const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+      component: ViewDocumentPage,
-      const browser = this.iab.create(url,"_blank");
+      componentProps: {
-      browser.show();
+        trustedUrl: '',
-      
+        file: {
+          title: Document.Assunto,
+          url: '',
+          title_link: '',
+        },
+        Document,
+        applicationId: Document.ApplicationId,
+        docId: Document.DocId || Document.SourceId,
+        folderId: this.loadedEvent.FolderId,
+        task: this.loadedEvent
+      },
+      cssClass: 'modal modal-desktop'
     });
+    await modal.present();
+
   }
 
   async openOptions(ev:any) {
@@ -186,9 +200,9 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
     .then( async (res) => {
       console.log(res.data);
-      
+
       if(res.data !== ''){
-        let body = { "serialNumber": serialNumber, 
+        let body = { "serialNumber": serialNumber,
         "action": "Emendar",
             "dataFields": {
             "ReviewUserComment": res.data,
@@ -197,7 +211,7 @@ export class ApproveEventPage implements OnInit {
         console.log(body);
         const loader = this.toastService.loading()
 
-        try { 
+        try {
           await this.processes.PostTaskAction(body).toPromise();
           this.toastService.successMessage('Pedido enviado');
           this.close();
@@ -211,7 +225,7 @@ export class ApproveEventPage implements OnInit {
         //this.alertService.presentAlert('Operação cancelada!');
       }
     });
-    
+
     //this.openEmendMessageModal(serialNumber);
     //this.goBack();
   }

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

@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
     <div class="header-title d-flex align-center justify-between width-100">
-      <div class="flex-grow-1">Eventos para Aprovação11</div>
+      <div class="flex-grow-1">Eventos para Aprovação</div>
       <div (click)="refreshing()">
         <button class="btn-no-color" >
           <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>

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

@@ -95,7 +95,7 @@ export class EventListPage implements OnInit {
   async openApproveModal(eventSerialNumber, data) {
 
     let a =this.eventsMDGPRList.filter((elem)=>{
-      console.log(eventSerialNumber," ",elem.serialNumber)
+      //console.log(eventSerialNumber," ",elem.serialNumber)
       return eventSerialNumber == elem.serialNumber
     });