Commit graph

172 commits

Author SHA1 Message Date
Ludovic Stephan 1f3e65fa68 Fix javascript code 2019-01-07 22:52:18 +01:00
Ludovic Stephan 55c1d7f02c Refactor templates 2019-01-07 22:51:02 +01:00
Ludovic Stephan 47c02d72af Réorganisation de bda/forms
Suppression de code mort, tri des formulaires
Remove bootstrap forms loading
2019-01-07 16:43:46 +01:00
Ludovic Stephan ae0abb5cb3 Better JS for tables 2019-01-07 16:28:52 +01:00
Ludovic Stephan f66a54bb73 Prettify revente/manage 2019-01-07 16:24:30 +01:00
Ludovic Stephan 010ce0df3e Bugfixes : add staticfiles and typo 2019-01-07 15:27:41 +01:00
Ludovic Stephan a30955fb75 HTML corrections ; stupidtable injection 2019-01-07 14:58:31 +01:00
Ludovic Stephan 15ab316909 Merge branch 'master' into Aufinal/prettify-revente 2018-12-08 10:40:10 +01:00
Ludovic Stephan 6be42d57ca Prettify revente/shotgun 2018-12-07 17:35:53 +01:00
Ludovic Stephan 5c8164dd3b Prettify revente/tirages 2018-12-07 17:35:40 +01:00
Ludovic Stephan 625825cf3f Améliore TemplateLabelField
- Rajouter une option pour `option_template_name` et `context_object_name` dans la classe, et documente mieux. Répercute ces changements dans `InscriptionReventeForm`.
2018-12-07 17:33:17 +01:00
Ludovic Stephan dbd017f680 Prettify revente/subscribe 2018-11-21 19:47:20 +01:00
Basile Clement 7124821f7c Permet la suppression d'un voeu ajouté mais non enregistré
Voir #203.  Cette solution est horrible, tout comme le code dans
lequel elle se trouve.  Déso pas déso.
2018-11-12 21:56:40 +01:00
Ludovic Stephan fc37c5a8a0 Annulation des reventes
- On peut annuler des reventes à tout point du processus
- Le formulaire d'annulation donne plus d'informations
2018-04-13 10:54:45 +02:00
Martin Pépin 87a6722143 Merge branch 'master' into Aufinal/bda_fixes 2018-04-07 14:46:07 +02:00
Martin Pépin 623047dca2 Fix old-style reversal of calendar urls 2018-04-06 11:11:02 +02:00
Martin Pepin 307c48ca76 Merge branch 'elarnon/fix-182' into 'master'
Properly propagate the default number of places in tirage

Closes #182

See merge request cof-geek/gestioCOF!295
2018-02-20 14:40:20 +01:00
Basile Clement 6ecc9a54b3 Properly propagate the default number of places in tirage
Fixes #182.
2018-02-11 19:24:01 +01:00
Basile Clement 3314670cab Various fixes for Django 1.11
- The {% cycle %} command was used non-quoted arguments separated by
   commas, while it is supposed to use quoted arguments separated by
   spaces (I'm actually not sure how that ever worked :)

 - django-bootstrap-form was at version 3.2.1 which is not compatible
   with Django 1.11 (but also required by GestioCOF). I upgraded it to
   version 3.3.
2018-02-11 19:09:07 +01:00
Ludovic Stephan 1783196a9c Management view only deals with Revente objects
Except for Revente creation, every form is now handled with revente
objects, to use the display option in the previous commit.
2017-12-19 12:41:50 +01:00
Martin Pépin f18959c0a1 BdA-Revente: meaningful names, some help tests 2017-11-01 17:26:40 +01:00
Martin Pépin e1794a654f Merge branch 'master' into Aufinal/bda_fixes 2017-11-01 11:25:52 +01:00
Martin Pépin 273e6374ef Pluralization in bda -> participant list 2017-11-01 11:09:35 +01:00
Ludovic Stephan e74dbb11f1 Organize revente files and function names 2017-10-23 18:39:45 +02:00
Ludovic Stephan 732e47707e Add unsubscribe option + list of current draws 2017-10-23 17:25:58 +02:00
Martin Pépin 80f6a808dc Simplify the mails-rappel view 2017-06-18 17:03:50 +01:00
Martin Pépin 5c11893059 Add a link to the "bda-rappel" mail edition page 2017-06-02 19:33:23 +01:00
Martin Pépin 76c75d5ccd Move bda-participant template -> bda/ folder 2017-06-02 19:14:10 +01:00
Martin Pépin fbdfdeef46 Add a link to the reminder emails sending page 2017-06-02 19:14:09 +01:00
Martin Pépin 31c034a96a send_rappel: use django messages + css tweaks 2017-06-02 19:14:06 +01:00
Aurélien Delobelle 3556e3b1b0 Fewer requests on bda.views.revente 2017-04-08 12:10:23 +02:00
Ludovic Stephan 42a93027d3 fix pep8 + move template 2017-02-21 19:49:29 -03:00
Ludovic Stephan d9402e1059 change resell and reinit forms 2017-02-16 01:52:44 -02:00
Martin Pépin 427859c2f5 Oublis 2017-02-11 21:33:25 +01:00
Martin Pépin 70e89e3737 Merge branch 'master' into Kerl/messages 2017-02-11 20:55:17 +01:00
Martin Pépin 65341f0ecb Minor error 2017-02-11 20:43:49 +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 675ff99414 Supprime les doublons avec jquery 2017-02-11 11:50: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
Evarin 839d60e48f Support tactile jquery-ui 2017-02-11 00:11:14 +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
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 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 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
Qwann 30cebac6e6 Merge branch 'hotfix/bda-static' 2017-01-24 20:39:14 +01:00
Martin Pépin 045f3f58e5 Met inscription-formset àa la bonne place 2017-01-24 20:34:53 +01:00