From 04c17b83238855b8544a358b6bb0f922102c4ca2 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Tue, 27 Aug 2024 14:36:15 +0200 Subject: [PATCH] Changed Jump time input to two fields --- client/components/dates_popup/dates_popup.js | 40 ++++++++++++++------ 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/client/components/dates_popup/dates_popup.js b/client/components/dates_popup/dates_popup.js index 8ff893e..c5bd3cc 100644 --- a/client/components/dates_popup/dates_popup.js +++ b/client/components/dates_popup/dates_popup.js @@ -16,26 +16,36 @@ class DatesPopup extends HTMLElement{ alertify.warning("Date in the future : using today"); } dateInputValue.setHours(0,0,0,0); - let formattedHour = this.getElementsByClassName("input-time")[0].value; - let timeMs = this.convertTimeStringToTimestamp(formattedHour); + let hours = this.getElementsByClassName("input-time-hour")[0].value; + if(hours < 0 || hours > 23){ + alertify.error("Invalid hours"); + throw RangeError; + } + let minutes = this.getElementsByClassName("input-time-minute")[0].value; + if(minutes < 0 || minutes > 59){ + alertify.error("Invalid minutes"); + throw RangeError; + } + let timeMs = this.convertTimeComponentsToTimestamp(hours, minutes); return [dateInputValue.getTime(), timeMs]; } doJumpCallback(){ - let dateTimeInput = this.getDateTimeInput(); - this.hide(); - this.jumpCallback(dateTimeInput[0], dateTimeInput[1]); + try{ + let dateTimeInput = this.getDateTimeInput(); + this.hide(); + this.jumpCallback(dateTimeInput[0], dateTimeInput[1]); + } + catch(e){} } - convertTimeStringToTimestamp(formattedTime){ - let pieces = formattedTime.split(":"); - return Number(pieces[0])*60*60*1000 + Number(pieces[1])*60*1000; + convertTimeComponentsToTimestamp(hours, minutes){ + return hours*60*60*1000 + minutes*60*1000; } doGoToNowCallback(){ this.hide(); - console.log(this); this.goToNowCallback(); } @@ -82,8 +92,16 @@ class DatesPopup extends HTMLElement{
- - +
+ Date : + +
+
+ Time : + + +
+