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/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 @@ - - 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 8073765e1..b24cfd28f 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -250,7 +250,8 @@
- + +
Adicionar documentos @@ -274,7 +275,6 @@ Acções Presidenciais Arquivo Despacho Electrónico -

diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 5b09bead6..722c2ef6b 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -260,7 +260,8 @@
- + +
Adicionar documentos diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index ea67a9683..62e5d4c4f 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -48,11 +48,13 @@ *ngFor="let dm of userDirectMessages" [class.item-active]="dm._id == idSelected">
- + + +
+ class="item-content flex-grow-1 cursor-pointer">
@@ -90,10 +92,16 @@ [class.item-active]="group._id ==idSelected" class="item item-hover d-flex">
- + + + + + + +
+ (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 fd06b69a2..2f0b9fc4c 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -6,7 +6,7 @@
@@ -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/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/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/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/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/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 cb2d87625..9fdeba30f 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 @@ -319,7 +319,8 @@
- + +
Anexar Documentos 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 8e1c308f6..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 @@
- +
@@ -175,7 +175,8 @@
- + +
Anexar Documentos diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index f06b1437f..0d1860bec 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -111,7 +111,8 @@
- + +

Expediente

{{expedientegbstore.count}} Documentos

@@ -120,7 +121,9 @@
- + + +

Pendentes

Meus Pendentes

@@ -129,7 +132,9 @@
- + + +

Despacho do Presidente da República

Despachos criados por mim

@@ -138,7 +143,9 @@
- + + +

Despachos

{{despachoStore.count}} Documentos

@@ -146,7 +153,9 @@
- + + +

Pedidos de Parecer

Pedidos de Parecer solicitados por mim

@@ -155,7 +164,9 @@
- + + +

Pedidos de Deferimento

{{pedidosstore.countdeferimento}} Documentos

@@ -178,7 +189,9 @@
- + + +

Despacho do Presidente da República

@@ -189,7 +202,9 @@
- + + +

Diplomas por Validar

Diplomas por Assinar

@@ -198,7 +213,9 @@
- + + +

Diplomas assinados PR

Diplomas

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/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/publications.page.html b/src/app/pages/publications/publications.page.html index 86ee02832..f1c15bcad 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -47,17 +47,20 @@ [class.item-active]="viagem.ProcessId == idSelected" >
- -
-
- -

{{viagem.Description}}

-

{{viagem.Detail}}

-
-
- - -
+ + + + +
+
+ +

{{viagem.Description}}

+

{{viagem.Detail}}

+
+
+ + +
@@ -82,7 +85,9 @@ [class.item-active]="evento.ProcessId == idSelected" (click)="goToPublicationsList(evento.ProcessId)">
- + + +
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/pages/search/search.page.html b/src/app/pages/search/search.page.html index 1e13757dc..d0d058026 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -140,11 +140,13 @@
- + +
- + +
@@ -152,8 +154,12 @@
  • - + + +
    - + +

    {{ attendee.Name }}

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

    {{ attendee.Name }}

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

    {{ attendee.Name }}

    diff --git a/src/app/services/events/attendees/attendees.page.ts b/src/app/services/events/attendees/attendees.page.ts index 5dfaeae0c..4936f9d95 100644 --- a/src/app/services/events/attendees/attendees.page.ts +++ b/src/app/services/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/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 ce3d140fa..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 @@ -333,7 +333,8 @@
    - + +
    Adicionar documentos @@ -354,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 6d69a901a..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
    @@ -276,7 +276,8 @@
    - + +
    Adicionar documentos 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/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index c41132d62..226019227 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -295,7 +295,8 @@
    - + +
    Adicionar documentos 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 @@
    -
    +