Ludovic Stephan
40da3bc299
Listen on input
2017-04-03 11:21:05 -03:00
Ludovic Stephan
b113a57b74
Fix update function
2017-04-03 11:20:56 -03:00
Aurélien Delobelle
769c37634d
delete debug msg
2017-04-03 15:43:56 +02:00
Aurélien Delobelle
7dc233c0e2
Merge branch 'Aufinal/editions' into 'master'
...
K-Fêt
- Fix: Les éditions ne touchent plus la caisse
- Fix: Seuls les achats sont possibles sur LIQ
See merge request !198
2017-04-03 14:39:53 +02:00
Aurélien Delobelle
b157ffac4c
Merge branch 'Aufinal/kfet_forms' into 'master'
...
K-Fêt
- Affichage des formulaires amélioré
See merge request !203
2017-04-03 13:40:41 +02:00
Aurélien Delobelle
c01de558e1
Clean Article stats
...
kfet.statistic
- delete no longer used defs
- new mixin - ScaleMixin
- get scale args from GET params
- chunkify querysets according to a scale
Article stats
- use SingleResumeStat for manifest
- use ScaleMixin for sales
- update urls
- update permission required: teamkfet
Account stats
- update permission required: teamkfet
- operations use ScaleMixin
- fix manifests urls
2017-04-03 03:12:52 +02:00
Aurélien Delobelle
31261fd376
set height canvas graph & fix graph display
2017-04-02 23:38:42 +02:00
Aurélien Delobelle
6ebea6557c
Merge branch 'Aufinal/graph_size' into aureplop/fix_stats
2017-04-02 23:19:34 +02:00
Ludovic Stephan
48721b7dca
Reduce graph size
2017-04-02 17:54:13 -03:00
Aurélien Delobelle
78aa5df350
fix template error
2017-04-02 12:55:44 +02:00
Aurélien Delobelle
96597aa146
clean some kfet templates
2017-04-02 05:17:26 +02:00
Aurélien Delobelle
55116f7179
Merge branch 'Aufinal/stat_article' into 'master'
...
Fix article stat display
See merge request !207
2017-04-02 02:49:54 +02:00
Ludovic Stephan
944a73eef7
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 18:09:23 -03:00
Ludovic Stephan
bbb517fbd3
Fix article stat display
2017-04-01 10:37:40 -03:00
Ludovic Stephan
6797c92a1f
Ok ok je me rends
2017-04-01 09:35:37 -03:00
Ludovic Stephan
4af2562121
More clarity in argument names
2017-04-01 09:34:02 -03:00
Ludovic Stephan
29836fd15c
Remove deprecated option
2017-04-01 09:24:18 -03:00
Ludovic Stephan
e20ab2f352
Use set delete()
2017-04-01 09:18:40 -03:00
Ludovic Stephan
ccf5f80685
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 02:43:19 -03:00
Ludovic Stephan
8da832c1f7
Use nice authentication in orders too
2017-04-01 00:36:39 -03:00
Ludovic Stephan
063446efb5
Use columns for authentication and submit
2017-04-01 00:32:09 -03:00
Ludovic Stephan
cf03fba1cc
Remove whitespace by using elif
2017-03-31 23:54:38 -03:00
Ludovic Stephan
2774dbb5de
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-03-31 23:51:13 -03:00
Ludovic Stephan
7d93d91af9
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-03-31 23:50:33 -03:00
Ludovic Stephan
9c9ad21d73
Add variable for article line
2017-03-31 23:46:10 -03:00
Ludovic Stephan
92fd94d1f9
Merge remote-tracking branch 'origin/master' into Aufinal/fix_stock_ws
2017-03-31 23:43:19 -03:00
Ludovic Stephan
236dcb4644
Tweaks to UserDialog
2017-03-31 18:10:06 -03:00
Ludovic Stephan
582cdebaa1
Better callback management
2017-03-31 17:49:22 -03:00
Ludovic Stephan
ab15dbae76
Add handler management
2017-03-31 17:37:39 -03:00
Ludovic Stephan
49c84076de
Manage help_text and errors
2017-03-31 15:01:31 -03:00
Ludovic Stephan
499c081565
Websocket class and instance
2017-03-31 12:23:27 -03:00
Ludovic Stephan
fdcd2e864c
Use widget_tweaks everywhere
2017-03-31 11:24:38 -03:00
Ludovic Stephan
530aafad19
Use widget_tweaks
2017-03-31 11:07:37 -03:00
Ludovic Stephan
6ac1241bd3
Listen to submit instead
2017-03-31 10:07:42 -03:00
Ludovic Stephan
50cb6e51a1
Use Set() natively
2017-03-31 10:06:02 -03:00
Ludovic Stephan
e54324e9f1
Use col-offset
2017-03-31 09:50:37 -03:00
Ludovic Stephan
c1b8849cb8
Idem for supplier_form
2017-03-30 21:16:47 -03:00
Ludovic Stephan
91d5fe234c
Idem for checkoutstatements
2017-03-30 21:10:50 -03:00
Ludovic Stephan
8e65298c7c
Idem for article_update
2017-03-30 19:34:22 -03:00
Ludovic Stephan
079666c0db
Use verbose names and form snippets for article_create
2017-03-30 19:32:11 -03:00
Ludovic Stephan
0c21238391
Change misc field when updating
2017-03-30 18:39:13 -03:00
Ludovic Stephan
998838ca3e
Add update button
2017-03-30 13:31:16 -03:00
Ludovic Stephan
31888e33ce
simpler jquery selection
2017-03-30 13:30:55 -03:00
Ludovic Stephan
eb7d436b90
Add "count finished" checkbox
2017-03-29 20:43:48 -03:00
Ludovic Stephan
ca6e120a38
Fix ws stock update
2017-03-29 09:43:10 -03:00
Ludovic Stephan
e6a1d16860
Websocket to manage possible kpsul conflicts
2017-03-29 00:58:47 -03:00
Ludovic Stephan
3b793dc726
Add first improvements for inventory
2017-03-28 23:47:41 -03:00
Ludovic Stephan
08c752f1b3
Simplify addcost management
2017-03-26 18:10:26 -03:00
Ludovic Stephan
5101400f64
Use callback_as_dict for addcost
2017-03-26 17:57:51 -03:00
Aurélien Delobelle
842f2cecc1
fix import, fix ope with addcost enabled, move Config location
2017-03-26 15:12:03 +02:00
Aurélien Delobelle
bc6ecda0c8
fix addcost kspul
2017-03-26 14:59:21 +02:00
Ludovic Stephan
3bf7a066a2
Adapt history.html to new functions
2017-03-26 00:33:33 -03:00
Ludovic Stephan
dbcfc6df46
Remove duplicate kfet.js import
2017-03-26 00:21:17 -03:00
Ludovic Stephan
87943ea7b9
Adapt kpsul to new functions
2017-03-26 00:20:47 -03:00
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
