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

action verification added to pedido details

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-06 17:11:30 +01:00
parent 9c3cdf2ac5
commit f2e95cc8b6
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+2 -2
View File
@@ -153,9 +153,9 @@
</div>
<div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente'">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
<button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+8 -1
View File
@@ -50,6 +50,7 @@ export class PedidoPage implements OnInit {
intervenientes: any = []
cc: any = [];
loggeduser: LoginUserRespose;
taskArrayActions = [];
constructor(private activatedRoute: ActivatedRoute,
private processes: ProcessesService,
@@ -113,6 +114,7 @@ export class PedidoPage implements OnInit {
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
this.taskArrayActions = res.actions
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
@@ -190,6 +192,10 @@ export class PedidoPage implements OnInit {
});
}
checkStringInArray(str) {
return this.taskArrayActions.includes(str);
}
updateProcess(res) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
} else {
@@ -339,7 +345,8 @@ export class PedidoPage implements OnInit {
serialNumber: this.task.SerialNumber,
fulltask: this.fulltask,
taskAction: taskAction,
showEnviarPendentes: false
showEnviarPendentes: false,
actions: this.taskArrayActions
},
translucent: true
});
src/app/shared/popover/request-options/request-options.page.html
+2 -2
View File
@@ -35,9 +35,9 @@
<div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente' ">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
<button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'">Iniciar Conversa</button>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
src/app/shared/popover/request-options/request-options.page.ts
+6
View File
@@ -26,6 +26,7 @@ export class RequestOptionsPage implements OnInit {
profile:string;
serialNumber : string;
showEnviarPendentes = false;
taskActions = [];
constructor(
private popoverController: PopoverController,
@@ -40,6 +41,7 @@ export class RequestOptionsPage implements OnInit {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
this.serialNumber = this.navParams.get('serialNumber');
this.taskActions = this.navParams.get('actions');
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
@@ -71,6 +73,10 @@ export class RequestOptionsPage implements OnInit {
};
}
checkStringInArray(str) {
return this.taskActions.includes(str);
}
close() {
this.popoverController.dismiss('close')
}