Skip to content

Commit

Permalink
In progress activities that are out of bounds are shown (#7945)
Browse files Browse the repository at this point in the history
If an activity is out of bounds, but in progress, display it in the currently visible list.
  • Loading branch information
shefalijoshi authored Dec 6, 2024
1 parent 5bb6a18 commit d74e1b1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/plugins/timelist/TimelistComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@ export default {

return startInBounds || endInBounds || middleInBounds;
},
isActivityInProgress(activity) {
return this.persistedActivityStates[activity.id] === 'in-progress';
},
filterActivities(activity) {
if (this.isEditing) {
return true;
Expand All @@ -460,7 +463,8 @@ export default {
return false;
}

if (!this.isActivityInBounds(activity)) {
// An activity may be out of bounds, but if it is in-progress, we show it.
if (!this.isActivityInBounds(activity) && !this.isActivityInProgress(activity)) {
return false;
}
//current event or future start event or past end event
Expand Down

0 comments on commit d74e1b1

Please sign in to comment.