diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index da7a5fd29..a54e31142 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -14,6 +14,8 @@
+ +
Anexar Documentos diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html index 848e950fa..a0c3cacdc 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ b/src/app/modals/chat-options-features/chat-options-features.page.html @@ -3,6 +3,7 @@
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index c2e121b25..6efadc2f5 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -96,6 +96,8 @@
+ +
@@ -118,6 +120,8 @@
+ +
@@ -128,6 +132,8 @@
+ +
Anexar Documentos diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index 71f7cfca7..ef09db6fb 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -19,6 +19,8 @@
+ +
Anexar Documentos diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 3e096eb03..36f32db59 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -25,6 +25,7 @@
+
@@ -46,6 +47,7 @@
+
Anexar Documentos diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 1e1c3d8a3..3c2b19df5 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -11,6 +11,7 @@
+
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index 6d53d4669..e6e1f86e4 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -302,6 +302,7 @@
+
@@ -324,6 +325,7 @@
+
@@ -345,6 +347,8 @@
+ +
Anexar Documentos diff --git a/src/app/modals/document-viewer/document-viewer.page.html b/src/app/modals/document-viewer/document-viewer.page.html index 0bc9e4ef2..4336485ee 100644 --- a/src/app/modals/document-viewer/document-viewer.page.html +++ b/src/app/modals/document-viewer/document-viewer.page.html @@ -4,8 +4,8 @@
- +
{{ fileName }}
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 37e6f9f0d..3e90a1f86 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -26,6 +26,7 @@
+
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index e82845b3c..4db0ad092 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -5,6 +5,7 @@
logo logo + logo logo
@@ -25,6 +26,7 @@
+
@@ -43,6 +45,7 @@
+
@@ -84,12 +87,13 @@ -
+
- DoneIt + +
+
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 3e93eb3db..5b82fb495 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 @@ -13,6 +13,7 @@
+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index a3efe7256..a17221298 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -28,11 +28,13 @@
+
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 30321e816..e782023ab 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 @@ -279,6 +279,7 @@
+
@@ -301,6 +302,7 @@
+
@@ -322,6 +324,7 @@
+
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 13a112e83..03a012339 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 @@ -145,6 +145,7 @@
+
@@ -167,6 +168,7 @@
+
@@ -177,6 +179,7 @@
+
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 f576bd6b2..5cc222a98 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -56,6 +56,7 @@
+
@@ -163,9 +164,10 @@
- + +

Expediente

@@ -174,10 +176,11 @@
- + +

Pendentes

@@ -187,10 +190,11 @@
- + +

Despachos

@@ -199,10 +203,11 @@
- + +

Pedidos de Parecer

@@ -212,10 +217,12 @@
- + + +

Pedidos de Deferimento

@@ -255,6 +262,8 @@ + +
@@ -280,6 +289,8 @@ + +

Diplomas para Assinar

diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index b4331d5b7..dd638c765 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -10,6 +10,7 @@ logo logo logo + logo
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 7531f48c0..0136d4e90 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -29,6 +29,7 @@
@@ -100,6 +103,7 @@ diff --git a/src/app/pages/search/sender/sender.page.html b/src/app/pages/search/sender/sender.page.html index f1b4e6a0e..f8f077441 100644 --- a/src/app/pages/search/sender/sender.page.html +++ b/src/app/pages/search/sender/sender.page.html @@ -4,6 +4,7 @@
+
diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index 65080e754..eba6fa6a5 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -38,13 +38,19 @@ export class BackgroundService { document.body.style.setProperty(`--color5`, "#ececec"); this.storageservice.store('networkCheckStore','online'); - } else { + } else if (this.themeservice.currentTheme == 'default') { document.body.style.setProperty(`--color`, "#0782C9"); document.body.style.setProperty(`--color2`, "#45BAFF"); document.body.style.setProperty(`--color3`, "#0782C9"); document.body.style.setProperty(`--color4`, "#0782c9f0"); document.body.style.setProperty(`--color5`, "#45BAFF"); this.storageservice.store('networkCheckStore','online'); + } else if (this.themeservice.currentTheme == 'doneIt') { + document.body.style.setProperty(`--color`, "#69B3E7"); + document.body.style.setProperty(`--color2`, "#A5D1F1"); + document.body.style.setProperty(`--color3`, "#69B3E7"); + document.body.style.setProperty(`--color4`, "#69B3E7"); + document.body.style.setProperty(`--color5`, "#A5D1F1"); } } diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index dd839dd99..b40e32f74 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -16,6 +16,7 @@
+

{{ attendee.Name }}

@@ -38,6 +39,7 @@
+

{{ attendee.Name }}

@@ -57,6 +59,7 @@
+

{{ attendee.Name }}

diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index 0f3ae20f8..88c55522b 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -49,6 +49,14 @@ export class ThemeService { } + allows(args) { + if(!Array.isArray(args)) { + args = [args] + } + + return args.includes(this.currentTheme) + } + saveTheme() { } 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 a1a99a38e..f2fe39805 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 @@ -289,6 +289,7 @@
+
@@ -311,6 +312,7 @@
+
@@ -332,6 +334,7 @@
+
Adicionar documentos 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 e3aaa8e7b..8008ac9af 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -281,6 +281,7 @@
+
Adicionar documentos 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 e106b4154..0d8758d81 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -248,6 +248,7 @@
+
@@ -272,6 +273,7 @@
+
@@ -295,6 +297,7 @@
+
Adicionar documentos diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index c64efc61b..c04724732 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -6,6 +6,7 @@
@@ -16,6 +17,7 @@
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 52fa56a75..39a0817c6 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -16,6 +16,7 @@
+

{{ attendee.Name }}

@@ -24,6 +25,7 @@
+
@@ -39,6 +41,7 @@
+

{{ attendee.Name }}

@@ -58,6 +61,7 @@
+

{{ attendee.Name }}

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 957ff060b..70196ac95 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 @@ -232,6 +232,7 @@
+
@@ -254,6 +255,7 @@
+
@@ -275,6 +277,7 @@
+
Adicionar documentos diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index e2ea662e1..658d1d007 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -5,7 +5,7 @@
- + @@ -14,19 +14,20 @@