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 af3dba008..cd6bf13d3 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
@@ -64,6 +64,7 @@ export class BookMeetingModalPage implements OnInit {
public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+ CalendarNamesOptions = ['Oficial', 'Pessoal']
Form: FormGroup;
validateFrom = false
@@ -116,7 +117,9 @@ export class BookMeetingModalPage implements OnInit {
loggeduser: LoginUserRespose;
emptyTextDescription = "Sem intervenientes selecionados";
- CalendarName: 'myCalendar' | 'sharedCalendar' = 'myCalendar'
+ CalendarName = ''
+ CalendarOwnerName = ''
+
sessionStore = SessionStore;
constructor(
@@ -145,17 +148,6 @@ export class BookMeetingModalPage implements OnInit {
this.postData.Category = 'Reunião'
-
-
- if(this.calendarService.hasOwnCalendar == false || !this.calendarService.hasSharedCalendar == false) {
-
- if(this.calendarService.hasOwnCalendar == false && this.calendarService.hasSharedCalendar == true) {
- this.CalendarName = 'sharedCalendar'
- } else if (this.calendarService.hasOwnCalendar == true && this.calendarService.hasSharedCalendar == false) {
- this.CalendarName = 'myCalendar'
- }
-
- }
}
@@ -174,6 +166,29 @@ export class BookMeetingModalPage implements OnInit {
}
+ changeAgenda() {
+
+ setTimeout(() => {
+
+ if(this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) {
+
+ this.CalendarNamesOptions = ['Oficial', 'Pessoal']
+ } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial']) {
+
+ this.CalendarNamesOptions = ['Oficial']
+ this.CalendarName = 'Oficial'
+ } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) {
+
+ this.CalendarNamesOptions = ['Pessoal']
+ this.CalendarName = 'Pessoal'
+ } else {
+
+ this.CalendarNamesOptions = ['Oficial', 'Pessoal']
+ }
+ }, 50)
+
+ }
+
setDefaultTime() {
this.postData.StartDate = new Date()
this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
@@ -278,8 +293,8 @@ export class BookMeetingModalPage implements OnInit {
const loader = this.toastService.loading()
try {
-
- await this.calendarService.genericPostExpedientEvent(this.task.DocId, this.postData, "",this.task.SerialNumber, this.task.FsId, this.CalendarName).toPromise();
+ const CalendarId = this.selectedCalendarId()
+ await this.calendarService.genericPostExpedientEvent(this.task.DocId, this.postData, "",this.task.SerialNumber, this.task.FsId, CalendarId).toPromise();
this.modalController.dismiss();
this.toastService._successMessage('Reunião criada');
@@ -298,7 +313,8 @@ export class BookMeetingModalPage implements OnInit {
const loader = this.toastService.loading()
try {
- await this.calendarService.genericCreateTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "",this.task.SerialNumber, this.task.FsId, this.CalendarName).toPromise();
+ const CalendarId = this.selectedCalendarId()
+ await this.calendarService.genericCreateTaskEvent(this.task.FolderID | this.task.FolderId, this.postData, "",this.task.SerialNumber, this.task.FsId, CalendarId).toPromise();
this.close();
this.toastService._successMessage('Reunião criada');
@@ -315,6 +331,22 @@ export class BookMeetingModalPage implements OnInit {
}
+
+
+ selectedCalendarId () {
+
+ if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial']) {
+ return this.calendarService.calendarNamesType[this.CalendarOwnerName]['OficialId']
+
+ } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) {
+
+ return this.calendarService.calendarNamesType[this.CalendarOwnerName]['PessoalId']
+
+ } else {
+ return '11:11'
+ }
+ }
+
async addParticipants() {
this.adding = "intervenient";
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 353e088c7..b018aac9f 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -1028,7 +1028,7 @@ export class EventsService {
}
- genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, calendar: 'myCalendar' | 'sharedCalendar') {
+ genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) {
const geturl = environment.apiURL + 'calendar/expediente';
let params = new HttpParams();
let options;
@@ -1037,34 +1037,21 @@ export class EventsService {
params = params.set("SerialNumber", serialNumber);
params = params.set("applicationID", applicationID);
- if(calendar == 'myCalendar') {
- if (body.CalendarName == 'Pessoal') {
- options = {
- headers: this.headerOwnPessoal,
- params: params
- }
- }
- else if (body.CalendarName == 'Oficial') {
- options = {
- headers: this.headerOwnOficial,
- params: params
- }
- }
- } else if (calendar == 'sharedCalendar') {
- if (body.CalendarName == 'Pessoal') {
- options = {
- headers: this.headerSharedPessoal,
- params: params
- };
- }
- else if (body.CalendarName == 'Oficial') {
- options = {
- headers: this.headerSharedOficial,
- params: params
- };
- }
- }
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+ const header = headers.find( (header) => {
+ return header?.get('CalendarId')?.includes(CalendarId)
+ })
+
+ options = {
+ headers: header,
+ params: params
+ };
return this.http.post
(`${geturl}`, body, options)
}
@@ -1114,7 +1101,7 @@ export class EventsService {
- genericCreateTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, calendar: 'myCalendar' | 'sharedCalendar') {
+ genericCreateTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) {
const geturl = environment.apiURL + 'calendar/dispatch';
let params = new HttpParams();
let options;
@@ -1123,34 +1110,21 @@ export class EventsService {
params = params.set("SerialNumber", serialNumber);
params = params.set("applicationID", applicationID);
- if(calendar == 'myCalendar') {
- if (body.CalendarName == 'Pessoal') {
- options = {
- headers: this.headerOwnPessoal,
- params: params
- }
- }
- else if (body.CalendarName == 'Oficial') {
- options = {
- headers: this.headerOwnOficial,
- params: params
- }
- }
- } else if (calendar == 'sharedCalendar') {
- if (body.CalendarName == 'Pessoal') {
- options = {
- headers: this.headerSharedPessoal,
- params: params
- };
- }
- else if (body.CalendarName == 'Oficial') {
- options = {
- headers: this.headerSharedOficial,
- params: params
- };
- }
- }
+ const headers = [
+ this.headerSharedOficial,
+ this.headerSharedPessoal,
+ this.headerOwnPessoal,
+ this.headerOwnOficial
+ ]
+ const header = headers.find((header)=> {
+ return header?.get('CalendarId')?.includes(CalendarId)
+ })
+
+ options = {
+ headers: header,
+ params: params
+ }
return this.http.post(`${geturl}`, body, options)
}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index c2a874c1d..2b18ae4e6 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -18,8 +18,8 @@ import { Storage } from '@ionic/storage';
export class EventsToApprovePage implements OnInit {
showLoader: boolean;
- eventsPRList: any = []
- eventsMDGPRList;
+ eventsPRList: any = [];
+ eventsMDGPRList: any = [];
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -41,7 +41,7 @@ export class EventsToApprovePage implements OnInit {
}
ngOnInit() {
- console.log('ERROR LEGN',this.eventsMDGPRList.length)
+ // console.log('ERROR LEGN',this.eventsMDGPRList.length)
this.segment = this.loggeduser.Profile;
this.LoadToApproveEvents();
@@ -67,16 +67,14 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
this.getFromDB();
- if(this.segment != 'PR'){
+ if(this.segment != 'PR') {
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
- console.log(mdEventsOficial)
- console.log(mdEventsPessoal)
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
- })
+ })
console.log(this.eventsMDGPRList)