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

287 commits

Author SHA1 Message Date
Aurélien Delobelle e2c4214efc fix history kpsul view 2017-02-25 01:36:53 +01:00
Aurélien Delobelle a98c6b233e fix checkout data error on k-psul 2017-02-25 01:30:26 +01:00
Qwann e1713a1d4f Merge branch 'Kerl/datetime_warnings' into supportBDS 2017-02-24 15:02:27 +01:00
Qwann 9c6f5533ec Merge branch 'supportBDS' of git.eleves.ens.fr:cof-geek/gestioCOF into supportBDS 2017-02-23 19:00:58 +01:00
Martin Pépin 1663a03a33 Use timezones everywhere in migrations 2017-02-23 18:33:44 +01:00
Martin Pépin 856faf2b73 Merge branch 'supportBDS' into Kerl/django111-packages 2017-02-23 17:56:12 +01:00
Martin Pepin 4b4d570e07 Merge branch 'Kerl/fix_generic_team_ath' into 'supportBDS' 
Change CofProfile to Profile in kfet/backends.py

- K-Fêt accounts are now linked to profiles
- There is no need to perform the `get_or_create` as long as the profile
  creation has been automated.
- This file is now PEP8 compliant

See merge request !180
 2017-02-23 12:31:55 +01:00
Martin Pépin 83e73376ad Change CofProfile to Profile in kfet/backends.py 
- K-Fêt accounts are now linked to profiles
- There is no need to perform the `get_or_create` as long as the profile
  creation has been automated.
- This file is now PEP8 compliant
 2017-02-23 12:04:33 +01:00
Martin Pépin 69f748acbd Django1.11-style MiddleWares 
The design of middlewares has changed in Django 1.11
 2017-02-23 02:00:34 +01:00
Martin Pépin e1bab7e4ed Use the AppConfig class 2017-02-23 01:56:59 +01:00
Martin Pépin 9f401b66e9 Specify the on_delete attribute everywhere 
- Models
- Migrations
 2017-02-23 01:40:25 +01:00
Martin Pépin 5632cdaa22 Uses the cof_members groups in kfet's autocomplete 
The is_cof attribute cannot be used in database queries anymore
 2017-02-22 15:03:34 +01:00
Martin Pépin a28c00e474 Move the auth stuff to gestion/ 
- The login views are in `gestion/`
- The templates are under `gestion/templates/gestion/`
- `cof/shared.py` moves to `gestion/` and is splitted into 3 files:
    - The auth backends are in `backends.py`.
    - The context_processor is in `context_processor.py`
    - The LOCK/UNLOCK functions remain in `shared.py`
 2017-02-12 15:38:14 +01:00
Martin Pépin 50b667993f Merge branch 'master' into supportBDS 
- Mise en page
- Cleanup des petits cours
- Utilisation de custommail
- Utilisation du ldap du SPI pour fetch les nouveaux comptes
 2017-02-12 04:26:43 +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
Michele Orrù 376e829502 Reaching a point where I can query /k-fet. 
Edit forms and views in app kfet to make the depend on gestion.Profile and not
on cof.CofProfile.
 2017-02-11 15:07:45 +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
Michele Orrù 815a5f274c Fix some reviewing considerations. 
- appropriate naming for migration
- remove __future__ imports.
- remove "CofProfile" left in kfet/models.py
 2017-02-11 00:33:46 +01:00
Michele Orrù 25c3106168 Add some tests about how profiles types should relate to each other. 2017-02-11 00:33:36 +01:00
Michele Orrù 22da04c3e2 s/cofprofile/profile/g into k-fêt. 
This commit also restores the only unittest present.
 2017-02-11 00:32:58 +01:00
Ubuntu f39d1545f0 Generic profiles and migrations. 
Creating profiles for BDS, COF and K-Fêt.
 2017-02-10 22:12:03 +01:00
Martin Pépin 5aff771d9c Set the new structure of gestioCOF 
- `cof` is renamed `gestioCOF`
- `gestioncof` become `cof` (yes it looks pretty stupid but it is not)
- `bds` is created
 2017-02-09 21:28:36 +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
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
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
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