Skip to content

Commit

Permalink
Merge pull request #7300 from stopfstedt/lg-calendar
Browse files Browse the repository at this point in the history
filter out events that are not in the current week.
  • Loading branch information
dartajax authored Jul 13, 2023
2 parents c095a40 + 9079686 commit 1c634f2
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion app/components/learner-group/calendar.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import Component from '@glimmer/component';
import { cached, tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import { DateTime } from 'luxon';
import { all, map } from 'rsvp';
import { mapBy } from 'ilios-common/utils/array-helpers';
import { TrackedAsyncData } from 'ember-async-data';

export default class LearnerGroupCalendarComponent extends Component {
@service localeDays;
@tracked selectedDate = DateTime.now();
@tracked showSubgroupEvents = false;

Expand All @@ -16,13 +18,27 @@ export default class LearnerGroupCalendarComponent extends Component {
}

get events() {
return this.eventsData.isResolved ? this.eventsData.value : [];
if (this.eventsData.isResolved) {
return this.eventsData.value.filter((ev) => {
const startDate = DateTime.fromISO(ev.startDate).toJSDate();
return this.firstDayOfWeek <= startDate && this.lastDayOfWeek >= startDate;
});
}
return [];
}

get date() {
return this.selectedDate.toJSDate();
}

get firstDayOfWeek() {
return this.localeDays.firstDayOfDateWeek(this.date);
}

get lastDayOfWeek() {
return this.localeDays.lastDayOfDateWeek(this.date);
}

async loadEvents(learnerGroup, showSubgroupEvents) {
let learnerGroups = [learnerGroup];
if (showSubgroupEvents) {
Expand Down

0 comments on commit 1c634f2

Please sign in to comment.