diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 6f43254c6..661a44cde 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -248,7 +248,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index ec8d49448..635b3ad59 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -481,7 +481,7 @@ export class GabineteDigitalPage implements OnInit { /* else if (workflowName == "Expediente") { this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']); } */ - else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') { + else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == 'Aprovar Evento') { this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']); } else { diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 260a10994..8a9402f82 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -16,7 +16,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { Storage } from '@ionic/storage'; import { PermissionService } from 'src/app/services/permission.service'; -import { ActionModel } from 'src/app/models/beast-orm'; +import { ActionModel, PublicationModel } from 'src/app/models/beast-orm'; @Component({ diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index deb5571b5..75971806c 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -137,7 +137,7 @@ export class ViewPublicationsPage implements OnInit { getPublicationDetail() { this.showLoader = true; const folderId = this.folderId - this.publications.GetPresidentialAction(folderId).subscribe(res=>{ + this.publications.GetPresidentialAction(folderId).subscribe(res =>{ this.showLoader = false; this.publicationItem[folderId] = res this.storage.set(folderId+"name", res) diff --git a/version/git-version.ts b/version/git-version.ts index 0f3e7537f..80563c274 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8ed49dc20", - "SHA": "8ed49dc2006f318a456a2e39bbe2d3291ffcefe8", + "shortSHA": "070edbd4f", + "SHA": "070edbd4faf94338eccc488162df486371263948", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Mar 7 11:48:38 2023 +0100'", - "lastCommitMessage": "remove duplicated header set background to event pages", - "lastCommitNumber": "4847", + "lastCommitTime": "'Tue Mar 7 12:31:43 2023 +0100'", + "lastCommitMessage": "fix begin date html erro", + "lastCommitNumber": "4848", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file