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

995 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erkan Narmanli 06370bc62a Update README.md for new kfet fixtures 2017-01-03 02:13:42 +01:00
Qwann 63b3fef78f Merge branch 'michele.orru/gestioCOF-k-fet' into k-fet 2017-01-03 01:50:34 +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
Qwann 74f4d94f28 first fixes 2016-12-27 15:44:58 +01:00
Martin Pépin ab80db8bed Merge branch 'master' into Kerl/clean_staticfiles 2016-12-26 00:54:31 +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
Martin Pépin dc32ae6ad2 Répare le traitement des petits cours 
Les fonctions de traitement des demandes faisaient des cast étranges à
l'aide de `base64`. Ça devrait être lié à python2 je suppose.
 2016-12-23 09:37:54 +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
Martin Pepin 6e5c3c8c33 Merge branch 'Aufinal/clean_code' into 'master' 
Rend le code de BdA-Revente plus robuste

- `shotgun` devient un champ, et nécessite que `tirage_done` vaille `True` (plus de places au shotgun avant que le tirage au sort ne soit fait)
- suppression de code mort
- correction d'un bug sur les reventes de reventes
- améliorations diverses : commentaires, messages d'erreur
Selon moi, ça règle le 3e point de #101.

See merge request !114
 2016-12-21 17:17:36 +01:00
Ludovic Stephan acfcddce07 Merge branch 'Kerl/clean_code_amend' into 'Aufinal/clean_code' 
Kerl/clean code amend

Ajoute quelques commentaires

Reformate le texte en 80 colonnes

Améliore l'algo d'inscription à la revente en inscrivant les gens à la revente ayant le moins d'inscrits

See merge request !135
 2016-12-21 14:13:15 +01:00
Qwann 7070129add evolution de la balance\n premier jet 2016-12-21 11:51:08 +01:00
Martin Pépin 847345bb63 Merge branch 'Aufinal/clean_code' into Kerl/clean_code_amend 2016-12-21 11:31:07 +01:00
Ludovic Stephan 2f70dbf911 default shotgun for existing rows 2016-12-21 01:05:04 -02:00
Ludovic Stephan e8be072e78 message si inscription a une revente en cours 2016-12-21 00:53:35 -02:00
Ludovic Stephan 82b6cea02f Merge branch 'Aufinal/clean_code' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/clean_code 2016-12-21 00:48:00 -02:00
Ludovic Stephan 9bbc9e934d change soldTo functioning 2016-12-21 00:47:36 -02:00
Ludovic Stephan 07f920976f change soldTo functioning 2016-12-21 00:45:30 -02:00
Ludovic Stephan 38dd220c23 modernize reventes_shotgun 2016-12-21 00:35:05 -02:00
Ludovic Stephan 257e538621 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/clean_code 2016-12-21 00:11:06 -02:00
Martin Pépin 28df0355c2 Améliore l'algo d'inscription à une revente 
Au lieu d'inscrire les gens à la première revente qu'on trouve on
les inscrit à celle qui a le moins de participants
 2016-12-21 02:15:50 +01:00
Qwann ccf7c4a484 ma conso added 2016-12-20 22:46:38 +01:00
Martin Pépin 330b45fb2c Style + commentaires 2016-12-20 22:24:07 +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
Qwann cb9b967d78 debug toolbar 2016-12-09 21:43:42 +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
Aurélien Delobelle 222e614648 Merge branch 'Aufinal/F2_invert' into 'k-fet' 
K-Psul

Inverse les raccourcis clavier entre le reset du compte (Shift+F2) et du panier (F2) pour plus d'ergonomie

Fix #112

See merge request !129
 2016-12-09 16:55:33 +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