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 22e2f5b5de2eb52a4b0d0ec00769ecb794552eae..f23aca3da8134dff1d130b6c48d123c1cb847505 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 42a66b7de9949e9462a5178c05c66073f66f943e..978968765a498866704e14a41a3cebed352d3edc 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