diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index b144853f9..cb33b4f3d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -168,7 +168,7 @@ export class GabineteDigitalPage implements OnInit {
let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
this.count_total_pending = Object.keys(pendentes).length;
- this.processesbackend.GetTasksList("Despacho do PR", false).subscribe(res =>{
+ this.processesbackend.GetTasksList("Despacho do Presidente da República", false).subscribe(res =>{
this.showLoader = false;
this.count_de_pr = Object.keys(res).length;
});
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 57d8b73fb..3c2da43e3 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -76,12 +76,11 @@ openExpedientDetailPage(data){
async LoadList(){
this.despachoList = new Array();
- let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise();
+ let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
console.log(result);
await result.forEach( (element, index) => {
-
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
@@ -94,7 +93,6 @@ openExpedientDetailPage(data){
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID
}
-
this.despachoList.push(task)
});
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 02260facc..5304731b4 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -29,13 +29,13 @@
-
+
@@ -65,7 +65,7 @@
@@ -90,7 +90,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 718484a6a..f663e9229 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -1,15 +1,11 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { 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';
+import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
@Component({
selector: 'app-diplomas',
@@ -18,23 +14,13 @@ import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido
})
export class DiplomasPage implements OnInit {
//profile:string;
-
-@ViewChild(CalendarComponent) myCal: CalendarComponent;
-
-taskslist:DailyWorkTask[];
-parecerList:DailyWorkTask[];
-fulltask:any;
-
-parecerListResult:tasksList[] = [];
-deferimentoListResult:tasksList[] = [];
-
-deferimentoList:DailyWorkTask[];
-taskType: string;
+diplomasList:DailyWorkTask[] = [];
+showLoader: boolean;
+totalDocs:any;
serialNumber:string;
@Input() profile:string;
@Input() segment:string;
-@Output() openExpedientDetail:EventEmitter = new EventEmitter();
constructor(
private processes:ProcessesService,
@@ -57,19 +43,54 @@ notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
-openExpedientDetailPage(data){
- console.log(data);
- this.openExpedientDetail.emit(data);
-}
+async LoadList(){
+ this.diplomasList = new Array();
+ let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ console.log(diplomas);
+ switch (this.segment) {
+ case 'validar':
+ let diplomasValidar = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Revising");
+ console.log(diplomasValidar);
+ diplomasValidar.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.diplomasList.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.diplomasList.push(task);
+ });
+ });
+ this.showLoader = false;
+ break;
+ case 'assinados':
-LoadList(){
- if(this.segment == 'validar'){
-
+ break;
}
- else if(this.segment == 'assinados'){
-
- }
- console.log(this.taskType);
}
doRefresh(event) {
@@ -83,7 +104,7 @@ async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
- component: PedidoPage,
+ component: DiplomaPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,