major recurring event structure changes
This commit is contained in:
@@ -454,7 +454,14 @@ export default function MobileEventForm({ event, eventTypes, userGroups, selecte
|
||||
setSaving(true);
|
||||
try {
|
||||
const body = { title:title.trim(), eventTypeId:typeId||null, startAt:allDay?buildISO(sd,'00:00'):buildISO(sd,st), endAt:allDay?buildISO(ed,'23:59'):buildISO(ed,et), allDay, location, description, isPublic:isToolManager?!isPrivate:false, trackAvailability:track, userGroupIds:[...groups], recurrenceRule:recRule||null };
|
||||
const r = event ? await api.updateEvent(event.id, {...body, recurringScope:scope}) : await api.createEvent(body);
|
||||
let r;
|
||||
if (event) {
|
||||
const updateBody = { ...body, recurringScope: scope };
|
||||
if (event._virtual) updateBody.occurrenceStart = event.start_at;
|
||||
r = await api.updateEvent(event.id, updateBody);
|
||||
} else {
|
||||
r = await api.createEvent(body);
|
||||
}
|
||||
onSave(r.event);
|
||||
} catch(e) { toast(e.message,'error'); }
|
||||
finally { setSaving(false); }
|
||||
|
||||
@@ -648,7 +648,14 @@ function EventForm({ event, userGroups, eventTypes, selectedDate, onSave, onCanc
|
||||
setSaving(true);
|
||||
try{
|
||||
const body={title:title.trim(),eventTypeId:typeId||null,startAt:allDay?buildISO(sd,'00:00'):buildISO(sd,st),endAt:allDay?buildISO(ed,'23:59'):buildISO(ed,et),allDay,location:loc,description:desc,isPublic:isToolManager?pub:false,trackAvailability:track,userGroupIds:[...grps],recurrenceRule:recRule||null};
|
||||
const r=event?await api.updateEvent(event.id,{...body,recurringScope:scope}):await api.createEvent(body);
|
||||
let r;
|
||||
if(event){
|
||||
const updateBody={...body,recurringScope:scope};
|
||||
if(event._virtual) updateBody.occurrenceStart=event.start_at;
|
||||
r=await api.updateEvent(event.id,updateBody);
|
||||
} else {
|
||||
r=await api.createEvent(body);
|
||||
}
|
||||
onSave(r.event);
|
||||
}catch(e){toast(e.message,'error');}finally{setSaving(false);}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user