diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index ca5c215ae..4d017eb84 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -1031,7 +1031,7 @@ $font-size: rem(15); } .height-356 { - height: 360px; + height: 369px; } } diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index 5b835e3d9..b060c378b 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -8,7 +8,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 66de3de5b..171621ffd 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -110,7 +110,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 9b2664e0a..43d8776cd 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -107,7 +107,7 @@
- +
@@ -120,7 +120,7 @@
- + diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 3a3e57f7d..75c8082ff 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -66,7 +66,6 @@ - Minha agenda
{{ environment.agendaPR}}
@@ -74,12 +73,20 @@
Agenda do {{calendars.Fullname}}
- +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
+ + +
Minha agenda
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda do {{calendars.Fullname}}
+ + diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index df8665e0c..edbbc4a99 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -21,7 +21,7 @@ import { NgxImageCompressService } from "ngx-image-compress"; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { PublicationFolderService } from 'src/app/store/publication-folder.service'; - +import { RouteService } from 'src/app/services/route.service'; const IMAGE_DIR = 'stored-images'; interface LocalFile { @@ -90,7 +90,8 @@ export class NewPublicationPage implements OnInit { private loadingCtrl: LoadingController, public imageCompress: NgxImageCompressService, private httpErrorHandle: HttpErrorHandle, - public PublicationFolderService: PublicationFolderService + public PublicationFolderService: PublicationFolderService, + private RouteService: RouteService, ) { this.publicationType = this.navParams.get('publicationType'); @@ -231,7 +232,7 @@ export class NewPublicationPage implements OnInit { this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') console.log({response}) - this.close(); + this.RouteService.goBack() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -260,7 +261,7 @@ export class NewPublicationPage implements OnInit { this.httpErrorHandle.httpsSucessMessagge('Criar publicação') console.log({response}) - this.close(); + this.RouteService.goBack() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -286,7 +287,7 @@ export class NewPublicationPage implements OnInit { const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') console.log({response}) - this.close(); + this.RouteService.goBack() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 5d73fd3c3..589595ac2 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -51,6 +51,8 @@ export class EventsService { calendarNamesAry = [] calendarNamesAryNoPr = [] + calendarNamesAryNoPrNMD = [] + calendarNamesAryOnlyMD = [] calendarNamesAryReverse = [] calendarNamesAryPR = [] @@ -60,6 +62,8 @@ export class EventsService { myCalendarNames = {} hasAnyCalendar = false + + HasMdGPR = false onCalendarFinishLoad = new Subscribe({execute : false, deleteOnExecute: true}) @@ -108,6 +112,10 @@ export class EventsService { this.calendarNamesAryNoPr = [] this.calendarNamesAryPR = [] + + this.calendarNamesAryNoPrNMD = [] + this.calendarNamesAryOnlyMD = [] + this.hasSharedCalendar = false this.hasSharedOficial = false this.hasSharedPessoal = false @@ -115,6 +123,8 @@ export class EventsService { this.hasOwnCalendar = false this.hasOwnOficial = false this.hasOwnPessoal = false + this.HasMdGPR = false + if (SessionStore.user) { if (SessionStore.user.Profile == 'MDGPR') { @@ -308,6 +318,22 @@ export class EventsService { } + this.calendarNamesAryNoPrNMD = this.calendarNamesAryNoPr.filter((e)=> { + return e.Role != 'Ministro e Director do Gabinete do PR' && e.Role != 'Presidente da República' + }) + + this.calendarNamesAryOnlyMD = this.calendarNamesAryNoPr.filter((e)=> { + return e.Role == 'Ministro e Director do Gabinete do PR' + }) + + + this.HasMdGPR = this.calendarNamesAryNoPr.find( (e)=> { + if(e.Role == 'Ministro e Director do Gabinete do PR') { + return true + } + return false + }) + if(SessionStore.user.OwnerCalendars.length == 0 && SessionStore.user.SharedCalendars.length == 0) { this.hasAnyCalendar = false diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index d5ee21d9c..afd5cf5b5 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -117,7 +117,7 @@
- +
@@ -130,7 +130,7 @@
- + diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index a1b3994ee..2909f57de 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -18,12 +18,19 @@ Minha agenda --> Minha agenda
-
{{ environment.agendaPR}}
-
{{ environment.agendaVP}}
-
Agenda do {{calendars.Fullname}}
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda do {{calendars.Fullname}}
- + +
Minha agenda
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda do {{calendars.Fullname}}
+ + +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
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 7f249653f..7332bfed3 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -91,6 +91,8 @@ export class EventListPage implements OnInit { return new Date(e).toDateString() } + + async LoadToApproveEvents() { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index ff17d8e55..3af8955dd 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -69,12 +69,20 @@
Agenda do {{calendars.Fullname}}
- +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
+ + +
Minha agenda
+
{{ environment.agendaPR}}
+
{{ environment.agendaVP}}
+
Agenda do {{calendars.Fullname}}
+ +
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 6c23eab19..596d312d2 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 @@ -151,6 +151,8 @@ export class EventsToApprovePage implements OnInit { } + + openSearch() { this.dynamicSearch() } @@ -229,8 +231,8 @@ export class EventsToApprovePage implements OnInit { if (event) { setTimeout(() => { try { - event?.target?.complete(); -} catch(error) {} + event?.target?.complete(); + } catch(error) {} }, 2000); } diff --git a/version/git-version.ts b/version/git-version.ts index 1e8e98f96..f0784a879 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "e8adb78b5", - "SHA": "e8adb78b56cf4a0ac7b11d736d3fe37b35b783e5", + "shortSHA": "cb95084c1", + "SHA": "cb95084c1020acc9cff39b2088445226b668425d", "branch": "developer-prod", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 22 09:22:08 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "5199", + "lastCommitAuthor": "'Eudes Inácio'", + "lastCommitTime": "'Tue Aug 22 11:52:16 2023 +0100'", + "lastCommitMessage": "agenda text change again", + "lastCommitNumber": "5200", "change": "", - "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 1 commit, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/shared/header/header.page.ts", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 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.scss\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file