From 6dc2fddcfb7d188b48a66d6df561433b774c3e21 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 11:20:54 +0100 Subject: [PATCH 1/5] save --- .../book-meeting-modal.page.ts | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) 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 6296cd6b7..550a1367b 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 @@ -235,7 +235,7 @@ export class BookMeetingModalPage implements OnInit { this.adding = "intervenient"; - if(window.innerWidth <= 800){ + if(window.innerWidth <= 801){ const modal = await this.modalController.create({ component: AttendeesPageModal, componentProps: { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 9d6c83605..04bc4a42f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -93,7 +93,7 @@ export class GabineteDigitalPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ this.modalController.dismiss(); } }; @@ -312,7 +312,7 @@ export class GabineteDigitalPage implements OnInit { } selectedElementF(element:string) { - if (window.innerWidth >= 800) { + if (window.innerWidth >= 801) { return element == this.selectedElement } return false; @@ -323,7 +323,7 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); let navigationExtras: NavigationExtras = { queryParams: {"eventos": true,}}; - if( window.innerWidth <= 800) { + if( window.innerWidth <= 801) { //this.openEventsToApproveList(profile); this.router.navigate(['/home/gabinete-digital/event-list']); } @@ -338,7 +338,7 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); switch(this.loggeduser.Profile){ case 'MDGPR': - if( window.innerWidth <= 800) { + if( window.innerWidth <= 801) { //this.openExpedientList(); this.router.navigate(['/home/gabinete-digital/expediente']); } @@ -350,8 +350,7 @@ export class GabineteDigitalPage implements OnInit { } break; case 'PR': - if( window.innerWidth <= 800) { - //this.openExpedientList(); + if( window.innerWidth <= 801) { this.router.navigate(['/home/gabinete-digital/expedientes-pr']); } else { @@ -367,7 +366,7 @@ export class GabineteDigitalPage implements OnInit { openPedidosPage(segment:string) { this.closeAllDesktopComponents(); - if( window.innerWidth <= 800) { + if( window.innerWidth <= 801) { let navigationExtras: NavigationExtras; @@ -389,7 +388,7 @@ export class GabineteDigitalPage implements OnInit { openDespachosPage(segment?:string) { this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ this.router.navigate(['/home/gabinete-digital/despachos']); } else{ @@ -401,7 +400,7 @@ export class GabineteDigitalPage implements OnInit { openDespachosPrPage(segment?:string) { this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ this.router.navigate(['/home/gabinete-digital/despachos-pr']); } else{ @@ -413,7 +412,7 @@ export class GabineteDigitalPage implements OnInit { openPendentesPage(segment?:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ this.router.navigate(['/home/gabinete-digital/pendentes']); } else{ @@ -425,7 +424,7 @@ export class GabineteDigitalPage implements OnInit { openExpedientesPrPage(segment?:string){ this.closeAllDesktopComponents(); - if( window.innerWidth <= 800) { + if( window.innerWidth <= 801) { this.router.navigate(['/home/gabinete-digital/expedientes-pr']); } else { @@ -440,7 +439,7 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}}; this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } @@ -456,7 +455,7 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); if (this.loggeduser.Profile == 'MDGPR') { - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } @@ -466,7 +465,7 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomasAssinar = true; } } else { - if( window.innerWidth <= 800){ + if( window.innerWidth <= 801){ let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras); } From 2de4878b58f6d206425e9cacbf448f34dd959cbb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 14:39:49 +0100 Subject: [PATCH 2/5] save --- package-lock.json | 27 ++++++- package.json | 2 +- .../book-meeting-modal.page.ts | 23 ++++-- .../gabinete-digital.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 73 +++++++++++++++---- 5 files changed, 99 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12e235fa1..9c27c52c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6069,17 +6069,20 @@ } }, "cordova-android": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz", - "integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz", + "integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==", "dev": true, "requires": { "android-versions": "^1.5.0", "cordova-common": "^4.0.1", "execa": "^4.0.2", + "fast-glob": "^3.2.4", "fs-extra": "^9.0.1", + "is-path-inside": "^3.0.2", "nopt": "^4.0.3", "properties-parser": "^0.3.1", + "semver": "^7.3.4", "which": "^2.0.2" }, "dependencies": { @@ -6121,6 +6124,12 @@ "pump": "^3.0.0" } }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -6146,6 +6155,15 @@ "path-key": "^3.0.0" } }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -20269,7 +20287,8 @@ }, "ssri": { "version": "6.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/package.json b/package.json index 98dc5071a..dabb7ea64 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", "codelyzer": "^6.0.0", - "cordova-android": "^9.0.0", + "cordova-android": "^9.1.0", "cordova-browser": "^6.0.0", "cordova-ios": "^6.2.0", "cordova-plugin-androidx": "^3.0.0", 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 550a1367b..1f1e47809 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 @@ -66,11 +66,21 @@ export class BookMeetingModalPage implements OnInit { showLoader = false get dateStart () { - return this.dateControlStart.value + if( window.innerWidth < 801) { + return this.postData.StartDate; + } + else{ + return this.dateControlStart.value; + } } get dateEnd () { - return this.dateControlEnd.value + if( window.innerWidth < 801) { + return this.postData.EndDate; + } + else{ + return this.dateControlEnd.value; + } } @ViewChild('picker') picker: any; @@ -182,9 +192,8 @@ export class BookMeetingModalPage implements OnInit { Categories: null, HasAttachments: true, } + console.log(this.postData); - console.log(this.task); - if(this.task.FsId == '8') { @@ -220,10 +229,8 @@ export class BookMeetingModalPage implements OnInit { await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); break; } - - this.toastService.successMessage('Reunião criada', ()=>{ - this.close(); - }) + this.close(); + this.toastService.successMessage('Reunião criada'); } catch (error) { this.toastService.badRequest() diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 34a7e03a5..3acec560f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -115,7 +115,7 @@ -
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 04bc4a42f..1fc8f360e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -98,6 +98,7 @@ export class GabineteDigitalPage implements OnInit { } }; this.checkRoutes(); + this.checkUser(); } @@ -111,14 +112,6 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { - switch(this.loggeduser.Profile){ - case 'MDGPR': - this.showExpedients = true; - break; - case 'PR': - this.showExpedientesPr = true; - break; - } this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.checkRoutes(); @@ -129,6 +122,17 @@ export class GabineteDigitalPage implements OnInit { this.hideRefreshButton(); } + checkUser(){ + switch(this.loggeduser.Profile){ + case 'MDGPR': + this.showExpedients = true; + break; + case 'PR': + this.showExpedientesPr = true; + break; + } + } + hideRefreshButton(){ window.onresize = (event) => { if( window.innerWidth < 801) { @@ -139,13 +143,54 @@ export class GabineteDigitalPage implements OnInit { } } if(window.innerWidth < 801){ - console.log('YASS'); this.hideRefreshBtn = false; } } checkRoutes(){ - this.activatedRoute.queryParams.subscribe(params => { + if(this.router.url == '/home/gabinete-digital?eventos=true'){ + this.openEventsToApprovePage("MDGPR"); + this.selectedElement='approval'; + } + else if(this.router.url == '/home/gabinete-digital?expedientes=true'){ + this.openExpedientListPage(); + if(this.loggeduser.Profile == 'MDGPR'){ + this.selectedElement='Correspondence'; + } + else{ + this.selectedElement='Expediente Presidente' + } + } + else if(this.router.url == '/home/gabinete-digital?pendentes=true'){ + this.openPendentesPage(''); + this.selectedElement='Pending'; + } + else if(this.router.url == '/home/gabinete-digital?despachos=true'){ + this.openDespachosPage(''); + this.selectedElement='Dispatches'; + } + else if(this.router.url == '/home/gabinete-digital?pedidos=true'){ + this.openPedidosPage('parecer'); + this.selectedElement='RequestsForOpinion'; + } + else if(this.router.url == '/home/gabinete-digital?expedientespr=true'){ + this.openExpedientesPrPage(); + this.selectedElement='Expediente Presidente' + } + else if(this.router.url == '/home/gabinete-digital?despachospr=true'){ + this.openDespachosPrPage(''); + this.selectedElement='DispatchesPr' + } + else if(this.router.url == '/home/gabinete-digital?diplomas=true'){ + this.openDiplomasPage('validar'); + this.selectedElement='DiplomasPorValidar'; + } + else if(this.router.url == '/home/gabinete-digital?diplomasassinar=true'){ + this.openDiplomasPage(''); + this.selectedElement='DiplomasAssinar'; + } + + /* this.activatedRoute.queryParams.subscribe(params => { switch (params) { case params["eventos"]: @@ -185,8 +230,8 @@ export class GabineteDigitalPage implements OnInit { break; case params["diplomas"]: - this.openDiplomasPage(''); - this.selectedElement='DiplomasPorAssinar'; + this.openDiplomasPage('validar'); + this.selectedElement='DiplomasPorValidar'; break; case params["diplomasassinar"]: @@ -194,7 +239,7 @@ export class GabineteDigitalPage implements OnInit { this.selectedElement='DiplomasAssinar'; break; } - }); + }); */ } refreshExpedientes(){ @@ -429,7 +474,7 @@ export class GabineteDigitalPage implements OnInit { } else { this.selectedElement='ExpedientesPr' - let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}}; + let navigationExtras: NavigationExtras = { queryParams: {"expedientespr": true,}}; this.router.navigate(['/home/gabinete-digital'], navigationExtras); this.showExpedientesPr = true; } From 5a1d746fd14e0f016c57e8d6bac657c7c1390363 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 15:11:09 +0100 Subject: [PATCH 3/5] save --- .../modals/create-process/create-process.page.html | 2 -- .../gabinete-digital/pendentes/pendentes.page.ts | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index ac4074a02..833699d1f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -145,9 +145,7 @@
-
- diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 0800712e3..fff07e2cc 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -51,16 +51,7 @@ export class PendentesPage implements OnInit { } goBack() { - - let navigationExtras: NavigationExtras = { - queryParams: { - "pedidos": true, - } - } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - - // window.history.back(); + this.router.navigate(['/home/gabinete-digital']); } notImplemented(){ From 86c2a2c3ce01a75f3306680be2245646d62a437b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 15:45:49 +0100 Subject: [PATCH 4/5] save --- .../diplomas/diploma/diploma.page.ts | 2 +- .../pages/gabinete-digital/diplomas/diplomas.page.ts | 2 -- .../pages/gabinete-digital/gabinete-digital.page.ts | 4 +--- .../gabinete-digital/diplomas/diplomas.page.html | 9 --------- .../gabinete-digital/diplomas/diplomas.page.ts | 12 +++++------- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 19cf3bffe..b7e328184 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -57,7 +57,7 @@ export class DiplomaPage implements OnInit { } goBack() { - if (window.innerWidth <= 800) { + if (window.innerWidth < 801) { this.router.navigate(['/home/gabinete-digital/diplomas']); } else { let navigationExtras: NavigationExtras = { diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index e43640af9..c33e839ff 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -83,8 +83,6 @@ constructor( } async LoadList(){ - - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); console.log('diplomas', diplomas); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1fc8f360e..a2ffad9d7 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -481,14 +481,12 @@ export class GabineteDigitalPage implements OnInit { } openDiplomasPage(segment:string) { - - this.closeAllDesktopComponents(); - if( window.innerWidth <= 801){ let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}}; this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } else{ + this.closeAllDesktopComponents(); this.segment = segment; let navigationExtras: NavigationExtras = { queryParams: {"diplomas": true,}}; this.router.navigate(['/home/gabinete-digital'], navigationExtras); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 56dd370c9..649c7d666 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -19,15 +19,6 @@ - - - - -
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 3b001438e..0a61077ed 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -31,10 +31,9 @@ constructor( } ngOnInit() { - this.LoadList(); this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); + this.LoadList(); } }); } @@ -57,9 +56,12 @@ constructor( } async LoadList(){ + this.diplomasList = new Array(); + + console.log('OOOKAY'); let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = new Array(); + console.log(diplomas); switch (this.segment) { @@ -168,16 +170,12 @@ constructor( }); }); this.showLoader = false; - break; } } doRefresh() { this.LoadList(); - setTimeout(() => { - //event.target.complete(); - }, 2000); } } From 46e6e3fe882560117dd23ee24fdfbd05e385eb82 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 15:49:59 +0100 Subject: [PATCH 5/5] save --- .../popover/deploma-options/deploma-options.page.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 1babb75f8..2eb280466 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { AnimationController, ModalController, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; @@ -27,7 +27,8 @@ export class DeplomaOptionsPage implements OnInit { private activatedRoute: ActivatedRoute, private processes: ProcessesService, private animationController: AnimationController, - private toastService: ToastService) { + private toastService: ToastService, + private router: Router,) { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; @@ -150,7 +151,8 @@ export class DeplomaOptionsPage implements OnInit { goBack() { - this.close() + this.close(); + this.router.navigate(['/home/gabinete-digital/diplomas']); }