From 62cd2e4f663e4bfffbb32cd7bab79538dbb93dcd Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 10 Aug 2021 09:40:14 +0100 Subject: [PATCH] Improve --- src/app/pages/events/events.page.ts | 2 +- .../book-meeting-modal.page.ts | 5 ++-- .../expediente/expediente.page.ts | 2 +- .../expediente-pr/expediente-pr.page.ts | 2 +- .../expedientes-pr/expedientes-pr.page.ts | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 4 ++-- .../pendentes/pendentes.page.ts | 2 +- src/app/services/events.service.ts | 24 ++++++++----------- .../all-processes/all-processes.page.ts | 2 +- .../expedientes-pr/expedientes-pr.page.ts | 12 ++++------ .../pendentes/pendentes.page.ts | 2 +- 11 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 5616d6190..738b50cfc 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -307,7 +307,7 @@ export class EventsPage implements OnInit { }); break; case 'PR': - this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { + this.processes.GetTasksList("Expediente", false).subscribe(result => { this.expedienteStorage.reset(result) }); break; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 3c55b1ab7..9e6bb4f18 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -131,6 +131,8 @@ export class BookMeetingModalPage implements OnInit { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; this.task = this.navParams.get('task'); + + console.log(this.task) this.postData = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.postData.Body = this.eventBody; @@ -140,7 +142,6 @@ export class BookMeetingModalPage implements OnInit { this.postData.CalendarName = "Oficial"; /* this.postData.StartDate = new Date(); */ /* Set + 30minutes to seleted datetime */ - let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ this.dateControlStart = new FormControl(moment(new Date())); @@ -279,7 +280,7 @@ export class BookMeetingModalPage implements OnInit { } this.modalController.dismiss(); - this.distartExpedientModal(); + // this.distartExpedientModal(); this.toastService.successMessage('Reunião criada'); } catch (error) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 60fc4f987..f66e118fd 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -56,7 +56,7 @@ export class ExpedientePage implements OnInit { this.skeletonLoader = true try { - const expedientePr: object[] = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise() + const expedientePr: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() const result = expedientePr.concat(expedienteMD) diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 33c343101..5face2565 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -161,7 +161,7 @@ export class ExpedientePrPage implements OnInit { "Note": res.workflowInstanceDataFields.Note, "FolderId": res.workflowInstanceDataFields.FolderID, "FsId": res.workflowInstanceDataFields.FsId, - "DocId": res.workflowInstanceDataFields.DocIdD, + "DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID, "WorkflowName": res.workflowDisplayName, "activityInstanceName": res.activityInstanceName, "Status": res.workflowInstanceDataFields.Status, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index b75700508..d8d966be0 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -64,7 +64,7 @@ export class ExpedientesPrPage implements OnInit { LoadList(){ this.skeletonLoader = true - this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { + this.processes.GetTasksList("Expediente", false).subscribe(result => { console.log(result); this.skeletonLoader = false this.showLoader =false diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 6575ba8bd..f788b7d8c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -286,7 +286,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { else if(workflowName == 'Expediente') { this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') { + else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') { this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); } else if (workflowName == "Pedido de Parecer do Presidente") { @@ -430,7 +430,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; this.expedientegbstore.count = this.count_exp_dailywork; - let expedientes_pr = await this.processesbackend.GetTasksList("Expediente do Presidente", false).toPromise(); + let expedientes_pr = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; this.expedienteprstore.count = this.count_exp_pr; diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index e9692af74..aa77c7e2d 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -138,7 +138,7 @@ export class PendentesPage implements OnInit { else if(workflowName == 'Expediente'){ this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') { + else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') { this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 76f7c97a9..5ab493039 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -26,31 +26,28 @@ export class EventsService { headersSharedPessoal: HttpHeaders; //lastloadedevent: Event; - constructor(private http: HttpClient, user: AuthService) { + constructor(private http: HttpClient, user: AuthService) { this.loggeduser = user.ValidatedUser; this.headersMdOficial = new HttpHeaders(); this.headersMdPessoal = new HttpHeaders(); - this.headersPrOficial = new HttpHeaders(); this.headersPrPessoal = new HttpHeaders(); this.headersSharedOficial = new HttpHeaders(); this.headersSharedPessoal = new HttpHeaders(); - - if(this.loggeduser){ - if(this.loggeduser.Profile == 'MDGPR'){ + if(this.loggeduser.Profile == 'MDGPR') { - this.loggeduser.OwnerCalendars.forEach(calendar =>{ - if(calendar.CalendarName == 'Oficial'){ + this.loggeduser.OwnerCalendars.forEach(calendar => { + if(calendar.CalendarName == 'Oficial') { this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersMdOficial = this.headersMdOficial.set('CalendarId', calendar.CalendarId); this.headersMdOficial = this.headersMdOficial.set('CalendarRoleId', calendar.CalendarRoleId); } - else if(calendar.CalendarName == 'Pessoal'){ + else if(calendar.CalendarName == 'Pessoal') { this.headersMdPessoal = this.headersMdPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersMdPessoal = this.headersMdPessoal.set('CalendarId', calendar.CalendarId); this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId); @@ -58,21 +55,20 @@ export class EventsService { } }); - this.loggeduser.SharedCalendars.forEach(sharedCalendar =>{ - if(sharedCalendar.CalendarName == 'Oficial'){ + this.loggeduser.SharedCalendars.forEach(sharedCalendar => { + if(sharedCalendar.CalendarName == 'Oficial') { this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey); this.headersSharedOficial = this.headersSharedOficial.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedOficial = this.headersSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); } - else if(sharedCalendar.CalendarName == 'Pessoal'){ + else if(sharedCalendar.CalendarName == 'Pessoal') { this.headersSharedPessoal = this.headersSharedPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); } }); - } - else if(this.loggeduser.Profile == 'PR'){ + else if(this.loggeduser.Profile == 'PR') { this.loggeduser.OwnerCalendars.forEach(calendar =>{ if(calendar.CalendarName == 'Oficial'){ @@ -80,7 +76,7 @@ export class EventsService { this.headersPrOficial = this.headersPrOficial.set('CalendarId', calendar.CalendarId); this.headersPrOficial = this.headersPrOficial.set('CalendarRoleId', calendar.CalendarRoleId); } - else if(calendar.CalendarName == 'Pessoal'){ + else if(calendar.CalendarName == 'Pessoal') { this.headersPrPessoal = this.headersPrPessoal.set('Authorization', this.loggeduser.BasicAuthKey); this.headersPrPessoal = this.headersPrPessoal.set('CalendarId', calendar.CalendarId); this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId); 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 289662379..e6c4d94a0 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 @@ -151,7 +151,7 @@ export class AllProcessesPage implements OnInit { else if(workflowName == 'Expediente') { this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') { + else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') { this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); } else if (workflowName == "Pedido de Parecer do Presidente") { diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 0daaf70f7..e48f34e9d 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -1,12 +1,10 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { NavigationStart, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } 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 { ModalController } 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 { User } from 'src/app/models/user.model'; @@ -66,8 +64,8 @@ export class ExpedientesPrPage implements OnInit { LoadList(){ this.skeletonLoader = true; - this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { - console.log(result); + this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.taskslist = []; let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 96e155e8a..965d2c0fc 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -131,7 +131,7 @@ export class PendentesPage implements OnInit { else if(workflowName == 'Expediente') { this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); } - else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') { + else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') { this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']); } else if (task.activityInstanceName == "Tarefa de Parecer") {