From e82fb04bff8409d6548b50ea0e9f84ca2c68ee74 Mon Sep 17 00:00:00 2001
From: Fanna Lautenbach <lautenbach@astron.nl>
Date: Wed, 13 Sep 2023 17:43:15 +0200
Subject: [PATCH] fix zoom; span length and zoom to current time
---
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss | 4 ++++
.../src/routes/Timeline/helpers/toolbar/zoomandmove.helper.js | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
index 22e2f5b5de2..f23aca3da81 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
@@ -218,6 +218,10 @@
}
.timeline-zoom-and-move {
+ .p-dropdown {
+ width: 7rem !important;
+ }
+
.zoom-selector-container {
margin-right: 1rem;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/toolbar/zoomandmove.helper.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/toolbar/zoomandmove.helper.js
index 42a66b7de99..978968765a4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/toolbar/zoomandmove.helper.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/toolbar/zoomandmove.helper.js
@@ -108,7 +108,8 @@ function getZoomTimesHoursMinutes(selectedZoomLevel, selectedTime) {
* @return {{start: moment, end: moment}}
*/
export function getZoomTimes(selectedZoomLevel, selectedTime, startDate) {
- let newSelectedTime = moment(startDate).format(UIConstants.CALENDAR_DATETIME_FORMAT)
+ const currentTime = moment().utc().format(UIConstants.CALENDAR_TIME_FORMAT).split(":")
+ let newSelectedTime = moment(moment(startDate).set({hour: currentTime[0], minutes: currentTime[1]})).format(UIConstants.CALENDAR_DATETIME_FORMAT)
if (selectedTime !== undefined) {
const selectedMoment = moment(moment(startDate).format(UIConstants.CALENDAR_DEFAULTDATE_FORMAT) + " " + selectedTime, UIConstants.CALENDAR_DATETIME_FORMAT);
newSelectedTime = selectedMoment.isValid() ? selectedMoment : newSelectedTime
--
GitLab