Fixe merge

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -1,3 +1,38 @@
+<ion-menu autoHide="false" side="end" content-id="main-content" >
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item  (click)="openExpedientActionsModal('0',fulltask)">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item  (click)="openExpedientActionsModal('1',fulltask)">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+<!--       <ion-item  (click)="openExpedientActionsModal('2',fulltask)">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item> -->
+      <!-- <ion-item  (click)="openBookMeetingModal(task)">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item> -->
+      <ion-item (click)="distartExpedientModal()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page d-none" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
+
 <ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
@@ -23,21 +58,25 @@
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding"  
-            *ngFor = "let task of despachoList"
+            *ngFor = "let task of despachoList; let i = index"
             (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
               <div class="item width-100">
-                <div class="exp-top-detail">
+                <div class="exp-top-detail ">
                   <div class="exp-date">
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                   </div>
                   <div class="exp-remetente">
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
-                  <div class="exp-icon">
+                  <div class="exp-icon d-flex align-center">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                     <label>{{task.DocumentsQty}}</label>
+
+                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                    </ion-menu-button> -->
                   </div>
                 </div>
                 <div class="exp-bottom-detail">

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

@@ -1,16 +1,19 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
-import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+
 import { AuthService } from 'src/app/services/auth.service';
+import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 
 @Component({
   selector: 'app-despachos',
@@ -25,6 +28,9 @@ export class DespachosPage implements OnInit {
  taskslist:DailyWorkTask[];
  despachoList:DailyWorkTask[];
  deferimentoList:DailyWorkTask[];
+
+ taskList:tasksList[] = [];
+ 
  taskType: string;
  serialNumber:string;
  totalDocs:any;
@@ -33,7 +39,10 @@ export class DespachosPage implements OnInit {
  segment:string;
  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
- constructor(
+ loadedAttachments:any;
+ dicIndex = 0;
+
+ constructor (
    private processes:ProcessesService,
    private modalController: ModalController,
    private alertService: AlertService,
@@ -150,5 +159,119 @@ export class DespachosPage implements OnInit {
    });
  }
 
+  // old
+  async openExpedientActionsModal(taskAction: any, task: any) {
+    //this.modalController.dismiss();
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res['data']);
+      if(res['data']=='openDiscart'){
+        console.log('open discart');
+        
+        // this.distartExpedientModal();
+
+      }
+
+    });
+  }
+
+  async openBookMeetingModal(task: any) {
+
+    const doc = this.loadedAttachments[ this.dicIndex];
+
+    task = {
+      serialNumber: doc.SourceId,
+      taskStartDate: doc.CreateDate,
+      isEvent: true,
+      workflowInstanceDataFields: {
+        FsId: doc.ApplicationId, 
+        FolderID: null,
+        DocId: doc.SourceId, 
+        Subject: doc.SourceName
+      },
+    }
+    
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'book-meeting-modal modal modal-desktop'
+    } else  {
+      classs = 'modal modal-desktop showAsideOptions'
+    }
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+
+  async distartExpedientModal() {
+
+    const doc = this.taskList[ this.dicIndex];
+
+    console.log(doc, this.dicIndex, this.taskList)
+    
+    const modal = await this.modalController.create({
+      component: DiscartExpedientModalPage,
+       componentProps: {
+        serialNumber: doc.serialNumber,
+        folderId: doc.workflowInstanceDataFields.FolderID,
+        action: 'complete',
+      },
+      cssClass: 'discart-expedient-modal',
+      backdropDismiss: false
+    });
+    
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      if(res['data']=='close'){
+        // this.close();
+        /* console.log('2Expedient Discard closed2');
+        this.close();
+        this.openMenu(); */
+      }
+      
+    });
+  }
+
+  docIndex(index: number) {
+    this.dicIndex = index;
+  }
+  
 }