merge with eudes branch

This commit is contained in:
Peter Maquiran
2024-05-31 12:54:07 +01:00
9 changed files with 256 additions and 145 deletions
@@ -3,7 +3,7 @@ import { AgendaDataService } from './agenda-data.service';
import { catchError, map } from 'rxjs/operators';
import { ListEventMapper } from './mapper/EventListMapper';
import { EventMapper } from './mapper/EventDetailsMapper';
import { Utils } from './utils';
import { Utils } from './utils';
import { EventInputDTO } from './agendaDataModels';
import { Event } from 'src/app/models/event.model';
import { SessionStore } from 'src/app/store/session.service';
@@ -79,11 +79,11 @@ export class AgendaDataRepositoryService {
}
}
createEvent(eventData: Event,CalendarName,documents) {
createEvent(eventData: Event, CalendarName, documents) {
console.log(eventData)
let eventInput = {
userId: this.utils.selectedCalendarUserId(CalendarName,eventData) as any,
userId: this.utils.selectedCalendarUserId(CalendarName, eventData) as any,
ownerType: this.utils.selectedCalendarOwner(CalendarName),
subject: eventData.Subject,
body: eventData.Body.Text,
@@ -102,49 +102,43 @@ export class AgendaDataRepositoryService {
isAllDayEvent: eventData.IsAllDayEvent,
}
this.agendaDataService.createEvent(eventInput).subscribe((value) => {
console.log(value)
},((error) => {
console.log('create event',error)
}));
return this.agendaDataService.createEvent(eventInput)
}
updateEvent(eventId,eventData: Event,CalendarName,documents) {
console.log(this.utils.editeEventCalendarUserId(CalendarName,eventData));
updateEvent(eventId, eventData) {
console.log(eventData.StartDate)
console.log(eventData.EndDate)
let eventInput = {
userId: this.utils.selectedCalendarUserId(CalendarName,eventData),
ownerType: this.utils.selectedCalendarOwner(CalendarName),
subject: eventData.Subject,
body: eventData.Body.Text,
body: eventData.Body.Text || eventData.Body,
location: eventData.Location,
startDate: JSON.stringify(eventData.StartDate),
endDate: JSON.stringify(eventData.EndDate),
type: this.utils.calendarTypeSeleted(eventData.Category),
category: this.utils.calendarCategorySeleted(eventData.CalendarName),
attendees: this.utils.attendeesAdded(eventData.Attendees),
attachments: this.utils.documentAdded(documents),
startDate: eventData.StartDate,
endDate: eventData.EndDate,
isAllDayEvent: eventData.IsAllDayEvent,
updateAllEvents: false,
recurrence: {
frequency: 0,
occurrences: 0,
},
organizerId: SessionStore.user.UserId,
isAllDayEvent: eventData.IsAllDayEvent,
occurrences: 0
}
}
return this.agendaDataService.updateEvent(eventId, eventInput)
}
this.agendaDataService.updateEvent(eventId, eventInput).subscribe((value) => {
console.log(value)
},((error) => {
console.log(error)
}));
addEventAttendee(id,attendeeData) {
return this.agendaDataService.addEventAttendee(id,attendeeData);
}
addEventAttachment(id,attachmentData) {
return this.agendaDataService.addEventAttachment(id,attachmentData);
}
deleteEvent(eventId) {
this.agendaDataService.deleteEvent(eventId,false).subscribe(() => {
console.log()
},((error) => {
console.log(error)
}))
return this.agendaDataService.deleteEvent(eventId, false)
}
removeEventAttachment(eventId,attachmentData) {
return this.agendaDataService.removeEventAttachment(eventId,attachmentData);
}
async deleteEvent1(eventId) {
@@ -157,4 +151,8 @@ export class AgendaDataRepositoryService {
}
}
eventToaprovalStatus(eventId, status) {
return this.agendaDataService.updateEventStatus(eventId,this.utils.statusEventAproval(status))
}
}