honeymoose
/
sp-dev-fx-webparts
mirror of https://github.com/pnp/sp-dev-fx-webparts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Returning single instance events when no recurring

This commit is contained in:
Sébastien Levert 2020-11-01 15:31:56 -05:00
parent 3d0e617e5b
commit aff8e71649
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
samples/react-graph-calendar/src/webparts/graphCalendar/components/GraphCalendar.tsx
View File

@ -308,11 +308,19 @@ export default class GraphCalendar extends React.Component<IGraphCalendarProps,
if (this.props.showRecurrence) { if (this.props.showRecurrence) {
//Get recurring events and merge with the other (standard) events //Get recurring events and merge with the other (standard) events
this._getRecurringMaster(startDate, endDate).then((recData: Array<EventInput>) => { this._getRecurringMaster(startDate, endDate).then((recData: Array<EventInput>) => {
this._getRecurrentEvents(recData, startDate, endDate).then((recEvents: Array<EventInput>) => {
this.setState({ if(recData.length > 0) {
events: [...recEvents, ...events].slice(0, this.props.limit), this._getRecurrentEvents(recData, startDate, endDate).then((recEvents: Array<EventInput>) => {
this.setState({
events: [...recEvents, ...events].slice(0, this.props.limit),
});
}); });
}); } else {
this.setState({
events: events,
});
}
}); });
} else { } else {
//Show only (standard) events //Show only (standard) events