Merge branch 'Aufinal/backbone' into 'master'
Refactor le JS de K-Psul via Backbone : 2e étape Closes #267 and #290 See merge request klub-dev-ens/gestioCOF!400
This commit is contained in:
commit
db42028228
7 changed files with 325 additions and 248 deletions
|
@ -194,6 +194,18 @@
|
||||||
|
|
||||||
/* Account autocomplete window */
|
/* Account autocomplete window */
|
||||||
|
|
||||||
|
.jconfirm #search_autocomplete {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#account_results {
|
||||||
|
left:0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#account_results ul li.autocomplete-header {
|
||||||
|
display:none;
|
||||||
|
}
|
||||||
|
|
||||||
#account_results ul {
|
#account_results ul {
|
||||||
list-style-type:none;
|
list-style-type:none;
|
||||||
background:rgba(255,255,255,0.9);
|
background:rgba(255,255,255,0.9);
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
.jconfirm .jconfirm-box .content-pane {
|
.jconfirm .jconfirm-box .content-pane {
|
||||||
border-bottom:1px solid #ddd;
|
border-bottom:1px solid #ddd;
|
||||||
margin: 0px !important;
|
margin: 0px !important;
|
||||||
|
/* fixes whitespace below block
|
||||||
|
see https://stackoverflow.com/a/5804278 */
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.jconfirm .jconfirm-box .content {
|
.jconfirm .jconfirm-box .content {
|
||||||
|
@ -51,7 +54,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.jconfirm .jconfirm-box .buttons {
|
.jconfirm .jconfirm-box .buttons {
|
||||||
margin-top:-6px; /* j'arrive pas à voir pk y'a un espace au dessus sinon... */
|
|
||||||
padding:0;
|
padding:0;
|
||||||
height:40px;
|
height:40px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ var Account = Backbone.Model.extend({
|
||||||
'is_frozen': false,
|
'is_frozen': false,
|
||||||
'departement': '',
|
'departement': '',
|
||||||
'nickname': '',
|
'nickname': '',
|
||||||
'trigramme': '',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
url: function () {
|
url: function () {
|
||||||
|
@ -18,8 +17,9 @@ var Account = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
reset: function () {
|
reset: function () {
|
||||||
// On ne veut pas trigger un `change` deux fois
|
// Réinitialise les attributs du modèle à leurs défaults, sauf le trigramme qui est bind à l'input.
|
||||||
this.clear({ silent: true }).set(this.defaults)
|
// On n'utilise pas .clear() car on ne veut pas clear le trigramme.
|
||||||
|
this.set(this.defaults)
|
||||||
},
|
},
|
||||||
|
|
||||||
parse: function (resp, options) {
|
parse: function (resp, options) {
|
||||||
|
@ -31,27 +31,37 @@ var Account = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
view: function () {
|
view: function () {
|
||||||
view_class = this.get("trigramme") == 'LIQ' ? LIQView : AccountView;
|
if (this.is_empty_account()) {
|
||||||
|
view_class = EmptyAccountView
|
||||||
|
} else if (this.get("trigramme") == 'LIQ') {
|
||||||
|
view_class = LIQView
|
||||||
|
} else {
|
||||||
|
view_class = AccountView
|
||||||
|
}
|
||||||
return new view_class({ model: this })
|
return new view_class({ model: this })
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function () {
|
render: function () {
|
||||||
this.view().render();
|
this.view().render();
|
||||||
}
|
},
|
||||||
|
|
||||||
|
is_empty_account: function () {
|
||||||
|
return (this.id == 0)
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
var AccountView = Backbone.View.extend({
|
var AccountView = Backbone.View.extend({
|
||||||
|
|
||||||
el: '#account',
|
el: '#account',
|
||||||
input: '#id_trigramme',
|
|
||||||
buttons: '.buttons',
|
buttons: '.buttons',
|
||||||
|
id_field: "#id_on_acc",
|
||||||
|
|
||||||
props: _.keys(Account.prototype.defaults),
|
props: _.keys(Account.prototype.defaults),
|
||||||
|
|
||||||
get: function (property) {
|
get: function (property) {
|
||||||
/* If the function this.get_<property> is defined,
|
/* If the function this.get_<property> is defined,
|
||||||
we call it ; else we call this.model.<property>. */
|
we call it ; else we call this.model.<property>. */
|
||||||
getter_name = 'get_' + property;
|
getter_name = `get_${property}`;
|
||||||
if (_.functions(this).includes(getter_name))
|
if (_.functions(this).includes(getter_name))
|
||||||
return this[getter_name]()
|
return this[getter_name]()
|
||||||
else
|
else
|
||||||
|
@ -67,9 +77,9 @@ var AccountView = Backbone.View.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
attr_data_balance: function () {
|
attr_data_balance: function () {
|
||||||
if (this.model.id == 0) {
|
// Cette fonction est utilisée uniquement sur un compte valide
|
||||||
return '';
|
|
||||||
} else if (this.model.get("is_frozen")) {
|
if (this.model.get("is_frozen")) {
|
||||||
return "frozen";
|
return "frozen";
|
||||||
} else if (this.model.get("balance") < 0) {
|
} else if (this.model.get("balance") < 0) {
|
||||||
return 'neg';
|
return 'neg';
|
||||||
|
@ -81,23 +91,9 @@ var AccountView = Backbone.View.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
get_buttons: function () {
|
get_buttons: function () {
|
||||||
var buttons = '';
|
var url = django_urls["kfet.account.read"](this.model.get("trigramme"));
|
||||||
if (this.model.id != 0) {
|
|
||||||
var url = django_urls["kfet.account.read"](encodeURIComponent(this.model.get("trigramme")))
|
|
||||||
buttons += `<a href="${url}" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>`;
|
|
||||||
} else {
|
|
||||||
var trigramme = this.$(this.input).val().toUpperCase();
|
|
||||||
if (isValidTrigramme(trigramme)) {
|
|
||||||
trigramme = encodeURIComponent(trigramme);
|
|
||||||
var url_base = django_urls["kfet.account.create"]();
|
|
||||||
var url = `${url_base}?trigramme=${trigramme}`;
|
|
||||||
buttons += `<a href="${url}" class="btn btn-primary" target="_blank" title="Créer"><span class="glyphicon glyphicon-plus"></span></a>`;
|
|
||||||
} else {
|
|
||||||
buttons += '<button class="btn btn-primary search" title="Rechercher"><span class="glyphicon glyphicon-search"></span></button>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return buttons
|
return `<a href="${url}" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>`;
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function () {
|
render: function () {
|
||||||
|
@ -108,16 +104,7 @@ var AccountView = Backbone.View.extend({
|
||||||
|
|
||||||
this.$el.attr("data-balance", this.attr_data_balance());
|
this.$el.attr("data-balance", this.attr_data_balance());
|
||||||
this.$(this.buttons).html(this.get_buttons());
|
this.$(this.buttons).html(this.get_buttons());
|
||||||
},
|
$(this.id_field).val(this.get("id"));
|
||||||
|
|
||||||
reset: function () {
|
|
||||||
for (let prop of this.props) {
|
|
||||||
var selector = "#account-" + prop;
|
|
||||||
this.$(selector).text('');
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$el.attr("data-balance", '');
|
|
||||||
this.$(this.buttons).html(this.get_buttons());
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -131,3 +118,28 @@ var LIQView = AccountView.extend({
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
var EmptyAccountView = AccountView.extend({
|
||||||
|
get: function () {
|
||||||
|
return '';
|
||||||
|
},
|
||||||
|
|
||||||
|
attr_data_balance: function () {
|
||||||
|
return '';
|
||||||
|
},
|
||||||
|
|
||||||
|
get_buttons: function () {
|
||||||
|
/* Léger changement de fonctionnement :
|
||||||
|
on affiche *toujours* le bouton de recherche si
|
||||||
|
le compte est invalide */
|
||||||
|
buttons = '<button class="btn btn-primary search" title="Rechercher"><span class="glyphicon glyphicon-search"></span></button>';
|
||||||
|
trigramme = this.model.get("trigramme")
|
||||||
|
if (trigramme.is_valid_trigramme()) {
|
||||||
|
trigramme = encodeURIComponent(trigramme);
|
||||||
|
var url_base = django_urls["kfet.account.create"]();
|
||||||
|
var url = `${url_base}?trigramme=${trigramme}`;
|
||||||
|
buttons += `<a href="${url}" class="btn btn-primary" target="_blank" title="Créer"><span class="glyphicon glyphicon-plus"></span></a>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return buttons
|
||||||
|
}
|
||||||
|
})
|
|
@ -1,3 +1,17 @@
|
||||||
|
/*
|
||||||
|
* Fonctions d'aide à la gestion de trigrammes
|
||||||
|
*/
|
||||||
|
|
||||||
|
String.prototype.format_trigramme = function () {
|
||||||
|
return this.toUpperCase().substr(0, 3)
|
||||||
|
}
|
||||||
|
|
||||||
|
String.prototype.is_valid_trigramme = function () {
|
||||||
|
var pattern = /^[^a-z]{3}$/;
|
||||||
|
return pattern.test(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CSRF Token
|
* CSRF Token
|
||||||
*/
|
*/
|
||||||
|
@ -92,11 +106,6 @@ function amountToUKF(amount, is_cof=false, account=false) {
|
||||||
return rounding(amount * coef_cof * 10);
|
return rounding(amount * coef_cof * 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
function isValidTrigramme(trigramme) {
|
|
||||||
var pattern = /^[^a-z]{3}$/;
|
|
||||||
return trigramme.match(pattern);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getErrorsHtml(data) {
|
function getErrorsHtml(data) {
|
||||||
var content = '';
|
var content = '';
|
||||||
if (!data)
|
if (!data)
|
||||||
|
|
154
kfet/static/kfet/js/kpsul.js
Normal file
154
kfet/static/kfet/js/kpsul.js
Normal file
|
@ -0,0 +1,154 @@
|
||||||
|
class AccountManager {
|
||||||
|
// Classe pour gérer la partie "compte" de K-Psul
|
||||||
|
// Devrait être la seule interface entre le JS de K-Psul et la logique des comptes.
|
||||||
|
constructor() {
|
||||||
|
// jQuery elements
|
||||||
|
this._$input = $("#id_trigramme");
|
||||||
|
this._$container = $("#account");
|
||||||
|
this._$article_select = $("#article_autocomplete")
|
||||||
|
|
||||||
|
// Subordinated classes
|
||||||
|
this.account = new Account({ "trigramme": "" });
|
||||||
|
this.search = new AccountSearch(this)
|
||||||
|
|
||||||
|
// Initialization
|
||||||
|
this._init_events();
|
||||||
|
}
|
||||||
|
|
||||||
|
get data() {
|
||||||
|
return this.account.toJSON();
|
||||||
|
}
|
||||||
|
|
||||||
|
_init_events() {
|
||||||
|
var that = this;
|
||||||
|
|
||||||
|
// L'input change ; on met à jour le compte
|
||||||
|
this._$input.on("input", () => this.update())
|
||||||
|
|
||||||
|
// Raccourci LIQ
|
||||||
|
this._$input.on("keydown", function (e) {
|
||||||
|
if (e.key == "ArrowDown") {
|
||||||
|
that.set("LIQ")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Fonction de recherche
|
||||||
|
this._$container.on('click', '.search', function () {
|
||||||
|
that.search.open();
|
||||||
|
});
|
||||||
|
|
||||||
|
this._$container.on('keydown', function (e) {
|
||||||
|
if (e.key == "f" && e.ctrlKey) {
|
||||||
|
// Ctrl + F : universal search shortcut
|
||||||
|
that.search.open();
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
set(trigramme) {
|
||||||
|
this._$input.val(trigramme);
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
update() {
|
||||||
|
var trigramme = this._$input.val().format_trigramme();
|
||||||
|
this.account.set({ "trigramme": trigramme })
|
||||||
|
if (trigramme.is_valid_trigramme()) {
|
||||||
|
this.account.fetch({
|
||||||
|
"success": this._on_success.bind(this),
|
||||||
|
"error": this.reset.bind(this, false),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.reset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_on_success() {
|
||||||
|
// On utilise l'objet global window pour accéder aux fonctions nécessaires
|
||||||
|
this.account.render();
|
||||||
|
this._$article_select.focus();
|
||||||
|
window.updateBasketAmount();
|
||||||
|
window.updateBasketRel();
|
||||||
|
}
|
||||||
|
|
||||||
|
reset(hard_reset = false) {
|
||||||
|
this.account.reset();
|
||||||
|
this.account.render();
|
||||||
|
|
||||||
|
if (hard_reset) {
|
||||||
|
this._$input.val("");
|
||||||
|
this.update()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AccountSearch {
|
||||||
|
|
||||||
|
constructor(manager) {
|
||||||
|
this.manager = manager;
|
||||||
|
|
||||||
|
this._content = '<input type="text" name="q" id="search_autocomplete" autocomplete="off" spellcheck="false" autofocus><div id="account_results"></div>';
|
||||||
|
this._input = '#search_autocomplete';
|
||||||
|
this._results_container = '#account_results';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
open() {
|
||||||
|
var that = this;
|
||||||
|
this._$dialog = $.dialog({
|
||||||
|
title: 'Recherche de compte',
|
||||||
|
content: this._content,
|
||||||
|
backgroundDismiss: true,
|
||||||
|
animation: 'top',
|
||||||
|
closeAnimation: 'bottom',
|
||||||
|
keyboardEnabled: true,
|
||||||
|
onOpen: function () {
|
||||||
|
that._$input = $(that._input);
|
||||||
|
that._$results_container = $(that._results_container);
|
||||||
|
that._init_form()
|
||||||
|
._init_events();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
_init_form() {
|
||||||
|
var that = this;
|
||||||
|
|
||||||
|
this._$input.yourlabsAutocomplete({
|
||||||
|
url: django_urls['kfet.account.search.autocomplete'](),
|
||||||
|
minimumCharacters: 2,
|
||||||
|
id: 'search_autocomplete',
|
||||||
|
choiceSelector: '.autocomplete-value',
|
||||||
|
placeholder: "Chercher un utilisateur K-Fêt",
|
||||||
|
container: that._$results_container,
|
||||||
|
box: that._$results_container,
|
||||||
|
fixPosition: function () { },
|
||||||
|
});
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
_init_events() {
|
||||||
|
this._$input.bind('selectChoice',
|
||||||
|
(e, choice, autocomplete) => this._on_select(e, choice, autocomplete)
|
||||||
|
);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
_on_select(e, choice, autocomplete) {
|
||||||
|
// Une option est de la forme "<User> (<trigramme>)"
|
||||||
|
var choice_text = choice.text().trim();
|
||||||
|
var trigramme_regex = /\((.{3})\)$/;
|
||||||
|
// le match est de la forme [<global match>, <group match>]
|
||||||
|
trigramme = choice_text.match(trigramme_regex)[1]
|
||||||
|
this.manager.set(trigramme);
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
close() {
|
||||||
|
if (this._$dialog !== undefined) {
|
||||||
|
this._$dialog.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,6 +10,7 @@
|
||||||
<script type="text/javascript" src="{% static 'kfet/vendor/underscore-min.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/vendor/underscore-min.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'kfet/vendor/backbone-min.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/vendor/backbone-min.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/account.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/account.js' %}"></script>
|
||||||
|
<script type="text/javascript" src="{% static 'kfet/js/kpsul.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}K-Psul{% endblock %}
|
{% block title %}K-Psul{% endblock %}
|
||||||
|
@ -213,124 +214,8 @@ $(document).ready(function() {
|
||||||
// Account data management
|
// Account data management
|
||||||
// -----
|
// -----
|
||||||
|
|
||||||
// Initializing
|
var account_manager = new AccountManager();
|
||||||
var account = new Account()
|
|
||||||
var account_container = $('#account');
|
|
||||||
var triInput = $('#id_trigramme');
|
var triInput = $('#id_trigramme');
|
||||||
var account_data = {};
|
|
||||||
var account_data_default = {
|
|
||||||
'id' : 0,
|
|
||||||
'name' : '',
|
|
||||||
'email': '',
|
|
||||||
'is_cof' : '',
|
|
||||||
'promo' : '',
|
|
||||||
'balance': '',
|
|
||||||
'trigramme' : '',
|
|
||||||
'is_frozen' : false,
|
|
||||||
'departement': '',
|
|
||||||
'nickname' : '',
|
|
||||||
};
|
|
||||||
|
|
||||||
// Search for an account
|
|
||||||
function searchAccount() {
|
|
||||||
var content = '<input type="text" name="q" id="search_autocomplete" spellcheck="false" autofocus><div id="account_results"></div>' ;
|
|
||||||
$.dialog({
|
|
||||||
title: 'Recherche de compte',
|
|
||||||
content: content,
|
|
||||||
backgroundDismiss: true,
|
|
||||||
animation: 'top',
|
|
||||||
closeAnimation: 'bottom',
|
|
||||||
keyboardEnabled: true,
|
|
||||||
|
|
||||||
onOpen: function() {
|
|
||||||
var that=this ;
|
|
||||||
$('input#search_autocomplete').yourlabsAutocomplete({
|
|
||||||
url: '{% url "kfet.account.search.autocomplete" %}',
|
|
||||||
minimumCharacters: 2,
|
|
||||||
id: 'search_autocomplete',
|
|
||||||
choiceSelector: '.choice',
|
|
||||||
placeholder: "Chercher un utilisateur K-Fêt",
|
|
||||||
box: $("#account_results"),
|
|
||||||
fixPosition: function() {},
|
|
||||||
});
|
|
||||||
$('input#search_autocomplete').bind(
|
|
||||||
'selectChoice',
|
|
||||||
function(e, choice, autocomplete) {
|
|
||||||
autocomplete.hide() ;
|
|
||||||
triInput.val(choice.find('.trigramme').text()) ;
|
|
||||||
triInput.trigger('input') ;
|
|
||||||
that.close() ;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
account_container.on('click', '.search', function () {
|
|
||||||
searchAccount() ;
|
|
||||||
}) ;
|
|
||||||
|
|
||||||
account_container.on('keydown', function(e) {
|
|
||||||
if (e.which == 70 && e.ctrlKey) {
|
|
||||||
// Ctrl + F : universal search shortcut
|
|
||||||
searchAccount() ;
|
|
||||||
e.preventDefault() ;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Clear data
|
|
||||||
function resetAccountData() {
|
|
||||||
account_data = account_data_default;
|
|
||||||
$('#id_on_acc').val(0);
|
|
||||||
account.reset();
|
|
||||||
account.view().reset()
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetAccount() {
|
|
||||||
triInput.val('');
|
|
||||||
resetAccountData();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store data
|
|
||||||
function storeAccountData() {
|
|
||||||
account_data = account.toJSON();
|
|
||||||
$('#id_on_acc').val(account.id);
|
|
||||||
account.render();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve via ajax
|
|
||||||
function retrieveAccountData(tri) {
|
|
||||||
account.set({'trigramme': tri});
|
|
||||||
account.fetch({
|
|
||||||
'success': function() {
|
|
||||||
storeAccountData();
|
|
||||||
articleSelect.focus();
|
|
||||||
updateBasketAmount();
|
|
||||||
updateBasketRel();
|
|
||||||
},
|
|
||||||
'error': function() {
|
|
||||||
resetAccountData();
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Event listener
|
|
||||||
triInput.on('input', function() {
|
|
||||||
var tri = triInput.val().toUpperCase();
|
|
||||||
// Checking if tri is valid to avoid sending requests
|
|
||||||
if (isValidTrigramme(tri)) {
|
|
||||||
retrieveAccountData(tri);
|
|
||||||
} else {
|
|
||||||
resetAccountData();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
triInput.on('keydown', function(e) {
|
|
||||||
if (e.keyCode == 40) {
|
|
||||||
// Arrow Down - Shorcut to LIQ
|
|
||||||
triInput.val('LIQ');
|
|
||||||
triInput.trigger('input');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// -----
|
// -----
|
||||||
|
@ -416,7 +301,7 @@ $(document).ready(function() {
|
||||||
// Event listener
|
// Event listener
|
||||||
checkoutInput.on('change', function() {
|
checkoutInput.on('change', function() {
|
||||||
retrieveCheckoutData(checkoutInput.val());
|
retrieveCheckoutData(checkoutInput.val());
|
||||||
if (account_data['trigramme']) {
|
if (account_manager.data['trigramme']) {
|
||||||
articleSelect.focus().select();
|
articleSelect.focus().select();
|
||||||
} else {
|
} else {
|
||||||
triInput.focus().select();
|
triInput.focus().select();
|
||||||
|
@ -752,11 +637,11 @@ $(document).ready(function() {
|
||||||
var amount_euro = - article_data[3] * nb ;
|
var amount_euro = - article_data[3] * nb ;
|
||||||
if (settings['addcost_for']
|
if (settings['addcost_for']
|
||||||
&& settings['addcost_amount']
|
&& settings['addcost_amount']
|
||||||
&& account_data['trigramme'] != settings['addcost_for']
|
&& account_manager.data['trigramme'] != settings['addcost_for']
|
||||||
&& article_data[5])
|
&& article_data[5])
|
||||||
amount_euro -= settings['addcost_amount'] * nb;
|
amount_euro -= settings['addcost_amount'] * nb;
|
||||||
var reduc_divisor = 1;
|
var reduc_divisor = 1;
|
||||||
if (account_data['is_cof'] && article_data[6])
|
if (account_manager.data['is_cof'] && article_data[6])
|
||||||
reduc_divisor = 1 + settings['subvention_cof'] / 100;
|
reduc_divisor = 1 + settings['subvention_cof'] / 100;
|
||||||
return (amount_euro / reduc_divisor).toFixed(2);
|
return (amount_euro / reduc_divisor).toFixed(2);
|
||||||
}
|
}
|
||||||
|
@ -779,7 +664,7 @@ $(document).ready(function() {
|
||||||
.attr('data-opeindex', index)
|
.attr('data-opeindex', index)
|
||||||
.find('.number').text('('+nb+'/'+article_data[4]+')').end()
|
.find('.number').text('('+nb+'/'+article_data[4]+')').end()
|
||||||
.find('.name').text(article_data[0]).end()
|
.find('.name').text(article_data[0]).end()
|
||||||
.find('.amount').text(amountToUKF(amount_euro, account_data['is_cof'], false));
|
.find('.amount').text(amountToUKF(amount_euro, account_manager.data['is_cof'], false));
|
||||||
basket_container.prepend(article_basket_html);
|
basket_container.prepend(article_basket_html);
|
||||||
if (is_low_stock(id, nb))
|
if (is_low_stock(id, nb))
|
||||||
article_basket_html.find('.lowstock')
|
article_basket_html.find('.lowstock')
|
||||||
|
@ -805,7 +690,7 @@ $(document).ready(function() {
|
||||||
.attr('data-opeindex', index)
|
.attr('data-opeindex', index)
|
||||||
.find('.number').text(amount+"€").end()
|
.find('.number').text(amount+"€").end()
|
||||||
.find('.name').text('Charge').end()
|
.find('.name').text('Charge').end()
|
||||||
.find('.amount').text(amountToUKF(amount, account_data['is_cof'], false));
|
.find('.amount').text(amountToUKF(amount, account_manager.data['is_cof'], false));
|
||||||
basket_container.prepend(deposit_basket_html);
|
basket_container.prepend(deposit_basket_html);
|
||||||
updateBasketRel();
|
updateBasketRel();
|
||||||
}
|
}
|
||||||
|
@ -818,7 +703,7 @@ $(document).ready(function() {
|
||||||
.attr('data-opeindex', index)
|
.attr('data-opeindex', index)
|
||||||
.find('.number').text(amount+"€").end()
|
.find('.number').text(amount+"€").end()
|
||||||
.find('.name').text('Édition').end()
|
.find('.name').text('Édition').end()
|
||||||
.find('.amount').text(amountToUKF(amount, account_data['is_cof'], false));
|
.find('.amount').text(amountToUKF(amount, account_manager.data['is_cof'], false));
|
||||||
basket_container.prepend(deposit_basket_html);
|
basket_container.prepend(deposit_basket_html);
|
||||||
updateBasketRel();
|
updateBasketRel();
|
||||||
}
|
}
|
||||||
|
@ -831,7 +716,7 @@ $(document).ready(function() {
|
||||||
.attr('data-opeindex', index)
|
.attr('data-opeindex', index)
|
||||||
.find('.number').text(amount+"€").end()
|
.find('.number').text(amount+"€").end()
|
||||||
.find('.name').text('Retrait').end()
|
.find('.name').text('Retrait').end()
|
||||||
.find('.amount').text(amountToUKF(amount, account_data['is_cof'], false));
|
.find('.amount').text(amountToUKF(amount, account_manager.data['is_cof'], false));
|
||||||
basket_container.prepend(withdraw_basket_html);
|
basket_container.prepend(withdraw_basket_html);
|
||||||
updateBasketRel();
|
updateBasketRel();
|
||||||
}
|
}
|
||||||
|
@ -887,7 +772,7 @@ $(document).ready(function() {
|
||||||
var amount = $(this).find('#id_form-'+opeindex+'-amount');
|
var amount = $(this).find('#id_form-'+opeindex+'-amount');
|
||||||
if (!deleted && type == "purchase")
|
if (!deleted && type == "purchase")
|
||||||
amount.val(amountEuroPurchase(article_id, article_nb));
|
amount.val(amountEuroPurchase(article_id, article_nb));
|
||||||
basket_container.find('[data-opeindex='+opeindex+'] .amount').text(amountToUKF(amount.val(), account_data['is_cof'], false));
|
basket_container.find('[data-opeindex='+opeindex+'] .amount').text(amountToUKF(amount.val(), account_manager.data['is_cof'], false));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -895,7 +780,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
function updateBasketRel() {
|
function updateBasketRel() {
|
||||||
var basketrel_html = '';
|
var basketrel_html = '';
|
||||||
if (account_data['trigramme'] == 'LIQ' && !isBasketEmpty()) {
|
if (account_manager.data['trigramme'] == 'LIQ' && !isBasketEmpty()) {
|
||||||
var amount = - getAmountBasket();
|
var amount = - getAmountBasket();
|
||||||
basketrel_html += '<div>Total: '+amount.toFixed(2)+' €</div>';
|
basketrel_html += '<div>Total: '+amount.toFixed(2)+' €</div>';
|
||||||
if (amount < 5)
|
if (amount < 5)
|
||||||
|
@ -904,11 +789,11 @@ $(document).ready(function() {
|
||||||
basketrel_html += '<div>Sur 10€: '+ (10-amount).toFixed(2) +' €</div>';
|
basketrel_html += '<div>Sur 10€: '+ (10-amount).toFixed(2) +' €</div>';
|
||||||
if (amount < 20)
|
if (amount < 20)
|
||||||
basketrel_html += '<div>Sur 20€: '+ (20-amount).toFixed(2) +' €</div>';
|
basketrel_html += '<div>Sur 20€: '+ (20-amount).toFixed(2) +' €</div>';
|
||||||
} else if (account_data['trigramme'] != '' && !isBasketEmpty()) {
|
} else if (account_manager.data['trigramme'] != '' && !isBasketEmpty()) {
|
||||||
var amount = getAmountBasket();
|
var amount = getAmountBasket();
|
||||||
var amountUKF = amountToUKF(amount, account_data['is_cof'], false);
|
var amountUKF = amountToUKF(amount, account_manager.data['is_cof'], false);
|
||||||
var newBalance = account_data['balance'] + amount;
|
var newBalance = account_manager.data['balance'] + amount;
|
||||||
var newBalanceUKF = amountToUKF(newBalance, account_data['is_cof'], true);
|
var newBalanceUKF = amountToUKF(newBalance, account_manager.data['is_cof'], true);
|
||||||
basketrel_html += '<div>Total: '+amountUKF+'</div>';
|
basketrel_html += '<div>Total: '+amountUKF+'</div>';
|
||||||
basketrel_html += '<div>Nouveau solde: '+newBalanceUKF+'</div>';
|
basketrel_html += '<div>Nouveau solde: '+newBalanceUKF+'</div>';
|
||||||
if (newBalance < 0)
|
if (newBalance < 0)
|
||||||
|
@ -929,7 +814,7 @@ $(document).ready(function() {
|
||||||
var nb_before = formset_container.find("#id_form-"+opeindex+"-article_nb").val();
|
var nb_before = formset_container.find("#id_form-"+opeindex+"-article_nb").val();
|
||||||
var nb_after = parseInt(nb_before) + parseInt(nb);
|
var nb_after = parseInt(nb_before) + parseInt(nb);
|
||||||
var amountEuro_after = amountEuroPurchase(id, nb_after);
|
var amountEuro_after = amountEuroPurchase(id, nb_after);
|
||||||
var amountUKF_after = amountToUKF(amountEuro_after, account_data['is_cof']);
|
var amountUKF_after = amountToUKF(amountEuro_after, account_manager.data['is_cof']);
|
||||||
|
|
||||||
if (type == 'purchase') {
|
if (type == 'purchase') {
|
||||||
if (nb_after == 0) {
|
if (nb_after == 0) {
|
||||||
|
@ -1151,7 +1036,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
function updatePreviousOp() {
|
function updatePreviousOp() {
|
||||||
var previousop_html = '';
|
var previousop_html = '';
|
||||||
var trigramme = account_data['trigramme'];
|
var trigramme = account_manager.data['trigramme'];
|
||||||
previousop_html += '<div class="trigramme">Trigramme : '+trigramme+'</div>';
|
previousop_html += '<div class="trigramme">Trigramme : '+trigramme+'</div>';
|
||||||
previousop_html += basketrel_container.html();
|
previousop_html += basketrel_container.html();
|
||||||
previousop_container.html(previousop_html);
|
previousop_container.html(previousop_html);
|
||||||
|
@ -1293,7 +1178,7 @@ $(document).ready(function() {
|
||||||
// Reset functions
|
// Reset functions
|
||||||
|
|
||||||
function coolReset(give_tri_focus=true) {
|
function coolReset(give_tri_focus=true) {
|
||||||
resetAccount();
|
account_manager.reset(true);
|
||||||
resetBasket();
|
resetBasket();
|
||||||
resetComment();
|
resetComment();
|
||||||
resetSelectable();
|
resetSelectable();
|
||||||
|
@ -1348,7 +1233,7 @@ $(document).ready(function() {
|
||||||
case 113:
|
case 113:
|
||||||
if (e.shiftKey) {
|
if (e.shiftKey) {
|
||||||
// Shift+F2 - Account reset
|
// Shift+F2 - Account reset
|
||||||
resetAccount();
|
account_manager.reset(true);
|
||||||
triInput.focus();
|
triInput.focus();
|
||||||
} else {
|
} else {
|
||||||
// F2 - Basket reset
|
// F2 - Basket reset
|
||||||
|
@ -1380,6 +1265,9 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// On exporte les fonctions nécessaires dans `window`
|
||||||
|
window.updateBasketAmount = updateBasketAmount;
|
||||||
|
window.updateBasketRel = updateBasketRel;
|
||||||
// -----
|
// -----
|
||||||
// Initiliazing all
|
// Initiliazing all
|
||||||
// -----
|
// -----
|
||||||
|
|
Loading…
Reference in a new issue