diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index d56956843..cb61ee3e1 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -257,7 +257,7 @@ export class EventsService { this.calendarNames[sharedCalendar.CalendarId] = e.FullName this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName - console.log('ROLE',e.Role, e.FullName) + console.log('ROLE',e.Role, e.FullName, e) if(!this.calendarNamesAry.find(x => x.Role == e.Role)) { /* if(e.Role == "Presidente da República") { @@ -273,11 +273,11 @@ export class EventsService { //this.calendarRole.push(e.Role) let objectShared = { "Fullname": e.FullName, - "Role": e.Role + "Role": e.Role, + "RoleId": sharedCalendar.CalendarRoleId } - this.calendarNamesAry.push(objectShared) - + this.calendarNamesAry.push(objectShared) console.log('objectShared',this.calendarNamesAry) this.calendarNamesType[e.FullName] = {} diff --git a/version/git-version.ts b/version/git-version.ts index 5341ac832..f8e9555b5 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9c108b688", - "SHA": "9c108b6885c45af107b20f1a38cd7e3fe5c2354a", + "shortSHA": "207a20739", + "SHA": "207a207398e3f8705bdc6a2914e7f8ea62b8a2e7", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 09:21:07 2023 +0100'", - "lastCommitMessage": "Create service notification message and roleId service", - "lastCommitNumber": "4790", - "change": "diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\nindex bd5a85f44..7926b8b76 100644\n--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n@@ -19,6 +19,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'\n import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';\n import { ThemeService } from 'src/app/services/theme.service'\n import { SessionStore } from 'src/app/store/session.service';\n+import { RoleIdService } from 'src/app/services/role-id.service';\n \n \n const moment = _rollupMoment || _moment;\n@@ -116,15 +117,15 @@ export class BookMeetingModalPage implements OnInit {\n private navParams: NavParams,\n private attachmentsService: AttachmentsService,\n public calendarService: EventsService,\n- authService: AuthService,\n private toastService: ToastService,\n public ThemeService: ThemeService,\n public eventService: EventsService,\n+ public RoleIdService: RoleIdService\n \n \n ) {\n this.taskParticipants = [];\n- this.loggeduser = SessionStore.user;\n+\n this.task = this.navParams.get('task');\n \n this.postData = new Event();\n@@ -256,7 +257,7 @@ export class BookMeetingModalPage implements OnInit {\n \n async saveTask() {\n \n- if(this.loggeduser.Profile == 'MDGPR') {\n+ if(SessionStore.user.Profile == 'MDGPR') {\n this.injectValidation()\n this.runValidation()\n if(this.Form.invalid) return false\ndiff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts\nindex d56956843..cb61ee3e1 100644\n--- a/src/app/services/events.service.ts\n+++ b/src/app/services/events.service.ts\n@@ -257,7 +257,7 @@ export class EventsService {\n this.calendarNames[sharedCalendar.CalendarId] = e.FullName\n this.myCalendarNames[sharedCalendar.CalendarId] = e.FullName\n \n- console.log('ROLE',e.Role, e.FullName)\n+ console.log('ROLE',e.Role, e.FullName, e)\n \n if(!this.calendarNamesAry.find(x => x.Role == e.Role)) {\n /* if(e.Role == \"Presidente da República\") {\n@@ -273,11 +273,11 @@ export class EventsService {\n //this.calendarRole.push(e.Role)\n let objectShared = {\n \"Fullname\": e.FullName,\n- \"Role\": e.Role\n+ \"Role\": e.Role,\n+ \"RoleId\": sharedCalendar.CalendarRoleId\n }\n \n- this.calendarNamesAry.push(objectShared)\n- \n+ this.calendarNamesAry.push(objectShared)\n \n console.log('objectShared',this.calendarNamesAry)\n this.calendarNamesType[e.FullName] = {}", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/notification-message.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/events.service.ts", + "lastCommitTime": "'Fri Feb 17 10:57:52 2023 +0100'", + "lastCommitMessage": "add notification message when theres no internet connection", + "lastCommitNumber": "4791", + "change": "diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\nindex bd5a85f44..7926b8b76 100644\n--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n@@ -19,6 +19,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'\n import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';\n import { ThemeService } from 'src/app/services/theme.service'\n import { SessionStore } from 'src/app/store/session.service';\n+import { RoleIdService } from 'src/app/services/role-id.service';\n \n \n const moment = _rollupMoment || _moment;\n@@ -116,15 +117,15 @@ export class BookMeetingModalPage implements OnInit {\n private navParams: NavParams,\n private attachmentsService: AttachmentsService,\n public calendarService: EventsService,\n- authService: AuthService,\n private toastService: ToastService,\n public ThemeService: ThemeService,\n public eventService: EventsService,\n+ public RoleIdService: RoleIdService\n \n \n ) {\n this.taskParticipants = [];\n- this.loggeduser = SessionStore.user;\n+\n this.task = this.navParams.get('task');\n \n this.postData = new Event();\n@@ -256,7 +257,7 @@ export class BookMeetingModalPage implements OnInit {\n \n async saveTask() {\n \n- if(this.loggeduser.Profile == 'MDGPR') {\n+ if(SessionStore.user.Profile == 'MDGPR') {\n this.injectValidation()\n this.runValidation()\n if(this.Form.invalid) return false", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/events.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file