From 295635fa17aac41fb4c8e6403913bf16d509c6d8 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 26 Oct 2021 15:21:15 +0100 Subject: [PATCH 01/11] Fix --- .../pages/events/attendees/attendees.page.html | 16 ++++++++++++---- src/app/pages/events/attendees/attendees.page.ts | 4 +++- .../events/attendees/attendees.page.html | 9 ++++++--- .../attendee-modal/attendee-modal.page.html | 14 +++++++++----- .../event/attendee-modal/attendee-modal.page.ts | 4 +++- src/assets/images/theme/gov/icons-add-25.svg | 4 ++++ src/theme/variables.scss | 2 ++ 7 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-add-25.svg diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 30ca368f1..c6937e8f8 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -14,14 +14,18 @@
- + + + +

{{ attendee.Name }}

{{ attendee.EmailAddress }}
- + +
@@ -35,7 +39,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +58,10 @@
- + + + +

{{ attendee.Name }}

diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index 5dfaeae0c..4936f9d95 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ModalController, NavParams } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendees', @@ -25,7 +26,8 @@ export class AttendeesPageModal implements OnInit { private modalCtrl: ModalController, private contactsService: ContactsService, private navParams: NavParams, - private modalController: ModalController) { + private modalController: ModalController, + public ThemeService: ThemeService) { this.adding = this.navParams.get('adding'); this.taskParticipants = this.navParams.get('taskParticipants'); diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index 9f63cff4d..dd839dd99 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -14,7 +14,8 @@
- + +

{{ attendee.Name }}

@@ -35,7 +36,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +55,8 @@
- + +

{{ attendee.Name }}

diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 1c3a0d70f..52fa56a75 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -14,14 +14,16 @@
- + +

{{ attendee.Name }}

{{ attendee.EmailAddress }}

 -
- +
+ +
@@ -35,7 +37,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +56,8 @@
- + +

{{ attendee.Name }}

diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index d6beba13d..863095e9f 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -3,6 +3,7 @@ import { ModalController } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendee-modal', @@ -34,7 +35,8 @@ export class AttendeePage implements OnInit { constructor( private modalCtrl: ModalController, - private contactsService: ContactsService ) { + private contactsService: ContactsService, + public ThemeService: ThemeService ) { this.LtaskParticipants = removeDuplicate(this.taskParticipants); this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc); diff --git a/src/assets/images/theme/gov/icons-add-25.svg b/src/assets/images/theme/gov/icons-add-25.svg new file mode 100644 index 000000000..db9cf71cc --- /dev/null +++ b/src/assets/images/theme/gov/icons-add-25.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index efd5367ce..1d4375fc8 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -520,6 +520,7 @@ $app-theme: mat-light-theme( background-color: #42b9fe; color: #ffffff !important; } + .btn-delete { display: block; width: 170px !important; @@ -530,6 +531,7 @@ $app-theme: mat-light-theme( background-color: #ffe0e0; color: #d30a0a !important; } + .btn-cancel { display: block; width: 170px !important; From 0d48bc322e7661d09f1db08ad374b847e14dc962 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 26 Oct 2021 17:22:21 +0100 Subject: [PATCH 02/11] Add icons --- src/app/modals/add-note/add-note.page.html | 3 +- src/app/modals/add-note/add-note.page.ts | 2 + .../create-process/create-process.page.html | 3 +- .../modals/dar-parecer/dar-parecer.page.html | 3 +- .../modals/dar-parecer/dar-parecer.page.ts | 2 + src/app/modals/delegar/delegar.page.html | 3 +- .../document-set-up-meeting.page.html | 3 +- src/app/modals/forward/forward.page.html | 3 +- .../agenda/edit-event/edit-event.page.html | 3 +- .../agenda/new-event/new-event.page.html | 3 +- src/app/pages/chat/chat.page.html | 12 ++- .../book-meeting-modal.page.html | 3 +- .../expedient-task-modal.page.html | 3 +- .../gabinete-digital.page.html | 24 ++++-- .../pages/publications/publications.page.html | 29 ++++--- .../events/attendees/attendees.page.ts | 4 +- .../edit-event-to-approve.page.html | 3 +- .../agenda/edit-event/edit-event.page.html | 3 +- .../agenda/new-event/new-event.page.html | 3 +- .../edit-event.page.html | 3 +- .../images/theme/gov/icons-attach-doc.svg | 6 ++ .../theme/gov/icons-chat-chat-40-hover.svg | 3 + .../images/theme/gov/icons-chat-chat-40.svg | 3 + .../gov/icons-chat-group-chat-40-hover.svg | 4 + .../theme/gov/icons-chat-group-chat-40.svg | 4 + .../theme/gov/icons-despachos-presidente.svg | 50 ++++++++++++ .../icons-diplomas-assinados-presidente.svg | 25 ++++++ .../gov/icons-expediente-deferimento.svg | 78 +++++++++++++++++++ .../theme/gov/icons-expediente-diploma.svg | 31 ++++++++ .../theme/gov/icons-expediente-parecer.svg | 57 ++++++++++++++ .../theme/gov/icons-expediente-pendente.svg | 23 ++++++ .../theme/gov/icons-nav-actions-hover.svg | 5 ++ .../images/theme/gov/icons-nav-actions.svg | 5 ++ .../theme/gov/icons-plane-active-hover.svg | 5 ++ .../images/theme/gov/icons-plane-active.svg | 5 ++ src/theme/variables.scss | 8 +- 36 files changed, 387 insertions(+), 40 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-attach-doc.svg create mode 100644 src/assets/images/theme/gov/icons-chat-chat-40-hover.svg create mode 100644 src/assets/images/theme/gov/icons-chat-chat-40.svg create mode 100644 src/assets/images/theme/gov/icons-chat-group-chat-40-hover.svg create mode 100644 src/assets/images/theme/gov/icons-chat-group-chat-40.svg create mode 100644 src/assets/images/theme/gov/icons-despachos-presidente.svg create mode 100644 src/assets/images/theme/gov/icons-diplomas-assinados-presidente.svg create mode 100644 src/assets/images/theme/gov/icons-expediente-deferimento.svg create mode 100644 src/assets/images/theme/gov/icons-expediente-diploma.svg create mode 100644 src/assets/images/theme/gov/icons-expediente-parecer.svg create mode 100644 src/assets/images/theme/gov/icons-expediente-pendente.svg create mode 100644 src/assets/images/theme/gov/icons-nav-actions-hover.svg create mode 100644 src/assets/images/theme/gov/icons-nav-actions.svg create mode 100644 src/assets/images/theme/gov/icons-plane-active-hover.svg create mode 100644 src/assets/images/theme/gov/icons-plane-active.svg diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index ea75cb4e8..3cd668ec4 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -12,7 +12,8 @@
@@ -20,7 +20,7 @@
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index b81dad3f3..17fabbb62 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -8,7 +8,7 @@
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 1e13757dc..7b1cda29c 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -152,8 +152,12 @@
  • - + + + + + + + + + + diff --git a/src/assets/images/theme/gov/icons-search-document.svg b/src/assets/images/theme/gov/icons-search-document.svg new file mode 100644 index 000000000..57395de9b --- /dev/null +++ b/src/assets/images/theme/gov/icons-search-document.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b1e0b05db..73e00efc8 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -632,6 +632,7 @@ body { --header-bottom-line-background: rgb(255, 0, 0); --header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c); --font-awesome: #ffb81c; + --font-awesome-1: #c63527; --color: #d9d9d9; --color2: #f0f0f0; @@ -717,6 +718,7 @@ body { var(--color5) 100% ) !important; --font-awesome: #42b9fe; + --font-awesome-1: #42b9fe; --color: #0782c9; --color2: #45baff; --color3: #0782c9; @@ -750,3 +752,8 @@ body { .font-awesome { color: var(--font-awesome) !important; } + + +.font-awesome-1 { + color: var(--font-awesome-1) !important; +} From 2bf87b07ad0ce59cefee0f322b31826d4a4c5b10 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 07:11:58 +0100 Subject: [PATCH 05/11] fix --- src/app/pages/login/login.page.scss | 4 ---- src/app/pages/login/login.page.ts | 4 ++-- src/app/pages/search/search.page.html | 3 ++- src/theme/variables.scss | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index ea799e883..055dc4e6b 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -35,28 +35,24 @@ ion-content{ height: 250px; overflow: auto; border-radius: 50%; - background: #4cb9f825; margin: auto; .bg-2{ width: 225px; height: 225px; overflow: auto; border-radius: 50%; - background: #61bdf2b4; margin: auto; .bg-3{ width: 200px; height: 200px; overflow: auto; border-radius: 50%; - background: #96d3f8be; margin: auto; .bg-4{ width: 175px; height: 175px; overflow: auto; border-radius: 50%; - background: rgba(255, 255, 255, 0.918); padding: 15px; margin: auto; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 55b8fc6c7..411e03c07 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -38,14 +38,14 @@ export class LoginPage implements OnInit { public alertController: AlertController, private clearStoreService: ClearStoreService, private changeProfileService: ChangeProfileService, - public themeservice: ThemeService, + public ThemeService: ThemeService, private storageservice: StorageService ) {} ngOnInit() { this.storageservice.get('theme').then((theme) =>{ console.log('LOGIN THEME',theme) - this.themeservice.setTheme(theme) + this.ThemeService.setTheme(theme) }) } diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 7b1cda29c..302f4b0ce 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -144,7 +144,8 @@
    - + +
diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 73e00efc8..69de167ac 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -747,6 +747,20 @@ body { color: #ffffff; --color: #ffffff; } + + + .bg-1{ + background: #4cb9f825; + .bg-2{ + background: #61bdf2b4; + .bg-3{ + background: #96d3f8be; + .bg-4{ + background: rgba(255, 255, 255, 0.918); + } + } + } + } } .font-awesome { From d030c7927277249582cdb0a0e4c0c53f13ec7d0b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 07:28:34 +0100 Subject: [PATCH 06/11] Improve --- src/theme/variables.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 69de167ac..4f0f8f632 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -663,8 +663,25 @@ body { --color: #000000; } + .bg-1{ + background: #ffc72c38; + .bg-2{ + background: #FFB81C; + .bg-3{ + background: #FFC72C; + + .bg-4{ + + background: rgba(255, 255, 255, 0.918); + + } + } + } + } } + + .default { --ion-color-primary: #3880ff; --login-background: linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !important; From 409be32e177c92ef16555baa8f2e2efa657d677e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 07:32:34 +0100 Subject: [PATCH 07/11] Improve --- src/app/pages/search/search.page.html | 5 +++-- src/assets/images/theme/gov/icons-arrow-arrow-up.svg | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-arrow-arrow-up.svg diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 302f4b0ce..d0d058026 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -140,11 +140,12 @@
- + +
- +
diff --git a/src/assets/images/theme/gov/icons-arrow-arrow-up.svg b/src/assets/images/theme/gov/icons-arrow-arrow-up.svg new file mode 100644 index 000000000..c790af97a --- /dev/null +++ b/src/assets/images/theme/gov/icons-arrow-arrow-up.svg @@ -0,0 +1,3 @@ + + + From f0408a40c7ab955b299a1f7eaf7ed06e856f8fd6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 07:54:20 +0100 Subject: [PATCH 08/11] Fix --- src/assets/images/theme/gov/icons-add.svg | 8 ++++---- .../theme/gov/icons-arrow-circle-arrow-right.svg | 2 +- .../theme/gov/icons-chat-new-conversation.svg | 6 ++++++ .../images/theme/gov/icons-chat-new-group.svg | 8 ++++---- src/assets/images/theme/gov/icons-chat-send.svg | 7 +++++++ src/assets/images/theme/gov/icons-edit.svg | 10 +++++----- .../images/theme/gov/icons-received-event.svg | 14 +++++++------- src/assets/images/theme/gov/icons-search-close.svg | 4 ++-- src/assets/images/theme/gov/icons-search.svg | 8 ++++---- src/assets/images/theme/gov/icons-user.svg | 4 ++++ 10 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-chat-new-conversation.svg create mode 100644 src/assets/images/theme/gov/icons-chat-send.svg create mode 100644 src/assets/images/theme/gov/icons-user.svg diff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg index d7ecdaa09..7881dd435 100644 --- a/src/assets/images/theme/gov/icons-add.svg +++ b/src/assets/images/theme/gov/icons-add.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg index e75c82ae4..7773657f0 100644 --- a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg +++ b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg @@ -1,4 +1,4 @@ - + diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg new file mode 100644 index 000000000..5503bda7d --- /dev/null +++ b/src/assets/images/theme/gov/icons-chat-new-conversation.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/theme/gov/icons-chat-new-group.svg b/src/assets/images/theme/gov/icons-chat-new-group.svg index c67dacd31..7b439345a 100644 --- a/src/assets/images/theme/gov/icons-chat-new-group.svg +++ b/src/assets/images/theme/gov/icons-chat-new-group.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/src/assets/images/theme/gov/icons-chat-send.svg b/src/assets/images/theme/gov/icons-chat-send.svg new file mode 100644 index 000000000..ab4457c38 --- /dev/null +++ b/src/assets/images/theme/gov/icons-chat-send.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg index 38611c651..e71901278 100644 --- a/src/assets/images/theme/gov/icons-edit.svg +++ b/src/assets/images/theme/gov/icons-edit.svg @@ -1,8 +1,8 @@ - - + + - - - + + + diff --git a/src/assets/images/theme/gov/icons-received-event.svg b/src/assets/images/theme/gov/icons-received-event.svg index ddeddbc08..3912abc68 100644 --- a/src/assets/images/theme/gov/icons-received-event.svg +++ b/src/assets/images/theme/gov/icons-received-event.svg @@ -1,10 +1,10 @@ - - + + - - - - - + + + + + diff --git a/src/assets/images/theme/gov/icons-search-close.svg b/src/assets/images/theme/gov/icons-search-close.svg index 63b648aa3..97dcbe0c6 100644 --- a/src/assets/images/theme/gov/icons-search-close.svg +++ b/src/assets/images/theme/gov/icons-search-close.svg @@ -2,6 +2,6 @@ - - + + diff --git a/src/assets/images/theme/gov/icons-search.svg b/src/assets/images/theme/gov/icons-search.svg index 4e8025f20..6a62127b8 100644 --- a/src/assets/images/theme/gov/icons-search.svg +++ b/src/assets/images/theme/gov/icons-search.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/images/theme/gov/icons-user.svg b/src/assets/images/theme/gov/icons-user.svg new file mode 100644 index 000000000..c54555a47 --- /dev/null +++ b/src/assets/images/theme/gov/icons-user.svg @@ -0,0 +1,4 @@ + + + + From 84a0b1181bf5701b0f9f561deb29bbc991cc60ba Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 07:56:54 +0100 Subject: [PATCH 09/11] Fix --- .../expedient-task-modal/expedient-task-modal.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f966e3b4c..26f567f8e 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 @@ -144,7 +144,7 @@
- +
@@ -166,7 +166,7 @@
- +
From 4b334dbebf8351ef7fe0108b22e4cc03aedea7ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 08:50:20 +0100 Subject: [PATCH 10/11] fix --- src/app/pages/agenda/edit-event/edit-event.page.html | 1 - .../approve-event-modal/approve-event-modal.page.html | 2 +- .../edit-event-to-approve/edit-event-to-approve.page.html | 2 +- src/app/shared/agenda/edit-event/edit-event.page.html | 2 +- src/app/shared/agenda/edit-event/edit-event.page.ts | 4 ++-- .../edit-event-to-approve/edit-event.page.html | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) 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 5a3fa6351..b24cfd28f 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,6 @@ Acções Presidenciais Arquivo Despacho Electrónico -

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 418781d21..05ea1fc20 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -92,7 +92,7 @@ AccoesPresidenciais ArquivoDespachoElect

-

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}

+

{{document.Stakeholders}} {{document.CreateDate }}

diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 8b14106a4..f3d876fd4 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -355,7 +355,7 @@

-

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}

+

{{document.Stakeholders}} {{document.CreateDate }}

diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 7aebf08da..488b36e05 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -3,7 +3,7 @@
- Editar Evento aganda + Editar Evento
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 682380246..494b832fa 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -405,9 +405,9 @@ export class EditEventPage implements OnInit { SourceName: data.selected.Assunto, ParentId: this.postEvent.EventId, SourceId: data.selected.Id, - Stakeholders: false, + Stakeholders: data.selected.Stakeholders | data.selected.EntidadeOrganicaNome, ApplicationId: data.selected.ApplicationType.toString(), - CreateDate: false, + CreateDate: data.selected.Data, // needed to attach this document Id: 'add', SourceTitle: data.selected.Assunto, 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 12165e065..5e55f3555 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 @@ -349,7 +349,7 @@

-

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}

+

{{document.Stakeholders}} {{document.CreateDate }}

From 7882f76d5407dd625755402293efce1f4f7c7577 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 09:49:50 +0100 Subject: [PATCH 11/11] Improve --- package.json | 2 +- src/app/modals/view-document/view-document.page.html | 2 +- src/app/pages/agenda/agenda.page.html | 8 ++++---- src/app/pages/chat/chat.page.html | 4 ++-- .../group-contacts/group-contacts.page.html | 2 +- .../pages/chat/group-messages/group-messages.page.html | 2 +- src/app/pages/chat/messages/contacts/contacts.page.html | 4 ++-- src/app/pages/chat/new-group/contacts/contacts.page.html | 2 +- .../new-publication/new-publication.page.html | 2 +- .../publication-detail/publication-detail.page.html | 4 ++-- .../view-publications/view-publications.page.html | 2 +- .../group-contacts/group-contacts.page.html | 2 +- src/app/shared/chat/messages/contacts/contacts.page.html | 2 +- src/app/shared/chat/new-group/contacts/contacts.page.html | 2 +- .../publication/new-publication/new-publication.page.html | 6 +++--- .../publication-detail/publication-detail.page.html | 4 ++-- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index bd977f239..63c179b6b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "ng": "ng", "start": "ng serve --port 4200", - "build": "ng build", + "build": "node --max_old_space_size=999192 ./node_modules/@angular/cli/bin/ng build", "lint": "ng lint", "e2e": "ng e2e", "test": "jest --detectOpenHandles --runInBand", diff --git a/src/app/modals/view-document/view-document.page.html b/src/app/modals/view-document/view-document.page.html index 0c02abea3..4c3fd741f 100644 --- a/src/app/modals/view-document/view-document.page.html +++ b/src/app/modals/view-document/view-document.page.html @@ -10,7 +10,7 @@
- +
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 53e4bfa2b..7198a0828 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -40,7 +40,7 @@

{{ viewTitle }} -
+
@@ -100,7 +100,7 @@
--> -
+
@@ -116,12 +116,12 @@ - - diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 919b18561..9f08e568f 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -54,7 +54,7 @@
+ class="item-content flex-grow-1 cursor-pointer">
@@ -101,7 +101,7 @@
+ (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
{{group.name.split('-').join(' ')}} diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index dafbabf47..734643f4d 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -3,7 +3,7 @@
- diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 7d456ffcb..2f0b9fc4c 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -20,7 +20,7 @@
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 576e531d5..c7b9c6077 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -2,8 +2,8 @@
-
- diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html index 08afbe556..deaaec451 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -3,7 +3,7 @@
- diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index d60a88c1b..ac53a9562 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -70,7 +70,7 @@
-
+
Anexar Fotografia
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html index 9fed86dd4..ea16990a6 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/publication-detail/publication-detail.page.html @@ -4,7 +4,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index d1a547375..b37990a07 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -6,7 +6,7 @@
-
+
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index d30645d4b..e2ed656ff 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -2,7 +2,7 @@
-
+