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

Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon

Browse source
This commit is contained in:
Ludovic Stephan 2016-12-09 17:32:21 -02:00
commit 7485308436
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,11 +48,11 @@
</div>
<div class="row">
<div class="col-xs-3"><b>F2</b></div>
<div class="col-xs-9">Reset compte</div>
<div class="col-xs-9">Reset panier</div>
</div>
<div class="row">
<div class="col-xs-3"><b>Shift + F2</b></div>
<div class="col-xs-9">Reset panier</div>
<div class="col-xs-9">Reset compte</div>
</div>
<div class="row">
<div class="col-xs-3"><b>F9</b></div>
@ -245,12 +245,14 @@ $(document).ready(function() {
if (account_data['id'] != 0) {
var url_base = '{% url 'kfet.account.read' 'LIQ' %}';
url_base = url_base.substr(0, url_base.length - 3);
buttons += '<a href="'+ url_base + account_data['trigramme']+'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
trigramme = encodeURIComponent(account_data['trigramme']) ;
buttons += '<a href="'+ url_base + trigramme +'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
}
if (account_data['id'] == 0) {
var trigramme = triInput.val().toUpperCase();
if (isValidTrigramme(trigramme)) {
var url_base = '{% url 'kfet.account.create' %}'
trigramme = encodeURIComponent(trigramme);
buttons += '<a href="'+url_base+'?trigramme='+trigramme+'" class="btn btn-primary" target="_blank" title="Créer"><span class="glyphicon glyphicon-plus"></span></a>';
} else {
var url_base = '{% url 'kfet.account' %}'
@ -1253,13 +1255,13 @@ $(document).ready(function() {
return false;
case 113:
if (e.shiftKey) {
// Shift+F2 - Basket reset
resetBasket();
articleSelect.focus();
} else {
// F2 - Account reset
// Shift+F2 - Account reset
resetAccount();
triInput.focus();
} else {
// F2 - Basket reset
resetBasket();
articleSelect.focus();
}
return false;
case 114: