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

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-06 17:58:02 +01:00
parent 3fd2803a3b f00415379b
commit 2d0f23749c
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/new-event/new-event.page.ts
-1
View File
@@ -226,7 +226,6 @@ export class NewEventPage implements OnInit {
}
setDefaultTime() {
console.log(this.CalendarDate)
this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
this.postEvent.EndDate = this.postEvent.StartDate;
}
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')
}