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/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/src/app/services/events.service.ts b/src/app/services/events.service.ts index d56956843..36dcc6b4d 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -256,30 +256,17 @@ 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) 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 + "Role": e.Role, + "RoleId": sharedCalendar.CalendarRoleId } - this.calendarNamesAry.push(objectShared) + 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/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..ed36e57b0 --- /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() { } + + /*** @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/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/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 07bc5a489..ef0c6423a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d44ca806e", - "SHA": "d44ca806efc86c21048752383dd3b5169e68670e", + "shortSHA": "87d8863d7", + "SHA": "87d8863d7dafa4532fa72e06f94188cb9222c34d", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu Feb 16 15:43:15 2023 +0100'", - "lastCommitMessage": "pull made", - "lastCommitNumber": "4795", + "lastCommitTime": "'Fri Feb 17 12:18:28 2023 +0100'", + "lastCommitMessage": "Verb of the action changed", + "lastCommitNumber": "4796", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 6 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/add-note/add-note.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 7 and 8 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/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/events.service.ts\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\n\tmodified: src/global.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file