diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 21d078e88..737777102 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -6,7 +6,7 @@
-
Diplomas por Assinar
+ Diplomas para Assinar
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 9061c93df..bec578ef0 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -19,7 +19,6 @@ showLoader: boolean;
totalDocs:any;
serialNumber:string;
-@Input() profile:string;
@Input() segment:string;
constructor(
@@ -29,16 +28,9 @@ constructor(
private router: Router,
private activatedRoute: ActivatedRoute,
) {
- this.profile = 'mdgpr';
- this.segment = 'validar'
}
ngOnInit() {
- //Inicializar segment
- this.segment = 'validar';
-
-
-
this.LoadList();
}
@@ -61,7 +53,6 @@ constructor(
async LoadList(){
-
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = new Array();
@@ -117,36 +108,63 @@ constructor(
this.showLoader = false;
break;
case 'assinados':
- console.log('Assinados');
+ let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+ console.log(diplomasAssinados);
+ diplomasAssinados.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 date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.originator.email,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": 0,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ },
+ (error)=>{
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": 0,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ });
+ });
+ this.showLoader = false;
break;
}
}
- doRefresh(event) {
+ doRefresh() {
this.LoadList();
setTimeout(() => {
//event.target.complete();
}, 2000);
}
- async viewPedidoDetail(serialNumber:any) {
- console.log(this.profile);
-
- const modal = await this.modalController.create({
- component: DiplomaPage,
- componentProps:{
- enterAnimation: "",
- serialNumber: serialNumber,
- profile: this.profile,
- },
- cssClass: 'modal modal-desktop',
- });
- await modal.present();
- modal.onDidDismiss().then((res)=>{
- console.log('refresh list');
- this.LoadList();
- });
- }
-
}
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index 4fc84cb0a..86e024981 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -36,7 +36,7 @@
{{task.Senders}}
- {{task.WorkflowName}}
+ {{task.activityInstanceName}}