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

708 commits

Author SHA1 Message Date
Ludovic Stephan b113a57b74 Fix update function 2017-04-03 11:20:56 -03:00
Aurélien Delobelle 87bc90ec8b Begin/end balance stat graph 
- Anytime begin at account creation datetime
- Others doesn't take care of account creation
- Add check to avoid to bug on actions list length
 2017-04-03 16:07:31 +02:00
Aurélien Delobelle 769c37634d delete debug msg 2017-04-03 15:43:56 +02:00
Aurélien Delobelle 1bb83ccdd7 simplify StatScale 2017-04-03 15:10:53 +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 b3a9ad8a96 clean mixin 2017-04-03 13:24:04 +02:00
Aurélien Delobelle d97a7be819 stats: fix begin of balances graphs 
- graph begin at first operation or later
 2017-04-03 03:15:07 +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 f585247224 Refactor Account Operations stats 
K-Fêt - Statistics

New base class - StatScale
- create scale, given chunk size (timedelta), start and end times
- get labels of
- get start and end datetimes of chunks

DayStatScale: Scale whose chunks interval is 1 day
WeekStatScale: same with 1 week
MonthStatScale: same with 1 month

AccountStatOperationList: manifest of operations stats of an account
- renamed from AccountStatLastAll
- updated according to SingleResumeStat

AccountStatOperation:
- renamed from AccountStatLast
- remove scale logic with use of StatScale objects
- used scale is given by `scale` and `scale_args` GET params
- add filter on operations types with `types` GET param

AccountStatLast(Day,Week,Month) are deleted ("merged" in
AccountStatOperation)
 2017-04-03 00:40: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 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
Aurélien Delobelle 1ee993e1e1 Add permission check to AccountStatBalance 
Only connected user can get its balance data
 2017-04-02 17:14:36 +02:00
Aurélien Delobelle 87b9db520f Refactor py base stats and account balance stats 
New mixin: PkUrlMixin
- use with SingleObjectMixin standard django mixin (used by
  DetailView...)
- `get_object` use field declared in `pk_url_kwarg` to get... the object

SingleResumeStat
- clean (part of) py code

AccountStatBalanceList
- renamed from `AccountStatBalanceAll`
- url modified
- add permission checking (only the connected user can get balance
  stats manifest)
- clean py code

AccountStatBalance
- cleaner filtering management
- merge urls using this class
- clean py code
 2017-04-02 17:03:20 +02:00
Aurélien Delobelle f6022ecf7d Add str to Transfer model 
+ PEP8 this model
 2017-04-02 16:49:41 +02:00
Aurélien Delobelle 78aa5df350 fix template error 2017-04-02 12:55:44 +02:00
Aurélien Delobelle e8fdd083aa delete unused class-views 2017-04-02 05:34:34 +02:00
Aurélien Delobelle 96597aa146 clean some kfet templates 2017-04-02 05:17:26 +02:00
Ludovic Stephan c9973cde75 Help text for password length 2017-04-01 23:25:47 -03: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
Martin Pépin e4d51de569 Merge branch 'hotfix/autocomplete_no_value' 2017-04-01 22:11:36 +01:00
Ludovic Stephan 91a057873d Merge migrations 2017-04-01 18:10:51 -03:00
Ludovic Stephan 944a73eef7 Merge remote-tracking branch 'origin/master' into Aufinal/editions 2017-04-01 18:09:23 -03:00
Martin Pépin a793e9a2e7 exclude empty strings from ldap results 
The uid attribute in a LDAP's entry cannot be an empty string. We need
to get an actual identifier.
 2017-04-01 22:07:32 +01:00
Martin Pépin 9cdf064005 Handle incomplete values from the LDAP 
Sometime `uid` is not set in the objects fetched from the LDAP. This
case has to be handled. Also, the `.uid` and `.cn` attributes of these
objects in the python abstractions have a `.value` method which we
should use.
 2017-04-01 21:45:05 +01:00
Ludovic Stephan cce0411ee9 Merge both 0048 migrations 2017-04-01 17:37:29 -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 271654b447 No need for intermediate error reporting 2017-04-01 08:47:09 -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
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 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 49c84076de Manage help_text and errors 2017-03-31 15:01:31 -03:00
Ludovic Stephan 1d8e084a19 websocket update when addcost 2017-03-31 14:37:00 -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 ebf133d9af Lowercase model verbose names 2017-03-30 21:38:16 -03:00
Ludovic Stephan 20561eb515 Idem for account_update 2017-03-30 21:31:16 -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 56b5fd6279 Always randomize supplier articles 2017-03-29 23:22:18 -03:00
Ludovic Stephan 95c59de4fc Add supplier to dev data 2017-03-29 23:16:40 -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 946182f1fe Simpler migration revert 2017-03-26 15:06:45 -03:00
Ludovic Stephan 06a89055c4 Simpler migration 2017-03-25 10:46:18 -03:00
Ludovic Stephan 9a081ddae0 PEP8 on Operation model 2017-03-25 10:43:02 -03:00
Ludovic Stephan f645121fb1 Add error when editing LIQ 2017-03-25 10:39:53 -03:00
Ludovic Stephan 14e0d8090f Add euros symbols 2017-03-25 10:01:35 -03:00
Ludovic Stephan d8f572bb01 Remove group check in is_checkout 2017-03-25 09:57:44 -03:00
Ludovic Stephan bc0affc038 Remove autocomplete leftovers 2017-03-25 09:56:36 -03:00
Aurélien Delobelle ae82c34023 add missing migration 2017-03-25 11:21:21 +01:00
Aurélien Delobelle 215d4a63ad Merge branch 'Aufinal/create_opes' into 'master' 
K-Fêt - Dev :
- new command - createopes: Création d'opérations et transferts aléatoires

See merge request !193
 2017-03-25 11:08:22 +01:00
Ludovic Stephan 794527772f Add more explicit migration name 2017-03-24 23:41:33 -03:00
Ludovic Stephan 5f3f044084 Add revert function to migration 2017-03-24 23:27:55 -03:00
Ludovic Stephan 608e67fe6a Add RunPython script to migration 2017-03-24 21:23:04 -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
Ludovic Stephan cadaf43131 Remove is_checkout field from Operation model 2017-03-24 18:50:57 -03:00
Aurélien Delobelle f063c3470c Merge branch 'Aufinal/fix_password_freeze' into 'master' 
K-Psul:
- fix freeze when no-team password

Closes #153

See merge request !196
 2017-03-24 20:53:44 +01:00
Aurélien Delobelle ff5959638b fix missing bracket 2017-03-24 20:32: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 7520effe53 Fix K-Psul freeze when no-team password 
L'erreur 403 est renvoyée dans ce cas par le décorateur
`@teamkfet_required`, donc sans data associé, ce qui faisait buguer
`getErrorsHtml`. On rajoute donc le cas correspondant.
 2017-03-24 15:45:47 -03:00
Martin Pepin 33b3d558b5 Merge branch 'Aufinal/decorators' into 'master' 
Utilise les bons décorateurs

See merge request !195
 2017-03-21 00:25:50 +01:00
Ludovic Stephan 5e802217fd Remove lambda operators 2017-03-20 20:24:44 -03:00
Ludovic Stephan dd4d1f3061 Improves creation efficiency 2017-03-20 20:19:04 -03:00
Ludovic Stephan aa247b465a Fix search box (hackish) 2017-03-20 19:08:48 -03:00
Martin Pepin ae38b5d1e7 Merge branch 'hotfix/prevent_ldap_injection' into 'master' 
Hotfix/prevent ldap injection

Closes #150

See merge request !188
 2017-03-20 23:06:59 +01:00
Martin Pépin 59f57793ba typo 2017-03-20 22:05:48 +00:00
Martin Pépin 0aed975615 Fix the empty-query test in autocomplete 
If there is no valid word to search in the LDAP database, no query is
performed. Since 74f0b63e, that behaviour was broken because of a typo
 2017-03-20 08:14:20 +00:00
Ludovic Stephan 6d36d50e9a Fix 'at' property for transfergroups 2017-03-20 01:56:59 -03:00
Ludovic Stephan 2c63e6b667 Use django.contrib.auth decorators 2017-03-20 00:11:50 -03:00
Ludovic Stephan 36dc6439a8 Plug createopes into loadkfetdevdata 2017-03-19 16:03:39 -03:00
Ludovic Stephan 0356ec34ae Add createopes command 2017-03-19 16:03:19 -03:00
Martin Pépin 74f0b63e96 Change ldap query behaviour if multiple inputs 
It is now consistent with the other lookups over the User database
 2017-03-19 15:10:08 +00:00
Martin Pépin dc50a23b10 Escape the content of the regex in highligh_text 2017-03-19 14:48:04 +00:00
Martin Pépin 4899bba1f7 Replace list comprehensions by iterators in dal 2017-03-19 14:05:25 +00:00
Ludovic Stephan 51fba4da21 Log messages 2017-03-18 19:02:08 -03:00
Ludovic Stephan 47b7d934e0 PEP8 on imports 2017-03-18 19:01:51 -03:00
Ludovic Stephan 29d7654052 Root kfet account 2017-03-18 18:02:33 -03:00
Ludovic Stephan f512c1bdd7 Add better checkout creation 2017-03-18 18:02:23 -03:00
Qwann de724a2c0d PEP8 for perform_operation 2017-03-17 19:53:23 +01:00
Qwann a107fa0309 migration renamed 2017-03-17 19:23:44 +01: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
Martin Pépin 741f0183e6 Prevent ldap injections in autocompletion views 
We only allow alphanumeric characters in the query in order to avoid
injections
 2017-03-16 22:43:43 +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
Martin Pépin 3acc8bca75 s/username/clipper in highlight_clipper 
There was typo, the `Clipper` object has no `username` attribute. We
want to use the `clipper` attribute
 2017-03-15 19:11:38 +00:00
Martin Pépin e98a407982 Rename bits -> search_words in kfet.autocomplete 
This is typo, this variable has not the same name in
`gestioncof.autocomplete` and `kfet.autocomplete`
 2017-03-15 19:02:31 +00:00
Qwann d0938dfae7 Merge branch 'k-fet' into qwann/k-fet/category_addcost 2017-03-11 15:10:04 +01:00
Qwann b0643c0928 typo 2017-03-11 02:04:30 +01:00
Qwann ee6de35627 category addcost added 2017-03-10 18:29:15 +01: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 cd31c55254 permission working 2017-03-10 16:40:36 +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 5694e4b9bc migrations merged 2017-03-09 11:11:31 +01:00
Qwann ce96bc4b67 Status added on home page 2017-03-07 17:31:43 +01:00
Qwann f8e09cf257 unknow status updated every 30s 2017-03-07 14:12:23 +01:00
Qwann 0f96d3bc46 moving kfet_open url 2017-03-07 14:02:08 +01:00
Qwann 392338eddd indent 2017-03-06 09:30:58 +01:00
Qwann b7040d5867 adding KFET_FORCE_CLOSE in cache 2017-03-06 02:25:18 +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 15b8900d43 fixes dumb merge 2017-03-05 19:56:56 +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 ddbcfe0c69 JS commenté et plus propre 2017-02-15 22:25:26 +01:00
Evarin 0fcb29252b Frontend tout en JS 2017-02-15 21:01:54 +01:00
Qwann 46f343b1ab la K-Fêt se réveille à 7h 2017-02-15 14:44:58 +01:00
Qwann 1c90608f6d some cleaning 2017-02-15 14:21:00 +01:00
Aurélien Delobelle ef864cec32 Merge branch 'Aufinal/visibilite_stock' into 'k-fet' 
K-Psul

Articles
- Ajout d'une surbrillance pour les articles dont le stock est bas
  (entre -5 et 5)

Panier
- Ajout d'indications de stocks sur chaque ligne (stock, warning visuel)
- Les ajouts/retraits d'articles déjà dans le panier mettent à jour la
  ligne associée à celui-ci déjà existante
- Les flèches haut/bas permettent de modifier la quantité d'un article

Fix #111

See merge request !133
 2017-02-13 16:42:22 +01:00
Aurélien Delobelle 2e8fc45a1b Merge branch 'Aufinal/own_password' into 'k-fet' 
Changement de son propre mot de passe

Permet à un K-Fêteux (disposant de la permission `kfet.is_team`) de modifier son propre mot de passe sur la page `account/XXX/edit`.

Accessoirement, la fonction `account_update` est maintenant conforme à PEP8.

Fix #121

See merge request !148
 2017-02-13 16:32:40 +01:00
Ludovic Stephan 46e9e82da8 move account save 2017-02-13 12:19:47 -02: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 1a684471c2 Merge branch 'Aufinal/fix_amounts' into 'k-fet' 
K-Psul:
- fix #163: different rounding for UKF accounts balances / UKF articles prices

See merge request !171
 2017-02-13 08:25:13 +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 4a5d9f880a Merge branch 'Aufinal/fix_amounts' into 'k-fet' 
Corrige l'affichage du prix

!124 était overkill ; `amountToUKF` peut prendre en argument des valeurs positives ou négatives, et il me semble que le `round` ne sert quà corriger les erreurs de `float`, ce qui conduit à #128. Du coup, on revert une partie.

fixes #128

See merge request !163
 2017-02-12 05:09:30 +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
Aurélien Delobelle 49e6101156 Merge branch 'qwann/k-fet/decimal_issue2' into 'k-fet' 
Qwann/k fet/decimal issue2

`grant` is a Decimal and thus can not be casted implicitly to float.

See merge request !158
 2017-02-11 22:04:10 +01:00
Aurélien Delobelle db4786abf8 Merge branch 'manet/correction-commandes' into 'k-fet' 
Manet/correction commandes

- Fix création de commandes (fournisseur)

Fix #97
See merge request !128
 2017-02-11 22:00:45 +01:00
Martin Pépin d41d905366 PEP8 2017-02-11 21:20:51 +01:00
Martin Pépin 313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet 2017-02-11 21:01:37 +01:00
Martin Pépin 02a8e74e3b Optimize code, better queries 
- Remove useless Q queries
- Optimize with sets
- Queries over clipper id too
 2017-02-11 02:39:59 +01:00
Qwann f87f1ceff1 kfetOpen bullet working 2017-02-11 00:29:12 +01:00
Qwann 4808650fa0 kfet_open is updatable 2017-02-09 14:05:29 +01:00
Ludovic Stephan 9ade88d076 add stdout log 2017-02-08 15:54:49 -02:00
Ludovic Stephan 01dbf7293c withdrawals cost money 2017-02-08 15:38:59 -02:00
Ludovic Stephan 5ea9705528 use decimal 2017-02-08 15:38:27 -02:00
Ludovic Stephan b692b92f74 correct return value for get_or_create 2017-02-08 15:33:35 -02:00
Ludovic Stephan 3b318cf623 correct timedelta 2017-02-08 15:31:10 -02:00
Ludovic Stephan c6e84b8cb4 bug 2017-02-08 15:29:40 -02:00
Ludovic Stephan 4e62eb0aee create checkout dynamically 2017-02-08 15:26:56 -02:00
Ludovic Stephan 066df73b62 add different operation types 2017-02-08 15:11:38 -02:00
Qwann ef59c115f6 avec le css c'est mieux 2017-02-08 15:40:58 +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 bb78091cc5 checkout fixture 2017-02-07 23:59:49 -02:00
Ludovic Stephan 8346dd65d1 dev data kfet 2017-02-07 23:22:31 -02:00
Ludovic Stephan 2013fec68b move fixtures 2017-02-07 18:42:31 -02:00
Ludovic Stephan 8d0f803639 Corrige l'affichage du prix 
fixes #128
 2017-02-06 16:42:19 -02:00
Ludovic Stephan 5654fd84e8 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/own_password 2017-02-06 16:37:48 -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
Qwann 44202811ae not supporting future.builtins anymore in templatetags 2017-02-05 22:39:20 +01: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
Aurélien Delobelle 1bf5352097 Merge branch 'Aufinal/fix_87' into 'k-fet' 
Fixes #87

Le field `groups` de `UserGroupForm` accepte les valeurs vides, ce qui permet la destitution de K-Fêt.

See merge request !157
 2017-02-02 12:28:56 +01:00
Qwann bc14205d29 fixing decimal issue2 2017-02-01 19:32:18 +01:00
Ludovic Stephan 47d7a3ec6e fixes #87 2017-01-31 16:35:52 -02: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 0ac1eaf414 fixing decimal_issue 2017-01-27 13:08:50 +01:00
Qwann 5cedabf5a8 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home 2017-01-27 12:15:47 +01:00
Qwann 2f1fe15be3 fixing decimal_issue merging 2017-01-27 12:08:18 +01:00
Qwann 5ee188e4df Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2017-01-27 11:56:39 +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 aa1afccf1f adding argumement hidden to Article 
in order to avoid some articles to appear in the menu
 2017-01-26 19:22:38 +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
Martin Pépin bd7f767953 Cleanup 
- Un peu de PEP8
- Suppression d'une partie de la py2 compat
- Typos
 2017-01-25 23:23:53 +01:00
Qwann 9607fab046 future removed 2017-01-25 16:00:48 +01:00
Qwann 0d1cece6db adding columns features 2017-01-24 19:56:58 +01:00
Qwann f48f6c57a7 Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats 2017-01-24 19:43:08 +01:00
Qwann 94f8705ea4 wrong merge fixed 2017-01-24 19:42:15 +01:00
Qwann df2a9bb1b3 factorising BalanceStat views 2017-01-24 16:56:26 +01:00
Qwann 947de3b638 wrong months in 'last months' stats 2017-01-20 21:21: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 f8c49ae90c docstring instead of comments 2017-01-20 20:19:28 +01:00
Qwann e6854d7987 using strftime instead of a personnal function 2017-01-20 20:19:16 +01:00
Qwann de3db1405e Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats 2017-01-20 18:53:49 +01:00
Qwann fff7a2022b conflict solved 2017-01-20 18:45:28 +01:00
Qwann 8b4f7ad60c decimal cast for operation.amount 2017-01-20 18:34:45 +01:00
Qwann 7e5910e0b3 balance templatetag fixed 2017-01-20 18:10:49 +01:00
Ludovic Stephan 1b0144691f No need for len of query 2017-01-20 07:32:11 -02: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 eff37f6c89 plain text highlighting 2017-01-19 01:42:00 -02:00
Ludovic Stephan 88aec52141 PEP8 + typo 2017-01-19 01:22:04 -02:00
Qwann bdbb252a05 Revert "first fixes" 
This reverts commit 5877218af5.
 2017-01-17 17:16:53 +01: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
Michele Orrù 76db0c86a3 Add fixtures. 
Create fixtures for kfet application:
- Add a bunch of non-cof profiles whose "last_name" is "Romain";
- Add k-fet articles using the real ones as a template;
- Add LIQ account;
- Add groups K-fet Chef and K-fet Girl;
- Add "caisse".
We also added some template for future tests (well, actually it's the script
used to generate the fixtures…).
 2017-01-14 16:23:45 +01:00
Qwann 5877218af5 first fixes 2017-01-14 16:23:45 +01:00
Ludovic Stephan fabd0949e2 correct imports 
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
 2017-01-10 15:15:53 -02:00
Ludovic Stephan 6315ddf6b8 move pwd change to method 
Signed-off-by: Ludovic Stephan <lstephan@clipper.ens.fr>
 2017-01-10 12:58:35 -02:00
Martin Pépin 540b6f38b8 Merge branch 'master' into Kerl/ldap 2017-01-09 15:47:12 +01:00
Martin Pépin 703921a314 Supprime du code mort 2017-01-07 17:36:18 +01:00
Ludovic Stephan 7dc7d57a5e restrict to team even if malicious POST edit 2017-01-07 13:57:54 -02:00
Ludovic Stephan fcf76b4af8 can change own password (actually working now) 2017-01-07 13:32:05 -02:00
Ludovic Stephan 2a20beeb59 pep8 2017-01-07 13:28:53 -02:00
Ludovic Stephan 1c5c1fe94d can change own password 2017-01-07 12:47:43 -02: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
Aurélien Delobelle 7ed9c90726 fix whitespaces 2017-01-07 01:56:33 +01:00
Aurélien Delobelle 86286b662a Merge branch 'Aufinal/search_icon' into k-fet 
- Ajoute une icône de recherche dans K-Psul pour accéder à la liste des comptes
 2017-01-07 01:12:13 +01:00
Aurélien Delobelle 1bae76a405 Merge branch 'Aufinal/arrondi_ukf' into k-fet 
- Arrondis cohérents des UKF lors des divers affichages
- Remplace les arrondis par des floor pour éviter les négatifs de quelques
centimes

Fix #92

See merge request !124
 2017-01-07 01:02:07 +01:00
Aurélien Delobelle 792c4177ec Merge branch 'master' into k-fet 2017-01-07 00:38:54 +01:00
Ludovic Stephan c58ac3a904 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon 2017-01-06 19:01:00 -02:00
Ludovic Stephan a78a4393d0 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf 2017-01-06 19:00:17 -02:00
Ludovic Stephan 20079c37e9 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/previous_op 2017-01-06 18:20:54 +01:00
Aurélien Delobelle e292318245 Fix WebSocket failure on K-Psul 2017-01-05 14:27:25 +01:00
Martin Pépin bc5a323dfe Add missing migration 2017-01-04 15:29:28 +01:00
Michele Orrù 0b54972aa8 Add fixtures. 
Create fixtures for kfet application:
- Add a bunch of non-cof profiles whose "last_name" is "Romain";
- Add k-fet articles using the real ones as a template;
- Add LIQ account;
- Add groups K-fet Chef and K-fet Girl;
- Add "caisse".
We also added some template for future tests (well, actually it's the script
used to generate the fixtures…).
 2017-01-03 01:35:56 +01:00
Martin Pépin 01ce955784 Fixes 
- Fixes bugs
- Removes useless scripts
 2016-12-25 12:27:42 +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