cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
2614 commits 38 branches 17 tags 11 MiB
Commit graph

404 commits

Author SHA1 Message Date
Aurélien Delobelle 3f4a1adbb9 Fewer queries on stats/scales + Fix 
Scales:
- Fix #chunks when used with std_chunk=True (there was one too many at
  the beginning)
- Scale.end gives the end of the last chunk (instead of its start)
  So scale.begin -> scale.end gives the full range of the scale.

`kfet_day` now returns an aware datetime.

ScaleMixin:
- new method `get_by_chunks` which use only one query and ranks
  elements according to the scale. Elements are returned by a generator
  for each scale chunk (and all chunks are returned as a generator too).

ArticlesStatSales and AccountStatOperations use this new method to
avoid issuing #scale_chunks queries.

ArticleStat:
- fixed on Chrome
 2017-04-12 18:03:31 +02:00
Aurélien Delobelle b5cc26bb1b Merge branch 'master' into aureplop/fewer_requests 2017-04-11 22:46:18 +02:00
Martin Pepin a68002d0f6 Merge branch 'aureplop/fix_double_js' into 'master' 
Fix stats on some browsers

See merge request !219
 2017-04-10 23:59:02 +02:00
Qwann 5c6a73c597 kfet_open uses moment.js 2017-04-09 20:54:30 +02:00
Aurélien Delobelle ebfe5c41d4 Fix stats on some browsers 
- Delete double import in account_read template
- Syntax on account_read

Stats didn't show on Chrome (at least v57) cause of these.
 2017-04-09 01:52:26 +02:00
Aurélien Delobelle 784ba9bd10 Merge branch 'master' into aureplop/kfet_config 2017-04-08 18:36:28 +02:00
Aurélien Delobelle 15861824b6 Merge branch 'Aufinal/tabs' into 'master' 
K-Fêt
- Détails d'un compte: historique et stats sont accessibles par des onglets.

See merge request !218
 2017-04-08 14:41:36 +02:00
Ludovic Stephan 4a6bfd5e3d Better button distinction 2017-04-07 12:58:03 -03:00
Ludovic Stephan 052e7b2b6e Move navigation to content-left 2017-04-07 12:17:36 -03:00
Qwann 531a4611d3 Merge branch 'master' into qwann/k-fet/kfet_open 2017-04-07 17:11:48 +02:00
Ludovic Stephan e26668e5eb Add tabs to account_read 2017-04-06 21:17:47 -03:00
Aurélien Delobelle 33cee05884 initial checkout selected 
Result is the same result but:
- auto-select go to javascript
- 1 less request for KPsulCheckoutForm

- delete debug messages
- some PEP8
 2017-04-06 16:45:44 +02:00
Aurélien Delobelle e2d7192b23 fix perform opes after account reset 2017-04-06 00:11:41 +02:00
Aurélien Delobelle c849306a32 fix kfet home template 2017-04-06 00:00:53 +02:00
Qwann a5671fdf4c Merge branch 'master' into qwann/k-fet/kfet_open 2017-04-05 17:40:19 +02:00
Aurélien Delobelle 3ee9de93d9 few improvements on article category 
- add verbose names to ArticleCategory fields
- add button to view categories list from articles list
- fix article_update template in form validation
- improve interface for articlecategory_update
- revert vanished urls (happened in merge with master...)
 2017-04-05 15:34:28 +02:00
Aurélien Delobelle 42728e58be Merge branch 'master' into qwann/k-fet/category_addcost 2017-04-05 14:57:26 +02: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
Qwann ba11aa49db categories are updatable 2017-04-04 21:36:02 +02:00
Qwann 72615bf400 small fixes 2017-04-04 16:57:17 +02:00
Ludovic Stephan 51acb4e00a Use new WS class 2017-04-03 16:05:18 -03:00
Ludovic Stephan 32474a6865 Don't update input when unchecking 2017-04-03 16:03:22 -03:00
Ludovic Stephan f46ba0dd6c Merge branch 'master' into Aufinal/inventaires 2017-04-03 16:01:51 -03:00
Aurélien Delobelle 85caa6b058 Use django-djconfig for kfet app. 
Old configuration(/settings), based on Settings model, system is
deleted: SettingsForm, Settings.
New system use `django-djconfig` module.

- `kfet.config` module provides `kfet_config` to access configuration concerning
kfet app.
- Views, forms, models, etc now use this object to retrieve conf values.
- Views no longer add config values to context, instead templates use
  `kfet_config` provided by a new context_processor.
- Enhance list and update views of settings.
- Fix: settings can directly be used without having to visit a specific
  page...

Misc
- Delete some py2/3 imports
- Delete unused imports in kfet.models and kfet.views
- Some PEP8 compliance
 2017-04-03 20:32:16 +02:00
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 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 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 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 bc0affc038 Remove autocomplete leftovers 2017-03-25 09:56:36 -03: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 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
Qwann fcc2ab8810 frontend working 2017-03-17 19:17:36 +01: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
Qwann 52dda7be9a Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-10 16:58:46 +01:00
Qwann 5ddcd2f1ff Merge branch 'k-fet' into qwann/k-fet/home 2017-03-10 16:58:10 +01:00
Qwann f18bb9f336 permission added 2017-03-09 17:27:58 +01:00
Qwann 8e7b9e2fd3 force close working 2017-03-09 15:05:47 +01:00
Qwann ce96bc4b67 Status added on home page 2017-03-07 17:31:43 +01:00
Qwann 392338eddd indent 2017-03-06 09:30:58 +01:00
Qwann 8e462134c7 home base html 2017-03-06 02:08:33 +01:00
Qwann 964dd716c6 Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-06 02:04:11 +01: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 624707570e Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-05 20:06:37 +01:00
Qwann 197da29366 css include added... 2017-03-05 20:05:35 +01:00
Qwann a828ecbcf0 Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open 2017-03-05 19:51:51 +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
Aurélien Delobelle 95b129e396 resolved merge conflict in kfet views imports 2017-02-25 02:00:56 +01:00
Evarin 0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +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
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
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
Qwann f87f1ceff1 kfetOpen bullet working 2017-02-11 00:29:12 +01: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 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
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
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
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