mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
git pull made
This commit is contained in:
@@ -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
|
||||
|
||||
+4
-3
@@ -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
|
||||
|
||||
@@ -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'] = {}
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
});
|
||||
@@ -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'
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
});
|
||||
});
|
||||
@@ -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
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user