diff --git a/package-lock.json b/package-lock.json index 2d9f87f9f..fcf37b152 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "angular-svg-icon": "^12.0.0", "angular-tag-cloud-module": "^5.2.2", "base64-js": "^1.5.1", - "beast-orm": "^1.1.2", + "beast-orm": "^1.1.3", "bootstrap": "^4.5.0", "browser-image-resizer": "^2.4.1", "build": "0.1.4", @@ -8833,9 +8833,9 @@ } }, "node_modules/beast-orm": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.2.tgz", - "integrity": "sha512-yboyvvasEIptcLNJ0yLl6DalQ2xSAUojNS/vPrPRir4gW99g6GFqlSiSWWTpCE4FHh827TuB8NUWbhLcqzoiyA==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz", + "integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw==" }, "node_modules/big-integer": { "version": "1.6.49", @@ -45616,9 +45616,9 @@ } }, "beast-orm": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.2.tgz", - "integrity": "sha512-yboyvvasEIptcLNJ0yLl6DalQ2xSAUojNS/vPrPRir4gW99g6GFqlSiSWWTpCE4FHh827TuB8NUWbhLcqzoiyA==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz", + "integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw==" }, "big-integer": { "version": "1.6.49" diff --git a/package.json b/package.json index 036e9d260..9665675e1 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "angular-svg-icon": "^12.0.0", "angular-tag-cloud-module": "^5.2.2", "base64-js": "^1.5.1", - "beast-orm": "^1.1.2", + "beast-orm": "^1.1.3", "bootstrap": "^4.5.0", "browser-image-resizer": "^2.4.1", "build": "0.1.4", diff --git a/readme.md b/readme.md index 42434a629..400292c92 100644 --- a/readme.md +++ b/readme.md @@ -77,7 +77,10 @@ cp -r ./www ./serve npm run dev:share ``` - +# Open xcode +ionic cap copy && +ionic cap update && +ionic cap open ios && ## Tag stable version diff --git a/src/app/modals/view-document/view-document.page.html b/src/app/modals/view-document/view-document.page.html index 1de58ce8d..9c0b9e166 100644 --- a/src/app/modals/view-document/view-document.page.html +++ b/src/app/modals/view-document/view-document.page.html @@ -18,12 +18,7 @@ -
- +
+
- -
- Estamos a preparar a visualização do documento. Por favor aguarde. -
- diff --git a/src/app/modals/view-document/view-document.page.scss b/src/app/modals/view-document/view-document.page.scss index 9347b1046..52b553151 100644 --- a/src/app/modals/view-document/view-document.page.scss +++ b/src/app/modals/view-document/view-document.page.scss @@ -9,3 +9,11 @@ float: right; margin-left: auto; } + + +.container-img { + background-image: url(/assets/gif/theme/gov/Blocks-loader.svg); + background-repeat: no-repeat; + background-position-x: center; + background-position-y: center; +} \ No newline at end of file diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 5eaf5bec2..e72e0b97b 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -7,6 +7,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page'; import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page'; import { AlertController, ModalController } from '@ionic/angular'; + @Component({ selector: 'app-view-document', templateUrl: './view-document.page.html', @@ -20,6 +21,7 @@ export class ViewDocumentPage implements OnInit { docId: any task: ExpedientTaskModalPageNavParamsTask; Document: any + loader = true constructor( private modalController: ModalController, @@ -49,6 +51,13 @@ export class ViewDocumentPage implements OnInit { const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/') this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); + // const iframe = document.getElementById("iframe") + // const handleLoad = () => { + // this.loader = false + // }; + + // iframe.addEventListener('load', handleLoad, true) + if(res == "") { const alert = await this.alertController.create({ cssClass: 'my-custom-class', diff --git a/src/app/pipes/filter.pipe.ts b/src/app/pipes/filter.pipe.ts index 68440de14..97100f9eb 100644 --- a/src/app/pipes/filter.pipe.ts +++ b/src/app/pipes/filter.pipe.ts @@ -13,6 +13,10 @@ export class FilterPipe implements PipeTransform { text = text.toLowerCase(); + if(Array.isArray(array)) { + array = [] + } + return array.filter(item =>{ return item[column].toLowerCase().includes(text); }); diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 2c6854b6e..7e4203b16 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -49,7 +49,7 @@
-
+
{{msg.u.name}} {{msg.duration}}
@@ -80,7 +80,7 @@
-
+
{{msg.u.name}} {{msg.duration}}
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 884abe7a0..061b474ce 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -48,7 +48,7 @@
-
+
{{msg.u.name}} {{msg.duration}}
@@ -82,7 +82,7 @@
-
+
{{msg.u.name}} {{msg.duration}}
diff --git a/version/git-version.ts b/version/git-version.ts index 51ccf2cb9..adbfc3cff 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "fcd198933", - "SHA": "fcd19893340c5359c9892506349adce885099066", + "shortSHA": "46387d497", + "SHA": "46387d4977fb03d124a76a274e70dd9ff1c31b32", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 27 09:45:31 2023 +0100'", - "lastCommitMessage": "Merge made with Peter changes", - "lastCommitNumber": "4831", + "lastCommitTime": "'Mon Feb 27 17:39:10 2023 +0100'", + "lastCommitMessage": "to many changes", + "lastCommitNumber": "4832", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: readme.md\n\tmodified: src/app/modals/view-document/view-document.page.html\n\tmodified: src/app/modals/view-document/view-document.page.scss\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pipes/filter.pipe.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file