From 9c108b6885c45af107b20f1a38cd7e3fe5c2354a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 09:21:07 +0100 Subject: [PATCH 1/8] Create service notification message and roleId service --- .../notification-message.service.spec.ts | 16 +++++++++++++ .../services/notification-message.service.ts | 13 +++++++++++ src/app/services/role-id.service.spec.ts | 16 +++++++++++++ src/app/services/role-id.service.ts | 23 +++++++++++++++++++ version/git-version.ts | 12 +++++----- 5 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 src/app/services/notification-message.service.spec.ts create mode 100644 src/app/services/notification-message.service.ts create mode 100644 src/app/services/role-id.service.spec.ts create mode 100644 src/app/services/role-id.service.ts diff --git a/src/app/services/notification-message.service.spec.ts b/src/app/services/notification-message.service.spec.ts new file mode 100644 index 000000000..0a981ff73 --- /dev/null +++ b/src/app/services/notification-message.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { NotificationMessageService } from './notification-message.service'; + +describe('NotificationMessageService', () => { + let service: NotificationMessageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(NotificationMessageService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/notification-message.service.ts b/src/app/services/notification-message.service.ts new file mode 100644 index 000000000..cdfffc027 --- /dev/null +++ b/src/app/services/notification-message.service.ts @@ -0,0 +1,13 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class NotificationMessageService { + + constructor() { } + + + noInternetConnection = 'Sem acesso à internet. Por favor verifique sua conexão' + +} diff --git a/src/app/services/role-id.service.spec.ts b/src/app/services/role-id.service.spec.ts new file mode 100644 index 000000000..4abe66018 --- /dev/null +++ b/src/app/services/role-id.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { RoleIdService } from './role-id.service'; + +describe('RoleIdService', () => { + let service: RoleIdService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(RoleIdService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/role-id.service.ts b/src/app/services/role-id.service.ts new file mode 100644 index 000000000..3d34116ad --- /dev/null +++ b/src/app/services/role-id.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class RoleIdService { + + constructor() { } + + /** + * @description President role id + */ + PV: number = 100000011 + /** + * @description Vice president role id + */ + PRES: number = 100000014 + /** + * @description Consultant role id + */ + Consultant: number = 99999872 + +} diff --git a/version/git-version.ts b/version/git-version.ts index 1bc78fbce..1b8f4ed60 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "75f56b681", - "SHA": "75f56b681b52b73e83ab1b14a8055846e0db88fb", + "shortSHA": "289cb30a6", + "SHA": "289cb30a6b3f9404d062afb5b39b509171e81781", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Feb 16 12:03:21 2023 +0100'", - "lastCommitMessage": "remove import", - "lastCommitNumber": "4788", + "lastCommitTime": "'Thu Feb 16 15:27:21 2023 +0100'", + "lastCommitMessage": "fix viewer", + "lastCommitNumber": "4789", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/assets/www/pdfjs/web/viewer.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/services/notification-message.service.spec.ts\n\tnew file: src/app/services/notification-message.service.ts\n\tnew file: src/app/services/role-id.service.spec.ts\n\tnew file: src/app/services/role-id.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 207a207398e3f8705bdc6a2914e7f8ea62b8a2e7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 10:57:52 +0100 Subject: [PATCH 2/8] add notification message when theres no internet connection --- src/app/services/notification-message.service.ts | 4 ++-- version/git-version.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/services/notification-message.service.ts b/src/app/services/notification-message.service.ts index cdfffc027..ac5037431 100644 --- a/src/app/services/notification-message.service.ts +++ b/src/app/services/notification-message.service.ts @@ -7,7 +7,7 @@ export class NotificationMessageService { constructor() { } - + /*** @description Sem acesso à internet. Por favor verifique sua conexão */ noInternetConnection = 'Sem acesso à internet. Por favor verifique sua conexão' - + } diff --git a/version/git-version.ts b/version/git-version.ts index 1b8f4ed60..5341ac832 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "289cb30a6", - "SHA": "289cb30a6b3f9404d062afb5b39b509171e81781", + "shortSHA": "9c108b688", + "SHA": "9c108b6885c45af107b20f1a38cd7e3fe5c2354a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Feb 16 15:27:21 2023 +0100'", - "lastCommitMessage": "fix viewer", - "lastCommitNumber": "4789", - "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/services/notification-message.service.spec.ts\n\tnew file: src/app/services/notification-message.service.ts\n\tnew file: src/app/services/role-id.service.spec.ts\n\tnew file: src/app/services/role-id.service.ts", + "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", "changeAuthor": "peter.maquiran" } \ No newline at end of file From f546ee566b1638fa97d3d5f082a3bd2280705201 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:02:19 +0100 Subject: [PATCH 3/8] add role Id to event service --- src/app/services/events.service.ts | 8 ++++---- version/git-version.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 From 1f6717a0ddae017ca5b80711cf442895be8e3bc3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:02:45 +0100 Subject: [PATCH 4/8] add role Id to event service --- src/app/services/events.service.ts | 16 +--------------- version/git-version.ts | 10 +++++----- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index cb61ee3e1..36dcc6b4d 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -256,21 +256,9 @@ export class EventsService { console.log('sharedCalendar.OwnerUserId',e) this.calendarNames[sharedCalendar.CalendarId] = e.FullName this.myCalendarNames[sharedCalendar.CalendarId] = 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") { - this.calendarNamesAry.push(e.Role) - console.log('PR ROLE',this.calendarNamesAry) - } else if (e.Role == "Ministro e Director do Gabinete do PR"){ - this.calendarNamesAry.push(e.Role) - console.log('MD ROLE',this.calendarNamesAry) - } else { - this.calendarNamesAry.push(e.FullName) - console.log('NORMAL ROLE',this.calendarNamesAry) - } */ - //this.calendarRole.push(e.Role) + let objectShared = { "Fullname": e.FullName, "Role": e.Role, @@ -279,7 +267,6 @@ export class EventsService { this.calendarNamesAry.push(objectShared) - console.log('objectShared',this.calendarNamesAry) this.calendarNamesType[e.FullName] = {} } @@ -298,7 +285,6 @@ export class EventsService { if(!this.calendarNamesAry.includes('Meu calendario')) { this.calendarNamesAry.push('Meu calendario') - console.log(this.calendarNamesAry) this.calendarNamesType['Meu calendario'] = {} } diff --git a/version/git-version.ts b/version/git-version.ts index f8e9555b5..6fad97af6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "207a20739", - "SHA": "207a207398e3f8705bdc6a2914e7f8ea62b8a2e7", + "shortSHA": "f546ee566", + "SHA": "f546ee566b1638fa97d3d5f082a3bd2280705201", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 10:57:52 2023 +0100'", - "lastCommitMessage": "add notification message when theres no internet connection", - "lastCommitNumber": "4791", + "lastCommitTime": "'Fri Feb 17 11:02:19 2023 +0100'", + "lastCommitMessage": "add role Id to event service", + "lastCommitNumber": "4792", "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" From 49711802c8cc600d923587be26bc3860bdc1decb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:27:05 +0100 Subject: [PATCH 5/8] set min height for text area box --- src/global.scss | 6 ++++++ version/git-version.ts | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/global.scss b/src/global.scss index 06a847a14..88975c962 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1431,4 +1431,10 @@ ngx-mat-datetime-content button.mat-stroked-button { pre { font-family: 'Roboto' !important; font-size: 12pt !important; +} + + +ion-textarea textarea { + min-height: 137px; + line-height: 21px; } \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 6fad97af6..5bd78abcf 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "f546ee566", - "SHA": "f546ee566b1638fa97d3d5f082a3bd2280705201", + "shortSHA": "1f6717a0d", + "SHA": "1f6717a0ddae017ca5b80711cf442895be8e3bc3", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 11:02:19 2023 +0100'", + "lastCommitTime": "'Fri Feb 17 11:02:45 2023 +0100'", "lastCommitMessage": "add role Id to event service", - "lastCommitNumber": "4792", - "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", + "lastCommitNumber": "4793", + "change": "diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts\nindex b6a4e0dc6..5620b9962 100644\n--- a/src/app/models/user.model.ts\n+++ b/src/app/models/user.model.ts\n@@ -67,10 +67,16 @@ export class UserSession {\n SharedCalendars: {\n CalendarId: string\n CalendarName: \"Oficial\" | \"Pessoal\";\n+ /**\n+ * @description User Role Id\n+ */\n CalendarRoleId: string;\n Id: number;\n OwnerUserId: string;\n TypeShare: number;\n+ /**\n+ * @description deprecated\n+ */\n CalendarToken: string;\n }[]\n UserName: string\ndiff --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/notification-message.service.ts b/src/app/services/notification-message.service.ts\nindex ac5037431..ed36e57b0 100644\n--- a/src/app/services/notification-message.service.ts\n+++ b/src/app/services/notification-message.service.ts\n@@ -10,4 +10,4 @@ export class NotificationMessageService {\n /*** @description Sem acesso à internet. Por favor verifique sua conexão */\n noInternetConnection = 'Sem acesso à internet. Por favor verifique sua conexão'\n \n-}\n+}\n\\ No newline at end of file", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/global.scss\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/models/user.model.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/notification-message.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From ac9e427d4cf742c26fc20dc7eb39c3bfd985a570 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:27:44 +0100 Subject: [PATCH 6/8] Set description for message --- src/app/services/notification-message.service.ts | 2 +- version/git-version.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/services/notification-message.service.ts b/src/app/services/notification-message.service.ts index ac5037431..ed36e57b0 100644 --- a/src/app/services/notification-message.service.ts +++ b/src/app/services/notification-message.service.ts @@ -10,4 +10,4 @@ export class NotificationMessageService { /*** @description Sem acesso à internet. Por favor verifique sua conexão */ noInternetConnection = 'Sem acesso à internet. Por favor verifique sua conexão' -} +} \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 5bd78abcf..f55bf63df 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1f6717a0d", - "SHA": "1f6717a0ddae017ca5b80711cf442895be8e3bc3", + "shortSHA": "49711802c", + "SHA": "49711802c8cc600d923587be26bc3860bdc1decb", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 11:02:45 2023 +0100'", - "lastCommitMessage": "add role Id to event service", - "lastCommitNumber": "4793", - "change": "diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts\nindex b6a4e0dc6..5620b9962 100644\n--- a/src/app/models/user.model.ts\n+++ b/src/app/models/user.model.ts\n@@ -67,10 +67,16 @@ export class UserSession {\n SharedCalendars: {\n CalendarId: string\n CalendarName: \"Oficial\" | \"Pessoal\";\n+ /**\n+ * @description User Role Id\n+ */\n CalendarRoleId: string;\n Id: number;\n OwnerUserId: string;\n TypeShare: number;\n+ /**\n+ * @description deprecated\n+ */\n CalendarToken: string;\n }[]\n UserName: string\ndiff --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/notification-message.service.ts b/src/app/services/notification-message.service.ts\nindex ac5037431..ed36e57b0 100644\n--- a/src/app/services/notification-message.service.ts\n+++ b/src/app/services/notification-message.service.ts\n@@ -10,4 +10,4 @@ export class NotificationMessageService {\n /*** @description Sem acesso à internet. Por favor verifique sua conexão */\n noInternetConnection = 'Sem acesso à internet. Por favor verifique sua conexão'\n \n-}\n+}\n\\ No newline at end of file", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/global.scss\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/models/user.model.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/notification-message.service.ts", + "lastCommitTime": "'Fri Feb 17 11:27:05 2023 +0100'", + "lastCommitMessage": "set min height for text area box", + "lastCommitNumber": "4794", + "change": "diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts\nindex b6a4e0dc6..5620b9962 100644\n--- a/src/app/models/user.model.ts\n+++ b/src/app/models/user.model.ts\n@@ -67,10 +67,16 @@ export class UserSession {\n SharedCalendars: {\n CalendarId: string\n CalendarName: \"Oficial\" | \"Pessoal\";\n+ /**\n+ * @description User Role Id\n+ */\n CalendarRoleId: string;\n Id: number;\n OwnerUserId: string;\n TypeShare: number;\n+ /**\n+ * @description deprecated\n+ */\n CalendarToken: string;\n }[]\n UserName: string\ndiff --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/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/models/user.model.ts\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 From 4b307790b47e9a4c30820cc4d82a6f57952d02b7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:28:12 +0100 Subject: [PATCH 7/8] add description for interface --- src/app/models/user.model.ts | 6 ++++++ version/git-version.ts | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index b6a4e0dc6..5620b9962 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -67,10 +67,16 @@ export class UserSession { SharedCalendars: { CalendarId: string CalendarName: "Oficial" | "Pessoal"; + /** + * @description User Role Id + */ CalendarRoleId: string; Id: number; OwnerUserId: string; TypeShare: number; + /** + * @description deprecated + */ CalendarToken: string; }[] UserName: string diff --git a/version/git-version.ts b/version/git-version.ts index f55bf63df..87518c1eb 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "49711802c", - "SHA": "49711802c8cc600d923587be26bc3860bdc1decb", + "shortSHA": "ac9e427d4", + "SHA": "ac9e427d4cf742c26fc20dc7eb39c3bfd985a570", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 11:27:05 2023 +0100'", - "lastCommitMessage": "set min height for text area box", - "lastCommitNumber": "4794", - "change": "diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts\nindex b6a4e0dc6..5620b9962 100644\n--- a/src/app/models/user.model.ts\n+++ b/src/app/models/user.model.ts\n@@ -67,10 +67,16 @@ export class UserSession {\n SharedCalendars: {\n CalendarId: string\n CalendarName: \"Oficial\" | \"Pessoal\";\n+ /**\n+ * @description User Role Id\n+ */\n CalendarRoleId: string;\n Id: number;\n OwnerUserId: string;\n TypeShare: number;\n+ /**\n+ * @description deprecated\n+ */\n CalendarToken: string;\n }[]\n UserName: string\ndiff --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/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/models/user.model.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", + "lastCommitTime": "'Fri Feb 17 11:27:44 2023 +0100'", + "lastCommitMessage": "Set description for message", + "lastCommitNumber": "4795", + "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/models/user.model.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 From 225b638052a9d339b7da8303165b877baa9ed407 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 17 Feb 2023 11:28:44 +0100 Subject: [PATCH 8/8] relace logguser to sesstion service --- .../book-meeting-modal/book-meeting-modal.page.ts | 7 ++++--- version/git-version.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) 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 index bd5a85f44..7926b8b76 100644 --- 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 @@ -19,6 +19,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker' import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; +import { RoleIdService } from 'src/app/services/role-id.service'; const moment = _rollupMoment || _moment; @@ -116,15 +117,15 @@ export class BookMeetingModalPage implements OnInit { private navParams: NavParams, private attachmentsService: AttachmentsService, public calendarService: EventsService, - authService: AuthService, private toastService: ToastService, public ThemeService: ThemeService, public eventService: EventsService, + public RoleIdService: RoleIdService ) { this.taskParticipants = []; - this.loggeduser = SessionStore.user; + this.task = this.navParams.get('task'); this.postData = new Event(); @@ -256,7 +257,7 @@ export class BookMeetingModalPage implements OnInit { async saveTask() { - if(this.loggeduser.Profile == 'MDGPR') { + if(SessionStore.user.Profile == 'MDGPR') { this.injectValidation() this.runValidation() if(this.Form.invalid) return false diff --git a/version/git-version.ts b/version/git-version.ts index 87518c1eb..a6d4bcada 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ac9e427d4", - "SHA": "ac9e427d4cf742c26fc20dc7eb39c3bfd985a570", + "shortSHA": "4b307790b", + "SHA": "4b307790b47e9a4c30820cc4d82a6f57952d02b7", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Feb 17 11:27:44 2023 +0100'", - "lastCommitMessage": "Set description for message", - "lastCommitNumber": "4795", - "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/models/user.model.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", + "lastCommitTime": "'Fri Feb 17 11:28:12 2023 +0100'", + "lastCommitMessage": "add description for interface", + "lastCommitNumber": "4796", + "change": "", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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