From 4b334dbebf8351ef7fe0108b22e4cc03aedea7ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 08:50:20 +0100 Subject: [PATCH 1/9] 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 2/9] 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 @@
-
+
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html index 6e4a59538..2d2699ca0 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html @@ -3,7 +3,7 @@
- +
{{ task.Folio}} diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html index c0c231441..caa20ddc4 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html @@ -11,7 +11,7 @@
- +
@@ -40,7 +40,7 @@
- +
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 06dfe3b1b..ab4e8eb78 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -11,13 +11,13 @@

{{item.Detail}}

-
+
- -
diff --git a/src/assets/images/theme/gov/icons-add-photo.svg b/src/assets/images/theme/gov/icons-add-photo.svg new file mode 100644 index 000000000..e406b05a1 --- /dev/null +++ b/src/assets/images/theme/gov/icons-add-photo.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/images/theme/gov/icons-add-photos.svg b/src/assets/images/theme/gov/icons-add-photos.svg new file mode 100644 index 000000000..4df9503ef --- /dev/null +++ b/src/assets/images/theme/gov/icons-add-photos.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/www/pdfjs/build/pdf.js b/src/assets/www/pdfjs/build/pdf.js index 9948aae0f..61d23ebc8 100644 --- a/src/assets/www/pdfjs/build/pdf.js +++ b/src/assets/www/pdfjs/build/pdf.js @@ -20,7 +20,7 @@ * Javascript code in this page */ -(function webpackUniversalModuleDefinition(root, factory) { + (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') module.exports = factory(); else if(typeof define === 'function' && define.amd) @@ -9928,8 +9928,6 @@ function getDocument(src) { source = src; } - console.log('source================================================', source) - var params = Object.create(null); var rangeTransport = null, worker = null; @@ -10002,9 +10000,7 @@ function getDocument(src) { } (0, _util.setVerbosityLevel)(params.verbosity); - - console.log('params=======================', params) - + if (!worker) { var workerParams = { verbosity: params.verbosity, @@ -10016,8 +10012,6 @@ function getDocument(src) { var docId = task.docId; worker.promise.then(function () { - - if (task.destroyed) { throw new Error('Loading aborted'); } diff --git a/src/assets/www/pdfjs/build/pdf.worker.js b/src/assets/www/pdfjs/build/pdf.worker.js index 92615e53e..9a8565a23 100644 --- a/src/assets/www/pdfjs/build/pdf.worker.js +++ b/src/assets/www/pdfjs/build/pdf.worker.js @@ -20,7 +20,7 @@ * Javascript code in this page */ -(function webpackUniversalModuleDefinition(root, factory) { + (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') module.exports = factory(); else if(typeof define === 'function' && define.amd) @@ -2952,7 +2952,7 @@ var store = global[SHARED] || setGlobal(SHARED, {}); })('versions', []).push({ version: '3.2.1', mode: IS_PURE ? 'pure' : 'global', - copyright: '© 2019 Denis Pushkarev (zloirock.ru)' + copyright: '© 2019 Denis Pushkarev (zloirock.ru)' }); /***/ }), @@ -6250,7 +6250,7 @@ module.exports = !fails(function () { var url = new URL('b?e=1', 'http://a'); var searchParams = url.searchParams; url.pathname = 'c%20d'; - return IS_PURE && !url.toJSON || !searchParams.sort || url.href !== 'http://a/c%20d?e=1' || searchParams.get('e') !== '1' || String(new URLSearchParams('?a=1')) !== 'a=1' || !searchParams[ITERATOR] || new URL('https://a@b').username !== 'a' || new URLSearchParams(new URLSearchParams('a=b')).get('a') !== 'b' || new URL('http://тест').host !== 'xn--e1aybc' || new URL('http://a#б').hash !== '#%D0%B1'; + return IS_PURE && !url.toJSON || !searchParams.sort || url.href !== 'http://a/c%20d?e=1' || searchParams.get('e') !== '1' || String(new URLSearchParams('?a=1')) !== 'a=1' || !searchParams[ITERATOR] || new URL('https://a@b').username !== 'a' || new URLSearchParams(new URLSearchParams('a=b')).get('a') !== 'b' || new URL('http://тест').host !== 'xn--e1aybc' || new URL('http://a#б').hash !== '#%D0%B1'; }); /***/ }), @@ -44839,7 +44839,7 @@ var getSerifFonts = (0, _core_utils.getLookupTableFactory)(function (t) { t['Sylfaen'] = true; t['Times'] = true; t['Trajan'] = true; - t['Trinité'] = true; + t['Trinité'] = true; t['Trump Mediaeval'] = true; t['Utopia'] = true; t['Vale Type'] = true; @@ -56297,8 +56297,6 @@ function () { _createClass(PDFWorkerStream, [{ key: "getFullReader", value: function getFullReader() { - - console.log('getFullReader') (0, _util.assert)(!this._fullRequestReader); this._fullRequestReader = new PDFWorkerStreamReader(this._msgHandler); return this._fullRequestReader; @@ -56306,8 +56304,6 @@ function () { }, { key: "getRangeReader", value: function getRangeReader(begin, end) { - - console.log('getRangeReader') var reader = new PDFWorkerStreamRangeReader(begin, end, this._msgHandler); this._rangeRequestReaders.push(reader); diff --git a/src/assets/www/pdfjs/web/viewer.html b/src/assets/www/pdfjs/web/viewer.html index 20bee9aaa..0d7dfbf13 100644 --- a/src/assets/www/pdfjs/web/viewer.html +++ b/src/assets/www/pdfjs/web/viewer.html @@ -7,6 +7,42 @@ PDF.js viewer + + + @@ -370,16 +406,6 @@
- - diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 4f0f8f632..fba7bd014 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -521,6 +521,11 @@ $app-theme: mat-light-theme( color: var(--button-text-color); } +.btn-ok:hover { + background-color: var(--button-hover); + color: var(--button-text-color); +} + .btn-delete { display: block; width: 170px !important; From dfaa9e584e2bf1eaae6852832bfe86f6ff577b68 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:08:36 +0100 Subject: [PATCH 8/9] cursor --- .../theme/gov/icons-expediente-parecer 4.svg | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/assets/images/theme/gov/icons-expediente-parecer 4.svg diff --git a/src/assets/images/theme/gov/icons-expediente-parecer 4.svg b/src/assets/images/theme/gov/icons-expediente-parecer 4.svg new file mode 100644 index 000000000..601412e30 --- /dev/null +++ b/src/assets/images/theme/gov/icons-expediente-parecer 4.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a6e4b1240843f2a70418a413968646b45e55129f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:09:10 +0100 Subject: [PATCH 9/9] cursor --- src/app/modals/add-note/add-note.page.html | 4 ++-- .../modals/create-process/create-process.page.html | 2 +- src/app/modals/dar-parecer/dar-parecer.page.html | 2 +- src/app/modals/delegar/delegar.page.html | 2 +- .../document-set-up-meeting.page.html | 2 +- src/app/modals/forward/forward.page.html | 12 +----------- .../pages/chat/messages/contacts/contacts.page.html | 2 +- .../pages/chat/new-group/contacts/contacts.page.html | 2 +- .../expedient-task-modal.page.html | 2 +- .../new-publication/new-publication.page.html | 2 +- .../shared/chat/messages/contacts/contacts.page.html | 2 +- .../chat/new-group/contacts/contacts.page.html | 2 +- .../new-publication/new-publication.page.html | 4 ++-- 13 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index 3cd668ec4..b936f5b07 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -9,13 +9,13 @@
- + diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index fa243a83f..509950761 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -130,7 +130,7 @@
-
+
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index e00bfe4bd..4f0a85a26 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -15,7 +15,7 @@
- +
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 8967a2d2d..68e2e491f 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -43,7 +43,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 8a573e718..3b318dd67 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 @@ -318,7 +318,7 @@
-
+
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index f930fed65..0f6ae2d18 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -42,17 +42,7 @@
- +
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index c7b9c6077..5dc48c889 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -35,7 +35,7 @@ {{header}}
-
+

{{user.name}}

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 deaaec451..59be5dfab 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -11,7 +11,7 @@
Contactos
- +
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 0256be2fc..baea578cf 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 @@ -172,7 +172,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 529553bea..c010cc1ad 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -68,7 +68,7 @@
- +
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index beb65ba22..be0ccfea1 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -35,7 +35,7 @@ {{header}}
-
+

{{user.name}}

diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/shared/chat/new-group/contacts/contacts.page.html index 802d21f05..1a0b27564 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.html +++ b/src/app/shared/chat/new-group/contacts/contacts.page.html @@ -11,7 +11,7 @@
Contactos
- +
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index e2891de57..f3d9dcd50 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -44,7 +44,7 @@
- +
@@ -82,7 +82,7 @@
- +