diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 79a942b9a..6a79f0892 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -160,7 +160,7 @@ -
+
-
+
-
+
-
+
e.ActionType == 'Evento') this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') + // ActionModel.create(folders) + await this.storage.set('actionsEvents', this.publicationsEventFolderList); await this.storage.set('actionsViagens', this.publicationsTravelFolderList); diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts index 8856473c9..2aacaa696 100644 --- a/src/app/services/http-error-handle.service.ts +++ b/src/app/services/http-error-handle.service.ts @@ -57,7 +57,7 @@ export class HttpErrorHandle { this.toastService._successMessage('Despacho executado!') break; case 'Gerar Diploma': - this.toastService._successMessage('Diploma gerado!') + this.toastService._successMessage('Enviado com sucesso!') break; case 'Efetuar Despacho': this.toastService._successMessage('Despacho efetuado!') diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.html b/src/app/shared/popover/deploma-options/deploma-options.page.html index c6de03aa0..02bbdb01a 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.html +++ b/src/app/shared/popover/deploma-options/deploma-options.page.html @@ -13,7 +13,6 @@ - @@ -25,10 +24,10 @@
-
- +
+
-
+
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index aad1bc377..27be22bb0 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -167,6 +167,7 @@ export class ViewPublicationsPage implements OnInit { const found = this.publicationIsPresent(publicationId, folderId) if(!found) { this.publicationList[folderId].push(publicationDetails) + // PublicationModel.create(publicationDetails) } else { this.publicationList[folderId][findIndex] = publicationDetails } diff --git a/version/git-version.ts b/version/git-version.ts index f9ee4b487..c74911884 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "08253646e", - "SHA": "08253646e6d133425af3b48b641a89b6bc437a0a", + "shortSHA": "c7d1a13eb", + "SHA": "c7d1a13eb7825833fecb60a6e3a43513bfb928c0", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Fri Mar 10 16:31:12 2023 +0100'", - "lastCommitMessage": "pull made", - "lastCommitNumber": "4871", + "lastCommitTime": "'Tue Mar 14 09:53:39 2023 +0100'", + "lastCommitMessage": "Changes made on event to aprove and added to diploma", + "lastCommitNumber": "4872", "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/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.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 2 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: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file