From 682504008d37dd2f4055b5e39c55c06dd1d25040 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 25 Jun 2021 10:50:31 +0100 Subject: [PATCH 1/8] Improve form --- src/global.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/global.scss b/src/global.scss index 4e012ae94..f130a4996 100644 --- a/src/global.scss +++ b/src/global.scss @@ -906,14 +906,14 @@ background: rgb(92, 92, 92); } .mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline { - display: none; + // display: none; } .date-hour-picker { margin-top: -6px; label#mat-form-field-label-7 { - // display: none; + display: none; } .span.ng-tns-c193-4, .ng-star-inserted { From 1adacf2febf6ae8b3ded89a7aa1bdc6bd3bc1292 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 25 Jun 2021 11:16:07 +0100 Subject: [PATCH 2/8] Fixe --- package-lock.json | 42 +++++++++++++++++++++++++++++++++++++----- package.json | 4 ++-- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f903fda6..cd83b102f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4624,6 +4624,16 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -8265,9 +8275,9 @@ } }, "cordova-plugin-mfp-push": { - "version": "8.0.2020072705", - "resolved": "https://registry.npmjs.org/cordova-plugin-mfp-push/-/cordova-plugin-mfp-push-8.0.2020072705.tgz", - "integrity": "sha512-aA7EAZnFgu8R5U+Vpt5fGbCq1lRYHrt9AXXEJMwc5Vv0sFVUz9iOyzMXHYuSFSqmYgW/XldRXgTxoc8UvXErcQ==", + "version": "8.0.2021062405", + "resolved": "https://registry.npmjs.org/cordova-plugin-mfp-push/-/cordova-plugin-mfp-push-8.0.2021062405.tgz", + "integrity": "sha512-OOSV4TCkZVNfwQzjfbsD0ycNcZyokKdBPJnEK/QrtrGtEA+Ah1R86FphXFNJtCWEQYybCCHvCVXgor4Pgf11xQ==", "dev": true }, "cordova-plugin-okhttp": { @@ -10286,6 +10296,13 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -13512,6 +13529,13 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, + "optional": true + }, "nanoid": { "version": "3.1.23", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", @@ -19882,7 +19906,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", @@ -20509,7 +20537,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", diff --git a/package.json b/package.json index 982a4ff18..f09e0d6f3 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "cordova-plugin-ionic-keyboard": "^2.2.0", "cordova-plugin-ionic-webview": "^4.2.1", "cordova-plugin-mfp": "^8.0.2021031007", - "cordova-plugin-mfp-push": "^8.0.2020072705", + "cordova-plugin-mfp-push": "^8.0.2021062405", "cordova-plugin-splashscreen": "^5.0.2", "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-whitelist": "^1.3.4", @@ -156,4 +156,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file From e3792667d229479fd6deb61be42dc16468061157 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 25 Jun 2021 15:49:54 +0100 Subject: [PATCH 3/8] save --- .../modals/create-process/create-process.page.html | 4 ++-- .../book-meeting-modal/book-meeting-modal.page.html | 10 +++++----- .../expedient-task-modal.page.html | 9 ++++----- .../edit-event-to-approve/edit-event.page.html | 12 ++++++------ src/environments/environment.ts | 4 ++-- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index f8260878f..ac4074a02 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -29,7 +29,7 @@
- + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) @@ -37,7 +37,7 @@ - + Normal diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 4de07a3f2..bef818178 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -10,7 +10,7 @@
- +
@@ -19,7 +19,7 @@
- +
@@ -46,8 +46,8 @@ - - + + Oficial @@ -169,7 +169,7 @@ interface="action-sheet" required > - + Não se repete diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 14fd82ab1..7983b307f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -43,7 +43,7 @@ - + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) @@ -63,7 +63,6 @@ @@ -71,11 +70,11 @@ - - + {{type.Description}} diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index b1e04b630..a3a2551a3 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -16,7 +16,7 @@
- +
@@ -24,7 +24,7 @@
- +
@@ -41,7 +41,7 @@
- - - + + Oficial @@ -194,7 +194,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 10ef84e6f..4d1d5244f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -9,8 +9,8 @@ export const environment = { apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: '', //gabinetedigital.local - defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local - defaultuserpwd: '' //tabteste@006 + defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local + defaultuserpwd: 'tabteste@006' //tabteste@006 }; /* From 989e734b346e058abfd725274ffbae16b63897e1 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 09:49:55 +0100 Subject: [PATCH 4/8] save --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c438561ee..c14eff9cf 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,7 +2,7 @@ export const environment = { production: true, apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', - domain: '', //gabinetedigital.local + domain: 'gabinetedigital.local', defaultuser: '', defaultuserpwd: '' }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4d1d5244f..2b6b37e91 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment = { /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', */ apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ - domain: '', //gabinetedigital.local + domain: 'gabinetedigital.local', //gabinetedigital.local defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuserpwd: 'tabteste@006' //tabteste@006 }; From 2d3f5f0eee3a7119f2d08134009d7a196f8d3cc3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 10:49:33 +0100 Subject: [PATCH 5/8] save --- .../create-process/create-process.page.ts | 22 +-- .../diplomas/diplomas.page.ts | 6 +- .../expedient-task-modal.page.ts | 12 +- .../gabinete-digital.page.html | 13 +- .../gabinete-digital/gabinete-digital.page.ts | 144 ------------------ .../expedients/expedients.page.html | 2 +- .../pedidos/pedidos.page.html | 4 +- 7 files changed, 31 insertions(+), 172 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 2aed50f40..c48f8c170 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -54,7 +54,6 @@ export class CreateProcessPage implements OnInit { taskDate: Date; taskDescription: string; - user: string; loadedAttachments:any; subjectTypes:any; selectedTypes: string[]=[]; @@ -91,7 +90,6 @@ export class CreateProcessPage implements OnInit { private toastService: ToastService, ) { this.loggeduser = userAuth.ValidatedUser; - this.user = environment.defaultuser +'@'+ environment.domain; this.task = this.navParams.get('task'); console.log('task', this.task) @@ -180,6 +178,8 @@ export class CreateProcessPage implements OnInit { } let attendees = this.taskParticipants.concat(this.taskParticipantsCc); + console.log(attendees); + attendees = attendees.map(function(val) { return { UserEmail: val.EmailAddress, @@ -187,6 +187,8 @@ export class CreateProcessPage implements OnInit { }; }); + console.log(attendees); + const DocumentToSave = this.documents.map((e) => { return { ApplicationId: e.ApplicationType, @@ -204,14 +206,14 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } console.log('this.postData', this.postData, this.taskType); try { - await this.processes.postDespatcho(this.postData).toPromise(); + //await this.processes.postDespatcho(this.postData).toPromise(); this.FinalizarDespacho('Despacho criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -223,14 +225,14 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } console.log(this.postData); try { - await this.processes.postParecer(this.postData).toPromise(); + //await this.processes.postParecer(this.postData).toPromise(); this.FinalizarParecer('Pedido de Parecer enviado'); } catch (error) { @@ -243,7 +245,7 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -273,7 +275,7 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -292,7 +294,7 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -313,7 +315,7 @@ export class CreateProcessPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 82c65d7d6..e43640af9 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -30,6 +30,7 @@ constructor( private activatedRoute: ActivatedRoute, ) { this.activatedRoute.queryParams.subscribe(params => { + console.log('Cria'); if(params['segment'] == 'validar') { this.segment = 'validar'; @@ -42,12 +43,15 @@ constructor( } ngOnInit() { - this.LoadList(); this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { + console.log('Atualiza'); + this.LoadList(); } }); + console.log('Init'); + this.LoadList(); } segmentChanged(ev: any) { 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 04b74559d..aaa148321 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 @@ -60,7 +60,6 @@ export class ExpedientTaskModalPage implements OnInit { taskDate: Date; taskDescription: string; - user: string; loadedAttachments:any; documents:SearchDocument[] = []; @@ -105,7 +104,6 @@ export class ExpedientTaskModalPage implements OnInit { ) { this.loggeduser = userAuth.ValidatedUser; - this.user = environment.defaultuser +'@'+ environment.domain; this.task = this.navParams.get('task'); console.log('task', this.task) @@ -230,7 +228,7 @@ export class ExpedientTaskModalPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs, @@ -261,7 +259,7 @@ export class ExpedientTaskModalPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs @@ -289,7 +287,7 @@ export class ExpedientTaskModalPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs @@ -325,7 +323,7 @@ export class ExpedientTaskModalPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs, @@ -356,7 +354,7 @@ export class ExpedientTaskModalPage implements OnInit { DistributionType: "Paralelo", CountryCode: 'AO', Priority: this.postData.Priority, - UserEmail: this.user, + UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 93612b97b..34a7e03a5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -150,15 +150,14 @@ - - - - - - + + + + + - +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 6545b3340..9d6c83605 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -333,26 +333,6 @@ export class GabineteDigitalPage implements OnInit { //this.eventsToApprove.doRefresh(); } } - - async openEventsToApproveList(profile:any) { - - this.closeAllDesktopComponent(); - //if( window.innerWidth <= 1024){ - const modal = await this.modalController.create({ - component: EventListPage, - componentProps:{ - profile: profile, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - //} else { - //this.desktopComponent.showEventList = true; - //} - - } openExpedientListPage() { this.closeAllDesktopComponents(); @@ -385,23 +365,9 @@ export class GabineteDigitalPage implements OnInit { } - openExpedientPage(data){ - console.log(data); - - this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ - //this.openExpedientList(); - } - else{ - this.serialNumber = data; - this.showExpedientDetail = true; - } - } - openPedidosPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { - //this.openPedidoList(); let navigationExtras: NavigationExtras; @@ -424,7 +390,6 @@ export class GabineteDigitalPage implements OnInit { openDespachosPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - //this.openDespachoList(); this.router.navigate(['/home/gabinete-digital/despachos']); } else{ @@ -437,7 +402,6 @@ export class GabineteDigitalPage implements OnInit { openDespachosPrPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - //this.openDespachoListPr(); this.router.navigate(['/home/gabinete-digital/despachos-pr']); } else{ @@ -450,7 +414,6 @@ export class GabineteDigitalPage implements OnInit { openPendentesPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - //this.openPendenteList(); this.router.navigate(['/home/gabinete-digital/pendentes']); } else{ @@ -463,7 +426,6 @@ export class GabineteDigitalPage implements OnInit { openExpedientesPrPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { - //this.openExpedientList(); this.router.navigate(['/home/gabinete-digital/expedientes-pr']); } else { @@ -479,7 +441,6 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - //this.openDeploma(); let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}}; this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } @@ -496,7 +457,6 @@ export class GabineteDigitalPage implements OnInit { if (this.loggeduser.Profile == 'MDGPR') { if( window.innerWidth <= 800){ - //this.openDeploma(); let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } @@ -507,7 +467,6 @@ export class GabineteDigitalPage implements OnInit { } } else { if( window.innerWidth <= 800){ - //this.openDeploma(); let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras); } @@ -517,109 +476,6 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomasAssinar = true; } } - - - } - - openSignedDiploma(segment:string) { - this.closeAllDesktopComponents(); - if( window.innerWidth <= 800){ - this.openDeploma(); - } - else{ - this.segment = segment; - this.showSignedDiploma = true; - } - } - - async openDeploma() { - const modal = await this.modalController.create({ - component: DiplomasPage, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - //backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - - async openExpedientList(){ - this.closeAllDesktopComponent(); - //if( window.innerWidth <= 1024){ - const modal = await this.modalController.create({ - component: ExpedientePage, - componentProps: { - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - //} else { - console.log('show desktop modal') - //this.desktopComponent.showExpediente = true; - //} - } - - /* async openPendenteList(){ - this.closeAllDesktopComponent(); - const modal = await this.modalController.create({ - component: PendentesPage, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss(); - console.log('show desktop modal') - } */ - - async openDespachoList(){ - this.closeAllDesktopComponent(); - const modal = await this.modalController.create({ - component: DespachosPage, - componentProps:{ - profile: this.profile, - serialNumber: this.serialNumber - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss(); - 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({ - component: PedidosPage, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss(); - console.log('show desktop modal') } } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index d410ad4a4..b2d2f646f 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -18,7 +18,7 @@ -
+
-
+
@@ -64,7 +64,7 @@
-
+
Date: Mon, 28 Jun 2021 10:51:06 +0100 Subject: [PATCH 6/8] save --- src/app/modals/create-process/create-process.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index c48f8c170..52fe388c5 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -213,7 +213,7 @@ export class CreateProcessPage implements OnInit { console.log('this.postData', this.postData, this.taskType); try { - //await this.processes.postDespatcho(this.postData).toPromise(); + await this.processes.postDespatcho(this.postData).toPromise(); this.FinalizarDespacho('Despacho criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -232,7 +232,7 @@ export class CreateProcessPage implements OnInit { console.log(this.postData); try { - //await this.processes.postParecer(this.postData).toPromise(); + await this.processes.postParecer(this.postData).toPromise(); this.FinalizarParecer('Pedido de Parecer enviado'); } catch (error) { From 86ec762804c0cf98e16dce18f1362712c0ffa45a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 28 Jun 2021 11:09:46 +0100 Subject: [PATCH 7/8] save --- .../book-meeting-modal.page.html | 2 +- .../book-meeting-modal.page.ts | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index bef818178..4af7eba49 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -288,7 +288,7 @@
- +
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 88653e0aa..6296cd6b7 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 @@ -129,8 +129,6 @@ export class BookMeetingModalPage implements OnInit { ngOnInit() { this.adding = "intervenient"; console.log(this.task); - - this.getAttachments(); } @@ -141,12 +139,9 @@ export class BookMeetingModalPage implements OnInit { } close(){ - this.router.navigate(['/home/gabinete-digital/expediente']); - this.modalController.dismiss(null); - } - cancelTask(){ this.modalController.dismiss(null); } + goBack() { this.modalController.dismiss(null); let navigationExtras: NavigationExtras = { @@ -161,8 +156,6 @@ export class BookMeetingModalPage implements OnInit { } } async saveTask(){ - console.log('HERE'); - // issue12323423 let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); @@ -235,10 +228,7 @@ export class BookMeetingModalPage implements OnInit { } catch (error) { this.toastService.badRequest() } - } - - } async addParticipants(){ @@ -323,7 +313,6 @@ export class BookMeetingModalPage implements OnInit { }); await modal.present(); - modal.onDidDismiss(); } @@ -348,11 +337,8 @@ export class BookMeetingModalPage implements OnInit { } removeAttachment(index: number){ - this.documents = this.documents.filter( (e, i) => index != i); - } - validateFormInputs(){ let formLocation = this.postData.Location.trim(); @@ -366,12 +352,10 @@ export class BookMeetingModalPage implements OnInit { this.taskParticipantsCc = taskParticipantsCc; } - goToGabinete() { this.router.navigate(['/home/gabinete-digital']); } - setIntervenient(data){ this.taskParticipants = data; } From a97ca61578685172c231eac237cb94cbdbb0d0c0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 28 Jun 2021 11:16:21 +0100 Subject: [PATCH 8/8] Improve login --- src/app/pages/login/login.page.html | 129 +++++++++--------- src/app/pages/login/login.page.scss | 7 +- .../agenda/new-event/new-event.page.html | 47 +++++-- .../shared/agenda/new-event/new-event.page.ts | 59 +++++++- src/global.scss | 14 +- 5 files changed, 173 insertions(+), 83 deletions(-) diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 7d127100f..52d0ee3c9 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -1,86 +1,85 @@
-
+
-
-
-
-
- -

Inicie a sessão

-
-

Nome de utilizador

- - - -

Palavra-passe

- - - -
- -
-
-
-

Uma iniciativa do Gabinete do Presidente da República

+

Inicie a sessão

+
+

Nome de utilizador

+ + + +

Palavra-passe

+ + + +
+ +
+
+
+

Uma iniciativa do Gabinete do Presidente da República

+
-
- -
-
-
+
+
+
- - -
- Digite o PIN - Digite o novo PIN + Digite o PIN + Digite o novo PIN -
-
-
-
-
-
-
- -
-
1
2
3
+
+
+
+
+
- -
-
4
5
6
+
+ +
+
1
2
3
+
+ +
+
4
5
6
+
+ +
+
7
8
9
+
+ +
+
0
+
+
- -
-
7
8
9
+ +
+ Entrar com senha
- -
-
0
-
- -
- -
- Entrar com senha -
-
- Limpar -
+
+ Limpar +
+
-
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 93e5cb06f..88f9eae74 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -211,8 +211,9 @@ ion-item{ } } -@media only screen and (min-width: 1024px){ - .form{ - width: 400px; +@media only screen and (max-height: 746px){ + .msg-bottom-p { + padding-top: 20px; + position: unset !important; } } \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 6408fccbc..d095b64d7 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -14,20 +14,44 @@
-
+
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
+
-
+ +
+ +
+
+
+ Campo obrigatório. +
+
+ O campo deve ter pelo menos 4 caracteres. +
+
+
@@ -36,7 +60,7 @@
- + Oficial @@ -58,9 +82,9 @@
- + - + Reunião @@ -84,7 +108,11 @@
-
+ + +
-
+ +
- + Não se repete diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 8fe802826..01fcb2410 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -61,8 +61,8 @@ export class NewEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; - public maxDate: any; + public minDate = new Date(); + public maxDate = ''; public stepHour = 1; public stepMinute = 5; public stepSecond = 5; @@ -71,7 +71,7 @@ export class NewEventPage implements OnInit { @Input() profile:string; @Input() selectedSegment: string; @Input() selectedDate: Date; - @Input() taskParticipants: EventPerson[]; + @Input() taskParticipants: EventPerson[] = []; @Input() taskParticipantsCc: any = []; @Output() setIntervenient = new EventEmitter(); @@ -94,6 +94,9 @@ export class NewEventPage implements OnInit { @ViewChild('inicio') inicio: any; @ViewChild('picker1') picker1: any; + Form: any = {} + validateFrom = false + public options = [ { value: true, label: 'True' }, @@ -118,7 +121,6 @@ export class NewEventPage implements OnInit { return this.dateControlEnd.value } - constructor( private modalController: ModalController, private eventService: EventsService, @@ -154,7 +156,7 @@ export class NewEventPage implements OnInit { let selectedEndDate = new Date(this.selectedDate); /* Set + 30minutes to seleted datetime */ selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ; - this.minDate = this.selectedDate.toString(); + if(this.selectedSegment != "Combinada"){ this.postEvent ={ @@ -222,6 +224,46 @@ export class NewEventPage implements OnInit { this.date = new Date(2021,9,4,5,6,7); this.getDatepickerData() + + this.injectValidation() + } + + runValidation() { + this.validateFrom = true + } + + injectValidation() { + + this.Form = new FormGroup({ + Subject: new FormControl(this.postEvent.Subject, [ + Validators.required, + Validators.minLength(4) + ]), + Location: new FormControl(this.postEvent.Location, [ + Validators.required, + ]), + CalendarName: new FormControl(this.postEvent.CalendarName), + Categories: new FormControl(this.postEvent.Categories[0], [ + Validators.required + ]), + dateStart: new FormControl(this.dateStart, [ + Validators.required + ]), + dateEnd: new FormControl(this.dateEnd, [ + Validators.required + ]), + IsRecurring: new FormControl(this.postEvent.IsRecurring, [ + Validators.required + ]), + participantes: new FormControl(this.participantes, [ + Validators.required + ]), + + }) + } + + get participantes() { + return this.taskParticipantsCc.concat(this.taskParticipants) } openInicio() { @@ -283,7 +325,12 @@ export class NewEventPage implements OnInit { } - async save(){ + async save() { + + this.runValidation() + + // dont runt this function + if (!this.Form.valid) return false this.getDatepickerData() diff --git a/src/global.scss b/src/global.scss index b52f7ece4..d13cdf552 100644 --- a/src/global.scss +++ b/src/global.scss @@ -983,4 +983,16 @@ background: rgb(92, 92, 92); // .ng-star-inserted { // opacity: 0; -// } \ No newline at end of file +// } + + + +.input-error{ + border: 1px solid #fba0a0 !important; +} + +.input-errror-message{ + margin-top: -16px; + margin-bottom: 10px; + font-size: 11pt; +} \ No newline at end of file