From b136664c480ec58453bd73b7a165d9cc597b2edd Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 14 Feb 2023 11:07:13 +0100 Subject: [PATCH 1/4] Fix alignment --- .../gabinete-digital/gabinete-digital.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.scss | 7 +++++++ version/git-version.ts | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index cc3b7a57a..a6e2e9f6a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -138,7 +138,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index e6118a619..b872824e5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -677,4 +677,11 @@ ion-content{ .item-options-active{ display: none !important; } +} + +.center-box { + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; } \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index a7a94745e..12f7b4486 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "68de93e5d", - "SHA": "68de93e5dbabe675f6452c90bfe5d14a118f58c8", + "shortSHA": "1e34f3de6", + "SHA": "1e34f3de62905bb24425504f6d4263d71d40559b", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Feb 14 10:17:25 2023 +0100'", - "lastCommitMessage": "message statude spacing", - "lastCommitNumber": "4779", + "lastCommitTime": "'Tue Feb 14 10:40:05 2023 +0100'", + "lastCommitMessage": "spelling", + "lastCommitNumber": "4780", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 225e050df3b94b7ca25f6e08ff769783af8d24ea Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 14 Feb 2023 16:24:45 +0100 Subject: [PATCH 2/4] Improve --- .../expediente-detail.page.html | 4 +- .../expediente-pr/expediente-pr.page.html | 4 +- .../agenda/edit-event/edit-event.page.ts | 69 +++++++++---------- .../opts-expediente-pr.page.html | 4 +- .../opts-expediente/opts-expediente.page.html | 4 +- version/git-version.ts | 12 ++-- 6 files changed, 47 insertions(+), 50 deletions(-) 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 72e94874d..c81ba5f26 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 @@ -102,7 +102,7 @@ - +
@@ -113,7 +113,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 98f198d7b..f87548b03 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -112,7 +112,7 @@
- + @@ -120,7 +120,7 @@
- +
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 81a806fc8..6b9f55c37 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -122,9 +122,6 @@ export class EditEventPage implements OnInit { } this.initCalendarName = this.postEvent.CalendarName; - - this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) - this.getRecurrenceTypes(); setTimeout(() => { @@ -136,7 +133,7 @@ export class EditEventPage implements OnInit { } ngOnChanges(changes: any): void { - this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) + this.loadedEventAttachments = this.postEvent.Attachments } close() { @@ -472,43 +469,43 @@ export class EditEventPage implements OnInit { } - async getDoc() { + // async getDoc() { - const modal = await this.modalController.create({ - component: SearchPage, - cssClass: 'modal-width-100-width-background modal', - componentProps: { - type: 'AccoesPresidenciais & ArquivoDespachoElect', - showSearchInput: true, - select: true, - } - }); - await modal.present(); - modal.onDidDismiss().then( async (res)=>{ - if(res){ - const data = res.data; + // const modal = await this.modalController.create({ + // component: SearchPage, + // cssClass: 'modal-width-100-width-background modal', + // componentProps: { + // type: 'AccoesPresidenciais & ArquivoDespachoElect', + // showSearchInput: true, + // select: true, + // } + // }); + // await modal.present(); + // modal.onDidDismiss().then( async (res)=>{ + // if(res){ + // const data = res.data; - const ApplicationIdDocumentToSave: any = { - SourceName: data.selected.Assunto, - ParentId: this.postEvent.EventId, - SourceId: data.selected.Id, - Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome, - ApplicationId: data.selected.ApplicationType.toString(), - CreateDate: data.selected.Data, - // needed to attach this document - Id: 'add', - SourceTitle: data.selected.Assunto, - Source: '1', - Link: '', - SerialNumber: '', - } + // const ApplicationIdDocumentToSave: any = { + // SourceName: data.selected.Assunto, + // ParentId: this.postEvent.EventId, + // SourceId: data.selected.Id, + // Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome, + // ApplicationId: data.selected.ApplicationType.toString(), + // CreateDate: data.selected.Data, + // // needed to attach this document + // Id: 'add', + // SourceTitle: data.selected.Assunto, + // Source: '1', + // Link: '', + // SerialNumber: '', + // } - this.loadedEventAttachments.push(ApplicationIdDocumentToSave) + // this.loadedEventAttachments.push(ApplicationIdDocumentToSave) - } - }); - } + // } + // }); + // } } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html index 34f938ca0..c31e8b565 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html @@ -12,14 +12,14 @@
- +
- +
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 71c28949f..162041115 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -19,7 +19,7 @@ - +
@@ -27,7 +27,7 @@