diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a0ed22aa0..884a238d2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -13,4 +13,5 @@ + 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 32b1c8201..d0d8b95ef 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -59,12 +59,23 @@
- + + + + + +
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 116ac26c1..8bf7aa9ab 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -1060,7 +1060,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { return blob; } - openFile(pdfString, filename, type) { + async openFile(pdfString, filename, type) { const blob = this.b64toBlob(pdfString, 'application/pdf') let pathFile = '' const fileName = filename @@ -1071,17 +1071,17 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { pathFile = this.file.externalRootDirectory } - - - this.file - .writeFile(pathFile, fileName, contentFile, { replace: true }) - .then(success => { - this.fileOpener - .open(pathFile + fileName, 'application/pdf') + await Filesystem.writeFile({ + path: fileName, + data: pdfString, + directory: Directory.Documents, + }).then((dir) => { + console.log('DIR ', dir) + this.fileOpener + .open(dir.uri, type) .then(() => console.log()) .catch(e => console.error(e)) - }) - .catch(e => console.error(e)) + }); } downloadFileMsg(msg: MessageService) { diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 19163d8b5..cef202043 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -1001,8 +1001,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { return blob; } - openFile(pdfString, filename, type) { + async openFile(pdfString, filename, type) { const blob = this.b64toBlob(pdfString, type) + console.log(blob) let pathFile = '' const fileName = filename const contentFile = blob @@ -1012,17 +1013,19 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { pathFile = this.file.externalRootDirectory } - - - this.file - .writeFile(pathFile, fileName, contentFile, { replace: true }) - .then(success => { - this.fileOpener - .open(pathFile + fileName, type) + console.log(pathFile) + + await Filesystem.writeFile({ + path: fileName, + data: pdfString, + directory: Directory.Documents, + }).then((dir) => { + console.log('DIR ', dir) + this.fileOpener + .open(dir.uri, type) .then(() => console.log()) .catch(e => console.error(e)) - }) - .catch(e => console.error(e)) + }); } downloadFileFromBrowser(fileName: string, data: any): void { diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index af0f9dc05..313aabf90 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -143,7 +143,7 @@
Correspondência por ler
-
@@ -141,30 +180,40 @@
- + -
+
+ + - -
- + + + + + + + + +
-
- {{notificationLength}}
+
+ {{notificationLength}}
@@ -174,5 +223,5 @@ -
- +
+ \ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index 25b09a5ba..cbf068614 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -7,6 +7,15 @@ border: 0!important; } + + + .profile-image { + border-radius: 80%; /* Tornar a imagem circular */ + width: 25.33%; + height: 25.33%; + overflow: auto; + } + .div-logo{ background: transparent; width: em(140); diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html index 340e10835..1c4d03450 100644 --- a/src/app/tiny-mce/tiny-mce.page.html +++ b/src/app/tiny-mce/tiny-mce.page.html @@ -9,9 +9,9 @@ {{Document.Assunto}} -
+
diff --git a/src/assets/images/md.webp b/src/assets/images/md.webp new file mode 100644 index 000000000..ecfa0a3e5 Binary files /dev/null and b/src/assets/images/md.webp differ diff --git a/src/assets/images/ministro.png b/src/assets/images/ministro.png new file mode 100644 index 000000000..74f15e1d7 Binary files /dev/null and b/src/assets/images/ministro.png differ diff --git a/src/assets/images/presidente.png b/src/assets/images/presidente.png new file mode 100644 index 000000000..4049a501f Binary files /dev/null and b/src/assets/images/presidente.png differ diff --git a/src/assets/images/secretaria_geral.png b/src/assets/images/secretaria_geral.png new file mode 100644 index 000000000..9cb12ba25 Binary files /dev/null and b/src/assets/images/secretaria_geral.png differ diff --git a/src/assets/images/sg.jpeg b/src/assets/images/sg.jpeg new file mode 100644 index 000000000..ef811a571 Binary files /dev/null and b/src/assets/images/sg.jpeg differ diff --git a/version/git-version.ts b/version/git-version.ts index c8a3ddef8..f3076a18c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a89b2739c", - "SHA": "a89b2739c8d9b5d320e107b1366017c8e01607f3", + "shortSHA": "68c849d0e", + "SHA": "68c849d0ee02f2a0c171db7d67c953e919c90167", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 21 11:42:34 2023 +0100'", - "lastCommitMessage": "update fix", - "lastCommitNumber": "5176", + "lastCommitTime": "'Mon Aug 21 12:22:19 2023 +0100'", + "lastCommitMessage": "replicate contact function", + "lastCommitNumber": "5177", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/chat/new-group/new-group.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", + "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tnew file: src/assets/images/md.webp\n\tnew file: src/assets/images/ministro.png\n\tnew file: src/assets/images/presidente.png\n\tnew file: src/assets/images/secretaria_geral.png\n\tnew file: src/assets/images/sg.jpeg\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file