diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index adccfcd2c..6b1d2f6bb 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -79,7 +79,7 @@ export class CreateProcessPage implements OnInit { Subject: '', Message: '', SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 - SouceType: 'DOC', //FOLDER + SourceType: 'DOC', //FOLDER SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index c7a662c08..0c82e912f 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -3,7 +3,7 @@ export class Folder{ Subject: string; Message:string; SourceSecFsId:string; - SouceType:string; + SourceType:string; SourceId:string; DeadlineType: string; SubjectTypes: string[]; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 5854871ec..c0e041e52 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -54,7 +54,7 @@ -
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 6de08d3f0..1cc711e40 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -36,6 +36,7 @@ export class DespachosPrPage implements OnInit { profile:string; segment:string; + loading = false // @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -78,8 +79,10 @@ export class DespachosPrPage implements OnInit { async LoadList(){ this.despachoList = new Array(); - - let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise(); + + this.loading = true; + + let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); console.log(result); @@ -113,6 +116,8 @@ export class DespachosPrPage implements OnInit { }) }); + + this.loading = false; } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index bc38f1ec7..983bce8bf 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -92,7 +92,7 @@ export class ExpedientTaskModalPage implements OnInit { Subject: '', Message: '', SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 - SouceType: 'DOC', //FOLDER + SourceType: 'DOC', //FOLDER SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 0487da0b9..3822c7b45 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -70,7 +70,7 @@

{{count_def_dailywork}} Documentos

-
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 5854871ec..c0e041e52 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -54,7 +54,7 @@
-
+
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..284623dac 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 @@ -34,6 +34,7 @@ taskList:tasksList[] = []; taskType: string; serialNumber:string; totalDocs:any; +loading = false @Input() profile:string; segment:string; @@ -64,52 +65,57 @@ segmentChanged(ev: any) { this.LoadList(); } -notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); -} + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } -openExpedientDetailPage(data){ - console.log(data); - this.openExpedientDetail.emit(data); -} + openExpedientDetailPage(data){ + console.log(data); + this.openExpedientDetail.emit(data); + } - async LoadList(){ - this.despachoList = new Array(); + async LoadList() { - let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise(); + this.despachoList = new Array(); + + this.loading = true; + + let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - console.log(result); - - await result.forEach( (element, index) => { + console.log(result); + + result.forEach( (element, index) => { - 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": '', - "DocId": element.workflowInstanceDataFields.DocId, - "WorkflowName": element.workflowDisplayName, - "FolderID": element.workflowInstanceDataFields.FolderID - } - - this.despachoList.push(task) - - }); + 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": '', + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + "FolderID": element.workflowInstanceDataFields.FolderID + } - this.despachoList = this.sortArrayISODate(this.despachoList).reverse() + this.despachoList.push(task) + + }); - this.despachoList.forEach( (element, index) => { - // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; - let FolderID = element['FolderID']; + this.despachoList = this.sortArrayISODate(this.despachoList).reverse() - this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{ - element.DocumentsQty = res.DocumentsTotal - }) + this.despachoList.forEach( (element, index) => { + // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; + let FolderID = element['FolderID']; - }); + this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{ + element.DocumentsQty = res.DocumentsTotal + }) + + }); + + this.loading = false; }