Ludovic Stephan
73fb3c419e
Add stop check in traverse
2017-04-09 11:43:51 -03:00
Ludovic Stephan
9ba13a81ee
Adapt add_to_container + small improvements
2017-04-06 00:10:39 -03:00
Ludovic Stephan
23d19545a7
Add back root_sort
2017-04-05 22:23:56 -03:00
Ludovic Stephan
df47bedae1
Change ModelForest inner structure
2017-04-05 22:10:21 -03:00
Aurélien Delobelle
e4ccd88dfd
Merge branch 'master' into aureplop/kpsul_js_refactor
2017-04-05 23:18:33 +02:00
Ludovic Stephan
5c422e892a
Add children fo traverse callback
2017-04-05 12:31:19 -03:00
Ludovic Stephan
508e7ec23f
Change traverse and find behavior
2017-04-05 12:00:39 -03:00
Ludovic Stephan
1761c5f1bd
Change fromAPI logic
2017-04-05 09:13:00 -03:00
Ludovic Stephan
840010b63f
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-04-05 09:03:59 -03:00
Ludovic Stephan
a29de134f1
Move focus ; move is_low_stock to method
2017-04-05 08:58:46 -03:00
Aurélien Delobelle
2e0de75471
kpsul - fix account balance ukf
2017-04-05 13:18:01 +02:00
Aurélien Delobelle
6be6202b3f
few cleans
2017-04-05 04:26:50 +02:00
Aurélien Delobelle
f1aaad7317
Better jquery ajax calls management
...
It becomes the same as the original jQuery ajax object.
For example, callbacks can be queued.
get_by_apipk and from_API of ModelObject returns the ajax object.
Example (js):
Account.get_by_apipk('AAA')
.done(function (data) {
console.log(data)
})
.fail( () => console.log('cool') )
...
.done( ...
2017-04-05 04:05:31 +02:00
Aurélien Delobelle
efbcde163b
clean some js
...
- clean buttons code on account and checkout
- merge CheckoutRead and kpsul_checkout_data views (the first won)
APIModelObject interface
- add url_create, url_update, url_update_for
- rename url_object_for and url_object to url_read_for and url_read
2017-04-05 03:43:51 +02:00
Ludovic Stephan
3b9affb3f3
Add focus methods
2017-04-04 20:18:53 -03:00
Ludovic Stephan
9c559d9ec3
Add articles reset to kpsul.reset
2017-04-04 19:54:03 -03:00
Ludovic Stephan
021937a38e
Small bugfixes
2017-04-04 19:52:12 -03:00
Martin Pepin
fe66a6ef6b
Merge branch 'aureplop/fix_stats' into 'master'
...
Stats K-Fêt - Python side
See merge request !208
2017-04-05 00:41:47 +02:00
Ludovic Stephan
e5791efe4d
Remove last traces of old articles
2017-04-04 19:41:15 -03:00
Ludovic Stephan
05156f37c6
Update addExistingPurchase
2017-04-04 19:34:22 -03:00
Ludovic Stephan
3ce4dc5c85
Add article stock management
2017-04-03 20:14:45 -03:00
Ludovic Stephan
b91edc9c7d
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-04-03 20:03:58 -03:00
Aurélien Delobelle
9d2298a089
Merge branch 'master' into aureplop/kpsul_js_refactor
...
Not chill.
2017-04-04 00:51:49 +02:00
Ludovic Stephan
5020037103
api_lock inside kfet.js
2017-04-03 16:08:40 -03:00
Ludovic Stephan
f46ba0dd6c
Merge branch 'master' into Aufinal/inventaires
2017-04-03 16:01:51 -03:00
Aurélien Delobelle
6d2e150aa0
clean align
2017-04-03 16:56:44 +02:00
Aurélien Delobelle
903da795ab
clean kfet statistic.js
...
- no longer dictToArray where it isn't necessary (because already an
array)
- fix chart height:
- previous charts were causing bugs
- height is fixed (even with window resizing)
- clean whitespaces
2017-04-03 16:53:28 +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
df7e935390
Clean GET params in ajax calls
...
- Use `data` arg of `$.getJSON` for `format` param
- Delete `dictToArray` call on data returned by `SingleResumeStat` class view since this view now returns stats manifest as an array
2017-04-02 17:16:05 +02:00
Ludovic Stephan
ccf5f80685
Merge remote-tracking branch 'origin/master' into Aufinal/editions
2017-04-01 02:43:19 -03:00
Ludovic Stephan
063446efb5
Use columns for authentication and submit
2017-04-01 00:32:09 -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
Aurélien Delobelle
1286606f7a
Merge branch 'Aufinal/hotfix/liq_withdraw' into 'master'
...
K-Fêt :
- Empêche les retraits/charges sur LIQ
See merge request !205
2017-03-31 23:49:33 +02:00
Ludovic Stephan
aa29621c7c
Prevents special opes on LIQ
2017-03-31 18:28:03 -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
38bfccf331
Change class name
2017-03-31 15:57:15 -03:00
Ludovic Stephan
8bf1bd5343
Websocket as member
2017-03-31 15:45:15 -03:00
Ludovic Stephan
413df0806d
Add url get method
2017-03-31 15:10:41 -03:00
Ludovic Stephan
499c081565
Websocket class and instance
2017-03-31 12:23:27 -03:00
Ludovic Stephan
998838ca3e
Add update button
2017-03-30 13:31:16 -03:00
Ludovic Stephan
eb7d436b90
Add "count finished" checkbox
2017-03-29 20:43:48 -03:00
Ludovic Stephan
e6a1d16860
Websocket to manage possible kpsul conflicts
2017-03-29 00:58:47 -03:00
Ludovic Stephan
c1f70d9d0a
Add capslock support for inputs
2017-03-26 17:51:55 -03:00
Ludovic Stephan
6d92df4155
Merge branch 'aureplop/kpsul_js_refactor' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/dialog_utils
2017-03-26 15:21:33 -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
24f72ae7d4
add missing ;
2017-03-26 14:52:23 +02:00