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
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
Ludovic Stephan
5267a8a368
add previous op recap
2016-12-22 01:13:14 -02:00
Ludovic Stephan
38dbebb05e
Merge branch 'Aufinal/arrondi_ukf' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf
2016-12-22 00:25:07 -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
Qwann
0c3c41a812
small changes
2016-12-19 16:36:23 +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
71fee9bf8a
temporary low stock css
2016-12-13 20:58:40 -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
83d49ad3a4
WIP articleCategory stat
2016-12-10 23:08:17 +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
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
cc94785fdf
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf
2016-12-09 01:25:02 -02: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
Hugo Manet
92ec85dbbd
Ajout d'un .distinct() dans la selection des articles liés à un supplier
2016-12-07 21:35:27 +01:00
Aurélien Delobelle
202199cc18
Merge branch 'Aufinal/correction_negatifs' into 'k-fet'
...
Corrige le négatif total
Le système de `balance_offset` (assez obscur par ailleurs) était compté dans la mauvais sens dans le calcul du négatif total.
Prend aussi en compte maintenant le statut spécial de `#13`, pour ne pas le ranger avec les négatifs habituels.
Fix #104
See merge request !125
2016-12-04 15:06:25 +01:00
Aurélien Delobelle
4fe17f3922
Merge branch 'Aufinal/capslock_indicator' into 'k-fet'
...
Indicateur capslock
Détecteur de capslock en js.
Détecte les incohérences du capslock (majuscule entrée quand shift non enfoncé) puis suit aussi la pression de la touche capslock.
Nécessite un caractère affecté par capslock pour commencer à fonctionner (au départ, l'état de la touche capslock est inconnu)
Fix #96
See merge request !119
2016-12-04 14:42:45 +01: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
Ludovic Stephan
251d10a426
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/correction_negatifs
2016-12-04 00:21:38 -02:00
Ludovic Stephan
d5877d083c
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/capslock_indicator
2016-12-04 00:19:57 -02:00
Ludovic Stephan
a2dc92d799
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf
2016-12-04 00:19:38 -02:00
Aurélien Delobelle
f5ebe3f166
Merge branch 'master' into k-fet
2016-12-03 21:44:33 +01: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
a7f3b85b25
exclut #13 du négatif total
2016-12-01 01:44:41 -02:00
Ludovic Stephan
45cc7cfa33
correction négatif total
2016-12-01 01:39:16 -02:00
Ludovic Stephan
ab0ed097cf
indication raccourcis
2016-11-30 23:12:58 -02:00
Ludovic Stephan
746f16f57d
remove float
2016-11-23 01:43:24 -02:00
Ludovic Stephan
98886f422a
replace round by floor
2016-11-23 01:39:31 -02:00
Ludovic Stephan
e31dadad10
détection et affichage capslock
2016-11-17 22:35:33 -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
Basile Clement
d77a4dde3e
GestioCOF devrait fonctionner sur / aussi bien que sur /gestion
2016-11-06 19:47:31 +01:00
Aurélien Delobelle
8349388ab3
Fix avaiable actions on genericteam acount
...
Empêche de rentrer des opérations et des transferts sur GNR (compte
équipe K-Fêt partagé)
Fix 84
2016-09-29 21:47:37 +02:00
Aurélien Delobelle
f39e1a653e
Ajout account pour compte générique
...
Lors de la connexion avec l'utilisateur kfet standard, un Account avec le
trigramme GNR est créé pour cet utilisateur
+ Clean et comment
2016-09-29 21:36:17 +02:00
Aurélien Delobelle
5d05b220fd
Fix touche H sur K-Psul
2016-09-25 23:35:29 +02:00
Aurélien Delobelle
efd92e9967
Fix protection autocomplete
2016-09-24 19:31:50 +02:00
Aurélien Delobelle
3a777a7045
Merge branch 'issue63' into k-fet
2016-09-24 18:51:41 +02:00
Aurélien Delobelle
59dcb72542
K-Psul - Fix erreur 500 caisse inexistante
2016-09-24 18:49:40 +02:00
Aurélien Delobelle
7f8c825c2a
Pour la prod!
2016-09-24 18:44:01 +02:00
Aurélien Delobelle
3ead35e171
clean
2016-09-24 18:27:40 +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
Martin Pépin
c79456e958
Syntaxe py3
...
`except e1, e2:` n'est pas valide en python3, il faut des parenthèses.
2016-09-12 23:24:18 +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
f614051365
Fix création compte
2016-09-06 19:49:28 +02:00
Aurélien Delobelle
120ffd574a
Fix liste utilisateurs création de compte
2016-09-06 19:44:40 +02:00
Aurélien Delobelle
ad661cab09
fix url account neg K-Psul
2016-09-06 18:50:57 +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
5569b7d154
Fix encodage password
2016-09-06 15:30:51 +02:00
Aurélien Delobelle
58cb6015fc
fix transfers
2016-09-05 22:12:58 +02:00
Aurélien Delobelle
a5b19b4328
fix js k-psul
2016-09-05 20:38:15 +02:00
Aurélien Delobelle
985dd2e82d
Fix autocomplétion article K-Psul
2016-09-05 20:35:45 +02:00
Aurélien Delobelle
5e6645ab84
Fix JS K-Psul
2016-09-05 20:19:46 +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
db4ae73dfd
Fix acc neg
2016-09-05 19:19:09 +02:00
Aurélien Delobelle
cd64f20275
fix checkout data
2016-09-05 18:09:34 +02:00
