diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index a6674b05e..52dac3fa0 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -193,6 +193,9 @@ export class HomePage implements OnInit { if (this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID != this.RoleIdService.PRES) { throw ('User has PRES permission but not roleId'); } + 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/modals/view-document/view-document.page.scss b/src/app/modals/view-document/view-document.page.scss index 52b553151..8043d493d 100644 --- a/src/app/modals/view-document/view-document.page.scss +++ b/src/app/modals/view-document/view-document.page.scss @@ -16,4 +16,12 @@ background-repeat: no-repeat; background-position-x: center; background-position-y: center; +} + + +@media only screen and (max-width: 650px) { + + .container-img { + background-size: 25%; + } } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fb12449ee..c2dc4137c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1333,7 +1333,7 @@ export class AgendaPage implements OnInit { async viewEventsToApprove() { await this.cloneAllmobileComponent(); - if (window.innerWidth <= 801) { + if (window.innerWidth <= 1023) { this.router.navigate(['/home/agenda/event-list']); } else { // hide all components diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 3e392b61f..8dc258889 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -171,7 +171,7 @@ export class EventListPage implements OnInit { this.color = 'mdgpr' } - let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); } catch (error) { diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index b689691b9..74511f859 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -83,10 +83,9 @@ export class PublicationsPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationEnd && event.url == pathname) { this.getActions(); - - } }); + this.hideRefreshButton(); this.getFromDB() @@ -141,32 +140,29 @@ export class PublicationsPage implements OnInit { getActions() { - if(this.showLoader == false) { + this.showLoader = false + + this.publications.GetPublicationFolderList().subscribe(async res => { this.showLoader = true; - this.publications.GetPublicationFolderList().subscribe(async res => { + const folders: PublicationFolder[] = this.getPublicationFolderMap(res) - const folders: PublicationFolder[] = this.getPublicationFolderMap(res) + this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') + this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') - this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') - this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') - - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - await this.storage.set('actionsEvents', this.publicationsEventFolderList); - await this.storage.set('actionsViagens', this.publicationsTravelFolderList); - } else { - folders.forEach((folder)=> { - this.addActionToDB(folder); - }) - } - - this.showLoader = false; - - }, (error) => { - this.showLoader = false; - }); - } + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + await this.storage.set('actionsEvents', this.publicationsEventFolderList); + await this.storage.set('actionsViagens', this.publicationsTravelFolderList); + } else { + folders.forEach((folder)=> { + this.addActionToDB(folder); + }) + } + this.showLoader = false; + }, (error) => { + this.showLoader = false; + }); } diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index bf31b560b..859448698 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -91,7 +91,7 @@ export class EventListPage implements OnInit { this.color = 'mdgpr' } - let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); } catch (error) { diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index 122bc44b3..b23520654 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -197,9 +197,7 @@ ion-content{ left: 0 !important; bottom: 0 !important; right: 0 !important; - top: calc(100% - 160px) !important; - max-height: 160px; - min-height: 160px; + bottom: 0px !important; } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 689a63134..377f490bf 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -86,7 +86,7 @@ export class EventsToApprovePage implements OnInit { this.color = 'mdgpr' } - let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); } catch (error) { diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index c2f47a60b..3ae9c4475 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -8,7 +8,7 @@
- +
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/src/global.scss b/src/global.scss index 10ccde75f..c14b1dd69 100644 --- a/src/global.scss +++ b/src/global.scss @@ -843,9 +843,7 @@ ion-content { left: 0 !important; bottom: 0 !important; right: 0 !important; - top: calc(100% - 160px) !important; - max-height: 160px; - min-height: 160px; + bottom: 0px !important; } diff --git a/version/git-version.ts b/version/git-version.ts index 2b2fa4498..8a48690a1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "79213a543", - "SHA": "79213a543b0b219f83c92199296d94304dde8c74", + "shortSHA": "75e6a6269", + "SHA": "75e6a62695abe44be50786e4cde227eec3b2a93c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 27 18:34:42 2023 +0100'", - "lastCommitMessage": "remove console log", - "lastCommitNumber": "4839", + "lastCommitTime": "'Mon Feb 27 18:38:55 2023 +0100'", + "lastCommitMessage": "remove", + "lastCommitNumber": "4840", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts", + "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/modals/view-document/view-document.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file