diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index eb74210c0..fa243a83f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -91,7 +91,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 36f6748ce..f930fed65 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -14,7 +14,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
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 722c2ef6b..1a6b55b81 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -193,7 +193,7 @@
-
+
@@ -208,7 +208,7 @@
-
+
@@ -221,7 +221,7 @@
-
+
@@ -236,7 +236,7 @@
-
+
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 40e240658..3b75f9d82 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -129,4 +129,6 @@
+ + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 81d64aa56..b431827ee 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -114,6 +114,15 @@ export class EventsPage implements OnInit { } catch (error) { console.log("Error creating local database: ", error) } + + + window['zipPhoneCallback'] = function (zipphone) { + var frame = document.getElementById('home-iframe'); + if(frame) { + frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); + } + } + } ngOnInit() { 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 9fdeba30f..991323c85 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 @@ -266,7 +266,7 @@
-
+
@@ -275,7 +275,7 @@
-
+
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 26f567f8e..0256be2fc 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 @@ -133,7 +133,7 @@
-
+
@@ -142,7 +142,7 @@
-
+
@@ -155,7 +155,7 @@
-
+
@@ -164,7 +164,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 ac53a9562..529553bea 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -57,7 +57,9 @@
- + + +
Tirar Fotografia @@ -68,7 +70,8 @@
- + +
Anexar Fotografia diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 94e4885e0..a314b4e99 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -17,6 +17,7 @@ import { ThemePalette } from '@angular/material/core'; import { formatDate } from 'src/plugin/momentG.js' import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-new-publication', @@ -69,7 +70,8 @@ export class NewPublicationPage implements OnInit { private camera: Camera, private toastService: ToastService, private fileLoaderService: FileLoaderService, - private fileToBase64Service: FileToBase64Service + private fileToBase64Service: FileToBase64Service, + public ThemeService: ThemeService ) { this.publicationType = this.navParams.get('publicationType'); 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 b37990a07..fd3a2a111 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -15,7 +15,7 @@

{{item.Detail}}

{{item.DateBegin | date: 'dd-MM-yy | HH:mm'}}

-
+
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index d0d058026..af66c3640 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -91,7 +91,7 @@
-
+
{{ category.Name }} {{ category.Qtd }} diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 131fe4cbe..08152d3a0 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -19,7 +19,7 @@
- +
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 f3d876fd4..7ccf43a4b 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 @@ -280,7 +280,7 @@
-
+
@@ -302,7 +302,7 @@
-
+
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 226019227..9c068535c 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -236,7 +236,7 @@
-
+
@@ -247,7 +247,7 @@
-
+
@@ -260,7 +260,7 @@
-
+
@@ -271,7 +271,7 @@
-
+
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 6e4038328..beb65ba22 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -4,7 +4,7 @@
- +
Nova Conversa 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 0844cb4e2..802d21f05 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.page.html +++ b/src/app/shared/chat/new-group/contacts/contacts.page.html @@ -5,7 +5,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}}

{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}

-
+
- -
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;