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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-19 10:58:41 +01:00
parent 330d7e66df
commit 270eb3a7f6
4 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+23 -3
View File
@@ -57,7 +57,7 @@
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
</div>
@@ -105,8 +105,8 @@
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="openAddNoteModal()" class="btn-cancel" shape="round" >Executado</button>
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
@@ -115,6 +115,26 @@
<div class="solid"></div>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<div class="solid"></div>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<div class="solid"></div>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button class="btn-cancel" shape="round" >Enviar para Reexecução</button>
</div>
</div>
<div *ngIf="!task">
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+21 -5
View File
@@ -90,6 +90,7 @@ export class DespachoPage implements OnInit {
"DocId": res.workflowInstanceDataFields.DispatchDocId,
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
"activityInstanceName": res.activityInstanceName,
}
this.fulltask = res;
console.log(this.task);
@@ -166,9 +167,18 @@ export class DespachoPage implements OnInit {
this.processes.CompleteTask(body);
this.close();
}
delegar(){
arquivar(note:string){
let body = {
"serialNumber": this.serialnumber,
"action": "Arquivo",
"ActionTypeId": 95,
"dataFields": {
"ReviewUserComent": note,
},
"AttachmentList" :null,
}
this.processes.CompleteTask(body);
this.close();
}
sendExpedienteToPending(){
@@ -178,7 +188,7 @@ export class DespachoPage implements OnInit {
});
}
async openAddNoteModal() {
async openAddNoteModal(actionName:string) {
const modal = await this.modalController.create({
component: AddNotePage,
componentProps:{
@@ -190,7 +200,13 @@ export class DespachoPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
this.executado(res.data);
if(actionName == 'executado'){
this.executado(res.data);
}
else if(actionName == 'arquivar'){
this.arquivar(res.data);
}
});
}
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+2 -1
View File
@@ -93,7 +93,8 @@ openExpedientDetailPage(data){
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID
"FolderID": element.workflowInstanceDataFields.FolderID,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+4 -6
View File
@@ -59,9 +59,6 @@ export class DespachosPage implements OnInit {
/* this.authService.userData$.subscribe((res:any)=>{
//console.log(res);
}); */
let u = this.authService.userData$.toPromise();
console.log(u);
}
segmentChanged(ev: any) {
@@ -97,7 +94,8 @@ export class DespachosPage implements OnInit {
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID
"FolderID": element.workflowInstanceDataFields.FolderID,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
@@ -124,11 +122,11 @@ export class DespachosPage implements OnInit {
});
}
doRefresh(event) {
doRefresh() {
this.LoadList();
setTimeout(() => {
event.target.complete();
//event.target.complete();
}, 2000);
}