Ludovic Stephan
0997d85083
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_history
2017-03-25 12:39:30 -03:00
Ludovic Stephan
5ff8f69bfa
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/refactor_articles
2017-03-25 12:35:04 -03:00
Ludovic Stephan
bc0affc038
Remove autocomplete leftovers
2017-03-25 09:56:36 -03:00
Aurélien Delobelle
72970c6be7
Fix api call on new transfers
...
- Use django-js-reverse
- Replace old url (deleted) with standard url
2017-03-25 09:44:55 +01:00
Ludovic Stephan
44fbc92893
Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/editions
2017-03-24 21:07:32 -03:00
Ludovic Stephan
d7740e66fe
adapt code to is_checkout removal
2017-03-24 20:52:49 -03:00
Aurélien Delobelle
0d02d47d33
move utils functions
2017-03-24 22:05:04 +01:00
Aurélien Delobelle
cb13280458
Merge branch 'master' into 'Aufinal/merge_k-fet'
...
# Conflicts:
# kfet/static/kfet/css/index.css
2017-03-24 20:23:32 +01:00
Ludovic Stephan
aa247b465a
Fix search box (hackish)
2017-03-20 19:08:48 -03:00
Martin Pépin
59f57793ba
typo
2017-03-20 22:05:48 +00:00
Ludovic Stephan
fe965875f7
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-20 00:33:30 -03:00
Ludovic Stephan
c99e4f26d0
Move history initialisation as Config.reset callback
2017-03-19 04:59:55 +01:00
Ludovic Stephan
66c5a6953c
Improve websocket filter for special history pages
2017-03-19 04:29:54 +01:00
Ludovic Stephan
7a00096170
Add support for account_read history
2017-03-18 22:48:50 -03:00
Ludovic Stephan
951932a6c8
Add support and websocket to transfers.html
2017-03-18 22:35:47 -03:00
Ludovic Stephan
fa64a68378
Add strict mode to history.html script
2017-03-18 22:15:09 -03:00
Ludovic Stephan
fc3e86aea6
Add websocket support to ArticleManager
2017-03-18 22:06:30 -03:00
Ludovic Stephan
b8a307b4a6
Add support for kfet/history page
2017-03-18 14:05:11 -03:00
Ludovic Stephan
14b922634d
Remove deprecated history functions
2017-03-18 02:28:01 -03:00
Qwann
fcc2ab8810
frontend working
2017-03-17 19:17:36 +01:00
Ludovic Stephan
11603cee69
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-17 00:19:45 -03:00
Ludovic Stephan
f0a80561ed
Add article display to Config callback
2017-03-16 22:24:57 -03:00
Martin Pépin
55b67f38c8
Notice the users about the α-numeric restriction
...
Add a help text above the two autocompletion inputs letting the users
know that non-alphanumeric characters will not be used.
2017-03-16 23:16:56 +00:00
Ludovic Stephan
3793863bab
Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet
2017-03-15 22:58:54 -03:00
Ludovic Stephan
ab6b0d52f2
Merge branch 'Aufinal/transferts_historique' into Aufinal/refactor_history
2017-03-11 00:45:54 -03:00
Qwann
5ddcd2f1ff
Merge branch 'k-fet' into qwann/k-fet/home
2017-03-10 16:58:10 +01:00
Ludovic Stephan
e1abff2242
last tweaks
2017-03-09 22:31:59 -03:00
Ludovic Stephan
fe8e5d7e46
move and adapt manager and completion
2017-03-09 09:20:23 -03:00
Qwann
ca17e36b5a
clean display for is_sold
2017-03-06 02:03:19 +01:00
Qwann
dcc19bd9e8
article.hidden in article & article_read
2017-03-06 01:58:33 +01:00
Ludovic Stephan
8e31fae340
last tweaks
2017-03-05 21:29:20 -03:00
Ludovic Stephan
61e2fedb08
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/command_interface
2017-03-05 21:12:53 -03:00
Qwann
197da29366
css include added...
2017-03-05 20:05:35 +01:00
Qwann
b0b2210e93
Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home
2017-03-05 19:44:08 +01:00
Qwann
9f94262b82
removing inapropriate message
2017-03-05 19:43:26 +01:00
Qwann
f52aba8ca6
Merge branch 'k-fet' into qwann/k-fet/home
2017-03-05 19:21:20 +01:00
Ludovic Stephan
643503269e
add Article and Category models
2017-03-02 06:50:47 -03:00
Aurélien Delobelle
95b129e396
resolved merge conflict in kfet views imports
2017-02-25 02:00:56 +01:00
Aurélien Delobelle
a9cb50b38d
Better k-fet js and more
...
JavaScript
----------
- Basic classes that can be inherited to define a new class for a
django model in javascript.
- Formatters classes are used to render properties and attributes of
the instances of models classes.
- New classes to handle Account, Checkout, Statement models.
- Refactor K-Psul JS (part n/m).
- Better file organization.
Views
-----
- 'kpsul.checkout_data' is cleaner. Last statement is added to the JSON
response with GET paramater 'last_statement'.
- 'account.read.json' is merged in account.read. JSON response is sent if
GET parametter 'format' is set to 'json'.
- Fix PEP8 of concerned views.
New requirement: django-js-reverse
----------------------------------
Used to resolve the URLs defined in the project in JavaScript.
See https://github.com/ierror/django-js-reverse
2017-02-23 22:07:38 +01:00
Evarin
0fcb29252b
Frontend tout en JS
2017-02-15 21:01:54 +01:00
Aurélien Delobelle
ee848d210e
refactor account k-psul js - part 2/?
...
- les événements de AccountSearch sont enregistrés depuis ces classes (plus depuis le manager)
- ajout d'une classe AccountSelection s'occupant de la sélection d'un
compte par l'utilisateur
- la méthode update de AccountManager peut maintenant prendre un
trigramme et le set correctement, à défaut elle récupère le trigramme
via AccountSelection
2017-02-15 14:09:20 +01:00
Qwann
9cae3ad0bd
Merge branch 'k-fet' into qwann/k-fet/stats
2017-02-13 14:37:29 +01:00
Ludovic Stephan
83e41c292e
css tweaks
2017-02-13 11:34:47 -02:00
Ludovic Stephan
43aab26530
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock
2017-02-13 10:51:24 -02:00
Aurélien Delobelle
fdcf4c3ab0
fix property location
2017-02-13 13:48:57 +01:00
Aurélien Delobelle
d9fc683525
update account_data[] to account_manager.account.
2017-02-13 00:41:41 +01:00
Aurélien Delobelle
890be9b343
refactor account k-psul js - part 1
...
- nouvelle classe - Account: stocke, sert et récupère les données
associées à un compte
- nouvelle classe - AccountManager: interface pour le management de la
partie Account de K-Psul
- nouvelle classe - AccountSearch: module de recherche d'un compte
- nouvelles classes - AccountFormatter, StandardAccountFormatter,
LIQAccountFormatter: styles de formattage des données d'un compte
- désactive l'autocomplétion dans la recherche d'un compte
- fix #89 : "Entrée" dans le champ de trigramme met le compte LIQ
2017-02-13 00:23:32 +01:00
Ludovic Stephan
3fa0e4de6c
different rounding for accounts
2017-02-12 19:05:41 -02:00
Ludovic Stephan
3dfd8bf616
interface for order_to_inventory
2017-02-12 18:04:50 -02:00
Ludovic Stephan
031b992fa3
fix brackets & lowstock indication
2017-02-12 11:09:03 -02:00
Ludovic Stephan
99d04fb75e
bugfix
2017-02-12 11:02:54 -02:00
Aurélien Delobelle
5c7a1d6874
Refactor JS Settings K-Psul
...
- change name: Settings -> Config
- provide interface `Config` to get/set parameters
- `Config` uses global object `window.config` to store key/value
- `Config` setters handle types
2017-02-12 13:26:02 +01:00
Aurélien Delobelle
8279bddf4e
clean js k-psul
...
- K-Psul JavaScript uses strict-mode (when JS try to do better things,
we should follow)
2017-02-12 06:10:17 +01:00
Ludovic Stephan
db899a891b
css tweaks
2017-02-12 02:03:41 -02:00
Ludovic Stephan
15d79aff2d
add help tooltips
2017-02-12 00:48:24 -02:00
Ludovic Stephan
be8eb4ac28
add (temporary) better presentation
2017-02-12 00:01:22 -02:00
Ludovic Stephan
481409253b
simpler string pluralizing
2017-02-11 21:44:32 -02:00
Qwann
6be2adc47a
removing "open-Kfet-feature"
...
to keep it for an other merge request
2017-02-08 12:47:11 +01:00
Qwann
a4fdb99267
Revert "WS : quand la K-Fêt est ouverte ?"
...
This reverts commit ce9f717f06
2017-02-08 12:42:07 +01:00
Ludovic Stephan
db94a8904c
remove addition of new opegroups
2017-02-07 18:45:57 -02:00
Ludovic Stephan
2394a5e5d2
add low stock css to WS
2017-02-05 21:38:13 -02:00
Ludovic Stephan
95e96d8ce5
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock
2017-02-05 19:56:34 -02:00
Ludovic Stephan
1ea334341b
ws update for history and transfer pages
2017-02-05 03:04:41 -02:00
Ludovic Stephan
f8aa67721c
fix socket update
2017-02-05 02:19:20 -02:00
Ludovic Stephan
8895daff6a
Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique
2017-02-04 23:22:54 -02:00
Martin Pepin
5b0dc1a07f
Merge branch 'fix/117' into 'k-fet'
...
Fix #117 .
Not tested because there's no unittests.
Reviewed by @manet.
See merge request !134
2017-02-04 11:23:30 +01:00
Qwann
1275fdff99
fixes #127
...
fixing stock update
2017-01-31 16:00:44 +01:00
Qwann
ce9f717f06
WS : quand la K-Fêt est ouverte ?
2017-01-27 21:46:21 +01:00
Qwann
5cedabf5a8
Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home
2017-01-27 12:15:47 +01:00
Qwann
a13c40736c
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats
2017-01-27 11:54:50 +01:00
Qwann
3ca38bd8e9
Carte done.
2017-01-26 17:19:42 +01:00
Martin Pepin
75ff77c4ec
Merge branch 'Aufinal/search_account' into 'k-fet'
...
Popup de recherche de compte
Quand on clique sur l'icone de recherche (ou qu'on appuie sur Ctrl+F depuis la zone de saisie de trigramme) un popup apparaît pour rechercher les comptes par prénom ou par nom, en utilisant `autocomplete`.
Fix #109
See merge request !153
2017-01-25 23:58:08 +01:00
Qwann
a63966b2f6
carte styling done
2017-01-25 23:41:16 +01:00
Qwann
0d1cece6db
adding columns features
2017-01-24 19:56:58 +01:00
Qwann
61a7f2df1e
sourcing get_thing in a js file
2017-01-20 21:05:22 +01:00
Qwann
232b293052
typos fixed
2017-01-20 20:27:24 +01:00
Qwann
de3db1405e
Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats
2017-01-20 18:53:49 +01:00
Ludovic Stephan
832dc0ce10
Search shortcut
2017-01-19 22:54:11 -02:00
Ludovic Stephan
016989c4de
search results css
2017-01-19 22:53:58 -02:00
Ludovic Stephan
e7956f3b62
Account search w/ autocomplete
2017-01-19 12:36:40 -02:00
Ludovic Stephan
88aec52141
PEP8 + typo
2017-01-19 01:22:04 -02:00
Ludovic Stephan
d6e13dbd61
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock
2017-01-16 23:57:27 -02:00
Martin Pépin
540b6f38b8
Merge branch 'master' into Kerl/ldap
2017-01-09 15:47:12 +01:00
Aurélien Delobelle
dd43f9d868
Merge branch 'Aufinal/previous_op' into 'k-fet'
...
Rappel de l'opération précédente sur K-Psul
Rajoute un champ d'informations sur la précédente opération validée (sur
la machine, pas sur le serveur) : valeur du panier et solde restant dans
le cas d'un utilisateur, et valeur du panier et rendus de monnaie dans
le cas d'une opération en liquide.
Fix #110
See merge request !146
2017-01-07 02:33:53 +01:00
Aurélien Delobelle
a34732cc9d
ajouts supp. previous_op
...
- Le trigramme est obtenu à partir de ``account_data`` qui contient les
données traitées et validées relatives au compte en train de commander.
- L'opération précédente disparaît en cas de ``hard reset``
2017-01-07 02:28:19 +01:00
Martin Pépin
3c7558c853
The end of Clipper
...
GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.
2016-12-25 11:57:50 +01:00
Qwann
219835be17
putting away some code for future improvments
2016-12-24 12:42:35 +01:00
Qwann
de9387c6ad
cleaning: PEP8, html, permissions
2016-12-24 12:34:11 +01:00
Ludovic Stephan
b27a2d0720
mise en valeur du trigramme
2016-12-22 01:29:40 -02:00
Ludovic Stephan
5267a8a368
add previous op recap
2016-12-22 01:13:14 -02:00
Qwann
7070129add
evolution de la balance\n premier jet
2016-12-21 11:51:08 +01:00
Qwann
ccf7c4a484
ma conso added
2016-12-20 22:46:38 +01:00
Ludovic Stephan
e981cad405
css tweaks
2016-12-20 16:48:09 -02:00
Ludovic Stephan
5784b4d20a
change stock warning CSS for basket
2016-12-20 01:09:22 -02:00
Michele Orrù
783332bbe0
Fix #117 .
...
Not tested because there's no unittests.
Reviewed by @manet.
2016-12-19 19:52:30 +01:00
Ludovic Stephan
4db55efb67
change stock warning threshold
2016-12-14 23:40:42 -02:00
Ludovic Stephan
75be9fd2a6
display stock with mouse selection
2016-12-14 23:40:23 -02:00
Ludovic Stephan
b7ebf4ee1c
add stock to article selection
2016-12-13 22:31:52 -02:00
Ludovic Stephan
080ff0f821
warning if not enough stock
2016-12-13 01:41:59 -02:00
Ludovic Stephan
711ef7e97b
one line by article id
2016-12-13 01:13:16 -02:00
Ludovic Stephan
9443f86298
use arrow keys to add/remove article
2016-12-13 01:11:35 -02:00
Ludovic Stephan
437233fd10
functions to change purchase amount
2016-12-13 00:33:25 -02:00
Ludovic Stephan
5492ecf534
add ukf for price visibility
2016-12-13 00:32:52 -02:00
Ludovic Stephan
ee54b36696
minor imprevements to history
2016-12-11 23:22:59 -02:00
Ludovic Stephan
3f35dc2c06
unite transfer history
2016-12-11 23:21:36 -02:00
Qwann
4da9327666
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats
2016-12-11 20:45:52 +01:00
Ludovic Stephan
2c2da60e54
send data for cancel
2016-12-10 23:52:26 -02:00
Ludovic Stephan
0b61a48c65
fix selection
2016-12-10 23:13:43 -02:00
Qwann
14f021b5b0
WIP articleCategory stat
2016-12-10 23:06:38 +01:00
Qwann
d19daa04b1
resuming views for stat
2016-12-10 17:33:24 +01:00
Qwann
3a7ffefacf
week & day stat
2016-12-09 21:45:34 +01:00
Qwann
e4c8209df8
first tests
2016-12-09 21:44:38 +01:00
Ludovic Stephan
7485308436
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon
2016-12-09 17:32:21 -02:00
Aurélien Delobelle
e63e56371d
Merge branch 'Aufinal/encode_trigramme' into 'k-fet'
...
K-Psul - Fix: Lien -> création/modification de comptes
Le javascript de K-Psul encode maintenant les caractères spéciaux (dont `, / ? : @ & = + $ # "`) afin de pouvoir avoir accès aux comptes en question sans bugs.
See merge request !131
2016-12-09 17:30:11 +01:00
Ludovic Stephan
21cf783144
add special character encoding
2016-12-09 01:05:30 -02:00
Ludovic Stephan
d05ed86c17
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/F2_invert
2016-12-09 00:44:39 -02:00
Ludovic Stephan
4453b504da
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon
2016-12-09 00:44:07 -02:00
Ludovic Stephan
3a68c6c9f1
add search button
2016-12-09 00:43:23 -02:00
Ludovic Stephan
d972af6854
update help
2016-12-09 00:33:18 -02:00
Ludovic Stephan
e725a10026
invert F2 and Shift+F2
2016-12-09 00:32:44 -02:00
Ludovic Stephan
cbf1e234b8
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/indication_raccourcis
2016-12-04 00:22:19 -02:00
Aurélien Delobelle
17f2202f0e
Merge branch 'Aufinal/freeze_transferts' into 'k-fet'
...
Fix un freeze dans l'écran de tranfert
Vide l'input caché lorsque le trigramme correspondant est effacé ; effacer une ligne de transfert n'empêche plus de valider le groupe.
Note : ne fonctionne pas sur la première ligne ; à cause de la façon dont django gère le nombre minimal de forms, celle ci doit toujours être remplie.
Fix #98
See merge request !118
2016-12-03 18:12:34 +01:00
Ludovic Stephan
65272450f8
change to Shift after consultation
2016-12-02 00:24:49 -02:00
Ludovic Stephan
ab0ed097cf
indication raccourcis
2016-11-30 23:12:58 -02:00
Ludovic Stephan
92b422697b
rebase kfet
2016-11-17 17:44:44 -02:00
Ludovic Stephan
9960e7e37e
rebase kfet
2016-11-17 16:51:36 -02:00
Aurélien Delobelle
5d05b220fd
Fix touche H sur K-Psul
2016-09-25 23:35:29 +02:00
Aurélien Delobelle
1ce16f48f6
Annulation transferts
...
Possibilité d'annuler un (ou plusieurs) transferts depuis la page
"Transferts"
2016-09-24 14:18:26 +02:00
Aurélien Delobelle
4e2ae1cb54
Fix (théorique) autocomplétion sur mobile
...
D'après
https://groups.google.com/a/chromium.org/d/msg/chromium-bugs/08KdqaHAhsY/DD8uqKDz01AJ
2016-09-23 01:44:36 +02:00
Aurélien Delobelle
1553b9d9ff
Fix affichage balance réelle gestion négatifs
2016-09-22 21:06:04 +02:00
Aurélien Delobelle
0b618fa045
K-Psul - Sélection des articles
...
Ajout de la sélection au clic (souris/tactile)
2016-09-22 17:59:51 +02:00
Aurélien Delobelle
dc4f0473fe
Ajout affichage raccourcis K-Psul avec ctrl+Hw
2016-09-11 22:55:46 +02:00
Aurélien Delobelle
8d20dbfe24
Ajout affichage messages sur K-Psul
2016-09-10 22:54:23 +02:00
Aurélien Delobelle
fe7f84ffad
Ajout message pour proposer connexion standard
2016-09-10 22:49:07 +02:00
Aurélien Delobelle
120ffd574a
Fix liste utilisateurs création de compte
2016-09-06 19:44:40 +02:00
Aurélien Delobelle
6ba8c9e741
URL Websocket K-Psul
2016-09-06 17:50:05 +02:00
Aurélien Delobelle
f6fa13fa95
Fix url création compte depuis K-Psul
2016-09-06 17:37:18 +02:00
Aurélien Delobelle
1f61f79606
Clean JS ajout article et ordre des articles
2016-09-06 16:38:48 +02:00
Aurélien Delobelle
e154316eae
Optimisation JS K-Psul sélection articles
2016-09-06 16:33:04 +02:00
Aurélien Delobelle
58cb6015fc
fix transfers
2016-09-05 22:12:58 +02:00
Aurélien Delobelle
985dd2e82d
Fix autocomplétion article K-Psul
2016-09-05 20:35:45 +02:00
Aurélien Delobelle
468098ae7b
Sélection par défaut de la caisse lorsqu'il n'y en a qu'une seule disponible
2016-09-05 20:07:08 +02:00
Aurélien Delobelle
3d2583e2a0
Fix url pour production
2016-09-05 19:50:16 +02:00
Aurélien Delobelle
cd64f20275
fix checkout data
2016-09-05 18:09:34 +02:00
Aurélien Delobelle
912d970029
Fix JS K-Psul
2016-09-05 15:57:08 +02:00
Aurélien Delobelle
fa83afc5f3
Limite de l'historique chargé sur K-Psul
2016-09-05 14:46:45 +02:00
Aurélien Delobelle
6c54d582ed
Limite de l'historique chargé sur K-Psul
2016-09-05 14:39:31 +02:00
Aurélien Delobelle
3745485e6c
Fix urls et type opération 'initial'
2016-09-05 13:11:02 +02:00
Aurélien Delobelle
f538f27843
Création compte avec balance initiale
...
- Utile pour la migration des anciens comptes vers le nouveau système
- Fix JS page historique
2016-09-05 07:31:54 +02:00
Aurélien Delobelle
d86873e620
K-Psul - Focus sur input trigramme ou articleselect après choix caisse
2016-09-04 17:07:44 +02:00
