ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-18 20:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In progress activities that are out of bounds are shown (#7945)

Browse Source 
If an activity is out of bounds, but in progress, display it in the currently visible list.
This commit is contained in:
Shefali Joshi 2024-12-06 14:38:27 -08:00 committed by Andrew Henry
parent bd11b85b6e
commit f890be64ac
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/timelist/TimelistComponent.vue
View File

@ -436,6 +436,9 @@ export default {
return startInBounds || endInBounds || middleInBounds; return startInBounds || endInBounds || middleInBounds;
}, },
isActivityInProgress(activity) {
return this.persistedActivityStates[activity.id] === 'in-progress';
},
filterActivities(activity) { filterActivities(activity) {
if (this.isEditing) { if (this.isEditing) {
return true; return true;
@ -460,7 +463,8 @@ export default {
return false; 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; return false;
} }
//current event or future start event or past end event //current event or future start event or past end event