Compare commits

...

12 Commits

Author SHA1 Message Date
Michael Rogers
19e86f2b02 Merge branch 'master' into mct5772 2023-02-06 14:24:07 -06:00
Michael Rogers
eee06e46d9 Adjust hideAll and showAll flags for non-realtime mode 2023-01-19 15:52:55 -06:00
Michael Rogers
7b26903c54 Merge branch 'master' into mct5772 2023-01-19 15:28:45 -06:00
Michael Rogers
f40b40dcc0 Merge branch 'master' into mct5772 2023-01-11 10:46:46 -06:00
Michael Rogers
4f48af34d1 Merge branch 'master' into mct5772 2023-01-09 14:11:08 -06:00
Michael Rogers
94e37fdfc0 Merge branch 'master' into mct5772 2023-01-03 11:58:34 -06:00
Michael Rogers
8ea4bc3b1f Merge branch 'master' into mct5772 2022-12-28 11:57:19 -06:00
Michael Rogers
8ba29a78ea Merge branch 'master' into mct5772 2022-12-15 17:49:43 -06:00
Shefali Joshi
432a911e3c Merge branch 'master' into mct5772 2022-12-12 14:46:08 -08:00
Michael Rogers
22627d2e06 Merge branch 'master' into mct5772 2022-12-05 15:28:36 -06:00
Michael Rogers
7e6d9115d5 Remove unnecessary logic 2022-11-07 15:20:37 -08:00
Michael Rogers
1f03f1e760 Selectively filter activities only for realtime 2022-11-07 15:15:17 -08:00

View File

@@ -198,17 +198,15 @@ export default {
},
setViewFromClock(newClock) {
this.filterValue = this.domainObject.configuration.filter;
const isFixedTime = newClock === undefined;
if (isFixedTime) {
this.isRealTime = newClock !== undefined;
if (!this.isRealTime) {
this.hideAll = false;
this.showAll = true;
// clear invokes listActivities
this.clearPreviousActivities(this.openmct.time.bounds()?.start);
} else {
this.setSort();
this.setViewBounds();
this.listActivities();
}
this.setSort();
this.setViewBounds();
this.listActivities();
},
addItem(domainObject) {
this.planObjects = [domainObject];
@@ -340,7 +338,12 @@ export default {
groups.forEach((key) => {
activities = activities.concat(this.planData[key]);
});
activities = activities.filter(this.filterActivities);
if (this.isRealTime) {
// avoid filtering activities when in fixed time
activities = activities.filter(this.filterActivities);
}
activities = this.applyStyles(activities);
this.setScrollTop();
// sort by start time