-
+
{{ task.CreateDate | date: 'dd-MM-yy' }}
@@ -54,7 +54,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss index e624d0744..0a5f9d37c 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -1,14 +1,16 @@ @import '~src/function.scss'; /* CONTENT */ -:host{ +.main-content{ padding: 30px 20px 0 20px !important; margin: 0; } -.title{ +.main-header{ font-family: Roboto; font-size: 25px; color:#000; overflow: auto; + padding: 30px 20px 0 20px !important; + margin: 0; .thetitle{ width: fit-content; @@ -19,6 +21,21 @@ float: right; } } + .bottom-title{ + //width: 100%; + margin-left: 20px !important; + margin-right: 20px !important; + margin: 0 auto; + align-items: center; + justify-content: center; + border-bottom: 5px solid #42b9fe; + + .bottom-text{ + font-size: 15px !important; + font-family: Roboto !important; + color: #0d89d1 !important; + } + } .item-list-small{ font-size: 11px; overflow: hidden; 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 c1c56bb06..6de08d3f0 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 @@ -4,7 +4,7 @@ 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 { ModalController } from '@ionic/angular'; +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'; @@ -22,12 +22,6 @@ import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/ }) export class DespachosPrPage implements OnInit { - - task: any; - attachments:any; - fulltask: any; - - @ViewChild(CalendarComponent) myCal: CalendarComponent; taskslist:DailyWorkTask[]; @@ -40,9 +34,10 @@ export class DespachosPrPage implements OnInit { serialNumber:string; totalDocs:any; - @Input() profile:string; + profile:string; segment:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); + + // @Output() openExpedientDetail:EventEmitter = new EventEmitter(); loadedAttachments:any; dicIndex = 0; @@ -53,8 +48,10 @@ export class DespachosPrPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + private navParams: NavParams ) { - this.profile = 'mdgpr'; + + this.profile = this.navParams.get('profile') || 'mdgpr'; } ngOnInit() { @@ -65,8 +62,9 @@ export class DespachosPrPage implements OnInit { console.log(res); }); } + segmentChanged(ev: any) { - this.LoadList(); + // this.LoadList(); } notImplemented(){ @@ -75,18 +73,16 @@ export class DespachosPrPage implements OnInit { openExpedientDetailPage(data){ console.log(data); - this.openExpedientDetail.emit(data); + // this.openExpedientDetail.emit(data); } async LoadList(){ + this.despachoList = new Array(); - - let result = await this.processes.GetTasksList("Despacho", false).toPromise(); + let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise(); console.log(result); - this.despachoList = new Array(); - await result.forEach( (element, index) => { let task = { @@ -137,6 +133,13 @@ export class DespachosPrPage implements OnInit { async viewExpedientDetail(serialNumber:any) { console.log(this.profile); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop' + } + const modal = await this.modalController.create({ component: DespachoPage, componentProps:{ @@ -144,7 +147,7 @@ export class DespachosPrPage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: 'modal modal-desktop', + cssClass: classs, }); await modal.present(); modal.onDidDismiss().then((res)=>{ @@ -166,15 +169,15 @@ export class DespachosPrPage implements OnInit { const doc = this.loadedAttachments[ this.dicIndex]; task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, } const modal = await this.modalController.create({ @@ -264,7 +267,7 @@ export class DespachosPrPage implements OnInit { } docIndex(index: number) { - this.dicIndex = index; + this.dicIndex = index; } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index b144853f9..f9942216e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -10,7 +10,7 @@ import { PedidosPage } from './pedidos/pedidos.page'; import { PendentesPage } from './pendentes/pendentes.page'; import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; - +import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -285,10 +285,10 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPrPage(segment:string){ + openDespachosPrPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ - this.openDespachoList(); + this.openDespachoListPr(); } else{ this.showDespachosPr = true; @@ -372,6 +372,21 @@ export class GabineteDigitalPage implements OnInit { console.log('show desktop modal') } + async openDespachoListPr(){ + + this.closeAllDesktopComponent(); + const modal = await this.modalController.create({ + component: DespachosPrPage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + }); + await modal.present(); + modal.onDidDismiss(); + console.log('show desktop modal') + } + async openPedidoList(){ this.closeAllDesktopComponent(); const modal = await this.modalController.create({ From f34b8129f5d3f7de16322f5ab6b72e8103f31b21 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 May 2021 15:03:46 +0100 Subject: [PATCH 5/7] Add Despacho do presifente da Republica --- .../create-process/create-process.page.ts | 2 +- src/app/models/folder.model.ts | 2 +- .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos-pr/despachos-pr.page.ts | 9 ++- .../expedient-task-modal.page.ts | 2 +- .../gabinete-digital.page.html | 2 +- .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos-pr/despachos-pr.page.ts | 80 ++++++++++--------- 8 files changed, 56 insertions(+), 45 deletions(-) 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; } From f9e2924f6734140b5e38724a131bf573b50b86c0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 May 2021 15:12:20 +0100 Subject: [PATCH 6/7] Add count for Pr dispatch --- .../despachos-pr/despachos-pr.page.html | 3 +- .../despachos-pr/despachos-pr.page.ts | 33 ++++++++++--------- .../gabinete-digital/gabinete-digital.page.ts | 5 +++ .../despachos-pr/despachos-pr.page.html | 2 +- .../despachos-pr/despachos-pr.page.ts | 3 +- 5 files changed, 27 insertions(+), 19 deletions(-) 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 c0e041e52..6f8adcaa7 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 @@ -26,9 +26,10 @@ class="expediente ion-no-padding cursor-pointer" *ngFor = "let task of despachoList; let i = index" (click)="viewExpedientDetail(task.SerialNumber)" + > -
+
{{ task.CreateDate | date: 'dd-MM-yy' }} 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 1cc711e40..0e1853919 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 @@ -88,31 +88,32 @@ export class DespachosPrPage implements OnInit { await 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 - } + 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, + "Status": element.workflowInstanceDataFields.Status + } - this.despachoList.push(task) + this.despachoList.push(task) }); this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { - // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; - let FolderID = element['FolderID']; + // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; + let FolderID = element['FolderID']; this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{ - element.DocumentsQty = res.DocumentsTotal + element.DocumentsQty = res.DocumentsTotal }) }); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index f9942216e..539560d8f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -38,6 +38,7 @@ export class GabineteDigitalPage implements OnInit { count_ev_pr=0; count_ev_md=0; count_total_pending = 0; + count_desp_pr_active = 0; selectedElement = ""; @@ -167,6 +168,10 @@ 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 Presidente da República", false).subscribe(e=>{ + this.count_de_pr = Object.keys(e).length + }); this.processesbackend.GetTasksList("Despacho do PR", false).subscribe(res =>{ this.showLoader = false; 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 c0e041e52..fe2ea539f 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 @@ -28,7 +28,7 @@ (click)="viewExpedientDetail(task.SerialNumber)" > -
+
{{ task.CreateDate | date: 'dd-MM-yy' }} 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 284623dac..b25875247 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 @@ -96,7 +96,8 @@ segmentChanged(ev: any) { "DocumentsQty": '', "DocId": element.workflowInstanceDataFields.DocId, "WorkflowName": element.workflowDisplayName, - "FolderID": element.workflowInstanceDataFields.FolderID + "FolderID": element.workflowInstanceDataFields.FolderID, + "Status": element.workflowInstanceDataFields.Status } this.despachoList.push(task) From bb49078bfced9a3cf3d4e7d5af6a60ec6e10164f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 May 2021 15:19:37 +0100 Subject: [PATCH 7/7] save --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 2 +- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 3822c7b45..a552d9a5f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -75,7 +75,7 @@

Expediente Presidente

-

- Documentos

+

{{count_exp_pr}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 539560d8f..c57e7be8b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -24,6 +24,7 @@ export class GabineteDigitalPage implements OnInit { public profile:string; count_exp_dailywork=0; + count_exp_pr =0 count_desp_dailywork=0; count_desp_pending=0; count_par_dailywork=0; @@ -172,6 +173,11 @@ export class GabineteDigitalPage implements OnInit { this.processesbackend.GetTasksList("Despacho do Presidente da República", false).subscribe(e=>{ this.count_de_pr = Object.keys(e).length }); + + this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); + this.count_exp_pr = Object.keys(res).length + }); this.processesbackend.GetTasksList("Despacho do PR", false).subscribe(res =>{ this.showLoader = false;