diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 02fbf9a41..a1428427a 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -197,7 +197,7 @@ export class BookMeetingModalPage implements OnInit { try { switch (this.loggeduser.Profile) { case 'MDGPR': - //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); break; case 'PR': 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 9d9dc654c..887f46844 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 @@ -97,27 +97,42 @@ export class ExpedienteDetailPage implements OnInit { } goBack() { - this.activatedRoute.paramMap.subscribe(params => { - switch (params["params"].caller) { - case 'events': - this.router.navigate(['/home',params["params"].caller]); - break; - - case 'gabinete-digital': - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes": true, + if(this.task.Status == "Pending"){ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pendentes']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pendentes": true, } - } - if( window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/expediente']); - } else { - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } - break; - + } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - }); + } + else{ + this.activatedRoute.paramMap.subscribe(params => { + switch (params["params"].caller) { + case 'events': + this.router.navigate(['/home',params["params"].caller]); + break; + + case 'gabinete-digital': + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes": true, + } + } + if( window.innerWidth < 801) { + this.router.navigate(['/home/gabinete-digital/expediente']); + } else { + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + break; + + } + }); + } } sendExpedienteToPending() { @@ -149,6 +164,7 @@ export class ExpedienteDetailPage implements OnInit { "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocID, "WorkflowName": res.workflowDisplayName, + "Status": res.workflowInstanceDataFields.Status, } //console.log('task', this.task); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index e692465fd..87e9d322c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -17,6 +17,7 @@ font-size: 18px !important; } .main-header{ + display: flex; font-family: Roboto; background-color: #fff; overflow:auto; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 8102f6c3c..78ef5944b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -102,6 +102,7 @@ export class PedidoPage implements OnInit { "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "activityInstanceName": res.activityInstanceName, + "Status": res.workflowInstanceDataFields.Status, } console.log(this.task); } @@ -126,6 +127,7 @@ export class PedidoPage implements OnInit { "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, "activityInstanceName": res.activityInstanceName, + "Status": res.workflowInstanceDataFields.Status, } console.log(this.task); } @@ -443,17 +445,32 @@ export class PedidoPage implements OnInit { } goBack() { - if (window.innerWidth <= 800) { - this.router.navigate(['/home/gabinete-digital/pedidos']); - } else { - let navigationExtras: NavigationExtras = { - queryParams: { - "pedidos": true, + if(this.task.Status == "Pending"){ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pendentes']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pendentes": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } + else{ + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pedidos']); + } + else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } + } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - } } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 6b4c5ee59..cf7806367 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - + @@ -46,6 +46,11 @@ +
+
+ {{task.Senders}} +
+
{{task.WorkflowName}} @@ -54,12 +59,6 @@ {{ task.CreateDate | date: 'dd-MM-yy' }}
- -
-
- {{task.Senders}} -
-
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index 4e4ca4724..fda425ff4 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -123,6 +123,38 @@ ion-item{ /* border-bottom: 1px solid gray; */ margin: 10px auto; } + +.exp-top-detail{ + width: 100%; + float: left; + font-family: Roboto; + font-size: 12pt; + font-weight: 700; + color: #0d89d1; + padding-left: 3px; + + .subject{ + width: 84%; + float: left; + } + + .exp-icon{ + width: fit-content; + float: right; + /* font-size: 13px; */ + margin: 0 !important; + padding: 0 !important; + + ion-icon{ + font-size: 12pt; + color: #42b9fe; + float: left; + } + label{ + font-size: 10pt; + } + } +} .exp-middle-detail, .exp-bottom-detail{ margin-bottom: 5px; @@ -158,40 +190,11 @@ ion-item{ float: right; } } -.exp-top-detail{ - width: 100%; - float: left; - font-family: Roboto; - font-size: 12pt; - font-weight: 700; - color: #0d89d1; - - .subject{ - width: 84%; - float: left; - } - - .exp-icon{ - width: fit-content; - float: right; - /* font-size: 13px; */ - margin: 0 !important; - padding: 0 !important; - - ion-icon{ - font-size: 12pt; - color: #42b9fe; - float: left; - } - label{ - font-size: 10pt; - } - } -} .exp-bottom-detail{ font-size: 8pt; width: 100%; overflow: auto; + padding-left: 3px; .exp-remetente{ //width: 200px; diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index d8a14ebcc..0800712e3 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -44,9 +44,6 @@ export class PendentesPage implements OnInit { //Inicializar segment this.segment = "despachos"; this.LoadList(); - this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); } segmentChanged(ev: any) { @@ -71,7 +68,6 @@ export class PendentesPage implements OnInit { } openExpedientDetailPage(data){ - console.log(data); this.openExpedientDetail.emit(data); } @@ -86,6 +82,7 @@ export class PendentesPage implements OnInit { let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise(); let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); + console.log(pendentes); pendentes.forEach(element => { let DocId = element.workflowInstanceDataFields.FolderID; let ApplicationId = element.workflowInstanceDataFields.ApplicationId; @@ -107,6 +104,7 @@ export class PendentesPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, } this.pendentesList.push(task); }, @@ -122,6 +120,7 @@ export class PendentesPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocId, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, } this.pendentesList.push(task); }); @@ -138,7 +137,6 @@ export class PendentesPage implements OnInit { } async viewTaskDetails(serialNumber:string, workflowName:string) { - console.log(this.profile); if(workflowName == 'Despacho'){ this.goToDespacho(serialNumber); }