Skip to content

Convert strings to templated #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryceg wants to merge 3 commits into
base: vite-migration
Choose a base branch
from
Open

Convert strings to templated #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb4b5c2
first commit
ryceg Feb 11, 2025
163513f
template string EVERYTHING
ryceg Feb 14, 2025
1c55e42
add prettier config
ryceg Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions frontend/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export default [
caughtErrorsIgnorePattern: "^_",
},
],

"prefer-template": "error",
},
},
{
Expand Down
133 changes: 70 additions & 63 deletions frontend/lib/profile/profileeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ var init = function init() {
if (profile.target_high.length !== profile.target_low.length) {
window.alert(
translate(
"Time ranges of target_low and target_high don't match. Values are restored to defaults.",
),
"Time ranges of target_low and target_high don't match. Values are restored to defaults."
)
);
profile.target_low = _.cloneDeep(defaultprofile.target_low);
profile.target_high = _.cloneDeep(defaultprofile.target_high);
Expand All @@ -189,11 +189,11 @@ var init = function init() {
function initeditor() {
$("#pe_history").toggle(
client.settings.extendedSettings.profile &&
client.settings.extendedSettings.profile.history,
client.settings.extendedSettings.profile.history
);
$("#pe_multiple").toggle(
client.settings.extendedSettings.profile &&
client.settings.extendedSettings.profile.multiple,
client.settings.extendedSettings.profile.multiple
);

// Load timezones
Expand Down Expand Up @@ -235,27 +235,23 @@ var init = function init() {
function initRecord() {
databaseRecords.empty();
for (var r = 0; r < mongorecords.length; r++) {
databaseRecords.append(
'<option value="' +
r +
'">' +
translate("Valid from:") +
" " +
new Date(mongorecords[r].startDate).toLocaleString() +
"</option>",
);
databaseRecords.append(/* HTML */
`
<option value="${r}">
${translate("Valid from:")}
${new Date(mongorecords[r].startDate).toLocaleString()}
</option>
`);
}
databaseRecords.val(currentrecord);

timeInput.val(
client.ctx
.moment(mongorecords[currentrecord].startDate)
.format("HH:mm"),
client.ctx.moment(mongorecords[currentrecord].startDate).format("HH:mm")
);
dateInput.val(
client.ctx
.moment(mongorecords[currentrecord].startDate)
.format("YYYY-MM-DD"),
.format("YYYY-MM-DD")
);

initProfile();
Expand Down Expand Up @@ -288,9 +284,10 @@ var init = function init() {

for (var key in record.store) {
if (Object.prototype.hasOwnProperty.call(record.store, key)) {
$("#pe_profiles").append(
'<option value="' + key + '">' + key + "</option>",
);
$("#pe_profiles").append(/* HTML */
`
<option value="${key}">${key}</option>
`);
}
}

Expand All @@ -309,7 +306,7 @@ var init = function init() {
if (
dirty &&
window.confirm(
translate("Save current record before switching to new?"),
translate("Save current record before switching to new?")
)
) {
profileSubmit();
Expand All @@ -325,7 +322,7 @@ var init = function init() {
if (
dirty &&
window.confirm(
translate("Save current record before switching to new?"),
translate("Save current record before switching to new?")
)
) {
profileSubmit();
Expand Down Expand Up @@ -384,7 +381,7 @@ var init = function init() {
if (
dirty &&
window.confirm(
translate("Save current record before switching to new?"),
translate("Save current record before switching to new?")
)
) {
profileSubmit();
Expand All @@ -397,7 +394,7 @@ var init = function init() {
"srvCreated",
"identifier",
"mills",
]),
])
);
currentrecord = mongorecords.length - 1;
mongorecords[currentrecord].startDate = new Date().toISOString();
Expand Down Expand Up @@ -508,7 +505,7 @@ var init = function init() {
return false;
} else {
var minutesFromMidnight = toMinutesFromMidnight(
c_profile[array][i - 1].time,
c_profile[array][i - 1].time
);
return !isNaN(minutesFromMidnight) && minutesFromMidnight < time * 30;
}
Expand All @@ -525,13 +522,12 @@ var init = function init() {
if (lowest === -1) {
lowest = t * 30;
}
select.append(
'<option value="' +
toTimeString(t * 30) +
'">' +
toDisplayTime(t * 30) +
"</option>",
);
select.append(/* HTML */
`
<option value="${toTimeString(t * 30)}">
${toDisplayTime(t * 30)}
</option>
`);
}
}
var selectedValue =
Expand All @@ -541,7 +537,7 @@ var init = function init() {
tr.append(
$("<td>")
.append(translate("From") + ": ")
.append(select),
.append(select)
);
tr.append(
$("<td>")
Expand All @@ -550,8 +546,8 @@ var init = function init() {
$('<input type="text">')
.attr("id", e.prefix + "_val_" + i)
.attr("value", c_profile[e.array][i].value)
.attr("class", e.prefix + "_value"),
),
.attr("class", e.prefix + "_value")
)
);
var icons_td = $("<td>").append(
$("<img>")
Expand All @@ -560,7 +556,7 @@ var init = function init() {
.attr("title", translate("Add new interval before"))
.attr("src", icon_add)
.attr("array", e.array)
.attr("pos", i),
.attr("pos", i)
);
if (c_profile[e.array].length > 1) {
icons_td.append(
Expand All @@ -570,7 +566,7 @@ var init = function init() {
.attr("title", translate("Delete interval"))
.attr("src", icon_remove)
.attr("array", e.array)
.attr("pos", i),
.attr("pos", i)
);
}
tr.append(icons_td);
Expand All @@ -587,14 +583,14 @@ var init = function init() {
{
prefix: "pe_basal",
array: "basal",
label: translate("Basal rate") + " : ",
label: `${translate("Basal rate")} : `,
},
{
prefix: "pe_ic",
array: "carbratio",
label: translate("I:C") + " : ",
label: `${translate("I:C")} : `,
},
{ prefix: "pe_isf", array: "sens", label: translate("ISF") + " : " },
{ prefix: "pe_isf", array: "sens", label: `${translate("ISF")} : ` },
],
function (e) {
var html = "<table>";
Expand All @@ -613,7 +609,7 @@ var init = function init() {
'" href="#"></td></tr>';
html += "</table>";
$("#" + e.prefix + "_placeholder").html(html);
},
}
);
$(".pe_basal_value").on("change keyup paste", refreshTotalBasal);
$(".addsingle").click(function addsingle_click() {
Expand Down Expand Up @@ -653,7 +649,7 @@ var init = function init() {
toTimeString(t * 30) +
'">' +
toDisplayTime(t * 30) +
"</option>",
"</option>"
);
}
}
Expand All @@ -663,33 +659,33 @@ var init = function init() {
tr.append(
$("<td>")
.append(translate("From") + ": ")
.append(select),
.append(select)
);
tr.append(
$("<td>")
.append(translate("Low") + " : ")
.append(
$('<input type="text">')
.attr("id", "pe_targetbg_low_" + i)
.attr("value", c_profile.target_low[i].value),
),
.attr("value", c_profile.target_low[i].value)
)
);
tr.append(
$("<td>")
.append(translate("High") + " : ")
.append(
$('<input type="text">')
.attr("id", "pe_targetbg_high_" + i)
.attr("value", c_profile.target_high[i].value),
),
.attr("value", c_profile.target_high[i].value)
)
);
var icons_td = $("<td>").append(
$("<img>")
.attr("class", "addtargetbg")
.attr("style", "cursor:pointer")
.attr("title", translate("Add new interval before"))
.attr("src", icon_add)
.attr("pos", i),
.attr("pos", i)
);
if (c_profile.target_low.length > 1) {
icons_td.append(
Expand All @@ -698,7 +694,7 @@ var init = function init() {
.attr("style", "cursor:pointer")
.attr("title", translate("Delete interval"))
.attr("src", icon_remove)
.attr("pos", i),
.attr("pos", i)
);
}
tr.append(icons_td);
Expand All @@ -716,13 +712,24 @@ var init = function init() {
html += addBGLine(i);
}
html +=
'<tr><td></td><td></td><td></td><td><img class="addtargetbg" style="cursor:pointer" title="' +
translate("Add new interval before") +
'" src="' +
icon_add +
'" pos="' +
i +
'" href="#"></td></tr>';
/* HTML */
`
<tr>
<td></td>
<td></td>
<td></td>
<td>
<img
class="addtargetbg"
style="cursor:pointer"
title="${translate("Add new interval before")}"
src="${icon_add}"
pos="${i}"
href="#"
/>
</td>
</tr>
`;
html += "</table>";
$("#pe_targetbg_placeholder").html(html);

Expand Down Expand Up @@ -790,10 +797,10 @@ var init = function init() {
].forEach(function (e) {
for (index = 0; index < c_profile[e.array].length; index++) {
$("#" + e.prefix + "_from_" + index).val(
c_profile[e.array][index].time,
c_profile[e.array][index].time
);
$("#" + e.prefix + "_val_" + index).val(
c_profile[e.array][index].value,
c_profile[e.array][index].value
);
}
});
Expand Down Expand Up @@ -841,10 +848,10 @@ var init = function init() {
].forEach(function (e) {
for (index = 0; index < c_profile[e.array].length; index++) {
c_profile[e.array][index].time = $(
"#" + e.prefix + "_from_" + index,
"#" + e.prefix + "_from_" + index
).val();
c_profile[e.array][index].value = parseFloat(
$("#" + e.prefix + "_val_" + index).val(),
$("#" + e.prefix + "_val_" + index).val()
);
}
});
Expand All @@ -853,11 +860,11 @@ var init = function init() {
var input = $("#pe_targetbg_from_" + index);
c_profile.target_low[index].time = input.val();
c_profile.target_low[index].value = parseFloat(
$("#pe_targetbg_low_" + index).val(),
$("#pe_targetbg_low_" + index).val()
);
c_profile.target_high[index].time = input.val();
c_profile.target_high[index].value = parseFloat(
$("#pe_targetbg_high_" + index).val(),
$("#pe_targetbg_high_" + index).val()
);
}

Expand Down Expand Up @@ -898,7 +905,7 @@ var init = function init() {
profileChange(event);
var record = mongorecords[currentrecord];
record.startDate = new Date(
client.utils.mergeInputTime(timeInput.val(), dateInput.val()),
client.utils.mergeInputTime(timeInput.val(), dateInput.val())
).toISOString();
record.created_at = new Date().toISOString();
record.srvModified = new Date().getTime(); // remove when switching to v3 API
Expand Down
Loading