+
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 668ce96fd..f7e69da92 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -28,7 +28,7 @@
-
-
+
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index ce7ab7e18..5baf8db36 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -34,37 +34,37 @@
-
-
-
-
@@ -94,7 +94,7 @@
-
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }}
-
-
- {{task.Remetente}}
-
-
- {{task.activityInstanceName}}
-
-
-
- {{ task.Folio }}
-
+ class="expediente ion-no-padding cursor-pointer"
+ *ngFor = "let task of diplomasList"
+ (click)="goToDiploma(task.SerialNumber)"
+ >
+
+
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
-
+
+ {{task.Remetente}}
+
+
+ {{task.activityInstanceName}}
+
+
+
+ {{ task.Folio }}
+
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index c1228ca86..b554579e9 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -59,7 +59,7 @@
{{ task.Folio }}
-
+
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index d2ba33918..3d29ce1cd 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -41,7 +41,7 @@ export class ExpedientePage implements OnInit {
}
- LoadList(){
+ LoadList() {
this.skeletonLoader = true
this.processes.GetTasksList("Expediente", false).subscribe(result => {
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 075333338..d5e412d26 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -52,7 +52,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index b56b272d5..682a495c9 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -4,8 +4,6 @@ import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
@@ -21,7 +19,7 @@ export class ExpedientesPrPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
- taskslist:DailyWorkTask[];
+ taskslist:DailyWorkTask[] = [];
serialNumber:string;
showLoader:boolean;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 08503b149..5162baed6 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -106,7 +106,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 67a4e7c48..9696ee78c 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -1,34 +1,27 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
-
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
import { ModalController, NavParams } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
-import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
-
@Component({
selector: 'app-pedidos',
templateUrl: './pedidos.page.html',
styleUrls: ['./pedidos.page.scss'],
})
export class PedidosPage implements OnInit {
- //profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
- parecerList:any[];
+ parecerList:any[] = [];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
- deferimentoList:any[];
+ deferimentoList:any[] = [];
taskType: string;
serialNumber:string;
skeletonLoader = true
@@ -109,7 +102,7 @@ export class PedidosPage implements OnInit {
this.skeletonLoader = false
let allParecer = parecer.concat(parecerPr).reverse();
- this.parecerList = new Array();
+ this.parecerList =[];
allParecer.forEach(element => {
@@ -141,7 +134,7 @@ export class PedidosPage implements OnInit {
console.log(result);
- this.deferimentoList = new Array();
+ this.deferimentoList = [];
let res = result.reverse();
res.forEach(element => {
let date = new Date(element.taskStartDate);
@@ -181,5 +174,4 @@ export class PedidosPage implements OnInit {
}, 2000);
}
-
}
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index dacd52b14..f22a15edb 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -27,7 +27,7 @@
-
-
- = 1" class="width-100">
+
-
+
+
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index 838befcea..4a05d26f7 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -16,7 +16,7 @@ import { AlertService } from 'src/app/services/alert.service';
export class PendentesPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
- pendentesList:DailyWorkTask[];
+ pendentesList:DailyWorkTask[] = [];
taskType: string;
serialNumber:string;
totalDocs:any;
@@ -32,7 +32,6 @@ export class PendentesPage implements OnInit {
private router: Router,
private activatedRoute: ActivatedRoute,
){
- this.pendentesList = new Array();
this.profile = 'mdgpr';
}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index 436190370..ce400c4cb 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -20,7 +20,7 @@
-
= 1">
+
= 1">
-
-
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }}
-
-
- {{task.Remetente}}
-
-
-
- {{ task.Folio }}
-
+ class="expediente ion-no-padding cursor-pointer"
+ *ngFor = "let task of taskslist"
+ (click)="goToExpediente(task.SerialNumber)"
+ >
+
+
+
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
-
+
+ {{task.Remetente}}
+
+
+
+ {{ task.Folio }}
+
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index c567bd735..a58d96362 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -62,8 +62,10 @@ export class ExpedientesPrPage implements OnInit {
case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
- this.taskslist = new Array();
+
+ this.taskslist = []
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
@@ -81,8 +83,8 @@ export class ExpedientesPrPage implements OnInit {
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
- });
- console.log(this.taskslist);
+ });
+
this.skeletonLoader = false;
});
@@ -90,7 +92,7 @@ export class ExpedientesPrPage implements OnInit {
case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
- this.taskslist = new Array();
+ this.taskslist = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
@@ -109,8 +111,7 @@ export class ExpedientesPrPage implements OnInit {
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
- });
- console.log(this.taskslist);
+ });
this.skeletonLoader = false;
});
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index f1da0f695..9bce19526 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -21,7 +21,7 @@ export class ExpedientsPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
- taskslist:DailyWorkTask[];
+ taskslist:DailyWorkTask[] = [];
serialNumber:string;
@Input() profile:string;
@@ -67,7 +67,7 @@ export class ExpedientsPage implements OnInit {
this.skeletonLoader = true
this.processes.GetTasksList("Expediente", false).subscribe(result => {
- this.taskslist = new Array();
+ this.taskslist = [];
this.skeletonLoader = false
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 6cbb893dd..3a9ab72dd 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -23,13 +23,13 @@ export class PedidosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
- parecerList:any[];
+ parecerList:any[] = [];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
- deferimentoList:any[];
+ deferimentoList:any[] = [];
taskType: string;
@Input() serialNumber:string;