From 645b6e8a13d8cf846d4e0490f6eb937d68a9486c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 4 May 2022 16:45:38 +0100 Subject: [PATCH 01/12] Bug datepipe solved --- android/app/src/main/assets/capacitor.config.json | 2 +- src/app/modals/profile/profile.page.ts | 2 ++ src/app/models/dailyworktask.model.ts | 2 +- src/app/pages/gabinete-digital/diplomas/diplomas.page.ts | 2 ++ src/app/pages/gabinete-digital/gabinete-digital.page.ts | 1 + src/app/pipes/expediente-task.pipe.ts | 2 +- .../events-to-approve/events-to-approve.page.ts | 3 ++- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index 10f114d8f..6077cab4f 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -18,6 +18,6 @@ } }, "server": { - "url": "http://192.168.0.50:8101" + "url": "http://192.168.0.50:8100" } } diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index cdbfadf5e..adc4af25b 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -138,6 +138,8 @@ export class ProfilePage implements OnInit { notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => { + console.log(index, Service, Object, IdObject, FolderId) + if (Service === "agenda" && IdObject.length > 10) { this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); } diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 1296fda0f..11ace9eec 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -144,7 +144,7 @@ export interface expedienteTask { export interface ExpedienteTask { SerialNumber: string Senders : string - CreateDate : string + CreateDate : any DocumentsQty : number WorkflowName : string activityInstanceName : string diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 9fdfe4037..a24267323 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -202,9 +202,11 @@ export class DiplomasPage implements OnInit, OnDestroy { let task = this.pipeTask(element); diplomasAssinadoList.push(task); + console.log('DIPLOMAS ASSINADOS', task) }); this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate') + console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList) }, (error) => { this.getFromDb() diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index a22521518..d3b847fa7 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -583,6 +583,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.allProcessesList.push(task); this.allProcessesList = removeDuplicate(this.allProcessesList); this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') + console.log('All PROCESS', this.allProcessesList) }); diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts index 13cad0df5..e5dc66e06 100644 --- a/src/app/pipes/expediente-task.pipe.ts +++ b/src/app/pipes/expediente-task.pipe.ts @@ -17,7 +17,7 @@ export class ExpedienteTaskPipe implements PipeTransform { "taskStartDate": fullTask.taskStartDate, "Subject": fullTask.workflowInstanceDataFields.Subject, "Senders": fullTask.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, + "CreateDate": date, "DocumentsQty": fullTask.totalDocuments, "WorkflowName": fullTask.workflowDisplayName, "activityInstanceName": fullTask.activityInstanceName, diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index bef6c9d0d..1f3ce3fe4 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -19,7 +19,7 @@ export class EventsToApprovePage implements OnInit { showLoader: boolean; eventsPRList: any = [] - eventsMDGPRList: any = [] + eventsMDGPRList; eventPerson: EventPerson; eventBody: EventBody; categories: string[]; @@ -41,6 +41,7 @@ export class EventsToApprovePage implements OnInit { } ngOnInit() { + console.log('ERROR LEGN',this.eventsMDGPRList.length) this.segment = this.loggeduser.Profile; this.LoadToApproveEvents(); From fbf91270567630acce989fc1e8d0b7cb7defd9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 5 May 2022 09:20:27 +0100 Subject: [PATCH 02/12] Bug users other then MD and PR could not see expedients list solved --- .../gabinete-digital/gabinete-digital.page.ts | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d3b847fa7..1a37f0ae4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -194,6 +194,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { selector: 'app-gabinete-digital ion-content .aside-wrapper', callback: () => { this.checkRoutes(); + console.log('FIRST CALL') this.LoadCounts(); } }) @@ -205,6 +206,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.waitForDomService.selector({ selector: 'app-gabinete-digital ion-content .aside-wrapper', callback: () => { + console.log('SECOND CALL') this.loadAllProcesses(); } }) @@ -224,7 +226,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.platform.ready().then(() => { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.set('GabineteProcess', data).then(() => { - + }) } else { data.forEach(element => { @@ -257,7 +259,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.hideRefreshButton(); if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.get('GabineteProcess').then((allprocess: any[]) => { - + allprocess.forEach(element => { let date = new Date(element.taskStartDate); date.setMonth(date.getMonth() + 1); @@ -318,7 +320,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') }); - + }) } @@ -352,7 +354,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { if (totalDays == 0) { if (allday) { customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)"; - + return customDate; } else { @@ -415,7 +417,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']); } else { - + } } @@ -581,12 +583,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } this.allProcessesList.push(task); - this.allProcessesList = removeDuplicate(this.allProcessesList); - this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') - console.log('All PROCESS', this.allProcessesList) - }); + this.allProcessesList = removeDuplicate(this.allProcessesList); + this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') + console.log('All PROCESS', this.allProcessesList) + let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") this.expedientegbstore.count = expedientes.length @@ -666,14 +668,14 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.count_dip_apr = "-"; - + this.loadCount = true } doRefresh(event) { - - this.LoadCounts(); + + this.LoadCounts(); if (event) { setTimeout(() => { @@ -681,7 +683,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { }, 2000); } else { - + } } @@ -746,6 +748,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.showExpedientesPr = true; } break; + default: + if (window.innerWidth < 701) { + //this.openExpedientList(); + this.router.navigate(['/home/gabinete-digital/expediente']); + } + else { + this.selectedElement = 'Correspondence' + let navigationExtras: NavigationExtras = { queryParams: { "expedientes": true, } }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + this.showExpedients = true; + } + } } From e360ca5ae4c6a999205705f68e1d7d892f1a6143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 5 May 2022 09:37:40 +0100 Subject: [PATCH 03/12] Users other then MD coundnt see aprove envent on GD solved --- src/app/models/permission/gabinete-permission.ts | 1 + src/app/pages/gabinete-digital/gabinete-digital.page.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/models/permission/gabinete-permission.ts b/src/app/models/permission/gabinete-permission.ts index 9252bb09d..10f195898 100644 --- a/src/app/models/permission/gabinete-permission.ts +++ b/src/app/models/permission/gabinete-permission.ts @@ -2,4 +2,5 @@ export class GabinetePermission{ access = 531; pr_tasks = 533; md_tasks = 532; + aprove_event = 507; } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 09b58317b..6ca9dd666 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -142,7 +142,7 @@

{{ allProcessesList.length }} Documentos

-
+
From 174072d91128660da878360271dad7b9cafee268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 5 May 2022 09:48:39 +0100 Subject: [PATCH 04/12] MD and other generic users can see event to aprove list on angenda --- src/app/pages/agenda/agenda.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 5370bb53e..77f5cd1ae 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -123,7 +123,7 @@ -
Solicitar revisão
-
Outras opções
+
Outras opções
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index b78e83d54..191e8a38e 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -12,7 +12,7 @@ - +
From 48167e02e0aad9a01488150e5e05e8fd38151d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 11:32:45 +0100 Subject: [PATCH 07/12] Remove some process from All process page --- .../gabinete-digital/event-list/event-list.page.ts | 2 ++ .../pages/gabinete-digital/gabinete-digital.page.ts | 11 ++++++++++- .../all-processes/all-processes.page.ts | 10 ++++++++++ .../events-to-approve/events-to-approve.page.ts | 5 ++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 4b944ef60..65ccc0551 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -161,6 +161,7 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) + this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -173,6 +174,7 @@ export class EventListPage implements OnInit { this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) + this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1a37f0ae4..93151543f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -544,9 +544,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let allProcessesList = allPreocesses_; this.loadCount = true; - + console.log(allProcessesList) allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director') if (!this.p.userRole(['PR'])) { allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index ad5ffd20c..ef5c816f5 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -63,6 +63,16 @@ export class AllProcessesPage implements OnInit { // allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente') + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director') this.skeletonLoader = true; diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 1f3ce3fe4..a673f6ee1 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -67,11 +67,13 @@ export class EventsToApprovePage implements OnInit { this.showLoader = true; this.getFromDB(); - if(this.segment == 'MDGPR'){ + if(this.segment != 'PR'){ let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) + console.log(this.eventsMDGPRList) + this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -85,6 +87,7 @@ export class EventsToApprovePage implements OnInit { let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) + this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { From f83394462da1a745092fdde2f1026d1cdfacf24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 13:47:21 +0100 Subject: [PATCH 08/12] Remove Edite Event process from event to aprove --- .../event-list/event-list.page.ts | 8 ++++++-- .../events-to-approve/events-to-approve.page.ts | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 65ccc0551..231170f7a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -161,7 +161,9 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -174,7 +176,9 @@ export class EventListPage implements OnInit { this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsPRList = this.eventsPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index a673f6ee1..2cd6de2a4 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -70,10 +70,15 @@ export class EventsToApprovePage implements OnInit { if(this.segment != 'PR'){ let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); + console.log(mdEventsOficial) + console.log(mdEventsPessoal) this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) + this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) console.log(this.eventsMDGPRList) - this.eventsMDGPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -85,9 +90,13 @@ export class EventsToApprovePage implements OnInit { else if(this.segment == 'PR'){ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); + console.log(prEventsOficial) + console.log(prEventsPessoal) this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList.filter(element => element.activityInstanceName != 'Editar Evento') + this.eventsPRList = this.eventsPRList.filter(function(item) { + return item.activityInstanceName != 'Editar Evento' + }) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { @@ -101,10 +110,12 @@ export class EventsToApprovePage implements OnInit { getFromDB() { this.storage.get('event-to-aproveMD').then((events) => { this.eventsMDGPRList = events + console.log('DB',this.eventsMDGPRList) }) this.storage.get('event-to-aprovePR').then((events) => { this.eventsPRList = events + console.log('DB',this.eventsPRList) }) } From bf493536ce8115e0ab047be9417cb0ab40c31103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 14:24:19 +0100 Subject: [PATCH 09/12] =?UTF-8?q?Display=20text=20Avalia=C3=A7=C3=A3o=20Su?= =?UTF-8?q?perior=20erro=20on=20expediente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expediente-detail/expediente-detail.page.ts | 1 - .../popover/opts-expediente/opts-expediente.page.html | 4 ++-- .../popover/opts-expediente/opts-expediente.page.ts | 8 +++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 79412d5fd..c9088b3c1 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -100,7 +100,6 @@ export class ExpedienteDetailPage implements OnInit { } ngOnInit() { - this.LoadTaskDetail(this.serialNumber); this.backgroundservice.registerBackService('Online', () => { this.LoadTaskDetail(this.serialNumber); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 191e8a38e..ed37cde88 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -8,8 +8,8 @@
- - + + diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 45c33dacd..f076a25a3 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -17,6 +17,8 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ThemeService } from 'src/app/services/theme.service' import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; import { RouteService } from 'src/app/services/route.service'; +import { LoginUserRespose } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-opts-expediente', @@ -34,6 +36,8 @@ export class OptsExpedientePage implements OnInit { searchDocumentPipe = new SearchDocumentPipe() documents:SearchList[] = []; + loggeduser: LoginUserRespose; + constructor( private popoverController: PopoverController, private modalController: ModalController, @@ -45,8 +49,10 @@ export class OptsExpedientePage implements OnInit { private attachmentsService: AttachmentsService, private RouteService: RouteService, private expedienteService: ExpedienteService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private userAuth: AuthService, ) { + this.loggeduser = userAuth.ValidatedUser this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); From 74a30df704b5b8fcebb61edc005c62b68e94758d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 14:36:57 +0100 Subject: [PATCH 10/12] =?UTF-8?q?Enable=20Avalia=C3=A7=C3=A3o=20Superiro?= =?UTF-8?q?=20button=20on=20opts-expediente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shared/popover/opts-expediente/opts-expediente.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index ed37cde88..6860955b9 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -8,8 +8,8 @@
- - + + From 4999f927640083c31ea75349a57143dc3bb2ae37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 14:46:50 +0100 Subject: [PATCH 11/12] Bug Despacho do PR duplicated box solved --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6ca9dd666..af735481b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -177,7 +177,7 @@ -
+
@@ -246,7 +246,8 @@
-

Despacho do Presidente da República

+

Despacho do Presidente da República

+

Despachos criados por mim

{{ despachoprstore.count }} Documentos

From 169bf9bbda97ffa4487ff0c28ac5d556a791c8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 6 May 2022 15:02:55 +0100 Subject: [PATCH 12/12] Duplicated cancelar solved --- .../shared/popover/opts-expediente/opts-expediente.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 6860955b9..3798b2ee2 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -14,7 +14,7 @@ - +