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 Pépin
45eb384cfd
Use class-based views
...
See #94
2017-02-05 17:41:23 +01:00
Martin Pépin
9aa4782d57
Move petits-cours forms in another file
2017-02-05 17:10:51 +01:00
Martin Pépin
81681ad0e5
Turn 2 functions into class/objects methods
...
- `_get_attrib_counter` become a classmethod of
`PetitCoursAttributionCounter`
- `_get_demande_candidates` become a method of `PetitCoursDemande`
2017-02-05 17:07:58 +01:00
Martin Pépin
2bc5f3d646
Style and PEP8
...
- Drop `%` in favour of `.format` which has a better specification
- Remove a string concatenation
- Remove the trailing slashes according to the PEP8:
https://www.python.org/dev/peps/pep-0008/#maximum-line-length
NB. We let some which will disappear in the next commit.
- Remove an unused import and change the imports order
2017-02-05 13:49:01 +01:00
Martin Pépin
bb4e9dde4f
End of py2 support
2017-02-05 13:32:31 +01:00
Martin Pépin
1e5c55a540
update readme
2017-02-04 11:57:58 +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
Martin Pépin
f274c1e978
Un seul message pour la liste des inscriptions
2017-02-04 00:01:15 +01:00
Martin Pépin
13da42b823
typo
2017-02-03 23:41:33 +01:00
Martin Pépin
54f09820bf
Merge branch 'Kerl/messages' of https://git.eleves.ens.fr/cof-geek/GestioCOF into Kerl/messages
2017-02-03 18:30:47 +01:00
Martin Pépin
8c34e2f83f
proper use of messages in petits cours
2017-02-03 18:29:18 +01:00
Martin Pépin
fd42563f7f
Proper use of messages in calendar subscription
2017-02-03 18:29:18 +01:00
Martin Pépin
51c0e2dabc
proper use of messages in registration
2017-02-03 18:29:12 +01:00
Martin Pépin
b7ecac3db6
Proper use of messages in profile edit
2017-02-03 18:29:12 +01:00
Martin Pépin
1fe1b94afc
Proper use of messages in events
2017-02-03 18:29:12 +01:00
Martin Pépin
b12b5c938f
Proper use of messages in inscription-reventes
2017-02-03 18:29:12 +01:00
Martin Pépin
efea92b5d2
Proper use of messages in places
2017-02-03 18:29:11 +01:00
Martin Pépin
91fff8a11e
Proper use of messages in BdA inscription
2017-02-03 18:29:05 +01:00
Martin Pépin
0666b5288f
Proper use of messages in survies
2017-02-03 18:29:05 +01:00
Martin Pépin
d31b9f59ab
Traitement des messages
...
- Les messages sont affichés à l'utilisateurs dans les vues de GestioCOF
- On utilise une autre version de bootstrap et jquery (plus récent)
Fixes #48
2017-02-03 18:28:56 +01:00
Martin Pépin
45856ca872
update README
2017-02-03 17:29:33 +01:00
Martin Pépin
ba88b94320
Fixes and cleanup
2017-02-03 17:07:50 +01:00
Martin Pépin
18b186929c
Dev data loaded using a django admin command
...
- Sites, surveys, events and petits cours demands/subjects are still
loaded from fixtures
- The users and their subscriptions to petits cours are loaded using the
`loaddevdata` command
- The sub command `loadbdadevdata` is called by `loaddevdata` and
populates the database with BdA related stuff :
- 2 tirages
- Show places
- Shows
- subscriptions
2017-02-03 14:33:10 +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
Aurélien Delobelle
d5bf249212
Merge branch 'qwann/k-fet/stock_update' into 'k-fet'
...
fixes #127
Si je ne me trompe pas, c'était juste un selecteur jQuery qui ne fonctionnait pas. fixes #127
See merge request !156
2017-02-02 12:24:54 +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
863699bfb6
Merge branch 'qwann/k-fet/stock_update' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stock_update
2017-01-31 16:03:00 +01:00
Qwann
1275fdff99
fixes #127
...
fixing stock update
2017-01-31 16:00:44 +01:00
Qwann
a400832c6d
fixing stock update
2017-01-31 15:55:38 +01:00
Martin Pépin
cf4a3ec64b
Traitement des messages
...
- Les messages sont affichés à l'utilisateurs dans les vues de GestioCOF
- On utilise une autre version de bootstrap et jquery (plus récent)
Fixes #48
2017-01-28 19:51:56 +01:00
Qwann
ce9f717f06
WS : quand la K-Fêt est ouverte ?
2017-01-27 21:46:21 +01:00
Qwann
ddf6343826
Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home
2017-01-27 13:13:28 +01:00
Qwann
df824a3a70
Merge branch 'k-fet' into qwann/k-fet/stats
2017-01-27 13:10:31 +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
7ab4e949d8
k-fet in gestiocof menu
2017-01-26 20:40:55 +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
c2b74ea625
Merge branch 'Kerl/bda_models_update' into 'master'
...
Typo et suppression de la py2 compat
See merge request !150
2017-01-25 23:58:23 +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
30cebac6e6
Merge branch 'hotfix/bda-static'
2017-01-24 20:39:14 +01:00
