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/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 9b5ea4a41..fcc93057d 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}} 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/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html index f45a1df33..fc65b0d24 100644 --- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html +++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html @@ -8,6 +8,18 @@
+ +
+ +
+
+ +
+
{{ attachment.Assunto || "Sem assunto" }}
@@ -15,19 +27,10 @@
- Rascunho + Rascunho
-
- -
-
- -
+
+ - + - + 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); +} 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, diff --git a/src/assets/icon/iconmonstr-eye-9.svg b/src/assets/icon/iconmonstr-eye-9.svg new file mode 100644 index 000000000..4ca9df30b --- /dev/null +++ b/src/assets/icon/iconmonstr-eye-9.svg @@ -0,0 +1 @@ + \ No newline at end of file