From 7d08d0d07756a4347f37ddab41c3b096ac5eac25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 29 Feb 2024 10:23:17 +0100 Subject: [PATCH 1/6] timepicker step solve when minutes are 59 --- .../pages/agenda/edit-event/edit-event.page.ts | 16 ++++++++-------- .../shared/agenda/edit-event/edit-event.page.ts | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index e75aac060..56926e7dc 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -638,14 +638,14 @@ export class EditEventPage implements OnInit { } ajustMinuts(string) { - var data = new Date(string); - if (data.getMinutes() === 59) { - data.setMinutes(0); - var novaString = data.toISOString().slice(0, 16).replace("T", " "); - + var partes = string.split(' '); + var horaMinuto = partes[1].split(':'); + if (horaMinuto[1] === '59') { + horaMinuto[1] = '00'; + var novaString = partes[0] + ' ' + horaMinuto.join(':'); + return novaString; - } else { - return string; } - } + return string; + } } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index dd3fe6b66..761414cd5 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -107,6 +107,8 @@ export class EditEventPage implements OnInit { ngOnInit() { this._postEvent = this.postEvent + this.postEvent.StartDate = new Date(this.ajustMinuts(this.postEvent.StartDate)) + this.postEvent.EndDate = new Date(this.ajustMinuts(this.postEvent.EndDate)) if(!this.restoreTemporaryData()) { // clear @@ -582,4 +584,16 @@ export class EditEventPage implements OnInit { } + ajustMinuts(string) { + var partes = string.split(' '); + var horaMinuto = partes[1].split(':'); + if (horaMinuto[1] === '59') { + horaMinuto[1] = '00'; + var novaString = partes[0] + ' ' + horaMinuto.join(':'); + + return novaString; + } + return string; + } + } From 764a9981601f0f516e0f0ebecfeb790124786d75 Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Thu, 29 Feb 2024 11:37:35 +0100 Subject: [PATCH 2/6] button with white background solved --- ios/App/Podfile | 1 + .../expediente-detail/expediente-detail.page.html | 1 + .../desktop/dk-opts-expediente/dk-opts-expediente.page.html | 6 +++--- .../desktop/dk-opts-expediente/dk-opts-expediente.page.scss | 6 ++++++ .../popover/opts-expediente/opts-expediente.page.html | 6 +++--- .../popover/opts-expediente/opts-expediente.page.scss | 6 ++++++ 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ios/App/Podfile b/ios/App/Podfile index 79de82432..f74deb023 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -24,6 +24,7 @@ def capacitor_pods pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage' pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker' + pod 'CapawesomeCapacitorScreenOrientation', :path => '../../node_modules/@capawesome/capacitor-screen-orientation' pod 'SentryCapacitor', :path => '../../node_modules/@sentry/capacitor' pod 'TeamhiveCapacitorVideoRecorder', :path => '../../node_modules/@teamhive/capacitor-video-recorder' pod 'CapacitorVideoPlayer', :path => '../../node_modules/capacitor-video-player' diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index e51c5fac4..d6581384e 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -19,6 +19,7 @@
Enviar para o PR
+
Enviar para o PR 22
Solicitar revisão
diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html index 6568a3d28..5bdce7874 100644 --- a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html +++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html @@ -2,11 +2,11 @@
- + - + - + diff --git a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss index 391fb1401..895915227 100644 --- a/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss +++ b/src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss @@ -64,3 +64,9 @@ background-color: white; color: var(--profile-text-color); } + +.deskButonText{ + text-align: left; + background-color: transparent; + color: var(--profile-text-color); +} 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 86a2711b7..44b7b9fc8 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -8,11 +8,11 @@
- + - + - + diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss index 677be7d4a..2e71ce598 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss @@ -64,3 +64,9 @@ background-color: white; color: var(--profile-text-color); } + +.deskButtonText{ + text-align: left; + background-color: transparent; + color: var(--profile-text-color); +} From 1c4e54d41275bc58eda934ccf2a6d2ed9f4283d9 Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Thu, 29 Feb 2024 11:39:07 +0100 Subject: [PATCH 3/6] remove tag --- .../expediente/expediente-detail/expediente-detail.page.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index d6581384e..e51c5fac4 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -19,7 +19,6 @@
Enviar para o PR
-
Enviar para o PR 22
Solicitar revisão
From baf770f5898edc6085d9ec8f82ae62adf41d945a Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Thu, 29 Feb 2024 12:18:14 +0100 Subject: [PATCH 4/6] tag Tarefa de Expediente ajusted --- .../gabinete-digital/generic/task-details/task-details.page.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss index 2609443a5..9683273b5 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss @@ -331,5 +331,6 @@ ion-button{ .activity-instanceName { span { text-wrap: nowrap; + white-space: nowrap; } } From e6f5ac9c6c175d49cda202c8a58d39f09fb3a930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 29 Feb 2024 16:07:25 +0100 Subject: [PATCH 5/6] bug solve creating action --- .../publication/new-action/new-action.page.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 21cc28180..dc21531a4 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -73,7 +73,7 @@ export class NewActionPage implements OnInit { } -/* get dateValid() { + get dateValid() { var validado: boolean; if (window.innerWidth <= 800) { @@ -86,16 +86,19 @@ export class NewActionPage implements OnInit { } else { return ['ok'] } - } */ - - get dateValid() { - return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null } + /* get dateValid() { + return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null + } */ + runValidation() { this.validateFrom = true; - if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())) { + console.log(this.folder.DateBegin) + console.log(this.folder.DateEnd) + if(this.folder.DateBegin > this.folder.DateEnd) { this.toastService._badRequest("A data de início não pode ser superior a data de fim"); + return false } } @@ -117,13 +120,13 @@ export class NewActionPage implements OnInit { async save() { - + alert('hererr') this.injectValidation() this.runValidation() if(this.Form.invalid) return false - + alert('hererr 222') this.folder = { ProcessId: null, From 839ea57d80f8cb5db66eb84fb3751b8bfc05446d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 29 Feb 2024 16:53:01 +0100 Subject: [PATCH 6/6] changed text on edit event on fied Com conhecimento --- src/app/pages/agenda/edit-event/edit-event.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 5f4fb93d9..7015a2edd 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -275,7 +275,7 @@
- Adicionar Intervenientes* + Com Conhecimento* {{participant.Name}}