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

925 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
Qwann bdbb252a05 Revert "first fixes" 
This reverts commit 5877218af5.
 2017-01-17 17:16:53 +01:00
Qwann 1ddd34d50e Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats 2017-01-14 16:24:56 +01:00
Qwann a14f1db9a1 doc added for kfet new fixtures 2017-01-14 16:23:45 +01: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
Martin Pépin 703921a314 Supprime du code mort 2017-01-07 17:36:18 +01:00
Aurélien Delobelle b6bd08170e fix pip warning 2017-01-07 03:47:10 +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
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
Martin Pépin 672b8727b7 Merge branch 'michele.orru/gestioCOF-master' 
Deleting a CofProfile => Deleting the associated User
 2017-01-06 17:00:06 +01:00
Martin Pépin 8568ecedba Update provisioning 
Django has now access to the test datebase
 2017-01-06 16:58:27 +01:00
Martin Pepin 888d4764e8 Merge branch 'Kerl/clean_staticfiles' into 'master' 
Cesse d'utiliser des fichiers statiques custom

Fixes #107 

See merge request !121
 2017-01-06 16:51:46 +01:00
Aurélien Delobelle d6542d8b21 Fix websocket for dev and www 
Le ProxyPass ignorait apparemment le header `Daphne-Root-Path`
 2017-01-05 15:52:25 +01:00
Aurélien Delobelle e292318245 Fix WebSocket failure on K-Psul 2017-01-05 14:27:25 +01:00
Michele Orrù 542d02ca6d Cosmetics: post_save-ing a CofProfile now with decorators. 2017-01-05 11:35:34 +01:00
Michele Orrù 8016078e4f Deleting a CofProfile ⇒ Deleting a User. 
There's no reason for keeping a User if its respective cofprofile was deleted.
No?

Unittests attached.
 2017-01-05 11:35:21 +01:00
Martin Pépin e8fe856262 Merge branch 'master' into Kerl/fix_petits_cours_json 2017-01-05 08:48:20 +01:00
Martin Pépin bc5a323dfe Add missing migration 2017-01-04 15:29:28 +01:00
Qwann ca28826d78 doc added for kfet new fixtures 2017-01-03 02:22:46 +01:00
Qwann 9cb5844c48 Revert "Update README.md for new kfet fixtures" 
This reverts commit 06370bc62a.
 2017-01-03 02:19:50 +01:00
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