diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index b9193d04f..8620310bd 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -131,6 +131,8 @@ export class HomePage implements OnInit { ); }); */ + + } goto(url) { @@ -215,6 +217,19 @@ export class HomePage implements OnInit { if (!this.p.userPermission([this.p.permissionList.Gabinete.md_tasks]) && SessionStore.user.RoleID == this.RoleIdService.PV) { throw (`User doesn't has vice president permission but has roleId`); } + + + + (()=>{ + document.addEventListener('click', (e: any) => { + const closest = e.target.closest(".mat-datepicker-content"); + if(closest) { + e.preventDefault() + document.activeElement['blur'](); + } + + }) + })() }, 1000) } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 2418d316d..8c1b7c939 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -104,6 +104,7 @@ export class EventsPage implements OnInit { this.listToPresent = []; }) + this.agendaColor = this.sessoStore.user.Profile if(this.agendaColor != "PR") { this.agendaColor = "MDGPR" diff --git a/version/git-version.ts b/version/git-version.ts index f02f11e18..5997fbeaf 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8cbcc370f", - "SHA": "8cbcc370f3786feb511794e60dd716e0908b9967", + "shortSHA": "926e4e39d", + "SHA": "926e4e39d8b0c3d3d073e6d98e5f2f049e12f9c2", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Aug 22 13:31:19 2023 +0100'", - "lastCommitMessage": "Text change from Rever to Enviar para Revisão", - "lastCommitNumber": "5202", + "lastCommitTime": "'Tue Aug 22 14:13:41 2023 +0100'", + "lastCommitMessage": "pull made", + "lastCommitNumber": "5204", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 2 and 1 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/pages/agenda/agenda.page.ts\n\tmodified: src/global.scss", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 3 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/home/home.page.ts\n\tmodified: src/app/pages/events/events.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file