Merge branch 'master' into qwann/separate_list

README.md

@@ -1,5 +1,7 @@
 # GestioCOF
 
+![build_status](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/build.svg)
+
 ## Installation
 
 ### Vagrant

bda/templates/bda/resume_places.html

@@ -16,7 +16,7 @@
     <h4 class="bda-prix">Total à payer : {{ total|floatformat }}€</h4>
     <br/>
     <p>Ne manque pas un spectacle avec le
-	    <a href="{% url "gestioncof.views.calendar" %}">calendrier
+	    <a href="{% url "calendar" %}">calendrier
 	    automatique&#8239;!</a></p>
     {% else %}
     <h3>Vous n'avez aucune place :(</h3>

cof/urls.py

@@ -86,13 +86,15 @@ urlpatterns = [
     url(r'^utile_bda$', gestioncof_views.utile_bda,
         name='utile_bda'),
     url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff),
-    url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof),
+    url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof,
+        name='ml_diffcof'),
     url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente),
     url(r'^k-fet/', include('kfet.urls')),
     url(r'^cms/', include(wagtailadmin_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),
     # djconfig
-    url(r"^config", gestioncof_views.ConfigUpdate.as_view()),
+    url(r"^config", gestioncof_views.ConfigUpdate.as_view(),
+        name='config.edit'),
 ]
 
 if 'debug_toolbar' in settings.INSTALLED_APPS:

gestioncof/forms.py

@@ -351,10 +351,12 @@ EventFormset = formset_factory(AdminEventForm, BaseEventRegistrationFormset)
 class CalendarForm(forms.ModelForm):
     subscribe_to_events = forms.BooleanField(
             initial=True,
-            label="Événements du COF")
+            label="Événements du COF",
+            required=False)
     subscribe_to_my_shows = forms.BooleanField(
             initial=True,
-            label="Les spectacles pour lesquels j'ai obtenu une place")
+            label="Les spectacles pour lesquels j'ai obtenu une place",
+            required=False)
     other_shows = forms.ModelMultipleChoiceField(
             label="Spectacles supplémentaires",
             queryset=Spectacle.objects.filter(tirage__active=True),

gestioncof/management/commands/syncmails.py

@@ -63,8 +63,9 @@ class Command(BaseCommand):
                 except CustomMail.DoesNotExist:
                     mail = CustomMail.objects.create(**fields)
                     status['synced'] += 1
-                    self.stdout.write(
-                        'SYNCED {:s}'.format(fields['shortname']))
+                    if options['verbosity']:
+                        self.stdout.write(
+                            'SYNCED {:s}'.format(fields['shortname']))
                 assoc['mails'][obj['pk']] = mail
 
             # Variables
@@ -79,8 +80,9 @@ class Command(BaseCommand):
                 except Variable.DoesNotExist:
                     Variable.objects.create(**fields)
 
-        # C'est agréable d'avoir le résultat affiché
-        self.stdout.write(
-            '{synced:d} mails synchronized {unchanged:d} unchanged'
-            .format(**status)
-        )
+        if options['verbosity']:
+            # C'est agréable d'avoir le résultat affiché
+            self.stdout.write(
+                '{synced:d} mails synchronized {unchanged:d} unchanged'
+                .format(**status)
+            )

gestioncof/templates/event_status.html

@@ -11,7 +11,7 @@
                 {% endif %}
                 {% include "tristate_js.html" %}
                 <h3>Filtres</h3>
-                <form method="post" action="{% url 'gestioncof.views.event_status' event.id %}">
+                <form method="post" action="{% url 'event.details.status' event.id %}">
                 {% csrf_token %}
                 {{ form.as_p }}
                 <input style="margin-top:10px;" type="submit" class="btn btn-primary" value="Filtrer" />

gestioncof/templates/gestioncof/calendar_subscription.html

@@ -12,7 +12,7 @@ souscrire aux événements du COF et/ou aux spectacles BdA.
 
 {% if token %}
 <p>Votre calendrier (compatible avec toutes les applications d'agenda) se trouve à
-<a href="{% url 'gestioncof.views.calendar_ics' token %}">cette adresse</a>.</p>
+<a href="{% url 'calendar.ics' token %}">cette adresse</a>.</p>
 
 <ul>
     <li>Pour l'ajouter à Thunderbird (lightning), il faut copier ce lien et aller

gestioncof/templates/gestioncof/profile.html

@@ -5,7 +5,7 @@
 
 {% block realcontent %}
                 <h2>Modifier mon profil</h2>
-                <form id="profile form-horizontal"  method="post" action="{% url 'gestioncof.views.profile' %}">
+                <form id="profile form-horizontal"  method="post" action="{% url 'profile' %}">
                     <div class="row" style="margin: 0 15%;">
                             {% csrf_token %}
                             <fieldset"center-block">

gestioncof/templates/gestioncof/utile_cof.html

@@ -7,15 +7,15 @@
                 <h2>Liens utiles du COF</h2>
                 <h3>COF</h3>
                 <ul>
-                <li><a href="{% url 'gestioncof.views.export_members' %}">Export des membres du COF</a></li>
-                <li><a href="{% url 'gestioncof.views.liste_diffcof' %}">Diffusion COF</a></li> 
+                <li><a href="{% url 'cof.membres_export' %}">Export des membres du COF</a></li>
+                <li><a href="{% url 'ml_diffcof' %}">Diffusion COF</a></li>
                 </ul>
 
                 <h3>Mega</h3>
                 <ul>
-                <li><a href="{% url 'gestioncof.views.export_mega_participants' %}">Export des non-orgas uniquement</a></li>
-		  <li><a href="{% url 'gestioncof.views.export_mega_orgas' %}">Export des orgas uniquement</a></li>
-		  <li><a href="{% url 'gestioncof.views.export_mega' %}">Export de tout le monde</a></li>
+                <li><a href="{% url 'cof.mega_export_participants' %}">Export des non-orgas uniquement</a></li>
+		  <li><a href="{% url 'cof.mega_export_orgas' %}">Export des orgas uniquement</a></li>
+		  <li><a href="{% url 'cof.mega_export' %}">Export de tout le monde</a></li>
                 </ul>
 
                 <p>Note&nbsp;: pour ouvrir les fichiers .csv avec Excel, il faut

gestioncof/tests/test_views.py

@@ -1,15 +1,711 @@
-from django.contrib import messages
-from django.contrib.messages import get_messages
-from django.contrib.messages.storage.base import Message
-from django.test import TestCase
+import csv
+import uuid
+from datetime import timedelta
 
-from gestioncof.models import Survey, SurveyAnswer
+from django.contrib import messages
+from django.contrib.messages.api import get_messages
+from django.contrib.messages.storage.base import Message
+from django.test import Client, TestCase
+from django.urls import reverse
+
+from bda.models import Salle, Tirage
+from gestioncof.models import (
+    CalendarSubscription, Club, Event, Survey, SurveyAnswer
+)
 from gestioncof.tests.testcases import ViewTestCaseMixin
 
+from .utils import create_member, create_root, create_user
+
+
+class HomeViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'home'
+    url_expected = '/'
+
+    auth_user = 'user'
+    auth_forbidden = [None]
+
+    def test(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+
+class ProfileViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'profile'
+    url_expected = '/profile'
+
+    http_methods = ['GET', 'POST']
+
+    auth_user = 'member'
+    auth_forbidden = [None, 'user']
+
+    def test_get(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+    def test_post(self):
+        u = self.users['member']
+
+        r = self.client.post(self.url, {
+            'first_name': 'First',
+            'last_name': 'Last',
+            'phone': '',
+            # 'mailing_cof': '1',
+            # 'mailing_bda': '1',
+            # 'mailing_bda_revente': '1',
+        })
+
+        self.assertEqual(r.status_code, 200)
+        expected_message = Message(messages.SUCCESS, (
+            "Votre profil a été mis à jour avec succès !"
+        ))
+        self.assertIn(expected_message, get_messages(r.wsgi_request))
+        u.refresh_from_db()
+        self.assertEqual(u.first_name, 'First')
+        self.assertEqual(u.last_name, 'Last')
+        self.assertFalse(u.profile.mailing_cof)
+        self.assertFalse(u.profile.mailing_bda)
+        self.assertFalse(u.profile.mailing_bda_revente)
+
+
+class UtilsViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'utile_cof'
+    url_expected = '/utile_cof'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+
+class MailingListDiffCof(ViewTestCaseMixin, TestCase):
+    url_name = 'ml_diffcof'
+    url_expected = '/utile_cof/diff_cof'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def setUp(self):
+        super().setUp()
+
+        self.u1 = create_member('u1', attrs={'mailing_cof': True})
+        self.u2 = create_member('u2', attrs={'mailing_cof': False})
+        self.u3 = create_user('u3', attrs={'mailing_cof': True})
+
+    def test(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.context['personnes'].get(), self.u1.profile)
+
+
+class ConfigUpdateViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'config.edit'
+    url_expected = '/config'
+
+    http_methods = ['GET', 'POST']
+
+    auth_user = 'root'
+    auth_forbidden = [None, 'user', 'member', 'staff']
+
+    def get_users_extra(self):
+        return {
+            'root': create_root('root'),
+        }
+
+    def test_get(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+    def test_post(self):
+        r = self.client.post(self.url, {
+            'gestion_banner': 'Announcement !',
+        })
+
+        self.assertRedirects(r, reverse('home'))
+
+
+class UserAutocompleteViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'cof-user-autocomplete'
+    url_expected = '/user/autocomplete'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        r = self.client.get(self.url, {'q': 'user'})
+
+        self.assertEqual(r.status_code, 200)
+
+
+class ExportMembersViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'cof.membres_export'
+    url_expected = '/export/members'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        u1, u2 = self.users['member'], self.users['staff']
+        u1.first_name = 'first'
+        u1.last_name = 'last'
+        u1.email = 'user@mail.net'
+        u1.save()
+        u1.profile.phone = '0123456789'
+        u1.profile.departement = 'Dept'
+        u1.profile.save()
+
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        data = list(csv.reader(r.content.decode('utf-8').split('\n')[:-1]))
+        expected = [
+            [
+                str(u1.pk), 'member', 'first', 'last', 'user@mail.net',
+                '0123456789', '1A', 'Dept', 'normalien',
+            ],
+            [str(u2.pk), 'staff', '', '', '', '', '1A', '', 'normalien'],
+        ]
+        # Sort before checking equality, the order of the output of csv.reader
+        # does not seem deterministic
+        expected.sort(key=lambda row: int(row[0]))
+        data.sort(key=lambda row: int(row[0]))
+        self.assertListEqual(data, expected)
+
+
+class MegaHelpers:
+    def setUp(self):
+        super().setUp()
+
+        u1 = create_user('u1')
+        u1.first_name = 'first'
+        u1.last_name = 'last'
+        u1.email = 'user@mail.net'
+        u1.save()
+        u1.profile.phone = '0123456789'
+        u1.profile.departement = 'Dept'
+        u1.profile.comments = 'profile.comments'
+        u1.profile.save()
+
+        u2 = create_user('u2')
+        u2.profile.save()
+
+        m = Event.objects.create(title='MEGA 2017')
+
+        cf1 = m.commentfields.create(name='Commentaire')
+        cf2 = m.commentfields.create(
+            name='Comment Field 2', fieldtype='char',
+        )
+
+        option_type = m.options.create(name='Conscrit/Orga ?')
+        choice_orga = option_type.choices.create(value='Orga')
+        choice_conscrit = option_type.choices.create(value='Conscrit')
+
+        mr1 = m.eventregistration_set.create(user=u1)
+        mr1.options.add(choice_orga)
+        mr1.comments.create(commentfield=cf1, content='Comment 1')
+        mr1.comments.create(commentfield=cf2, content='Comment 2')
+
+        mr2 = m.eventregistration_set.create(user=u2)
+        mr2.options.add(choice_conscrit)
+
+        self.u1 = u1
+        self.u2 = u2
+        self.m = m
+        self.choice_orga = choice_orga
+        self.choice_conscrit = choice_conscrit
+
+
+class ExportMegaViewTests(MegaHelpers, ViewTestCaseMixin, TestCase):
+    url_name = 'cof.mega_export'
+    url_expected = '/export/mega'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual(self.load_from_csv_response(r), [
+            [
+                'u1', 'first', 'last', 'user@mail.net', '0123456789',
+                str(self.u1.pk), 'profile.comments', 'Comment 1---Comment 2',
+            ],
+            ['u2', '', '', '', '', str(self.u2.pk), '', ''],
+        ])
+
+
+class ExportMegaOrgasViewTests(MegaHelpers, ViewTestCaseMixin, TestCase):
+    url_name = 'cof.mega_export_orgas'
+    url_expected = '/export/mega/orgas'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual(self.load_from_csv_response(r), [
+            [
+                'u1', 'first', 'last', 'user@mail.net', '0123456789',
+                str(self.u1.pk), 'profile.comments', 'Comment 1---Comment 2',
+            ],
+        ])
+
+
+class ExportMegaParticipantsViewTests(
+        MegaHelpers, ViewTestCaseMixin, TestCase):
+    url_name = 'cof.mega_export_participants'
+    url_expected = '/export/mega/participants'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual(self.load_from_csv_response(r), [
+            ['u2', '', '', '', '', str(self.u2.pk), '', ''],
+        ])
+
+
+class ExportMegaRemarksViewTests(
+        MegaHelpers, ViewTestCaseMixin, TestCase):
+    url_name = 'cof.mega_export_remarks'
+    url_expected = '/export/mega/avecremarques'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    def test(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertListEqual(self.load_from_csv_response(r), [
+            [
+                'u1', 'first', 'last', 'user@mail.net', '0123456789',
+                str(self.u1.pk), 'profile.comments', 'Comment 1',
+            ],
+        ])
+
+
+class ClubListViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'liste-clubs'
+    url_expected = '/clubs/liste'
+
+    auth_user = 'member'
+    auth_forbidden = [None, 'user']
+
+    def setUp(self):
+        super().setUp()
+
+        self.c1 = Club.objects.create(name='Club1')
+        self.c2 = Club.objects.create(name='Club2')
+
+        m = self.users['member']
+        self.c1.membres.add(m)
+        self.c1.respos.add(m)
+
+    def test_as_member(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.context['owned_clubs'].get(), self.c1)
+        self.assertEqual(r.context['other_clubs'].get(), self.c2)
+
+    def test_as_staff(self):
+        u = self.users['staff']
+        c = Client()
+        c.force_login(u)
+
+        r = c.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertQuerysetEqual(
+            r.context['owned_clubs'], map(repr, [self.c1, self.c2]),
+            ordered=False,
+        )
+
+
+class ClubMembersViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'membres-club'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    @property
+    def url_kwargs(self):
+        return {'name': self.c.name}
+
+    @property
+    def url_expected(self):
+        return '/clubs/membres/{}'.format(self.c.name)
+
+    def setUp(self):
+        super().setUp()
+
+        self.u1 = create_user('u1')
+        self.u2 = create_user('u2')
+
+        self.c = Club.objects.create(name='Club')
+        self.c.membres.add(self.u1, self.u2)
+        self.c.respos.add(self.u1)
+
+    def test_as_staff(self):
+        r = self.client.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.context['members_no_respo'].get(), self.u2)
+
+    def test_as_respo(self):
+        u = self.users['user']
+        self.c.respos.add(u)
+
+        c = Client()
+        c.force_login(u)
+        r = c.get(self.url)
+
+        self.assertEqual(r.status_code, 200)
+
+
+class ClubChangeRespoViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'change-respo'
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    @property
+    def url_kwargs(self):
+        return {'club_name': self.c.name, 'user_id': self.users['user'].pk}
+
+    @property
+    def url_expected(self):
+        return '/clubs/change_respo/{}/{}'.format(
+            self.c.name, self.users['user'].pk,
+        )
+
+    def setUp(self):
+        super().setUp()
+
+        self.c = Club.objects.create(name='Club')
+
+    def test(self):
+        u = self.users['user']
+        expected_redirect = reverse('membres-club', kwargs={
+            'name': self.c.name,
+        })
+        self.c.membres.add(u)
+
+        r = self.client.get(self.url)
+        self.assertRedirects(r, expected_redirect)
+        self.assertIn(u, self.c.respos.all())
+
+        self.client.get(self.url)
+        self.assertNotIn(u, self.c.respos.all())
+
+
+class CalendarViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'calendar'
+    url_expected = '/calendar/subscription'
+
+    auth_user = 'member'
+    auth_forbidden = [None, 'user']
+
+    post_expected_message = Message(
+        messages.SUCCESS, "Calendrier mis à jour avec succès.")
+
+    def test_get(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+    def test_post_new(self):
+        r = self.client.post(self.url, {
+            'subscribe_to_events': True,
+            'subscribe_to_my_shows': True,
+            'other_shows': [],
+        })
+
+        self.assertEqual(r.status_code, 200)
+        self.assertIn(self.post_expected_message, get_messages(r.wsgi_request))
+        cs = self.users['member'].calendarsubscription
+        self.assertTrue(cs.subscribe_to_events)
+        self.assertTrue(cs.subscribe_to_my_shows)
+
+    def test_post_edit(self):
+        u = self.users['member']
+        token = uuid.uuid4()
+        cs = CalendarSubscription.objects.create(token=token, user=u)
+
+        r = self.client.post(self.url, {
+            'other_shows': [],
+        })
+
+        self.assertEqual(r.status_code, 200)
+        self.assertIn(self.post_expected_message, get_messages(r.wsgi_request))
+        cs.refresh_from_db()
+        self.assertEqual(cs.token, token)
+        self.assertFalse(cs.subscribe_to_events)
+        self.assertFalse(cs.subscribe_to_my_shows)
+
+    def test_post_other_shows(self):
+        t = Tirage.objects.create(
+            ouverture=self.now,
+            fermeture=self.now,
+            active=True,
+        )
+        l = Salle.objects.create()
+        s = t.spectacle_set.create(
+            date=self.now, price=3.5, slots=20, location=l, listing=True)
+
+        r = self.client.post(self.url, {'other_shows': [str(s.pk)]})
+
+        self.assertEqual(r.status_code, 200)
+
+
+class CalendarICSViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'calendar.ics'
+
+    auth_user = None
+    auth_forbidden = []
+
+    @property
+    def url_kwargs(self):
+        return {'token': self.token}
+
+    @property
+    def url_expected(self):
+        return '/calendar/{}/calendar.ics'.format(self.token)
+
+    def setUp(self):
+        super().setUp()
+
+        self.token = uuid.uuid4()
+
+        self.t = Tirage.objects.create(
+            ouverture=self.now,
+            fermeture=self.now,
+            active=True,
+        )
+        l = Salle.objects.create(name='Location')
+        self.s1 = self.t.spectacle_set.create(
+            price=1, slots=10, location=l, listing=True,
+            title='Spectacle 1', date=self.now + timedelta(days=1),
+        )
+        self.s2 = self.t.spectacle_set.create(
+            price=2, slots=20, location=l, listing=True,
+            title='Spectacle 2', date=self.now + timedelta(days=2),
+        )
+        self.s3 = self.t.spectacle_set.create(
+            price=3, slots=30, location=l, listing=True,
+            title='Spectacle 3', date=self.now + timedelta(days=3),
+        )
+
+    def test(self):
+        u = self.users['user']
+        p = u.participant_set.create(tirage=self.t)
+        p.attribution_set.create(spectacle=self.s1)
+
+        self.cs = CalendarSubscription.objects.create(
+            user=u, token=self.token,
+            subscribe_to_my_shows=True, subscribe_to_events=True,
+        )
+        self.cs.other_shows.add(self.s2)
+
+        r = self.client.get(self.url)
+
+        def get_dt_from_ical(v):
+            return v.dt
+
+        self.assertCalEqual(r.content.decode('utf-8'), [
+            {
+                'summary': 'Spectacle 1',
+                'dtstart': (get_dt_from_ical, (
+                    (self.now + timedelta(days=1)).replace(microsecond=0)
+                )),
+                'dtend': (get_dt_from_ical, (
+                    (self.now + timedelta(days=1, hours=2)).replace(
+                        microsecond=0)
+                )),
+                'location': 'Location',
+                'uid': 'show-{}-{}@example.com'.format(self.s1.pk, self.t.pk),
+            },
+            {
+                'summary': 'Spectacle 2',
+                'dtstart': (get_dt_from_ical, (
+                    (self.now + timedelta(days=2)).replace(microsecond=0)
+                )),
+                'dtend': (get_dt_from_ical, (
+                    (self.now + timedelta(days=2, hours=2)).replace(
+                        microsecond=0)
+                )),
+                'location': 'Location',
+                'uid': 'show-{}-{}@example.com'.format(self.s2.pk, self.t.pk),
+            },
+        ])
+
+
+class EventViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'event.details'
+    http_methods = ['GET', 'POST']
+
+    auth_user = 'user'
+    auth_forbidden = [None]
+
+    post_expected_message = Message(messages.SUCCESS, (
+        "Votre inscription a bien été enregistrée ! Vous pouvez cependant la "
+        "modifier jusqu'à la fin des inscriptions."
+    ))
+
+    @property
+    def url_kwargs(self):
+        return {'event_id': self.e.pk}
+
+    @property
+    def url_expected(self):
+        return '/event/{}'.format(self.e.pk)
+
+    def setUp(self):
+        super().setUp()
+
+        self.e = Event.objects.create()
+
+        self.ecf1 = self.e.commentfields.create(name='Comment Field 1')
+        self.ecf2 = self.e.commentfields.create(
+            name='Comment Field 2', fieldtype='char',
+        )
+
+        self.o1 = self.e.options.create(name='Option 1')
+        self.o2 = self.e.options.create(name='Option 2', multi_choices=True)
+
+        self.oc1 = self.o1.choices.create(value='O1 - Choice 1')
+        self.oc2 = self.o1.choices.create(value='O1 - Choice 2')
+        self.oc3 = self.o2.choices.create(value='O2 - Choice 1')
+        self.oc4 = self.o2.choices.create(value='O2 - Choice 2')
+
+    def test_get(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+    def test_post_new(self):
+        r = self.client.post(self.url, {
+            'option_{}'.format(self.o1.pk): [str(self.oc1.pk)],
+            'option_{}'.format(self.o2.pk): [
+                str(self.oc3.pk), str(self.oc4.pk),
+            ],
+        })
+
+        self.assertEqual(r.status_code, 200)
+        self.assertIn(self.post_expected_message, get_messages(r.wsgi_request))
+
+        er = self.e.eventregistration_set.get(user=self.users['user'])
+        self.assertQuerysetEqual(
+            er.options.all(), map(repr, [self.oc1, self.oc3, self.oc4]),
+            ordered=False,
+        )
+        # TODO: Make the view care about comments.
+        # self.assertQuerysetEqual(
+        #     er.comments.all(), map(repr, []),
+        #     ordered=False,
+        # )
+
+    def test_post_edit(self):
+        er = self.e.eventregistration_set.create(user=self.users['user'])
+        er.options.add(self.oc1, self.oc3, self.oc4)
+        er.comments.create(
+            commentfield=self.ecf1, content='Comment 1',
+        )
+
+        r = self.client.post(self.url, {
+            'option_{}'.format(self.o1.pk): [],
+            'option_{}'.format(self.o2.pk): [str(self.oc3.pk)],
+        })
+
+        self.assertEqual(r.status_code, 200)
+        self.assertIn(self.post_expected_message, get_messages(r.wsgi_request))
+
+        er.refresh_from_db()
+        self.assertQuerysetEqual(
+            er.options.all(), map(repr, [self.oc3]),
+            ordered=False,
+        )
+        # TODO: Make the view care about comments.
+        # self.assertQuerysetEqual(
+        #     er.comments.all(), map(repr, []),
+        #     ordered=False,
+        # )
+
+
+class EventStatusViewTests(ViewTestCaseMixin, TestCase):
+    url_name = 'event.details.status'
+
+    http_methods = ['GET', 'POST']
+
+    auth_user = 'staff'
+    auth_forbidden = [None, 'user', 'member']
+
+    @property
+    def url_kwargs(self):
+        return {'event_id': self.e.pk}
+
+    @property
+    def url_expected(self):
+        return '/event/{}/status'.format(self.e.pk)
+
+    def setUp(self):
+        super().setUp()
+
+        self.e = Event.objects.create()
+
+        self.cf1 = self.e.commentfields.create(name='Comment Field 1')
+        self.cf2 = self.e.commentfields.create(
+            name='Comment Field 2', fieldtype='char',
+        )
+
+        self.o1 = self.e.options.create(name='Option 1')
+        self.o2 = self.e.options.create(name='Option 2', multi_choices=True)
+
+        self.oc1 = self.o1.choices.create(value='O1 - Choice 1')
+        self.oc2 = self.o1.choices.create(value='O1 - Choice 2')
+        self.oc3 = self.o2.choices.create(value='O2 - Choice 1')
+        self.oc4 = self.o2.choices.create(value='O2 - Choice 2')
+
+        self.er1 = self.e.eventregistration_set.create(user=self.users['user'])
+        self.er1.options.add(self.oc1)
+        self.er2 = self.e.eventregistration_set.create(
+            user=self.users['member'],
+        )
+
+    def _get_oc_filter_name(self, oc):
+        return 'option_{}_choice_{}'.format(oc.event_option.pk, oc.pk)
+
+    def _test_filters(self, filters, expected):
+        r = self.client.post(self.url, {
+            self._get_oc_filter_name(oc): v for oc, v in filters
+        })
+
+        self.assertEqual(r.status_code, 200)
+        self.assertQuerysetEqual(
+            r.context['user_choices'], map(repr, expected),
+            ordered=False,
+        )
+
+    def test_filter_none(self):
+        self._test_filters([(self.oc1, 'none')], [self.er1, self.er2])
+
+    def test_filter_yes(self):
+        self._test_filters([(self.oc1, 'yes')], [self.er1])
+
+    def test_filter_no(self):
+        self._test_filters([(self.oc1, 'no')], [self.er2])
+
 
 class SurveyViewTests(ViewTestCaseMixin, TestCase):
     url_name = 'survey.details'
-
     http_methods = ['GET', 'POST']
 
     auth_user = 'user'

gestioncof/tests/utils.py

@@ -9,7 +9,9 @@ def _create_user(username, is_cof=False, is_staff=False, attrs=None):
 
     password = attrs.pop('password', username)
 
-    user_keys = ['first_name', 'last_name', 'email', 'is_staff']
+    user_keys = [
+        'first_name', 'last_name', 'email', 'is_staff', 'is_superuser',
+    ]
     user_attrs = {k: v for k, v in attrs.items() if k in user_keys}
 
     profile_keys = [
@@ -49,3 +51,11 @@ def create_member(username, attrs=None):
 
 def create_staff(username, attrs=None):
     return _create_user(username, is_cof=True, is_staff=True, attrs=attrs)
+
+
+def create_root(username, attrs=None):
+    if attrs is None:
+        attrs = {}
+    attrs.setdefault('is_staff', True)
+    attrs.setdefault('is_superuser', True)
+    return _create_user(username, attrs=attrs)

gestioncof/urls.py

@@ -6,12 +6,17 @@ from gestioncof import views, petits_cours_views
 from gestioncof.decorators import buro_required
 
 export_patterns = [
-    url(r'^members$', views.export_members),
-    url(r'^mega/avecremarques$', views.export_mega_remarksonly),
-    url(r'^mega/participants$', views.export_mega_participants),
-    url(r'^mega/orgas$', views.export_mega_orgas),
+    url(r'^members$', views.export_members,
+        name='cof.membres_export'),
+    url(r'^mega/avecremarques$', views.export_mega_remarksonly,
+        name='cof.mega_export_remarks'),
+    url(r'^mega/participants$', views.export_mega_participants,
+        name='cof.mega_export_participants'),
+    url(r'^mega/orgas$', views.export_mega_orgas,
+        name='cof.mega_export_orgas'),
     # url(r'^mega/(?P<type>.+)$', views.export_mega_bytype),
-    url(r'^mega$', views.export_mega),
+    url(r'^mega$', views.export_mega,
+        name='cof.mega_export'),
 ]
 
 petitcours_patterns = [
@@ -52,7 +57,8 @@ events_patterns = [
 calendar_patterns = [
     url(r'^subscription$', views.calendar,
         name='calendar'),
-    url(r'^(?P<token>[a-z0-9-]+)/calendar.ics$', views.calendar_ics)
+    url(r'^(?P<token>[a-z0-9-]+)/calendar.ics$', views.calendar_ics,
+        name='calendar.ics'),
 ]
 
 clubs_patterns = [

gestioncof/views.py

@@ -9,6 +9,7 @@ from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.views import (
     login as django_login_view, logout as django_logout_view,
+    redirect_to_login,
 )
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -338,7 +339,7 @@ def profile(request):
         if form.is_valid():
             form.save()
             messages.success(request,
-                             "Votre profil a été mis à jour avec  succès !")
+                             "Votre profil a été mis à jour avec succès !")
     else:
         form = UserProfileForm(instance=request.user.profile)
     return render(request, "gestioncof/profile.html", {"form": form})
@@ -566,7 +567,7 @@ def liste_clubs(request):
     if request.user.profile.is_buro:
         data = {'owned_clubs': clubs.all()}
     else:
-        data = {'owned_clubs': request.user.clubs_geres,
+        data = {'owned_clubs': request.user.clubs_geres.all(),
                 'other_clubs': clubs.exclude(respos=request.user)}
     return render(request, 'liste_clubs.html', data)
 
@@ -782,7 +783,7 @@ class ConfigUpdate(FormView):
 
     def dispatch(self, request, *args, **kwargs):
         if request.user is None or not request.user.is_superuser:
-            raise Http404
+            return redirect_to_login(request.get_full_path())
         return super().dispatch(request, *args, **kwargs)
 
     def form_valid(self, form):

kfet/migrations/0063_promo.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-04-05 21:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kfet', '0062_delete_globalpermissions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='promo',
+            field=models.IntegerField(blank=True, choices=[(1980, 1980), (1981, 1981), (1982, 1982), (1983, 1983), (1984, 1984), (1985, 1985), (1986, 1986), (1987, 1987), (1988, 1988), (1989, 1989), (1990, 1990), (1991, 1991), (1992, 1992), (1993, 1993), (1994, 1994), (1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018)], default=2017, null=True),
+        ),
+    ]

kfet/static/kfet/css/base/misc.css

@@ -75,6 +75,10 @@ ul {
     padding:8px !important;
 }
 
+.table thead .sm-padding {
+    padding:3px !important;
+}
+
 .table tr.section {
     background: #c63b52 !important;
     color:#fff;

kfet/static/kfet/css/index.css

@@ -3,6 +3,7 @@
 
 /* Libs customizations */
 @import url("libs/jconfirm-kfet.css");
+@import url("libs/jquery-tablesorter-kfet.css");
 @import url("libs/multiple-select-kfet.css");
 
 /* Base */
@@ -54,6 +55,11 @@
     color: #C81022;
 }
 
+.table thead .glyphicon {
+    font-size: 12px;
+    opacity: 0.8;
+}
+
 
 /*
  * Pages tableaux seuls
@@ -82,6 +88,11 @@
     border-radius: 0;
 }
 
+.table td.small-width {
+    /* Header still extends the width of the column, but it will be minimal. */
+    width: 30px;
+}
+
 .auth-form {
     padding: 15px 0;
     background: #d86c7e;

kfet/static/kfet/js/kfet.js

@@ -235,3 +235,77 @@ function submit_url(el) {
     let url = $(el).data('url');
     create_form(url).appendTo($('body')).submit();
 }
+
+
+/**
+ * jquery-tablesorter
+ * https://mottie.github.io/tablesorter/docs/
+ *
+ * Known bugs (v2.29.0):
+ * - Sort order icons in sticky headers are not updated.
+ *   Status: Fixed in next release.
+ *
+ * TODO:
+ * - Handle i18n.
+ */
+
+
+function registerBoolParser(id, true_str, false_str) {
+    $.tablesorter.addParser({
+        id: id,
+        format: function(s) {
+            return s.toLowerCase()
+                .replace(true_str, 1)
+                .replace(false_str, 0);
+        },
+        type: 'numeric'
+    });
+}
+
+
+// Parsers for the text representations of boolean.
+registerBoolParser('yesno', 'oui', 'non');
+
+registerBoolParser('article__is_sold', 'en vente', 'non vendu');
+registerBoolParser('article__hidden', 'caché', 'affiché');
+
+
+// https://mottie.github.io/tablesorter/docs/index.html#variable-defaults
+$.extend(true, $.tablesorter.defaults, {
+    headerTemplate: '{content} {icon}',
+
+    cssIconAsc  : 'glyphicon glyphicon-chevron-up',
+    cssIconDesc : 'glyphicon glyphicon-chevron-down',
+    cssIconNone : 'glyphicon glyphicon-resize-vertical',
+
+    // Only four-digits format year is handled by the builtin parser
+    // 'shortDate'.
+    dateFormat: 'ddmmyyyy',
+
+    // Accented characters are replaced with their non-accented one.
+    sortLocaleCompare: true,
+    // French format: 1 234,56
+    usNumberFormat: false,
+
+    widgets: ['stickyHeaders'],
+    widgetOptions: {
+        stickyHeaders_offset: '.navbar',
+    }
+});
+
+
+// https://mottie.github.io/tablesorter/docs/index.html#variable-language
+$.extend($.tablesorter.language, {
+    sortAsc      : 'Trié par ordre croissant, ',
+    sortDesc     : 'Trié par ordre décroissant, ',
+    sortNone     : 'Non trié, ',
+    sortDisabled : 'tri désactivé et/ou non-modifiable',
+    nextAsc      : 'cliquer pour trier par ordre croissant',
+    nextDesc     : 'cliquer pour trier par ordre décroissant',
+    nextNone     : 'cliquer pour retirer le tri'
+});
+
+
+$( function() {
+    $('.sortable').tablesorter();
+});

kfet/templates/kfet/account.html

@@ -37,13 +37,16 @@
 
 <section>
   <div class="table-responsive">
-    <table class="table table-hover table-condensed">
+    <table
+        class="table table-hover table-condensed sortable"
+        {# Initial sort: [(trigramme,asc)] #}
+        data-sortlist="[[0,0]]">
       <thead>
         <tr>
           <td class="text-center">Tri.</td>
           <td>Nom</td>
           <td class="text-right">Balance</td>
-          <td class="text-center">COF</td>
+          <td class="text-center" data-sorter="yesno">COF</td>
           <td>Dpt</td>
           <td class="text-center">Promo</td>
         </tr>

kfet/templates/kfet/account_negative.html

@@ -35,16 +35,19 @@
 {% block main %}
 
 <div class="table-responsive">
-  <table class="table table-hover table-condensed">
+  <table
+      class="table table-hover table-condensed sortable"
+      {# Initial sort: [(trigramme,asc)] #}
+      data-sortlist="[[0,0]]">
     <thead>
       <tr>
         <td class="text-center">Tri.</td>
         <td>Nom</td>
         <td class="text-right">Balance</td>
         <td class="text-right">Réelle</td>
-        <td>Début</td>
+        <td data-sorter="shortDate">Début</td>
         <td>Découvert autorisé</td>
-        <td>Jusqu'au</td>
+        <td data-sorter="shortDate">Jusqu'au</td>
         <td>Balance offset</td>
       </tr>
     </thead>
@@ -63,9 +66,13 @@
             {{ neg.account.real_balance|floatformat:2 }}€
           {% endif %}
         </td>
-        <td>{{ neg.start|date:'d/m/Y H:i:s'}}</td>
+        <td title="{{ neg.start }}">
+          {{ neg.start|date:'d/m/Y H:i'}}
+        </td>
         <td>{{ neg.authz_overdraft_amount|default_if_none:'' }}</td>
-        <td>{{ neg.authz_overdrafy_until|default_if_none:'' }}</td>
+        <td title="{{ neg.authz_overdraft_until }}">
+          {{ neg.authz_overdraft_until|date:'d/m/Y H:i' }}
+        </td>
         <td>{{ neg.balance_offset|default_if_none:'' }}</td>
       </tr>
       {% endfor %}

kfet/templates/kfet/article.html

@@ -30,38 +30,49 @@
 {% block main %}
 <h2>Article{{ articles|length|pluralize}} en vente</h2>
 <div class="table-responsive">
-  <table class="table table-hover table-condensed">
+  <table
+      class="table table-hover table-condensed sortable"
+      {# Initial sort: [(is_sold,desc), (name,asc)] #}
+      data-sortlist="[[3,1], [0,0]]">
     <thead>
       <tr>
         <td>Nom</td>
         <td class="text-right">Prix</td>
         <td class="text-right">Stock</td>
-        <td class="text-right">En vente</td>
-        <td class="text-right">Affiché</td>
-        <td class="text-right">Dernier inventaire</td>
+        <td class="text-right" data-sorter="article__is_sold">En vente</td>
+        <td class="text-right" data-sorter="article__hidden">Affiché</td>
+        <td class="text-right" data-sorter="shortDate">Dernier inventaire</td>
       </tr>
     </thead>
-    <tbody>
-      {% for article in articles %}
-      {% ifchanged article.category %}
-      <tr class="section">
-        <td colspan="6">{{ article.category.name }}</td>
-      </tr>
-      {% endifchanged %}
-      <tr>
-        <td>
-          <a href="{% url 'kfet.article.read' article.pk %}">
-            {{ article.name }}
-          </a>
-        </td>
-        <td class="text-right">{{ article.price }}€</td>
-        <td class="text-right">{{ article.stock }}</td>
-        <td class="text-right">{{ article.is_sold | yesno:"En vente,Non vendu"}}</td>
-        <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
-        <td class="text-right">{{ article.inventory.0.at }}</td>
-      </tr>
-      {% endfor %}
-    </tbody>
+    {% regroup articles by category as category_list %}
+
+    {% for category in category_list %}
+      <tbody class="tablesorter-no-sort">
+        <tr class="section">
+          <td colspan="6">{{ category.grouper }}</td>
+        </tr>
+      </tbody>
+      <tbody>
+        {% for article in category.list %}
+          <tr>
+            <td>
+              <a href="{% url 'kfet.article.read' article.pk %}">
+                {{ article.name }}
+              </a>
+            </td>
+            <td class="text-right">{{ article.price }}€</td>
+            <td class="text-right">{{ article.stock }}</td>
+            <td class="text-right">{{ article.is_sold | yesno:"En vente,Non vendu"}}</td>
+            <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
+            {% with last_inventory=article.inventory.0 %}
+            <td class="text-right" title="{{ last_inventory.at }}">
+              {{ last_inventory.at|date:'d/m/Y H:i' }}
+            </td>
+            {% endwith %}
+          </tr>
+        {% endfor %}
+      </tbody>
+    {% endfor %}
   </table>
 </div>
 

kfet/templates/kfet/article_inventories_snippet.html

@@ -1,7 +1,10 @@
-<table class="table table-hover table-condensed">
+<table
+    class="table table-hover table-condensed sortable"
+    {# Initial sort: [(inventory.at,desc)] #}
+    data-sortlist="[[0,1]]">
   <thead>
     <tr>
-      <td>Date</td>
+      <td data-sorter="shortDate">Date</td>
       <td>Stock</td>
       <td>Erreur</td>
     </tr>
@@ -9,9 +12,9 @@
   <tbody>
     {% for inventoryart in inventoryarts %}
     <tr>
-      <td>
+      <td title="{{ inventoryart.inventory.at }}">
         <a href="{% url "kfet.inventory.read" inventoryart.inventory.pk %}">
-          {{ inventoryart.inventory.at }}
+          {{ inventoryart.inventory.at|date:'d/m/Y H:i' }}
         </a>
       </td>
       <td>{{ inventoryart.stock_new }}</td>

kfet/templates/kfet/article_suppliers_snippet.html

@@ -1,7 +1,10 @@
-<table class="table table-hover table-condensed">
+<table
+    class="table table-hover table-condensed sortable"
+    {# Initial sort: [(at,desc)] #}
+    data-sortlist="[[0,1]]">
   <thead>
     <tr>
-      <td>Date</td>
+      <td data-sorter="shortDate">Date</td>
       <td>Fournisseur</td>
       <td>HT</td>
       <td>TVA</td>
@@ -11,7 +14,9 @@
   <tbody>
     {% for supplierart in supplierarts %}
     <tr>
-      <td>{{ supplierart.at }}</td>
+      <td title="{{ supplierart.at }}">
+        {{ supplierart.at|date:'d/m/Y' }}
+      </td>
       <td>{{ supplierart.supplier.name }}</td>
       <td>{{ supplierart.price_HT|default_if_none:"" }}</td>
       <td>{{ supplierart.TVA|default_if_none:"" }}</td>

kfet/templates/kfet/base.html

@@ -24,6 +24,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <script type="text/javascript" src="{% static 'kfet/js/jquery-ui.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/js/jquery-confirm.js' %}"></script>
+    <script type="text/javascript" src="{% static 'kfet/vendor/jquery-tablesorter/jquery.tablesorter.combined.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/js/reconnecting-websocket.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/js/moment.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>

kfet/templates/kfet/category.html

@@ -17,12 +17,15 @@
 {% block main %}
 
 <div class="table-responsive">
-  <table class="table table-hover table-condensed">
+  <table
+      class="table table-hover table-condensed sortable"
+      {# Initial sort: [(name,asc)] #}
+      data-sortlist="[[0,0]]">
     <thead>
       <tr>
         <td>Nom</td>
         <td class="text-right">Nombre d'articles</td>
-        <td class="text-right">Peut être majorée</td>
+        <td class="text-right" data-sorter="yesno">Peut être majorée</td>
       </tr>
     </thead>
     <tbody>

kfet/templates/kfet/checkout.html

@@ -24,13 +24,16 @@
 {% block main %}
 
 <div class="table-responsive">
-  <table class="table table-hover table-condensed">
+  <table
+      class="table table-hover table-condensed sortable"
+      {# Initial sort: [(valid_to,desc)] #}
+      data-sortlist="[[3,1]]">
     <thead>
       <tr>
         <td>Nom</td>
         <td class="text-right">Balance</td>
-        <td class="text-right">Déb. valid.</td>
-        <td class="text-right">Fin valid.</td>
+        <td class="text-right" data-parser="shortDate">Déb. valid.</td>
+        <td class="text-right" data-parser="shortDate">Fin valid.</td>
         <td class="text-right">Protégée</td>
       </tr>
     </thead>
@@ -43,8 +46,12 @@
           </a>
         </td>
         <td class="text-right">{{ checkout.balance}}€</td>
-        <td class="text-right">{{ checkout.valid_from }}</td>
-        <td class="text-right">{{ checkout.valid_to }}</td>
+        <td class="text-right" title="{{ checkout.valid_from }}">
+          {{ checkout.valid_from|date:'d/m/Y H:i' }}
+        </td>
+        <td class="text-right" title="{{ checkout.valid_to }}">
+          {{ checkout.valid_to|date:'d/m/Y H:i' }}
+        </td>
         <td class="text-right">{{ checkout.is_protected|yesno }}</td>
       </tr>
       {% endfor %}

kfet/templates/kfet/checkout_read.html

@@ -14,10 +14,13 @@
     {% if not statements %}
       Pas de relevé
     {% else %}
-      <table class="table table-hover table-condensed">
+      <table
+          class="table table-hover table-condensed sortable"
+          {# Initial sort: [(at,desc)] #}
+          data-sortlist="[[0,1]]">
         <thead>
           <tr>
-            <td>Date/heure</td>
+            <td data-sorter="shortDate">Date/heure</td>
             <td>Montant pris</td>
             <td>Montant laissé</td>
             <td>Erreur</td>
@@ -25,9 +28,9 @@
         <tbody>
           {% for statement in statements %}
           <tr>
-            <td>
+            <td title="{{ statement.at }}">
               <a href="{% url 'kfet.checkoutstatement.update' checkout.pk statement.pk %}">
-                {{ statement.at }}
+                {{ statement.at|date:'d/m/Y H:i' }}
               </a>
             </td>
             <td>{{ statement.amount_taken }}</td>

kfet/templates/kfet/inventory.html

@@ -17,10 +17,13 @@
 {% block main %}
 
 <div class="table-responsive">
-  <table class="table table-hover table-condensed">
+  <table
+      class="table table-hover table-condensed sortable"
+      {# Initial sort: [(at,desc)] #}
+      data-sortlist="[[0,1]]">
     <thead>
       <tr>
-        <td>Date</td>
+        <td data-sorter="shortDate">Date</td>
         <td>Par</td>
         <td>Nb articles</td>
       </tr>
@@ -28,9 +31,9 @@
     <tbody>
       {% for inventory in inventories %}
       <tr>
-        <td>
+        <td title="{{ inventory.at }}">
           <a href="{% url 'kfet.inventory.read' inventory.pk %}">
-            <span>{{ inventory.at }}</span>
+            {{ inventory.at|date:'d/m/Y H:i' }}
           </a>
         </td>
         <td>{{ inventory.by }}</td>

kfet/templates/kfet/inventory_read.html

@@ -27,7 +27,10 @@
 {% block main %}
 
 <div class="table-responsive">
-  <table class="table table-condensed">
+  <table
+      class="table table-condensed table-hover table-striped sortable"
+      {# Initial sort: [(article.name,asc)] #}
+      data-sortlist="[[0,0]]">
     <thead>
       <tr>
         <td>Article</td>
@@ -36,25 +39,28 @@
         <td>Erreur</td>
       </tr>
     </thead>
-    <tbody>
-      {% for inventoryart in inventoryarts %}
-        {% ifchanged inventoryart.article.category %}
-          <tr class="section">
-            <td colspan="4">{{ inventoryart.article.category.name }}</td>
-          </tr>
-        {% endifchanged %}
-        <tr>
-          <td>
-            <a href="{% url "kfet.article.read" inventoryart.article.id %}">
-              {{ inventoryart.article.name }}
-            </a>
-          </td>
-          <td>{{ inventoryart.stock_old }}</td>
-          <td>{{ inventoryart.stock_new }}</td>
-          <td>{{ inventoryart.stock_error }}</td>
+    {% regroup inventoryarts by article.category as category_list %}
+    {% for category in category_list %}
+      <tbody class="tablesorter-no-sort">
+        <tr class="section">
+          <td colspan="4">{{ category.grouper.name }}</td>
         </tr>
-      {% endfor %}
-    </tbody>
+      </tbody>
+      <tbody>
+        {% for inventoryart in category.list %}
+          <tr>
+            <td>
+              <a href="{% url "kfet.article.read" inventoryart.article.id %}">
+                {{ inventoryart.article.name }}
+              </a>
+            </td>
+            <td>{{ inventoryart.stock_old }}</td>
+            <td>{{ inventoryart.stock_new }}</td>
+            <td>{{ inventoryart.stock_error }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    {% endfor %}
   </table>
 </div>
 

kfet/templates/kfet/order.html

@@ -55,11 +55,14 @@
 <section>
   <h2>Liste des commandes</h2>
   <div class="table-responsive">
-    <table class="table table-hover table-condensed">
+    <table
+        class="table table-hover table-condensed sortable"
+        {# Initial sort: [(at,desc)] #}
+        data-sortlist="[[1,1]]">
       <thead>
         <tr>
-          <td></td>
-          <td>Date</td>
+          <td data-sorter="false"></td>
+          <td data-parser="shortDate">Date</td>
           <td>Fournisseur</td>
           <td>Inventaire</td>
         </tr>
@@ -74,9 +77,9 @@
               </a>
             {% endif %}
           </td>
-          <td>
+          <td tile="{{ order.at }}">
             <a href="{% url 'kfet.order.read' order.pk %}">
-              {{ order.at }}
+              {{ order.at|date:'d/m/Y H:i' }}
             </a>
           </td>
           <td>{{ order.supplier }}</td>

kfet/templates/kfet/order_create.html

@@ -11,60 +11,79 @@
 <form action="" method="post">
   {% csrf_token %}
   <div class="table-responsive">
-  <table class="table table-hover table-condensed table-condensed-input text-center table-striped">
+  <table
+      class="table table-hover table-condensed table-condensed-input text-center table-striped sortable"
+      {# Initial sort: [(name,asc)] #}
+      data-sortlist="[[0,0]]">
     <thead>
       <tr>
         <td rowspan="2">Article</td>
-        <td colspan="{{ scale|length }}">Ventes
-            <span class='glyphicon glyphicon-question-sign' title="Ventes des 5 dernières semaines" data-placement="bottom"></span>
-            </td>
-        <td rowspan="2">V. moy.<br>
-            <span class='glyphicon glyphicon-question-sign' title="Moyenne des ventes" data-placement="bottom"></span>
-            </td>
-        <td rowspan="2">E.T.<br>
-            <span class='glyphicon glyphicon-question-sign' title="Écart-type des ventes" data-placement="bottom"></span>
-            </td>
-        <td rowspan="2">Prév.<br>
-            <span class='glyphicon glyphicon-question-sign' title="Prévision de ventes" data-placement="bottom"></span>
-            </td>
+        <td colspan="{{ scale|length }}">
+          Ventes
+          <i class='glyphicon glyphicon-question-sign' title="Ventes des 5 dernières semaines" data-placement="bottom"></i>
+        </td>
+        <td rowspan="2">
+          V. moy.
+          <br>
+          <i class='glyphicon glyphicon-question-sign' title="Moyenne des ventes" data-placement="bottom"></i>
+        </td>
+        <td rowspan="2" data-sorter="false">
+          E.T.
+          <br>
+          <i class='glyphicon glyphicon-question-sign' title="Écart-type des ventes" data-placement="bottom"></i>
+        </td>
+        <td rowspan="2">
+          Prév.
+          <br>
+          <i class='glyphicon glyphicon-question-sign' title="Prévision de ventes" data-placement="bottom"></i>
+        </td>
         <td rowspan="2">Stock</td>
-        <td rowspan="2">Box<br>
-            <span class='glyphicon glyphicon-question-sign' title="Capacité d'une boite" data-placement="bottom"></span>
-            </td>
-        <td rowspan="2">Rec.<br>
-            <span class='glyphicon glyphicon-question-sign' title="Quantité conseillée" data-placement="bottom"></span>
-            </td>
-        <td rowspan="2">Commande</td>
+        <td rowspan="2" data-sorter="false">
+          Box
+          <br>
+          <i class='glyphicon glyphicon-question-sign' title="Capacité d'une boite" data-placement="bottom"></i>
+        </td>
+        <td rowspan="2">
+          Rec.
+          <br>
+          <i class='glyphicon glyphicon-question-sign' title="Quantité conseillée" data-placement="bottom"></i>
+        </td>
+        <td rowspan="2" data-sorter="false" class="small-width">
+          Commande
+        </td>
       </tr>
       <tr>
         {% for label in scale.get_labels %}
-        <td>{{ label }}</td>
+        <td class="sm-padding">{{ label }}</td>
         {% endfor %}
       </tr>
     </thead>
-    <tbody>
-      {% for form in formset %}
-        {% ifchanged form.category %}
-          <tr class='section text-left'>
-            <td colspan="{{ scale|length|add:'8' }}">{{ form.category_name }}</td>
-          </tr>
-        {% endifchanged %}
-        <tr>
-          {{ form.article }}
-          <td class="text-left">{{ form.name }}</td>
-          {% for v_chunk in form.v_all %}
-          <td>{{ v_chunk }}</td>
-          {% endfor %}
-          <td>{{ form.v_moy }}</td>
-          <td>{{ form.v_et }}</td>
-          <td>{{ form.v_prev }}</td>
-          <td>{{ form.stock }}</td>
-          <td>{{ form.box_capacity|default:"" }}</td>
-          <td>{{ form.c_rec }}</td>
-          <td class="nopadding">{{ form.quantity_ordered | add_class:"form-control" }}</td>
+    {% regroup formset by category_name as category_list %}
+    {% for category in category_list %}
+      <tbody class="tablesorter-no-sort">
+        <tr class='section text-left'>
+          <td colspan="{{ scale|length|add:'8' }}">{{ category.grouper }}</td>
         </tr>
-      {% endfor %}
-    </tbody>
+      </tbody>
+      <tbody>
+        {% for form in category.list %}
+          <tr>
+            {{ form.article }}
+            <td class="text-left">{{ form.name }}</td>
+            {% for v_chunk in form.v_all %}
+            <td>{{ v_chunk }}</td>
+            {% endfor %}
+            <td>{{ form.v_moy }}</td>
+            <td>{{ form.v_et }}</td>
+            <td>{{ form.v_prev }}</td>
+            <td>{{ form.stock }}</td>
+            <td>{{ form.box_capacity|default:"" }}</td>
+            <td>{{ form.c_rec }}</td>
+            <td class="nopadding">{{ form.quantity_ordered|add_class:"form-control" }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    {% endfor %}
   </table>
   </div>
   {{ formset.management_form }}

kfet/templates/kfet/order_read.html

@@ -42,7 +42,10 @@
 <section>
   <h2>Détails</h2>
   <div class="table-responsive">
-    <table class="table table-condensed">
+    <table
+        class="table table-condensed table-hover table-striped sortable"
+        {# Initial sort: [(article.name,asc)] #}
+        data-sortlist="[[0,0]]">
       <thead>
         <tr>
           <td>Article</td>
@@ -51,32 +54,35 @@
           <td>Reçu</td>
         </tr>
       </thead>
-      <tbody>
-        {% for orderart in orderarts %}
-          {% ifchanged orderart.article.category %}
-            <tr class="section">
-              <td colspan="4">{{ orderart.article.category.name }}</td>
-            </tr>
-          {% endifchanged %}
-          <tr>
-            <td>
-              <a href="{% url "kfet.article.read" orderart.article.id %}">
-                {{ orderart.article.name }}
-              </a>
-            </td>
-            <td>{{ orderart.quantity_ordered }}</td>
-            <td>
-              {% if orderart.article.box_capacity %}
-                {# c'est une division ! #}
-                {% widthratio orderart.quantity_ordered orderart.article.box_capacity 1 %}
-              {% endif %}
-            </td>
-            <td>
-              {{ orderart.quantity_received|default_if_none:'' }}
-            </td>
+      {% regroup orderarts by article.category as category_list %}
+      {% for category in category_list %}
+        <tbody class="tablesorter-no-sort">
+          <tr class="section">
+            <td colspan="4">{{ category.grouper.name }}</td>
           </tr>
-        {% endfor %}
-      </tbody>
+        </tbody>
+        <tbody>
+          {% for orderart in category.list %}
+            <tr>
+              <td>
+                <a href="{% url "kfet.article.read" orderart.article.id %}">
+                  {{ orderart.article.name }}
+                </a>
+              </td>
+              <td>{{ orderart.quantity_ordered }}</td>
+              <td>
+                {% if orderart.article.box_capacity %}
+                  {# c'est une division ! #}
+                  {% widthratio orderart.quantity_ordered orderart.article.box_capacity 1 %}
+                {% endif %}
+              </td>
+              <td>
+                {{ orderart.quantity_received|default_if_none:'' }}
+              </td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      {% endfor %}
     </table>
   </div>
 </section>

kfet/views.py

@@ -1843,7 +1843,7 @@ def order_create(request, pk):
     else:
         formset = cls_formset(initial=initial)
 
-    scale.label_fmt = "S -{rev_i}"
+    scale.label_fmt = "S-{rev_i}"
 
     return render(request, 'kfet/order_create.html', {
         'supplier': supplier,

shared/tests/testcases.py

@@ -1,3 +1,4 @@
+import csv
 from unittest import mock
 from urllib.parse import parse_qs, urlparse
 
@@ -8,6 +9,8 @@ from django.test import Client
 from django.utils import timezone
 from django.utils.functional import cached_property
 
+import icalendar
+
 User = get_user_model()
 
 
@@ -92,6 +95,44 @@ class TestCaseMixin:
         else:
             self.assertEqual(actual, expected)
 
+    def load_from_csv_response(self, r):
+        decoded = r.content.decode('utf-8')
+        return list(csv.reader(decoded.split('\n')[:-1]))
+
+    def _test_event_equal(self, event, exp):
+        for k, v_desc in exp.items():
+            if isinstance(v_desc, tuple):
+                v_getter = v_desc[0]
+                v = v_desc[1]
+            else:
+                v_getter = lambda v: v
+                v = v_desc
+            if v_getter(event[k.upper()]) != v:
+                return False
+        return True
+
+    def _find_event(self, ev, l):
+        for i, elt in enumerate(l):
+            if self._test_event_equal(ev, elt):
+                return elt, i
+        return False, -1
+
+    def assertCalEqual(self, ical_content, expected):
+        remaining = expected.copy()
+        unexpected = []
+
+        cal = icalendar.Calendar.from_ical(ical_content)
+
+        for ev in cal.walk('vevent'):
+            found, i_found = self._find_event(ev, remaining)
+            if found:
+                remaining.pop(i_found)
+            else:
+                unexpected.append(ev)
+
+        self.assertListEqual(unexpected, [])
+        self.assertListEqual(remaining, [])
+
 
 class ViewTestCaseMixin(TestCaseMixin):
     """