diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index f4c247f96..e3ce3d3bd 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -57,50 +57,25 @@ export class ExpedientsPage implements OnInit {
}
LoadList(){
- switch(this.segment){
- case "expedientes":
- 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,
- "DocumentsQty": 0,
- "WorkflowName": element.workflowDisplayName,
- }
- 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,
- "DocumentsQty": 0,
- "WorkflowName": element.workflowDisplayName,
- }
- this.taskslist.push(task);
- });
- console.log(this.taskslist);
- });
- break;
- }
+ 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,
+ "DocumentsQty": 0,
+ "WorkflowName": element.workflowDisplayName,
+ }
+ this.taskslist.push(task);
+ });
+ console.log(this.taskslist);
+ });
}
doRefresh(event) {
@@ -113,9 +88,6 @@ export class ExpedientsPage implements OnInit {
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
-
-
-
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index 6f92f4747..4fc84cb0a 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -52,7 +52,7 @@
+
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 6316cc51c..4ecf14498 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -10,6 +10,7 @@ import { AlertService } from 'src/app/services/alert.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { AuthService } from 'src/app/services/auth.service';
import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
+import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
@Component({
@@ -24,6 +25,7 @@ export class PendentesPage implements OnInit {
taskType: string;
serialNumber:string;
totalDocs:any;
+ showLoader: boolean;
@Input() profile:string;
segment:string;
@@ -59,53 +61,51 @@ export class PendentesPage implements OnInit {
this.openExpedientDetail.emit(data);
}
- LoadList(){
- this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
- //ParecerList
- this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
- //DeferimentoList
- this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
- this.pendentesList = new Array();
- //PendentesList
- let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
- pendentes.forEach(element => {
- let DocId = element.workflowInstanceDataFields.FolderID;
- this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
- this.totalDocs = res.DocumentsTotal;
- console.log(res.DocumentsTotal);
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": this.totalDocs,
- "DocId": element.workflowInstanceDataFields.DocId,
- "WorkflowName": element.workflowDisplayName,
- }
- this.pendentesList.push(task);
- },
- (error)=>{
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocId,
- "WorkflowName": element.workflowDisplayName,
- }
- this.pendentesList.push(task);
- });
- });
- console.log(pendentes);
- console.log(this.pendentesList);
- });//Fim deferimento
- });//Fim parecer
- });//Fim despacho
+ async LoadList(){
+ this.showLoader = true;
+ this.pendentesList = new Array();
+
+ let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
+ let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
+ let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise();
+ let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise();
+
+ let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+ pendentes.forEach(element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+ this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+ this.totalDocs = res.DocumentsTotal;
+ console.log(res.DocumentsTotal);
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": this.totalDocs,
+ "DocId": element.workflowInstanceDataFields.DocId,
+ "WorkflowName": element.workflowDisplayName,
+ }
+ this.pendentesList.push(task);
+ },
+ (error)=>{
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": 0,
+ "DocId": element.workflowInstanceDataFields.DocId,
+ "WorkflowName": element.workflowDisplayName,
+ }
+ this.pendentesList.push(task);
+ });
+ });
+ this.showLoader = false;
}
doRefresh(event) {
@@ -124,7 +124,9 @@ export class PendentesPage implements OnInit {
else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
this.openPedido(serialNumber);
}
-
+ else if(workflowName == 'Expediente'){
+ this.viewExpedientDetail(serialNumber);
+ }
}
async openDespacho(serialNumber:string){
@@ -162,6 +164,24 @@ export class PendentesPage implements OnInit {
this.LoadList();
});
}
+
+ async viewExpedientDetail(serialNumber:any) {
+ console.log(this.profile);
+ const modal = await this.modalController.create({
+ component: ExpedienteDetailPage,
+ componentProps:{
+ enterAnimation: "",
+ serialNumber: serialNumber,
+ profile: this.profile,
+ },
+ cssClass: 'modal modal-desktop',
+ });
+ await modal.present();
+ modal.onDidDismiss().then((res)=>{
+ console.log('refresh list');
+ this.LoadList();
+ });
+ }
}
\ No newline at end of file
diff --git a/src/global.scss b/src/global.scss
index e45e16988..6c9ac7301 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -371,6 +371,12 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
}
}
+.hide-footer{
+ ion-footer{
+ display: none !important;
+ }
+}
+
.modal-width-100-width-background, .modal-desktop {
.modal-wrapper{
width: 100% !important;