Commit graph

1045 commits

Author SHA1 Message Date
Michele Orrù f0c3def935 Make the test really works.
This fixes the proble with debug_toolbar,
the fucking toolbar that messes all your tests.
2017-02-11 15:47:31 +01:00
Qwann 5d35112c87 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 15:34:04 +01:00
Qwann 62dc04c19f cleaning ugly html 2017-02-11 15:33:22 +01:00
Martin Pépin 0e759405c7 Change the migration index 2017-02-11 15:13:29 +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
Michele Orrù f50ef1d51a Merge remote-tracking branch 'origin/supportBDS-fixes1' into supportBDS 2017-02-11 14:26:55 +01:00
Martin Pépin b639c04549 Fix the registration forms
- The former `RegistrationUserProfileForm` is splitted in two.
- There is a new form: `RegistrationCofProfileForm`
2017-02-11 12:42:36 +01:00
Martin Pépin 675ff99414 Supprime les doublons avec jquery 2017-02-11 11:50:49 +01:00
Martin Pépin 99a19f850a typo 2017-02-11 11:41:49 +01:00
Martin Pépin 71fb020e10 Merge branch 'master' into Kerl/messages 2017-02-11 11:40:47 +01:00
Martin Pépin 6e55905781 Merge branch 'master' into Kerl/use_django_custommail 2017-02-11 03:20:29 +01:00
Qwann 06eafdae47 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-02-11 02:54:54 +01:00
Qwann 5136e394d4 Merge branch 'Kerl/modernize_petitscours' 2017-02-11 02:54:22 +01:00
Qwann ed01508481 using context_object_name and moving template 2017-02-11 02:51:43 +01:00
Martin Pépin b1cf96d0ae Move profile editing to gestion 2017-02-11 01:43:17 +00:00
Robin Champenois 1060a0a368 Merge branch 'Kerl/ldap' into 'master'
The end of Clipper

GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.

You need to run migrations to apply this patch

The default behaviour is not to fetch data from the LDAP because you may not have access to it.
To test over a ldap database server or in production, you need to set `settings.LDAP_SERVER_URL`
to the correct value.

Fixes #13

See merge request !140
2017-02-11 02:42:00 +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
Martin Pépin d4b696db70 Merge branch 'master' into Kerl/ldap 2017-02-11 01:55:02 +01:00
Martin Pepin f0774a3e3c Merge branch 'robin' into 'master'
Support des touch-events et clean des deps jquery-ui

Fixes #80

See merge request !167
2017-02-11 00:37:16 +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
Evarin 839d60e48f Support tactile jquery-ui 2017-02-11 00:11:14 +01:00
Martin Pépin 58d708b791 Move profile editing to gestion 2017-02-10 23:50:19 +01:00
Evarin 80d8cb6b7e Mise à jour des dépendances jquery-ui et jquery
Should fix #80 - à tester sur mobile (via dev.cof)
2017-02-10 23:47:49 +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
Evarin 399e5ca16d Jolie mise en page pour les demandes de petit cours
Closes #6
2017-02-10 20:42:54 +01:00
Evarin f7ec5ef9ee Grise les spectacles passés dans la liste des spectacles pour le BdA 2017-02-10 19:58:22 +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
Martin Pepin e32faf6182 Merge branch 'Aufinal/select_all' into 'master'
Aufinal/fixes_85

Rajoute des boutons pour tout (dé-)sélectionner dans la vue d'inscription au calendrier.

Utilise `bootstrap` pour afficher le formulaire.

See merge request !166
2017-02-09 12:29:08 +01:00
Martin Pépin 8e7428a11e Répercute le déplacement du template dans les vues 2017-02-09 12:26:08 +01:00
Ludovic Stephan ca73dc27bb move template 2017-02-08 21:13:02 -02:00
Ludovic Stephan 46638bd6d8 fixes #85 2017-02-08 21:08:00 -02: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 1062fd480f update provisioning 2017-02-08 15:11:48 -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 Pepin 217624fe08 Merge branch 'Kerl/fix_dev_data' into 'master'
Kerl/fix dev data

Les données de développement sont désormais réparties entre deux fixtures et un commande django-admin.

- Fixtures
    - `gestion` : sondages, événéments, matières de petits cours et deux demandes de petits cours.
    - `sites` : le site pour l'application `sites`.
- La commande `loaddevdata` : elle se découpe en deux parties.
    - La première dont le code est dans `gestioncof/management/commands/loaddevdata.py` charge les utilisateurs dans la base de données et les inscrits aux petits cours. Si l'argument `--no-root` est passé, l'utilisateur privilégié `root` n'est pas créé.
    - La deuxième, `loadbdadevdata` est appelée par la première. Elle instancie deux tirages et y inscrit tous les utilisateurs puis lance le premier tirage.

Comme on peut le constater dans `provisioning/prepare_django.sh`, les commandes à appeler pour setup l'environnement de dev sont

    python manage.py loaddata gestion sites
    python manage.py loaddevdata

Pour augmenter la liste des données à importer, compléter les fichiers contenus dans `{gestioncof,bda}/management/data/`

See merge request !160
2017-02-07 11:00:44 +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