This commit is contained in:
Peter Maquiran
2021-07-17 21:22:03 +01:00
parent 841a0967a9
commit e3fa0981a7
10 changed files with 49 additions and 22 deletions
+1 -1
View File
@@ -1348,8 +1348,8 @@ export class AgendaPage implements OnInit {
InstanceId: saveData.workflowInstanceDataFields.InstanceId || "" InstanceId: saveData.workflowInstanceDataFields.InstanceId || ""
} }
this.mobileComponent.transparentEventList = true;
this.mobileComponent.showEventToApprove = true; this.mobileComponent.showEventToApprove = true;
this.mobileComponent.showEventList = false
} }
@@ -322,6 +322,9 @@ export class DespachoPrPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
this.goBack(); this.goBack();
this.toastService.successMessage('Processo enviado para pendentes') this.toastService.successMessage('Processo enviado para pendentes')
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -278,6 +278,9 @@ export class PedidoPage implements OnInit {
sendExpedienteToPending() { sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
this.goBack(); this.goBack();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -138,16 +138,16 @@ export class PedidosPage implements OnInit {
} }
else if(this.segment == 'deferimento') { else if(this.segment == 'deferimento') {
this.taskType = "Pedido de Deferimento"; this.taskType = "Pedido de Deferimento";
await this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.taskslist = result.filter(data => data.workflowInstanceDataFields.Status == "Active")
this.skeletonLoader = false this.skeletonLoader = false
console.log(result); console.log(result);
this.deferimentoList = []; this.deferimentoList = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active")
res = res.reverse()
res.forEach(element => { res.forEach(element => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
@@ -166,7 +166,12 @@ export class PedidosPage implements OnInit {
"WorkflowName": element.workflowDisplayName, "WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName, "activityInstanceName": element.activityInstanceName,
} }
if(element.workflowInstanceDataFields.Status == "Active") {
this.deferimentoList.push(task); this.deferimentoList.push(task);
}
}); });
}); });
@@ -67,6 +67,9 @@ export class DespachosOptionsPage implements OnInit {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res); console.log(res);
this.close(); this.close();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -98,6 +98,9 @@ export class DespachosPrOptionsPage implements OnInit {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res); console.log(res);
this.close(); this.close();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -247,6 +247,9 @@ export class OptsExpedientePrPage implements OnInit {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res); console.log(res);
this.close(); this.close();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -109,6 +109,9 @@ export class OptsExpedientePage implements OnInit {
this.close(); this.close();
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
this.goBack(); this.goBack();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
@@ -75,7 +75,11 @@ export class RequestOptionsPage implements OnInit {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res); console.log(res);
this.close(); this.close();
},()=>{
this.toastService.badRequest('Processo não encontrado')
}); });
} }
async openBookMeetingModal(task: any) { async openBookMeetingModal(task: any) {