diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index bd532161f..c59cd5d79 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -57,7 +57,7 @@
-
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 8c96b1c6e..53e76ca71 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/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);
+ }
+
});
}
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index c2992d885..e78f148a3 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/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)
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 68ad53ebd..c5505cb8e 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -59,9 +59,6 @@ export class DespachosPage implements OnInit {
/* this.authService.userData$.subscribe((res:any)=>{
//console.log(res);
}); */
-
- let u = this.authService.userData$.toPromise();
- console.log(u);
}
segmentChanged(ev: any) {
@@ -97,7 +94,8 @@ export class DespachosPage implements OnInit {
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
- "FolderID": element.workflowInstanceDataFields.FolderID
+ "FolderID": element.workflowInstanceDataFields.FolderID,
+ "activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
@@ -124,11 +122,11 @@ export class DespachosPage implements OnInit {
});
}
- doRefresh(event) {
+ doRefresh() {
this.LoadList();
setTimeout(() => {
- event.target.complete();
+ //event.target.complete();
}, 2000);
}