peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'despacho-parecer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Eudes Inácio
2022-06-24 16:31:47 +01:00
parent e539675209 5590336fb2
commit b37903cab1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/Rules/despacho.service.ts
+1 -1
View File
@@ -66,7 +66,7 @@ export class DespachoService {
return this.processes.CompleteTask(body) return this.processes.CompleteTask(body)
} }
solicitarParecer({note ='', documents = [], serialnumber, activityInstanceName}) { solicitarParecer({note, documents = [], serialnumber, activityInstanceName}) {
let body; let body;
if(activityInstanceName == 'Concluir Despacho' if(activityInstanceName == 'Concluir Despacho'
|| activityInstanceName == 'Concluir Parecer' || activityInstanceName == 'Concluir Parecer'
src/app/modals/create-process/create-process.page.ts
+4 -4
View File
@@ -316,11 +316,11 @@ export class CreateProcessPage implements OnInit {
try { try {
if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') { if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
await this.despachoService.createParecer(this.postData).toPromise(); await this.despachoService.createParecer(this.postData).toPromise();
await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); await this.despachoService.solicitarParecer({ note: this.postData.DispatchFolder.Message, serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
} else { } else {
await this.pedidoService.createParecer(this.postData).toPromise(); await this.pedidoService.createParecer(this.postData).toPromise();
await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise(); await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Message}).toPromise();
} }
this.modalController.dismiss(); this.modalController.dismiss();
@@ -406,10 +406,10 @@ export class CreateProcessPage implements OnInit {
if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') { if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
await this.despachoService.createParecer(this.postData).toPromise(); await this.despachoService.createParecer(this.postData).toPromise();
await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); await this.despachoService.solicitarParecer({ note: this.postData.DispatchFolder.Message, serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
} else { } else {
await this.pedidoService.createParecer(this.postData).toPromise(); await this.pedidoService.createParecer(this.postData).toPromise();
await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise(); await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Message}).toPromise();
} }
this.modalController.dismiss(); this.modalController.dismiss();