Fix countdown inital value, fix colortable time pickers

helpers.js

@@ -22,12 +22,11 @@ function convertStringBooleanToBoolean(stringBoolean) {
 
 function wrapBooleanConverter(stringBoolean, res) {
   const temp = convertStringBooleanToBoolean(stringBoolean);
-  if(temp === -1) {
+  if(temp == -1) {
     res.json({ status: "error", message: "Invalid boolean value" });
   } else {
     return(temp);
   }
 }
 
-// export { convertStringBooleanToBoolean, wrapBooleanConverter };
 module.exports = { convertStringBooleanToBoolean, wrapBooleanConverter };

index.js

@@ -131,7 +131,7 @@ app.get("/api/v1/set/mode", function (req, res) {
 
 app.get("/api/v1/set/layout/showMillis", function (req, res) {
   const resy = helper.wrapBooleanConverter(req.query.show, res)
-  if (resy) {
+  if (resy != undefined) {
     currentState.showMilliSeconds = resy;
     if (req.query.persist === 'true') {
       dataToBeWritten.showMilliSeconds = currentState.showMilliSeconds
@@ -151,6 +151,7 @@ app.get("/api/v1/set/timerGoal", function (req, res) {
 app.get("/api/v1/set/addMillisToTimer", function (req, res) {
   currentState.timeAmountInital = req.query.time;
   currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time)
+  currentState.pauseMoment = new Date().getTime();
   res.json({ status: "ok" });
   updatedData()
 });
@@ -180,7 +181,7 @@ app.get("/api/v1/ctrl/timer/restart", function (req, res) {
 
 app.get("/api/v1/set/layout/showTime", function (req, res) {
   const resy = helper.wrapBooleanConverter(req.query.show, res)
-  if (resy) {
+  if (resy != undefined) {
     currentState.showTimeOnCountdown = resy;
     if (req.query.persist === 'true') {
       dataToBeWritten.showTimeOnCountdown = currentState.showTimeOnCountdown
@@ -219,6 +220,10 @@ app.get("/api/v1/set/progressbar/colors", function (req, res) {
 
 app.get("/api/v1/set/text/colors", function (req, res) {
   try {
+    if (req.query.copy === "true") {
+      currentState.textColors = currentState.colorSegments
+      res.json({ status: "ok" });
+    } else {
       let data = req.query.colors
       if (req.query.isBase64 === "true") {
         data = atob(data)
@@ -228,6 +233,7 @@ app.get("/api/v1/set/text/colors", function (req, res) {
       if (req.query.persist === 'true') {
         dataToBeWritten.textColors = currentState.textColors
       }
+    }
     res.json({ status: "ok" });
   } catch (error) {
     res.json({ status: "error", message: error });

static/js/interface.js

@@ -49,31 +49,56 @@ $(function () {
         jsonview.expand(tree2);
     })
 
-    $("#addRow").click(function (event) {
+    $("#addRow").on("click", function (event) {
-        tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+        const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
         let temp = tableEntryDom.innerHTML
         temp = temp.replace("#COLOR#", "gray");
         temp = temp.replace("#bg-COLOR#", "gray");
         temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
+        temp = temp.replace("timeValue-ID", Math.floor(Math.random() * 9999999))
         tableEntryDom.innerHTML = temp;
+        tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+        tableEntryDom.id = Math.floor(Math.random() * 9999999)
         document.getElementById("colors1").appendChild(tableEntryDom)
         $(".deleteRow1").on("click", function removeRowEntry(event) {
             $(event.target).closest("tr").remove();
         });
-
+        $('.timeDurPicker').durationPicker({
+            showSeconds: true,
+            showDays: false,
+            onChanged: function (newVal, test, val2) {
+                //   $('#duration-label2').text(newVal);
+                val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value)
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1])
+            }
+        });
     });
 
-    $("#addRow2").click(function (event) {
+    $("#addRow2").on("click", function (event) {
-        tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+        const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
         let temp = tableEntryDom.innerHTML
         temp = temp.replace("#COLOR#", "gray");
         temp = temp.replace("#bg-COLOR#", "gray");
-        temp = temp.replace("#VALUE#", 60);
+        temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
+        temp = temp.replace("timeValue-ID", Math.floor(Math.random() * 9999999))
         tableEntryDom.innerHTML = temp;
+        tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+        tableEntryDom.id = Math.floor(Math.random() * 9999999)
         document.getElementById("colors2").appendChild(tableEntryDom)
         $(".deleteRow1").on("click", function removeRowEntry(event) {
             $(event.target).closest("tr").remove();
         });
+        $('.timeDurPicker').durationPicker({
+            showSeconds: true,
+            showDays: false,
+            onChanged: function (newVal, test, val2) {
+                //   $('#duration-label2').text(newVal);
+                val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value)
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1])
+            }
+        });
     });
 
     
@@ -122,6 +147,7 @@ $(function () {
             if(item != "START"){
                 temp = temp.replace("#VALUE#", item/1000);
                 tableEntryDom.innerHTML = temp;
+                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
             } else {
                 tableEntryDom.innerHTML = temp;
                 tableEntryDom.children[2].children[0].children[0].disabled = true;
@@ -151,6 +177,7 @@ $(function () {
             if(item != "START"){
                 temp = temp.replace("#VALUE#", item/1000);
                 tableEntryDom.innerHTML = temp;
+                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
             } else {
                 tableEntryDom.innerHTML = temp;
                 tableEntryDom.children[2].children[0].children[0].disabled = true;
@@ -160,6 +187,9 @@ $(function () {
                 
                 tableEntryDom.children[0].innerHTML = '<i class="bi bi-flag-fill"></i> Start'
             }
+            
+            
+            // timeDurPicker
             tableEntryDom.id = "1C" + currIndex
             tableEntryDom.style.display = "table-row"
             document.getElementById("colors2").appendChild(tableEntryDom)
@@ -254,7 +284,7 @@ $(function () {
         allPathes.push("/api/v1/set/progressbar/show?show=" + progBarShowB)
         allPathes.push("/api/v1/set/text/enableColoring?enable=" + textColorsB)
         allPathes.push("/api/v1/set/progressbar/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors)))
-        ///allPathes.push("/api/v1/set/text/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors2)))
+        allPathes.push("/api/v1/set/text/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors2)))
 
 
         for (pI in allPathes) {

templates/newAdminPanel.html

@@ -325,7 +325,7 @@
                         </thead>
                         <tr id="tableCopySource">
                             <td contenteditable="false" class="time">
-                                        <input type="text" class="form-control timeDurPicker" id="timeValue-ID" value="#VALUE#">
+                                        <input type="text" class="form-control " id="timeValue-ID" value="#VALUE#">
                                     <value></value>
                             </td>
                             <td class="pt-3-half full" contenteditable="false">