github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 12:26:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Possible fix for the chore & battery dropdown clearing issue - #1560

Browse Source
This commit is contained in:
Akos Pinter 2021-08-04 14:06:32 +02:00
parent 53e405c4f8
commit 365a8a2abc
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
public/viewjs/batterytracking.js
View File

@ -122,10 +122,8 @@ function UndoChargeCycle(chargeCycleId)
);
};
$('#battery_id_text_input').on('blur', function(e)
{
if ($('#battery_id').hasClass("combobox-menu-visible"))
{
$('#battery_id_text_input').on('blur', function(e) {
if ($('#battery_id').hasClass("combobox-menu-visible")) {
return;
}
@ -133,26 +131,21 @@ $('#battery_id_text_input').on('blur', function(e)
var possibleOptionElement = [];
// grocycode handling
if (input.startsWith("grcy"))
{
if (input.startsWith("grcy")) {
var gc = input.split(":");
if (gc[1] == "b")
{
if (gc[1] == "b") {
possibleOptionElement = $("#battery_id option[value=\"" + gc[2] + "\"]").first();
}
}
if (possibleOptionElement.length > 0)
{
$('#battery_id').val(possibleOptionElement.val());
$('#battery_id').data('combobox').refresh();
$('#battery_id').trigger('change');
}
else
{
$('#battery_id').val(null);
$('#battery_id_text_input').val("");
$('#battery_id').data('combobox').refresh();
$('#battery_id').trigger('change');
if (possibleOptionElement.length > 0) {
$('#battery_id').val(possibleOptionElement.val());
$('#battery_id').data('combobox').refresh();
$('#battery_id').trigger('change');
} else {
$('#battery_id').val(null);
$('#battery_id_text_input').val("");
$('#battery_id').data('combobox').refresh();
$('#battery_id').trigger('change');
}
}
});

26
public/viewjs/choretracking.js
View File

@ -161,19 +161,19 @@ $('#chore_id_text_input').on('blur', function(e)
{
possibleOptionElement = $("#chore_id option[value=\"" + gc[2] + "\"]").first();
}
}
if (possibleOptionElement.length > 0)
{
$('#chore_id').val(possibleOptionElement.val());
$('#chore_id').data('combobox').refresh();
$('#chore_id').trigger('change');
}
else
{
$('#chore_id').val(null);
$('#chore_id_text_input').val("");
$('#chore_id').data('combobox').refresh();
$('#chore_id').trigger('change');
if (possibleOptionElement.length > 0)
{
$('#chore_id').val(possibleOptionElement.val());
$('#chore_id').data('combobox').refresh();
$('#chore_id').trigger('change');
}
else
{
$('#chore_id').val(null);
$('#chore_id_text_input').val("");
$('#chore_id').data('combobox').refresh();
$('#chore_id').trigger('change');
}
}
});