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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-05-20 11:38:27 +01:00
parent b335335869 98ecb6d27b
commit 2790702a1e
24 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+3 -26
View File
@@ -22,10 +22,6 @@
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
@@ -57,7 +53,7 @@
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
</div>
@@ -105,9 +101,10 @@
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
<div class="buttons" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'">
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </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>
@@ -115,26 +112,6 @@
<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-pr/despachos-pr.page.ts
+3 -2
View File
@@ -25,7 +25,7 @@ export class DespachosPrPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:DailyWorkTask[] = [];
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
@@ -99,7 +99,8 @@ export class DespachosPrPage implements OnInit {
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID,
"Status": element.workflowInstanceDataFields.Status
"Status": element.workflowInstanceDataFields.Status,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+1 -5
View File
@@ -22,10 +22,6 @@
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
@@ -133,7 +129,7 @@
<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>
<button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
</div>
</div>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+16
View File
@@ -180,6 +180,19 @@ export class DespachoPage implements OnInit {
this.processes.CompleteTask(body);
this.close();
}
reexecute(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
"ActionTypeId": 98,
"dataFields": {
"ReviewUserComent": note,
},
"AttachmentList" :documents,
}
this.processes.CompleteTask(body);
this.close();
}
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -214,6 +227,9 @@ export class DespachoPage implements OnInit {
else if(actionName == 'Arquivar'){
this.arquivar(res.data.note,res.data.documents);
}
else if(actionName == 'Reexecução'){
this.reexecute(res.data.note,res.data.documents);
}
}
});
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+3
View File
@@ -36,6 +36,9 @@
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.WorkflowName}}</span>
</div>
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+1 -1
View File
@@ -26,7 +26,7 @@ export class DespachosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:DailyWorkTask[] = [];
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
+2
View File
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
import { DiplomaPageRoutingModule } from './diploma-routing.module';
import { DiplomaPage } from './diploma.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
DiplomaPageRoutingModule
],
declarations: [DiplomaPage]
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+2
View File
@@ -60,6 +60,7 @@ export class ExpedientePage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.taskslist.push(task);
});
@@ -81,6 +82,7 @@ export class ExpedientePage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.taskslist.push(task);
});
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+3
View File
@@ -79,6 +79,9 @@
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.WorkflowName}}</span>
</div>
<div class="exp-icon">
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+2 -2
View File
@@ -22,13 +22,13 @@ export class PedidosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
parecerList:DailyWorkTask[];
parecerList:any[];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
deferimentoList:DailyWorkTask[];
deferimentoList:any[];
taskType: string;
serialNumber:string;
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+2
View File
@@ -83,6 +83,7 @@ export class PendentesPage implements OnInit {
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
},
@@ -97,6 +98,7 @@ export class PendentesPage implements OnInit {
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});