ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-30 04:13:01 +00:00
Code Issues Releases Wiki Activity

Fix minor front bugs

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-03-16 13:06:02 +01:00 committed by Bombar Maxime
parent dac14b13df
commit 7313e5a337
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
static/js/consos.js
View File

@ -24,40 +24,56 @@ $(document).ready(function() {
}); });
// Switching in double consumptions mode should update the layout // Switching in double consumptions mode should update the layout
$("#double_conso").click(function() { let double_conso_obj = $("#double_conso");
double_conso_obj.click(function() {
$("#consos_list_div").show(); $("#consos_list_div").show();
$("#infos_div").attr('class', 'col-sm-5 col-xl-6'); $("#infos_div").attr('class', 'col-sm-5 col-xl-6');
$("#note_infos_div").attr('class', 'col-xl-3'); $("#note_infos_div").attr('class', 'col-xl-3');
$("#user_select_div").attr('class', 'col-xl-4'); $("#user_select_div").attr('class', 'col-xl-4');
$("#buttons_div").attr('class', 'col-sm-7 col-xl-6'); $("#buttons_div").attr('class', 'col-sm-7 col-xl-6');
if (buttons.length > 0) { let note_list_obj = $("#note_list");
let note_list_obj = $("#note_list"); if (buttons.length > 0 && note_list_obj.text().length > 0) {
$("#consos_list").html(note_list_obj.html()); $("#consos_list").html(note_list_obj.html());
note_list_obj.html(""); note_list_obj.html("");
buttons.forEach(function(button) {
$("#conso_button_" + button.id).click(removeNote(button, "conso_button", buttons,
"consos_list"));
});
} }
}); });
$("#single_conso").click(function() { let single_conso_obj = $("#single_conso");
single_conso_obj.click(function() {
$("#consos_list_div").hide(); $("#consos_list_div").hide();
$("#infos_div").attr('class', 'col-sm-5 col-md-4'); $("#infos_div").attr('class', 'col-sm-5 col-md-4');
$("#note_infos_div").attr('class', 'col-xl-5'); $("#note_infos_div").attr('class', 'col-xl-5');
$("#user_select_div").attr('class', 'col-xl-7'); $("#user_select_div").attr('class', 'col-xl-7');
$("#buttons_div").attr('class', 'col-sm-7 col-md-8'); $("#buttons_div").attr('class', 'col-sm-7 col-md-8');
let consos_list_obj = $("#consos_list");
if (buttons.length > 0) { if (buttons.length > 0) {
if (notes_display.length === 0) { if (notes_display.length === 0 && consos_list_obj.text().length > 0) {
let consos_list_obj = $("#consos_list");
$("#note_list").html(consos_list_obj.html()); $("#note_list").html(consos_list_obj.html());
consos_list_obj.html(""); consos_list_obj.html("");
buttons.forEach(function(button) {
$("#conso_button_" + button.id).click(removeNote(button, "conso_button", buttons,
"note_list"));
});
} }
else { else {
buttons.length = 0; buttons.length = 0;
$("#consos_list").html(""); consos_list_obj.html("");
} }
} }
}); });
// Ensure we begin in single consumption. Removing these lines may cause problems when reloading.
single_conso_obj.prop('checked', 'true');
double_conso_obj.removeAttr('checked');
$("label[for='double_conso']").attr('class', 'btn btn-sm btn-outline-primary');
$("#consos_list_div").hide(); $("#consos_list_div").hide();
$("#consume_all").click(consumeAll); $("#consume_all").click(consumeAll);

4
templates/note/conso_form.html
View File

@ -121,11 +121,11 @@
<i class="fa fa-edit"></i> {% trans "Edit" %} <i class="fa fa-edit"></i> {% trans "Edit" %}
</a> </a>
<div class="btn-group btn-group-toggle float-right" data-toggle="buttons"> <div class="btn-group btn-group-toggle float-right" data-toggle="buttons">
<label class="btn btn-sm btn-outline-primary active"> <label for="single_conso" class="btn btn-sm btn-outline-primary active">
<input type="radio" name="conso_type" id="single_conso" checked> <input type="radio" name="conso_type" id="single_conso" checked>
{% trans "Single consumptions" %} {% trans "Single consumptions" %}
</label> </label>
<label class="btn btn-sm btn-outline-primary"> <label for="double_conso" class="btn btn-sm btn-outline-primary">
<input type="radio" name="conso_type" id="double_conso"> <input type="radio" name="conso_type" id="double_conso">
{% trans "Double consumptions" %} {% trans "Double consumptions" %}
</label> </label>

18
templates/note/transaction_form.html
View File

@ -10,19 +10,19 @@ SPDX-License-Identifier: GPL-2.0-or-later
<div class="row"> <div class="row">
<div class="col-xl-12"> <div class="col-xl-12">
<div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0" data-toggle="buttons"> <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0" data-toggle="buttons">
<label class="btn btn-sm btn-outline-primary active"> <label for="type_gift" class="btn btn-sm btn-outline-primary active">
<input type="radio" name="transaction_type" id="type_gift" checked> <input type="radio" name="transaction_type" id="type_gift" checked>
{% trans "Gift" %} {% trans "Gift" %}
</label> </label>
<label class="btn btn-sm btn-outline-primary"> <label for="type_transfer" class="btn btn-sm btn-outline-primary">
<input type="radio" name="transaction_type" id="type_transfer"> <input type="radio" name="transaction_type" id="type_transfer">
{% trans "Transfer" %} {% trans "Transfer" %}
</label> </label>
<label class="btn btn-sm btn-outline-primary"> <label for="type_credit" class="btn btn-sm btn-outline-primary">
<input type="radio" name="transaction_type" id="type_credit"> <input type="radio" name="transaction_type" id="type_credit">
{% trans "Credit" %} {% trans "Credit" %}
</label> </label>
<label class="btn btn-sm btn-outline-primary"> <label type="type_debit" class="btn btn-sm btn-outline-primary">
<input type="radio" name="transaction_type" id="type_debit"> <input type="radio" name="transaction_type" id="type_debit">
{% trans "Debit" %} {% trans "Debit" %}
</label> </label>
@ -194,6 +194,16 @@ SPDX-License-Identifier: GPL-2.0-or-later
return true; return true;
}); });
// Ensure we begin in gift mode. Removing these lines may cause problems when reloading.
$("#type_gift").prop('checked', 'true');
$("#type_transfer").removeAttr('checked');
$("#type_credit").removeAttr('checked');
$("#type_debit").removeAttr('checked');
$("label[for='type_gift']").attr('class', 'btn btn-sm btn-outline-primary');
$("label[for='type_transfer']").attr('class', 'btn btn-sm btn-outline-primary');
$("label[for='type_debit']").attr('class', 'btn btn-sm btn-outline-primary');
}); });
$("#type_gift").click(function() { $("#type_gift").click(function() {