Compare commits
2 Commits
df3f5fdb58
...
469fa5048c
Author | SHA1 | Date | |
---|---|---|---|
469fa5048c | |||
1aea4d54df |
@ -22,12 +22,11 @@ function convertStringBooleanToBoolean(stringBoolean) {
|
|||||||
|
|
||||||
function wrapBooleanConverter(stringBoolean, res) {
|
function wrapBooleanConverter(stringBoolean, res) {
|
||||||
const temp = convertStringBooleanToBoolean(stringBoolean);
|
const temp = convertStringBooleanToBoolean(stringBoolean);
|
||||||
if(temp === -1) {
|
if(temp == -1) {
|
||||||
res.json({ status: "error", message: "Invalid boolean value" });
|
res.json({ status: "error", message: "Invalid boolean value" });
|
||||||
} else {
|
} else {
|
||||||
return(temp);
|
return(temp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// export { convertStringBooleanToBoolean, wrapBooleanConverter };
|
|
||||||
module.exports = { convertStringBooleanToBoolean, wrapBooleanConverter };
|
module.exports = { convertStringBooleanToBoolean, wrapBooleanConverter };
|
10
index.js
10
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) {
|
app.get("/api/v1/set/layout/showMillis", function (req, res) {
|
||||||
const resy = helper.wrapBooleanConverter(req.query.show, res)
|
const resy = helper.wrapBooleanConverter(req.query.show, res)
|
||||||
if (resy) {
|
if (resy != undefined) {
|
||||||
currentState.showMilliSeconds = resy;
|
currentState.showMilliSeconds = resy;
|
||||||
if (req.query.persist === 'true') {
|
if (req.query.persist === 'true') {
|
||||||
dataToBeWritten.showMilliSeconds = currentState.showMilliSeconds
|
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) {
|
app.get("/api/v1/set/addMillisToTimer", function (req, res) {
|
||||||
currentState.timeAmountInital = req.query.time;
|
currentState.timeAmountInital = req.query.time;
|
||||||
currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time)
|
currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time)
|
||||||
|
currentState.pauseMoment = new Date().getTime();
|
||||||
res.json({ status: "ok" });
|
res.json({ status: "ok" });
|
||||||
updatedData()
|
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) {
|
app.get("/api/v1/set/layout/showTime", function (req, res) {
|
||||||
const resy = helper.wrapBooleanConverter(req.query.show, res)
|
const resy = helper.wrapBooleanConverter(req.query.show, res)
|
||||||
if (resy) {
|
if (resy != undefined) {
|
||||||
currentState.showTimeOnCountdown = resy;
|
currentState.showTimeOnCountdown = resy;
|
||||||
if (req.query.persist === 'true') {
|
if (req.query.persist === 'true') {
|
||||||
dataToBeWritten.showTimeOnCountdown = currentState.showTimeOnCountdown
|
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) {
|
app.get("/api/v1/set/text/colors", function (req, res) {
|
||||||
try {
|
try {
|
||||||
|
if (req.query.copy === "true") {
|
||||||
|
currentState.textColors = currentState.colorSegments
|
||||||
|
res.json({ status: "ok" });
|
||||||
|
} else {
|
||||||
let data = req.query.colors
|
let data = req.query.colors
|
||||||
if (req.query.isBase64 === "true") {
|
if (req.query.isBase64 === "true") {
|
||||||
data = atob(data)
|
data = atob(data)
|
||||||
@ -228,6 +233,7 @@ app.get("/api/v1/set/text/colors", function (req, res) {
|
|||||||
if (req.query.persist === 'true') {
|
if (req.query.persist === 'true') {
|
||||||
dataToBeWritten.textColors = currentState.textColors
|
dataToBeWritten.textColors = currentState.textColors
|
||||||
}
|
}
|
||||||
|
}
|
||||||
res.json({ status: "ok" });
|
res.json({ status: "ok" });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
res.json({ status: "error", message: error });
|
res.json({ status: "error", message: error });
|
||||||
|
@ -6,20 +6,24 @@ function convertTimeOffset() {
|
|||||||
|
|
||||||
function convertColorSegments(elementId) {
|
function convertColorSegments(elementId) {
|
||||||
const raw = document.getElementById(elementId);
|
const raw = document.getElementById(elementId);
|
||||||
console.log(raw)
|
|
||||||
const segmentData = {}
|
const segmentData = {}
|
||||||
for (elm in raw.children) {
|
for (elm in raw.children) {
|
||||||
if (raw.children[elm].nodeName == "TBODY") {
|
if (raw.children[elm].nodeName == "TR") {
|
||||||
const child = raw.children[elm].firstChild.childNodes
|
const child = raw.children[elm].children[1].children[0]
|
||||||
segmentData[child[0].innerText] = child[2].firstChild.value
|
let timeVal = parseInt(raw.children[elm].children[0].children[0].value * 1000);
|
||||||
|
if(Number.isInteger(timeVal)){
|
||||||
|
segmentData[timeVal] = child.style.color
|
||||||
|
} else {
|
||||||
|
segmentData["START"] = child.style.color
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.info(segmentData)
|
console.info(segmentData)
|
||||||
return (segmentData)
|
return (segmentData)
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(function () {
|
||||||
$(".numVal").bind("DOMSubtreeModified", alert);
|
// $(".numVal").bind("DOMSubtreeModified", alert);
|
||||||
|
|
||||||
const modes = ["timer", "clock", "black", "test"]
|
const modes = ["timer", "clock", "black", "test"]
|
||||||
let selectPresetTime = 0;
|
let selectPresetTime = 0;
|
||||||
@ -43,28 +47,58 @@ $(document).ready(function () {
|
|||||||
const tree2 = jsonview.create(dataSystem);
|
const tree2 = jsonview.create(dataSystem);
|
||||||
jsonview.render(tree2, document.getElementById("systemInfo"));
|
jsonview.render(tree2, document.getElementById("systemInfo"));
|
||||||
jsonview.expand(tree2);
|
jsonview.expand(tree2);
|
||||||
// console.log(dataSystem)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
$("#addRow").click(function (event) {
|
$("#addRow").on("click", function (event) {
|
||||||
$("#colors1").append(
|
const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
|
||||||
'<tr>' +
|
let temp = tableEntryDom.innerHTML
|
||||||
'<td contenteditable="true" class="time"></td>' +
|
temp = temp.replace("#COLOR#", "gray");
|
||||||
'<td contenteditable="true" class="color full"><input id="demo-input1" "type="text" value="#COLOR#" data-coloris /></td></td>' +
|
temp = temp.replace("#bg-COLOR#", "gray");
|
||||||
'<td><button type="button" class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">Remove</button></td>' +
|
temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
|
||||||
'</tr>'
|
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) {
|
||||||
$("#colors2").append(
|
const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
|
||||||
'<tr>' +
|
let temp = tableEntryDom.innerHTML
|
||||||
'<td contenteditable="true" class="time"></td>' +
|
temp = temp.replace("#COLOR#", "gray");
|
||||||
'<td contenteditable="true" class="color full"><input id="demo-input2" type="text" value="#COLOR#" data-coloris /></td></td>' +
|
temp = temp.replace("#bg-COLOR#", "gray");
|
||||||
'<td><button type="button" class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">Remove</button></td>' +
|
temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
|
||||||
'</tr>'
|
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])
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@ -93,38 +127,98 @@ $(document).ready(function () {
|
|||||||
// Restore mode radio
|
// Restore mode radio
|
||||||
const currentModeInt = modes.indexOf(jsonResult.mode);
|
const currentModeInt = modes.indexOf(jsonResult.mode);
|
||||||
$("#btnradio" + (currentModeInt + 1))[0].checked = true
|
$("#btnradio" + (currentModeInt + 1))[0].checked = true
|
||||||
|
|
||||||
// Restore layout settings
|
// Restore layout settings
|
||||||
$("#showTime")[0].checked = jsonResult.showTimeOnCountdown;
|
$("#showTime")[0].checked = jsonResult.showTimeOnCountdown;
|
||||||
$("#showMillis")[0].checked = jsonResult.showMilliSeconds;
|
$("#showMillis")[0].checked = jsonResult.showMilliSeconds;
|
||||||
$("#progBarShow")[0].checked = jsonResult.showProgressbar;
|
$("#progBarShow")[0].checked = jsonResult.showProgressbar;
|
||||||
$("#textColors")[0].checked = jsonResult.enableColoredText;
|
$("#textColors")[0].checked = jsonResult.enableColoredText;
|
||||||
|
console.log(document.getElementById("tableCopySource"))
|
||||||
|
|
||||||
|
let tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
|
||||||
|
let currIndex = 0
|
||||||
for (item in jsonResult.colorSegments) {
|
for (item in jsonResult.colorSegments) {
|
||||||
let temp = tableEntry.replace("#VALUE#", item);
|
tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
|
||||||
|
let temp = tableEntryDom.innerHTML
|
||||||
temp = temp.replace("#COLOR#", jsonResult.colorSegments[item]);
|
temp = temp.replace("#COLOR#", jsonResult.colorSegments[item]);
|
||||||
temp = temp.replace("#bg-COLOR#", jsonResult.colorSegments[item]);
|
temp = temp.replace("#bg-COLOR#", jsonResult.colorSegments[item]);
|
||||||
document.getElementById("colors1").innerHTML += temp
|
temp = temp.replace("timeValue-ID", "timeValue-1C" + currIndex)
|
||||||
//console.log(jsonResult.colorSegments[item])
|
|
||||||
|
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;
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("data-toggle", "tooltip")
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("data-placement", "right")// 'data-placement="right" title="Tooltip on right"'
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("title", "You cannot delete the start time")
|
||||||
|
|
||||||
|
tableEntryDom.children[0].innerHTML = '<i class="bi bi-flag-fill"></i> Start'
|
||||||
|
}
|
||||||
|
tableEntryDom.id = "1C" + currIndex
|
||||||
|
tableEntryDom.style.display = "table-row"
|
||||||
|
document.getElementById("colors1").appendChild(tableEntryDom)
|
||||||
|
currIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Text colors
|
// Text colors
|
||||||
|
currIndex = 0
|
||||||
for (item in jsonResult.textColors) {
|
for (item in jsonResult.textColors) {
|
||||||
let temp = tableEntry.replace("#VALUE#", item);
|
tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
|
||||||
|
let temp = tableEntryDom.innerHTML
|
||||||
temp = temp.replace("#COLOR#", jsonResult.textColors[item]);
|
temp = temp.replace("#COLOR#", jsonResult.textColors[item]);
|
||||||
temp = temp.replace("#bg-COLOR#", jsonResult.textColors[item]);
|
temp = temp.replace("#bg-COLOR#", jsonResult.textColors[item]);
|
||||||
document.getElementById("colors2").innerHTML += temp
|
temp = temp.replace("timeValue-ID", "timeValue-1C" + currIndex)
|
||||||
//console.log(jsonResult.textColors[item])
|
|
||||||
|
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;
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("data-toggle", "tooltip")
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("data-placement", "right")// 'data-placement="right" title="Tooltip on right"'
|
||||||
|
tableEntryDom.children[2].children[0].setAttribute("title", "You cannot delete the start time")
|
||||||
|
|
||||||
|
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)
|
||||||
|
currIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$('.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])
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//console.debug(jsonResult, currentModeInt)
|
//console.debug(jsonResult, currentModeInt)
|
||||||
$('.colorPicky').on('colorpickerChange', function (event) {
|
$('.colorPicky').on('colorpickerChange', function (event) {
|
||||||
event.target.parentElement.style.backgroundColor = event.target.value
|
event.target.parentElement.style.backgroundColor = event.target.value
|
||||||
});
|
});
|
||||||
|
|
||||||
$(".deleteRow1").on("click", function removeRowEntry(event) {
|
$(".deleteRow1").on("click", function removeRowEntry(event) {
|
||||||
//console.warn(event.target.parentElement)
|
$(event.target).closest("tr").remove();
|
||||||
$(event.target).closest("tbody").remove();
|
|
||||||
});
|
});
|
||||||
|
$('[data-toggle="tooltip"]').tooltip({container: "body"})
|
||||||
})
|
})
|
||||||
|
|
||||||
$("#copyColors").click(function CopyTextColors(event) {
|
$("#copyColors").click(function CopyTextColors(event) {
|
||||||
@ -174,7 +268,7 @@ $(document).ready(function () {
|
|||||||
$("#applyLayout").click(function (event) {
|
$("#applyLayout").click(function (event) {
|
||||||
$("#applyLayout")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
|
$("#applyLayout")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
|
||||||
|
|
||||||
// Collect all data, build all paths3
|
// Collect all data, build all paths
|
||||||
const allPathes = [];
|
const allPathes = [];
|
||||||
|
|
||||||
const showTimeB = $("#showTime")[0].checked
|
const showTimeB = $("#showTime")[0].checked
|
||||||
|
@ -261,7 +261,7 @@
|
|||||||
<summary>Text Colors</summary>
|
<summary>Text Colors</summary>
|
||||||
<p>
|
<p>
|
||||||
|
|
||||||
<div id="table" class="table-editable">
|
<div id="table2" class="table-editable">
|
||||||
<table class="table table-bordered table-responsive-md table-striped text-center" id="colors2">
|
<table class="table table-bordered table-responsive-md table-striped text-center" id="colors2">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -314,24 +314,51 @@
|
|||||||
</div>
|
</div>
|
||||||
<br><br>
|
<br><br>
|
||||||
<i class="bi-alarm"></i>
|
<i class="bi-alarm"></i>
|
||||||
<templateObj id="tableCopySource">
|
<templateObj>
|
||||||
|
<table class="table table-bordered table-responsive-md table-striped text-center" id="colors1">
|
||||||
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td contenteditable="true" class="time">
|
<th class="text-center">Time</th>
|
||||||
<form>
|
<th class="text-center">Color</th>
|
||||||
<div class="form-group">
|
<th class="text-center">Remove</th>
|
||||||
<label>Duration with seconds</label>
|
</tr>
|
||||||
<input type="text" class="form-control" id="duration2">
|
</thead>
|
||||||
</div>
|
<tr id="tableCopySource">
|
||||||
|
<td contenteditable="false" class="time">
|
||||||
|
<input type="text" class="form-control " id="timeValue-ID" value="#VALUE#">
|
||||||
<value></value>
|
<value></value>
|
||||||
</form>
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
<td contenteditable="true" class="color full"><input id="demo-input2" type="text"
|
<td class="pt-3-half full" contenteditable="false">
|
||||||
value="#COLOR#" data-coloris /></td>
|
<div class="clr-field" style="color: #bg-COLOR#;">
|
||||||
|
<button aria-labelledby="clr-open-label"></button>
|
||||||
|
<input type="text" class="coloris" value="#COLOR#"></div>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<button type="button"
|
<span class="table-remove"><button type="button"
|
||||||
class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">Remove</button>
|
class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">
|
||||||
|
Remove
|
||||||
|
</button></span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<tr><td class="pt-3-half numVal" contenteditable="true">#VALUE#</td>
|
||||||
|
<td class="pt-3-half full" contenteditable="false">
|
||||||
|
<div class="clr-field" style="color: #bg-COLOR#;">
|
||||||
|
<button aria-labelledby="clr-open-label"></button>
|
||||||
|
<input id="demo-input1" type="text" class="coloris" value="#COLOR#"></div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span class="table-remove"><button type="button"
|
||||||
|
class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">
|
||||||
|
Remove
|
||||||
|
</button></span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</templateObj>
|
</templateObj>
|
||||||
@ -377,6 +404,9 @@
|
|||||||
el: '.coloris',
|
el: '.coloris',
|
||||||
alpha: false,
|
alpha: false,
|
||||||
});
|
});
|
||||||
|
$(function () {
|
||||||
|
$('[data-toggle="tooltip"]').tooltip({container: "body"})
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
Loading…
Reference in New Issue
Block a user