diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index 29d19bbb0..f566aa4d9 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -5,4 +5,5 @@ export class Folder{ SourceSecFsId:string; SouceType:string; SourceId:string; + DeadlineType: string; } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 5d42ddc78..38a4141de 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -137,8 +137,16 @@ export class DespachoPage implements OnInit { this.modalController.dismiss(); } executado(){ - + let body = { + "serialNumber": this.serialnumber, + "action": "Conhecimento", + "dataFields": { + "ReviewerComments": '', + } + } + this.processes.PostTaskAction(body); } + delegar(){ } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index e12d6b828..a778c11f2 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -77,6 +77,7 @@ export class ExpedientTaskModalPage implements OnInit { SourceSecFsId: this.task.workflowInstanceDataFields.FsId, SouceType: 'DOC', SourceId: this.task.workflowInstanceDataFields.DocId, + DeadlineType: '', }; this.postData.DispatchFolder = this.dispatchFolder; @@ -117,6 +118,19 @@ export class ExpedientTaskModalPage implements OnInit { } 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) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 15a9b2b87..2227dc03f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -154,7 +154,7 @@ - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 52b42de7a..9f95377a7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -69,6 +69,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 => { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index a6f019fbc..4529504db 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -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 = { @@ -53,6 +55,8 @@ export class ExpedientePage implements OnInit { } this.taskslist.push(task); }); + console.log(this.taskslist); + }); } diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 55c65f18c..8098d3eef 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -49,6 +49,18 @@ export class ProcessesService { }; return this.http.get(`${geturl}`, options); } + SetTaskToPending(serialNumber:string): Observable{ + const geturl = environment.apiURL + 'Tasks/SetTaskPending'; + let params = new HttpParams(); + + params = params.set("serialNumber", serialNumber); + + let options = { + headers: this.headers, + params: params + }; + return this.http.post(`${geturl}`,'', options); + } GetTaskParticipants(folderId:string): Observable{ const geturl = environment.apiURL + 'Processes/GetUsersInDispash'; @@ -210,9 +222,4 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } - - - - - } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 12e023db3..3de5d21ac 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -8,11 +8,11 @@ - + Expediente - + Pendentes diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 61e175436..1492ae2ea 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -41,6 +41,10 @@ export class ExpedientsPage implements OnInit { this.LoadList(); } + segmentChanged(ev: any) { + this.LoadList(); + } + notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } @@ -51,22 +55,47 @@ export class ExpedientsPage implements OnInit { } LoadList(){ - this.processes.GetTasksList("Expediente", false).subscribe(result => { - console.log(result); - this.taskslist = new Array(); - let res = result.reverse(); - res.forEach(element => { - let task: DailyWorkTask = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente - } - this.taskslist.push(task); - }); - }); + switch(this.segment){ + case "Expediente": + this.processes.GetTasksList("Expediente", false).subscribe(result => { + console.log(result); + this.taskslist = new Array(); + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); + res.forEach(element => { + let task: DailyWorkTask = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.originator.email, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente + } + this.taskslist.push(task); + }); + console.log(this.taskslist); + }); + break; + case "Pendentes": + this.processes.GetTasksList("Expediente", false).subscribe(result => { + console.log(result); + this.taskslist = new Array(); + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); + res.forEach(element => { + let task: DailyWorkTask = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.originator.email, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente + } + this.taskslist.push(task); + }); + console.log(this.taskslist); + }); + break; + } + } doRefresh(event) { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 14613dc95..39aaac285 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -101,14 +101,11 @@ export class PedidosPage implements OnInit { }); } - console.log(this.taskType); - - + console.log(this.taskType); } doRefresh(event) { this.LoadList(); - setTimeout(() => { event.target.complete(); }, 2000);