diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 782c2457f..a6674b05e 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -190,7 +190,7 @@ export class HomePage implements OnInit { if (this.p.userPermission([this.p.permissionList.Agenda.access]) && !this.eventService.hasAnyCalendar) { throw ('User ' + SessionStore.user.FullName + 'has No calendar'); } - if (this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID == this.RoleIdService.PRES) { + if (this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID != this.RoleIdService.PRES) { throw ('User has PRES permission but not roleId'); } }, 1000) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a6a479a70..58811e9b5 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -156,6 +156,7 @@ export class EventsPage implements OnInit { let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; if(SessionStore.user) { let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { + this.showLoader = false; this.showAgendaLoader = false; console.error(error) }) @@ -163,12 +164,11 @@ export class EventsPage implements OnInit { if(onwEvent?.length) { this.totalEvent = onwEvent.length; } - this.showLoader = false; - this.showAgendaLoader = false; - } else { - - } + } + + this.showLoader = false; + this.showAgendaLoader = false; } addEventToDb(list) { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 10909d23b..aaefbfe6d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = oaprDev; \ No newline at end of file +export const environment: Environment = doneITDev; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index adbfc3cff..f6bc9f817 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "46387d497", - "SHA": "46387d4977fb03d124a76a274e70dd9ff1c31b32", + "shortSHA": "195785367", + "SHA": "195785367888a9895738c86b1a998186f0c78876", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Mon Feb 27 17:39:10 2023 +0100'", - "lastCommitMessage": "to many changes", - "lastCommitNumber": "4832", + "lastCommitTime": "'Mon Feb 27 17:44:15 2023 +0100'", + "lastCommitMessage": "Merge with Peter chnages 3", + "lastCommitNumber": "4838", "change": "", - "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" + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/environments/environment.ts", + "changeAuthor": "peter.maquiran" } \ No newline at end of file