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

Fixe merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-28 11:43:42 +01:00
parent a7277f0f90 32109edb8a
commit ed8aac110f
52 changed files with 1211 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+4 -4
View File
@@ -26,10 +26,10 @@
</div>
<div class="ion-input-class">
<ion-select placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-select-option value="99999861">Normal</ion-select-option>
<ion-select-option value="99999862">Urgente</ion-select-option>
<ion-select-option value="99999863">Muito Urgente</ion-select-option>
<ion-select-option value="99999864">Urgentíssimo</ion-select-option>
<ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
</ion-select>
</div>
</div>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+15 -1
View File
@@ -77,6 +77,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
SouceType: 'DOC',
SourceId: this.task.workflowInstanceDataFields.DocId,
DeadlineType: '',
};
@@ -123,7 +124,20 @@ export class ExpedientTaskModalPage implements OnInit {
this.modalController.dismiss(null);
}
saveTask() {
saveTask(){
if(this.postData.Priority=='99999861'){
this.dispatchFolder.DeadlineType = 'Normal';
}
else if(this.postData.Priority=='99999862'){
this.dispatchFolder.DeadlineType = 'Urgente';
}
else if(this.postData.Priority=='99999863'){
this.dispatchFolder.DeadlineType = 'Muito Urgente';
}
else if(this.postData.Priority=='99999864'){
this.dispatchFolder.DeadlineType = 'Urgentíssimo';
}
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
attendees = attendees.map(function(val) {
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -154,7 +154,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button hidden class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+7
View File
@@ -70,6 +70,13 @@ export class ExpedienteDetailPage implements OnInit {
this.modalController.dismiss();
}
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
});
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+7 -2
View File
@@ -39,8 +39,10 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
console.log('YEAHHH');
this.processes.GetTasksList("Expediente", false).subscribe(result => {
let tasksListReverse = result.reverse();
let tasksListReverse = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
this.taskslist = new Array();
tasksListReverse.forEach(element => {
let task: DailyWorkTask = {
@@ -49,10 +51,13 @@ export class ExpedientePage implements OnInit {
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
}