DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +9 -9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a29de134f1 - Show all commits

4
kfet/static/kfet/js/kfet.api.js
View file

@ -502,6 +502,10 @@ class Article extends ModelObject {
// API currently returns a string object (serialization of Decimal type within Django) // API currently returns a string object (serialization of Decimal type within Django)
get price() { return this._price; } get price() { return this._price; }
set price(v) { this._price = floatCheck(v); } set price(v) { this._price = floatCheck(v); }
is_low_stock(nb) {
return (-5 <= this.stock - nb && this.stock - nb <= 5);
}
} }

2
kfet/static/kfet/js/kpsul.js
View file

@ -98,7 +98,7 @@ class AccountManager {
$('#id_on_acc').val(this.account.id); $('#id_on_acc').val(this.account.id);
this.display(); this.display();
kpsul.article_manager.focus(); kpsul.focus();
kpsul._env.updateBasketAmount(); kpsul._env.updateBasketAmount();
kpsul._env.updateBasketRel(); kpsul._env.updateBasketRel();
} }

12
kfet/templates/kfet/kpsul.html
View file

@ -191,7 +191,7 @@ $(document).ready(function() {
commentDialog.open({ commentDialog.open({
callback: confirm_callback, callback: confirm_callback,
next_focus: kpsul.article_manager, next_focus: kpsul,
}); });
} }
@ -237,7 +237,7 @@ $(document).ready(function() {
else else
displayErrors(getErrorsHtml(response)); displayErrors(getErrorsHtml(response));
}, },
next_focus: kpsul.article_manager, next_focus: kpsul,
}); });
} }
@ -312,17 +312,13 @@ $(document).ready(function() {
.find('.name').text(article.name).end() .find('.name').text(article.name).end()
.find('.amount').text(amountToUKF(amount_euro, kpsul.account_manager.account.is_cof)); .find('.amount').text(amountToUKF(amount_euro, kpsul.account_manager.account.is_cof));
basket_container.prepend(article_basket_html); basket_container.prepend(article_basket_html);
if (is_low_stock(article, nb)) if (article.is_low_stock(nb))
article_basket_html.find('.lowstock') article_basket_html.find('.lowstock')
.show(); .show();
updateBasketRel(); updateBasketRel();
} }
} }
function is_low_stock(article, nb) {
return (-5 <= article.stock - nb && article.stock - nb <= 5);
}
function addDeposit(amount) { function addDeposit(amount) {
var deposit_basket_html = $(item_basket_default_html); var deposit_basket_html = $(item_basket_default_html);
var amount = parseFloat(amount).toFixed(2); var amount = parseFloat(amount).toFixed(2);
@ -481,7 +477,7 @@ $(document).ready(function() {
} }
if (is_low_stock(article, nb_after)) if (article.is_low_stock(nb_after))
article_html.find('.lowstock') article_html.find('.lowstock')
.show(); .show();
else else