diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 4b8f33e43..b0e9b3338 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -65,7 +65,7 @@
- Adicionar intervenientes
+ Adicionar intervenientes
{{participant.Name}}
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 29baba605..8817f1424 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -199,9 +199,9 @@ export class CreateProcessPage implements OnInit {
console.log('this.postData', this.postData, this.taskType);
try {
- //await this.processes.postDespatcho(this.postData).toPromise();
+ await this.processes.postDespatcho(this.postData).toPromise();
this.FinalizarDespacho();
- this.toastService.badRequest('Despacho criado');
+ this.toastService.successMessage('Despacho criado');
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
}
@@ -220,6 +220,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postParecer(this.postData).toPromise();
+
this.FinalizarParecer();
this.toastService.successMessage('Pedido de Parecer criado');
}
@@ -342,23 +343,38 @@ export class CreateProcessPage implements OnInit {
}
async FinalizarDespacho() {
- let body = {
- "serialNumber": this.task.serialNumber,
- "action": "Despacho",
- "ActionTypeId": 94,
- "dataFields": {
- "ReviewUserComment": '',
- },
- "AttachmentList" :null,
- }
- await this.processes.CompleteTask(body).toPromise();
+
+ if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho'){
+ let body = {
+ "serialNumber": this.task.serialNumber,
+ "action": "Conhecimento",
+ "ActionTypeId": 104,
+ "dataFields": {
+ "ReviewUserComment": '',
+ },
+ "AttachmentList" :null,
+ }
+ await this.processes.CompleteTask(body).toPromise();
+ }
+ else if(this.task.activityInstanceName =='Concluir Despacho'){
+ let body = {
+ "serialNumber": this.task.serialNumber,
+ "action": "Despacho",
+ "ActionTypeId": 94,
+ "dataFields": {
+ "ReviewUserComment": '',
+ },
+ "AttachmentList" :null,
+ }
+ await this.processes.CompleteTask(body).toPromise();
+ }
}
async FinalizarParecer() {
let body = {
"serialNumber": this.task.serialNumber,
"action": "Parecer",
- "ActionTypeId": 92,
+ "ActionTypeId": 96,
"dataFields": {
"ReviewUserComment": '',
},
diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
index dc5ebab7a..eaef16cfb 100644
--- a/src/app/pages/events/attendees/attendees.page.ts
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -118,11 +118,11 @@ export class AttendeesPage implements OnInit {
async selectContact(itm: EventPerson){
if(this.adding == "intervenient"){
-
+ itm.IsRequired = true;
this.taskParticipants.push(itm);
} else if (this.adding == "CC") {
-
+ itm.IsRequired = false;
this.taskParticipantsCc.push(itm);
}
}
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 8ca8a90b3..da81230b7 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -2,41 +2,6 @@
-
-
-
- Menu
-
-
-
-
-
-
- Efectuar Despacho
-
-
-
- Pedido de Parecer
-
-
-
- Pedido de Deferimento
-
-
-
- Marcar reunião
-
-
-
- Enviar para pendentes
-
-
-
-
-
-
-
-
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 922d9e945..7905d4b08 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
@@ -176,7 +176,7 @@ export class ExpedientTaskModalPage implements OnInit {
attendees = attendees.map(function(val) {
return {
UserEmail: val.EmailAddress,
- UserType: val.IsRequired?"intervenient": "CC"
+ UserType: val.IsRequired?"I": "CC"
};
})
@@ -219,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
console.log(this.postData);
- //this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
+ this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_despacho);
});
@@ -250,10 +250,12 @@ export class ExpedientTaskModalPage implements OnInit {
"Note": "",
}
}
- this.taskResult = await this.processes.postParecer(this.postData).toPromise();
- await this.toastService.successMessage('Processo efetuado', () =>{
+ //this.taskResult = await this.processes.postParecer(this.postData).toPromise();
+ await this.toastService.successMessage('Processo efetuado');
+ setInterval(()=>{
this.modalController.dismiss(action_parecer);
- });
+ }, 7000);
+
} catch (error) {
await this.toastService.badRequest('Processo não efetuado')
}