peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add role Id to event service

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-17 11:02:45 +01:00
parent f546ee566b
commit 1f6717a0dd
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/events.service.ts
+1 -15
View File
@@ -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'] = {}
}
version/git-version.ts
+5 -5
View File
@@ -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 <file>...\" to unstage)\n\tmodified: src/app/services/events.service.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" 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"