save

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

@@ -57,7 +57,7 @@
       <div class="upper-content">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
             <p><span class="color-red">{{ task.DeadlineType }}</span></p>
           </ion-label>
         </div>
@@ -105,8 +105,8 @@
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
-      <div class="buttons">
-        <button (click)="openAddNoteModal()" class="btn-cancel" shape="round" >Executado</button>
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
+        <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
@@ -115,6 +115,26 @@
         <div class="solid"></div>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
+        <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
+        <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
+        <div class="solid"></div>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <div class="solid"></div>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+      </div>
+      <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
+        <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
+        <div class="solid"></div>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <div class="solid"></div>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button class="btn-cancel" shape="round" >Enviar para Reexecução</button>
+      </div>
     </div>
 
     <div *ngIf="!task">

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

@@ -90,6 +90,7 @@ export class DespachoPage implements OnInit {
         "DocId": res.workflowInstanceDataFields.DispatchDocId,
         "WorkflowName": res.workflowDisplayName,
         "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
+        "activityInstanceName": res.activityInstanceName,
       }
       this.fulltask = res;
       console.log(this.task);
@@ -166,9 +167,18 @@ export class DespachoPage implements OnInit {
     this.processes.CompleteTask(body);
     this.close();
   }
-
-  delegar(){
-
+  arquivar(note:string){
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComent": note,
+      },
+      "AttachmentList" :null,
+    }
+    this.processes.CompleteTask(body);
+    this.close();
   }
 
   sendExpedienteToPending(){
@@ -178,7 +188,7 @@ export class DespachoPage implements OnInit {
     });
   }
 
-  async openAddNoteModal() {
+  async openAddNoteModal(actionName:string) {
     const modal = await this.modalController.create({
       component: AddNotePage,
       componentProps:{
@@ -190,7 +200,13 @@ export class DespachoPage implements OnInit {
     await modal.present();
   
     modal.onDidDismiss().then(res => {
-      this.executado(res.data); 
+      if(actionName == 'executado'){
+        this.executado(res.data);
+      }
+      else if(actionName == 'arquivar'){
+        this.arquivar(res.data);
+      }
+       
     });
   }
 

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

@@ -93,7 +93,8 @@ openExpedientDetailPage(data){
        "DocumentsQty": '',
        "DocId": element.workflowInstanceDataFields.DocId,
        "WorkflowName": element.workflowDisplayName,
-       "FolderID": element.workflowInstanceDataFields.FolderID
+       "FolderID": element.workflowInstanceDataFields.FolderID,
+       "activityInstanceName": element.activityInstanceName,
      }
      
      this.despachoList.push(task)