diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index dc4dc9886..76a50e90e 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -22,7 +22,7 @@
-
+
-->
-
+
-
@@ -95,18 +95,18 @@
-
@@ -127,7 +127,7 @@
-
+
-
+
-
+
@@ -177,35 +177,33 @@
Anexar Documentos
-
+
-
-
+
+
-
- {{document.Assunto}}
- {{document.appName}}
+
+ {{document.Assunto}}
+ {{document.appName}}
-
+
{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index b0cab8f2e..ce699f4a7 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -272,13 +272,22 @@ export class ExpedientTaskModalPage implements OnInit {
AttachmentList: docs,
}
+ let action_despacho = {
+ "serialNumber": this.task.serialNumber,
+ "action": "Tratado",
+ "ActionTypeId": 94,
+ "dataFields": {
+ "Note": "",
+ }
+ }
+
console.log(this.postData);
try {
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado');
- this.modalController.dismiss();
+ this.modalController.dismiss(action_despacho);
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 1da86e469..d105e4ec1 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -192,7 +192,6 @@ export class ExpedienteDetailPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
- //this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -210,15 +209,12 @@ export class ExpedienteDetailPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res=>{
- console.log(res['data']);
let body = res['data'];
if(res['data']){
- console.log('open discart')
this.distartExpedientModal(body);
}
else{
- console.log('Not open');
- this.goBack();
+ this.close();
}
});
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 4de464916..a2869261b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -85,6 +85,7 @@ export class ExpedientePage implements OnInit {
}
goToExpediente(serialNumber:any){
+ //console.log('ABRE');
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}