From ba48adab6dee434213c9cb7a58d4d48e114b3c46 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Fri, 29 Jul 2016 13:00:32 +0200
Subject: [PATCH] Improve launderette plannings and admin part

---
 core/templates/core/user_tools.jinja          |   5 +
 launderette/migrations/0003_machine_type.py   |  20 +++
 .../migrations/0004_token_start_date.py       |  22 +++
 launderette/models.py                         |  10 +-
 .../launderette/launderette_book.jinja        |  23 ++-
 .../launderette/launderette_detail.jinja      |   9 +-
 launderette/urls.py                           |   3 +
 launderette/views.py                          | 105 +++++++++---
 locale/fr/LC_MESSAGES/django.mo               | Bin 20085 -> 20385 bytes
 locale/fr/LC_MESSAGES/django.po               | 150 ++++++++----------
 10 files changed, 232 insertions(+), 115 deletions(-)
 create mode 100644 launderette/migrations/0003_machine_type.py
 create mode 100644 launderette/migrations/0004_token_start_date.py

diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index a577ed71..e88ccb16 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -16,12 +16,17 @@
     {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
     <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
     {% endif %}
+    <h5>{% trans %}Launderette{% endtrans %}</h5>
+    {% if user.is_in_group(settings.SITH_GROUPS['launderette-admin']['name']) %}
+    <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Launderette{% endtrans %}</a></li>
+    {% endif %}
 </ul>
 
 <hr>
 <h4>{% trans %}Counters{% endtrans %}</h4>
 <ul>
     {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    <h5>{% trans %}General management{% endtrans %}</h5>
     <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
     <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
     <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Products type management{% endtrans %}</a></li>
diff --git a/launderette/migrations/0003_machine_type.py b/launderette/migrations/0003_machine_type.py
new file mode 100644
index 00000000..fa23c679
--- /dev/null
+++ b/launderette/migrations/0003_machine_type.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('launderette', '0002_auto_20160729_0138'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='machine',
+            name='type',
+            field=models.CharField(choices=[('WASHING', 'Washing'), ('DRYING', 'Drying')], max_length=10, default='WASHING', verbose_name='type'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/launderette/migrations/0004_token_start_date.py b/launderette/migrations/0004_token_start_date.py
new file mode 100644
index 00000000..f610a6cc
--- /dev/null
+++ b/launderette/migrations/0004_token_start_date.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.utils.timezone import utc
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('launderette', '0003_machine_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='token',
+            name='start_date',
+            field=models.DateTimeField(default=datetime.datetime(2016, 7, 29, 10, 46, 13, 675691, tzinfo=utc), verbose_name='start date'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/launderette/models.py b/launderette/models.py
index d458d2e2..741df23f 100644
--- a/launderette/models.py
+++ b/launderette/models.py
@@ -35,6 +35,7 @@ class Launderette(models.Model):
 class Machine(models.Model):
     name = models.CharField(_('name'), max_length=30)
     launderette = models.ForeignKey(Launderette, related_name='machines', verbose_name=_('launderette'))
+    type = models.CharField(_('type'), max_length=10, choices=[('WASHING', _('Washing')), ('DRYING', _('Drying'))])
     is_working = models.BooleanField(_('is working'), default=True)
 
     class Meta:
@@ -49,12 +50,16 @@ class Machine(models.Model):
         return False
 
     def __str__(self):
-        return "%s - Launderette: %s - Working: %s" % (self.name, self.launderette, self.is_working)
+        return "%s %s" % (self._meta.verbose_name, self.name)
+
+    def get_absolute_url(self):
+        return reverse('launderette:launderette_details', kwargs={"launderette_id": self.launderette.id})
 
 class Token(models.Model):
     name = models.IntegerField(_('name'))
     launderette = models.ForeignKey(Launderette, related_name='tokens', verbose_name=_('launderette'))
     type = models.CharField(_('type'), max_length=10, choices=[('WASHING', _('Washing')), ('DRYING', _('Drying'))])
+    start_date = models.DateTimeField(_('start date'))
 
     class Meta:
         verbose_name = _('Token')
@@ -81,6 +86,7 @@ class Slot(models.Model):
         return super(Slot, self).full_clean()
 
     def __str__(self):
-        return str(self.user) + " - " + str(self.start_date)
+        return "User: %s - Date: %s - Type: %s - Machine: %s - Token: %s" % (self.user, self.start_date, self.get_type_display(),
+                self.machine.name, self.token)
 
 
diff --git a/launderette/templates/launderette/launderette_book.jinja b/launderette/templates/launderette/launderette_book.jinja
index d7f54d01..6eca751a 100644
--- a/launderette/templates/launderette/launderette_book.jinja
+++ b/launderette/templates/launderette/launderette_book.jinja
@@ -7,13 +7,29 @@
 {% macro choose(date) %}
 <form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
     {% csrf_token %}
-    <button type="submit" name="slot" value="{{ localtime(date).isoformat() }}"> {% trans %}Choose{% endtrans %} </button>
+    <input type="hidden" name="slot_type" value="{{ slot_type }}">
+    <button type="submit" name="slot" value="{{ date.isoformat() }}">{% trans %}Choose{% endtrans %}</button>
 </form>
 {% endmacro %}
 
 
 {% block content %}
-{% if request.user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP) %}
+<h3>{{ launderette }}</h3>
+<p>
+<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}"
+                    class="inline" style="display:inline">
+    {% csrf_token %}
+    <button type="submit" name="slot_type" value="BOTH" {% if slot_type == "BOTH" -%}style="background: #FF0"{% endif %}>{% trans %}Washing and drying{% endtrans %}</button>
+</form>
+<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
+    {% csrf_token %}
+    <button type="submit" name="slot_type" value="WASHING" {% if slot_type == "WASHING" -%}style="background: #FF0"{% endif %}>{% trans %}Washing{% endtrans %}</button>
+</form>
+<form method="post" action="{{ url('launderette:book_slot', launderette_id=launderette.id) }}" class="inline" style="display:inline">
+    {% csrf_token %}
+    <button type="submit" name="slot_type" value="DRYING" {% if slot_type == "DRYING" -%}style="background: #FF0"{% endif %}>{% trans %}Drying{% endtrans %}</button>
+</form>
+</p>
 <table>
     <thead>
         <tr>
@@ -28,7 +44,7 @@
             {% for hours in planning.values() %}
             <td>
                 {% if hours[i] %}
-                {{ hours[i]|localtime|time(TIME_FORMAT) }} {{ choose(hours[i]) }}
+                {{ hours[i]|time(TIME_FORMAT) }} {{ choose(hours[i]) }}
                 {% endif %}
             </td>
             {% endfor %}
@@ -36,7 +52,6 @@
         {% endfor %}
     </tbody>
 </table>
-{% endif %}
 {% endblock %}
 
 
diff --git a/launderette/templates/launderette/launderette_detail.jinja b/launderette/templates/launderette/launderette_detail.jinja
index 44885117..b94c018b 100644
--- a/launderette/templates/launderette/launderette_detail.jinja
+++ b/launderette/templates/launderette/launderette_detail.jinja
@@ -5,7 +5,14 @@
 {% endblock %}
 
 {% block content %}
-Admin
+<h3>{% trans %}Machines{% endtrans %}</h3>
+<p><a href="{{ url('launderette:machine_new') }}?launderette={{ launderette.id }}">{% trans %}New machine{% endtrans %}</a></p>
+<ul>
+    {% for m in launderette.machines.all() %}
+    <li><a href="{{ url('launderette:machine_edit', machine_id=m.id) }}">{{ m }}</a> -
+        <a href="{{ url('launderette:machine_delete', machine_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></li>
+    {% endfor %}
+</ul>
 {% endblock %}
 
 
diff --git a/launderette/urls.py b/launderette/urls.py
index fe045885..6444f36c 100644
--- a/launderette/urls.py
+++ b/launderette/urls.py
@@ -11,6 +11,9 @@ urlpatterns = [
     url(r'^admin/(?P<launderette_id>[0-9]+)$', LaunderetteDetailView.as_view(), name='launderette_details'),
     url(r'^admin/(?P<launderette_id>[0-9]+)/edit$', LaunderetteEditView.as_view(), name='launderette_edit'),
     url(r'^admin/new$', LaunderetteCreateView.as_view(), name='launderette_new'),
+    url(r'^admin/machine/new$', MachineCreateView.as_view(), name='machine_new'),
+    url(r'^admin/machine/(?P<machine_id>[0-9]+)/edit$', MachineEditView.as_view(), name='machine_edit'),
+    url(r'^admin/machine/(?P<machine_id>[0-9]+)/delete$', MachineDeleteView.as_view(), name='machine_delete'),
 ]
 
 
diff --git a/launderette/views.py b/launderette/views.py
index 7c2fa6f5..3b9a9ae8 100644
--- a/launderette/views.py
+++ b/launderette/views.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 from collections import OrderedDict
+import pytz
 
 from django.shortcuts import render
 from django.views.generic import ListView, DetailView, RedirectView, TemplateView
@@ -7,9 +8,10 @@ from django.views.generic.edit import UpdateView, CreateView, DeleteView, Proces
 from django.forms.models import modelform_factory
 from django.forms import CheckboxSelectMultiple
 from django.utils.translation import ugettext as _
-from django.utils.timezone import make_aware
 from django.utils import dateparse
+from django.core.urlresolvers import reverse_lazy
 from django.conf import settings
+from django.db import transaction
 
 from core.models import Page
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
@@ -33,27 +35,50 @@ class LaunderetteBookMainView(CanViewMixin, ListView):
     model = Launderette
     template_name = 'launderette/launderette_book_choose.jinja'
 
-class LaunderetteBookView(DetailView):
+class LaunderetteBookView(CanViewMixin, DetailView):
     """Display the launderette schedule"""
     model = Launderette
     pk_url_kwarg = "launderette_id"
     template_name = 'launderette/launderette_book.jinja'
 
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        if 'slot' in request.POST.keys() and request.user.is_authenticated():
-            subscriber = get_subscriber(request.user)
-            if subscriber.is_subscribed():
-                date = dateparse.parse_datetime(request.POST['slot'])
-                for m in self.object.machines.filter(is_working=True).all():
-                    slot = Slot.objects.filter(start_date=date, machine=m).first()
-                    print(slot)
-                    if slot is None:
-                        Slot(user=subscriber, start_date=date, machine=m, type="WASHING").save()
-                        print("Saved")
-                        break
+    def get(self, request, *args, **kwargs):
+        self.slot_type = "BOTH"
+        self.machines = {}
         return super(LaunderetteBookView, self).get(request, *args, **kwargs)
 
+    def post(self, request, *args, **kwargs):
+        self.slot_type = "BOTH"
+        self.machines = {}
+        with transaction.atomic():
+            self.object = self.get_object()
+            if 'slot_type' in request.POST.keys():
+                self.slot_type = request.POST['slot_type']
+            if 'slot' in request.POST.keys() and request.user.is_authenticated():
+                self.subscriber = get_subscriber(request.user)
+                if self.subscriber.is_subscribed():
+                    self.date = dateparse.parse_datetime(request.POST['slot']).replace(tzinfo=pytz.UTC)
+                    if self.slot_type == "WASHING":
+                        if self.check_slot(self.slot_type):
+                            Slot(user=self.subscriber, start_date=self.date, machine=self.machines[self.slot_type], type=self.slot_type).save()
+                    elif self.slot_type == "DRYING":
+                        if self.check_slot(self.slot_type):
+                            Slot(user=self.subscriber, start_date=self.date, machine=self.machines[self.slot_type], type=self.slot_type).save()
+                    else:
+                        if self.check_slot("WASHING") and self.check_slot("DRYING", self.date + timedelta(hours=1)):
+                            Slot(user=self.subscriber, start_date=self.date, machine=self.machines["WASHING"], type="WASHING").save()
+                            Slot(user=self.subscriber, start_date=self.date + timedelta(hours=1),
+                                    machine=self.machines["DRYING"], type="DRYING").save()
+        return super(LaunderetteBookView, self).get(request, *args, **kwargs)
+
+    def check_slot(self, type, date=None):
+        if date is None: date = self.date
+        for m in self.object.machines.filter(is_working=True, type=type).all():
+            slot = Slot.objects.filter(start_date=date, machine=m).first()
+            if slot is None:
+                self.machines[type] = m
+                return True
+        return False
+
     @staticmethod
     def date_iterator(startDate, endDate, delta=timedelta(days=1)):
         currentDate = startDate
@@ -65,16 +90,20 @@ class LaunderetteBookView(DetailView):
         """ Add page to the context """
         kwargs = super(LaunderetteBookView, self).get_context_data(**kwargs)
         kwargs['planning'] = OrderedDict()
-        start_date = make_aware(datetime.now().replace(hour=0, minute=0, second=0, microsecond=0))
+        kwargs['slot_type'] = self.slot_type
+        start_date = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0, tzinfo=pytz.UTC)
         for date in LaunderetteBookView.date_iterator(start_date, start_date+timedelta(days=6), timedelta(days=1)):
             kwargs['planning'][date] = []
             for h in LaunderetteBookView.date_iterator(date, date+timedelta(days=1), timedelta(hours=1)):
                 free = False
-                for m in self.object.machines.filter(is_working=True).all():
-                    s = Slot.objects.filter(start_date=h, machine=m).first()
-                    if s is None:
-                        free = True
-                if free and make_aware(datetime.now()) < h:
+                if self.slot_type == "BOTH" and self.check_slot("WASHING", h) and self.check_slot("DRYING", h + timedelta(hours=1)):
+                    print("GUY")
+                    free = True
+                elif self.slot_type == "WASHING" and self.check_slot("WASHING", h):
+                    free = True
+                elif self.slot_type == "DRYING" and self.check_slot("DRYING", h):
+                    free = True
+                if free and datetime.now().replace(tzinfo=pytz.UTC) < h:
                     kwargs['planning'][date].append(h)
                 else:
                     kwargs['planning'][date].append(None)
@@ -105,5 +134,37 @@ class LaunderetteEditView(CanViewMixin, UpdateView):
 class LaunderetteCreateView(CanCreateMixin, CreateView):
     """Create a new launderette"""
     model = Launderette
-    fields = ['name', 'sellers']
+    fields = ['name']
     template_name = 'core/create.jinja'
+
+
+class MachineEditView(CanEditPropMixin, UpdateView):
+    """Edit a machine"""
+    model = Machine
+    pk_url_kwarg = "machine_id"
+    fields = ['name', 'launderette', 'type', 'is_working']
+    template_name = 'core/edit.jinja'
+
+class MachineDeleteView(CanEditPropMixin, DeleteView):
+    """Edit a machine"""
+    model = Machine
+    pk_url_kwarg = "machine_id"
+    template_name = 'core/delete_confirm.jinja'
+    success_url = reverse_lazy('launderette:launderette_list')
+
+class MachineCreateView(CanCreateMixin, CreateView):
+    """Create a new machine"""
+    model = Machine
+    fields = ['name', 'launderette', 'type']
+    template_name = 'core/create.jinja'
+
+    def get_initial(self):
+        ret = super(MachineCreateView, self).get_initial()
+        if 'launderette' in self.request.GET.keys():
+            obj = Launderette.objects.filter(id=int(self.request.GET['launderette'])).first()
+            if obj is not None:
+                ret['launderette'] = obj.id
+        return ret
+
+
+
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 29621bbb11cbbc5ce17439130473f1bda2d78bdd..bfad99ae07f497fc4ba7d1be04a2e56910906d7f 100644
GIT binary patch
delta 7135
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
CaN}?Q

delta 6891
zcmYk=37k*m9>?)Bi`keNjA1OZF=IBf7=|$u#x_QcifKv+4WsT*BBDl}in6pw(xPQ7
zshg7Wzma5#$gNb@k|b`E7E5*2RJtnl`ToyudO5HA^M0P^obxQd^PKaa?uxpApPveF
zkF^Y5>TnbVI8F!rHr#PmQGPQ<t&UUH&T(>Z2*%+oY=eu<7ciFkTNs6h%&#$%`p=k+
zN$njc124rPI157^$8~m4h@jzJY=sBC6V54&r2ZoYp=K8X!5D^3Q3JHXX4n^7VmWF;
zW3dI!Kuv5Os-H(u{Vc;U#&=fu3y!k})sYX?!FJSzAEPF66q&Je8r4yQoj;4g)X!Tz
zDBhb$1U8{P9yQ@ksQ$X3uJ4ACjPDdu&<snF>^qgHiHt>MW-{u=nWzr$Ky@$|HK7Hl
zl`lp;qGzpri@D3r??p}IbJRE|(T%3iKtTfqC6HE(GTWgB=#08C2Q_d{)PycVZIc1m
z3$H>w>%~}&+fdi1CVJOrq88c}mBErk@~;5~(x3~=Q7a#Yn&BAKp19uHZ%0jZp`Blf
zt*O^xN8EsV=7+I4o<?QnchrE<NlX%Ba12gLa=i=Qr9mq?in`%TWZyYwF%V;ty@6Y!
zu1m)5n2uV&HP&8@+AEW>7H>m6vR|+*{*KCIYi6tVM3+J?g;Z;(M5SmH>QU67R&)z$
zrSnlY)}b=C8a1IcsOw%u-M<qxv3;o5^;4_=h`R3_>OS{R3V{?tI(g4B9Q6p|Q7Ozs
z&A8a=15p#JL_MNwtv(60mu8|eFwfeTqWW23u1Afx)2qAAZVKw?5Ne=$)XYwyCh`Mn
z#ph9*EjYz%k3-#;iW)c<bzNW7b%Ri^@ztn3GzFEJxu|}ZU`xIK%PADm;6pa7^F3+>
zk*VGQ?NO;rMeU7jtCyfUDnq5d5;gF3sMoL-wOJp*V5~ze@LANv*XlguI~(o94%ABC
z!%{qgO|WBUZ-8`EM@6U(`l2Q_1l92{b0qRVXFUICA`4LyU4`oZ6;!|5(bY<KQ_yZd
zfZAkda5#phv1%NNY+UC~tFOd#>U*sH2h5}%L!++mgKR5j0uID^r~%(M_nDuh+xvfv
z2Ce98^9*WY=P(4rGQ1T;qf*+z>S@TfaJr*bIs(ISD&}A<>Y1-WO<<GNx1lomK?eB`
zrLdm{c?9pn<ETtbVOe2#FOn2z5$eVb7=)X#2X4bY_zNatK^EV4tVB&@0p{ZCsEnLI
zlICQ)UA&*eN>u9Vum*QwSIo=iV}ezvP5L2flSa@hb96E=0xK{I$DlHH18PCjtv(wy
z@i|tXkIJyS$WA<Mu0-AVJZk0ZFdSdE^E<F9^><Jm>_@G*-r56Lrr!5R)cFKdKV480
zEkI4A1R2M522s!eL%jy)D%6EzQO~Rfb;C`l>t>)P;M)27P!nE^dJUgI4g4bNzD=l%
zY{h1{3)Rm)jL`f483lFt4Mt&u{{&yDJg?(O)P!PD9VD6AsOyVRD;$FAcsOdn(bhg5
zHId1viB2_dMgQ;rT@>`CT7(*4HEO{1*c`W@K0F_wR#=Z3r~#FsKTrb%v0-#y80vfs
zsy!Yx!H#B@o$ror?*Mi#1^s@{&i8($HlThqJ~B_3+R`m)kHhAeg=u&Z7T^TbTe1vC
z<6EdqB=A$IN0N&A73_w}#L({KUn{P(hAOiLwSsBL;+)y2f!Ctm^X<srmCj+*hwCSd
z!RE|DuVo5q;B-_!xn?ia#0Ov!UQxjF*99|Z(6e+=H$I5!Xenx@PoPq`!s=^K6IpNd
z_fY-pN8NuEmHIDH{hl;`#c1lGd^BVmmx4B58fu_!sApP?>Y$&UFGa0zIO@iUsLb7h
zn%EpWe?Mv>%kBIc)b$(D|Jqu8zv&*Qpn)4uGye@Wa9~fbqfk_eTi^i9#$23=HMjyb
zV6#GRBCS!6DiM{zd{qBE%s!|Im3q3)l@yX_n21{8JZynadKWlr?fe$(O#3m^k4qDF
zte#~$YQSEo0n71byc{d=ZH&V>KA*}|S5&<Sll1;qP|ysgqXwRB^#`$p`lG1V>X5a6
zfg1P}uEO6?kF2iPduvvs2HIloM*TK?h{{ydMfMh9DC0X>6k@TPofv|;a5U;sOhi5F
zNtlAOuoXUyn)rHbhi_Q@ASx3_QIE79^(WT}Y>lT;84K*qhF2<LDQJKk)FUWHt?)9`
z?j2|KDdwH1>lUM)<!Wq$uUY$E)CB5L8T|^i`Ocy;8ALiXv8X=eUngQ|PzsY#nMgBx
zqXwuz4KN;cT`gwfUDo~*CQyGHwZh}544uPxjPA={N0^N{=%N<>a$oYV8NEY;R=Uql
z)T2^+4*jVr@lqU%>NpQO;2_ijs!$oc5%uV5t$q*c%lEL=m!lrlTGZy;<5JLyI`s2q
z-Vv3WUZ{>sQ0L37eK=}!U5(jTg~|93YNG2=8QX>G=OC(|&rq2-fto-_f4;itCR50u
zFcUlD3e3Vi*8UTwQcoDbyNm--sh^2maV3t!1E`4>4D<#rM%DYHCR}C?LuGs<l5y9m
z_6p8))H9xg+FVbfR<sT^;0{d2?@*5*dXVF=pPUrbeO0JOa2qNE^Dr16Lrvf*R7O_g
zMtlj|>iwTk>doj5R0bBHZhQrU@HNy*HzCPzPNOoBGuZn+T#J0xot5S%SWZ2v%=;T~
z6kbPt5%Q^U&f)^hAHr9W@trp*jKc;TfmdAYJ(9KNA=GOWaEbR?#$XfbDHw{GW<G{c
zFEaa~GFXOM&?s{phEcCZS2x^9K^@Jo3vNf<csFX`rC5m1V^jPb^?mpjwY&eY_NFXb
z{j@<1m}vDBjG*2HHE>VVxFzM}Kb*o~YZ!(~`3O`;qfslJVD%c*_hA}pV)IegFSGN{
zpeFtt>UG|Pn&=+Xo;Zx!J10>SI$uuyHBk6aZzU~IHzuNP$iZgV2Q|@4tX_#)NtLxv
zLQQmrwbxpGE=JP65cOet9M%6ibE`{1Gun&V#b2OSa1OP?$V<JB6HzHm#YoIVO`s5U
zT|ct|wV-PA1`ME{M6kX5M=t+%A~YfQEq{~uH@u2B5h2_$*V-51T4Ep3LOn_1G2#tX
zI9?)@tvEZ+?~C&|@isAwSWI-bb9|AVZ-~i6g5LknDCjsqTtjpua_nNg9Ty&PRQ^He
z+0_xB5IUN1{mVF?c$7FtR1<p$9bGs-)hjyh;?D%X#vF`L3!S*22XQy$*+h3DntDrO
zC*>K$KM5UA5y`Y)hdtE5@d9x>v4l8J@Iv_i6aHVQ|7SIx_#frN#6Utv4RN1V_#a{u
zp(B<HGYK8zi4DXtB8SK(RukRq{AtQrly~Ec#CL=~Fk6TYgf?z_BGRs>=>KrZ+lan|
zdz63vApT8sv<nwfewEP9SqYyLqlo*73y(QeQn}{H1&xy^rxE>#N31=~`VF-D9XQl0
zd++}%c47=(VdZ>oT2A>rBAjv%zE8BLd?Q{)Ttz%f{6?H5bgUt|a!qgCL9`=u)DzDU
z@v3m-agG1^3msJ+fB)O{?~+&e6K*CxC9Wn4iQ_~bkwRy^@FdZA=)<F<(!<%0%ZN9L
z7_NT@EA;$zv?9`pGGZp7Ba_fa<sh++2qp@-@ku;HwDzxn&oJfJi4TZD#7Ls?NTJY*
z>(Yr`lz*`ktMC@Wz1$jxn_uHyRxZGejb%E>Aog0l3yvkSX&Y^AQTULRm*Nk^0IT0)
zHgYQkpYs18g(h^;oCqRrpxzFj!C?Fe8;=+(^rHPk%Kx|e1Z+y&OFT`qA;P$(@%X5*
zfK6#{Kz(KX&%YaVpfL>pOH3njFSxmc`UoPGh@kypyq;)0$|;O%tl$$?9*m*ZPYC5x
zL=^QYIFHC8^!;%jP=Vun5C31PKT`gfh$I#eor#MH9j|%#|4pL9M4~OVp2QiVJM~}j
zQer!yV=K{?_6&cGKl5-R;f7j+I6?eQ+(|r7Y$o~>u|yy@e}#=lPwEN8wKPn(#xKk(
zF_~Cz^=)PwuK&`?0hFDHO5c%ohXZ|^<Ie>7wkGchShA?oI^V@9J%W7qq;(4NZO(ik
zG_)`&Kd&e+-*;L5=wP3($MRs`#NyJxu)#ZDm{vV4Y4Va51u;uL>b=YNT%Y1#->LqG
Yf_w)`9|;MmzIl35S%q)f(A>bk03t1^;{X5v

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index ddb49138..dbff0900 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-28 20:02+0200\n"
+"POT-Creation-Date: 2016-07-29 12:46+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Skia <skia@libskia.so>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -19,7 +19,7 @@ msgstr ""
 #: accounting/models.py:32 accounting/models.py:55 accounting/models.py:94
 #: club/models.py:18 counter/models.py:38 counter/models.py:63
 #: counter/models.py:91 launderette/models.py:12 launderette/models.py:36
-#: launderette/models.py:52
+#: launderette/models.py:59
 msgid "name"
 msgstr "nom"
 
@@ -32,7 +32,7 @@ msgid "account number"
 msgstr "numero de compte"
 
 #: accounting/models.py:92 club/models.py:109 counter/models.py:237
-#: launderette/models.py:68
+#: launderette/models.py:62 launderette/models.py:76
 msgid "start date"
 msgstr "date de début"
 
@@ -116,12 +116,12 @@ msgstr "Il n'y a pas de types comptable dans ce site web."
 #: accounting/templates/accounting/bank_account_details.jinja:5
 #: accounting/templates/accounting/club_account_details.jinja:5
 #: accounting/templates/accounting/journal_details.jinja:5
-#: core/templates/core/user_tools.jinja:38
+#: core/templates/core/user_tools.jinja:43
 msgid "Accounting"
 msgstr "Comptabilité"
 
 #: accounting/templates/accounting/bank_account_details.jinja:8
-#: core/templates/core/user_tools.jinja:45
+#: core/templates/core/user_tools.jinja:50
 msgid "Bank account: "
 msgstr "Compte en banque : "
 
@@ -148,7 +148,7 @@ msgstr "Nouveau compte club"
 #: accounting/templates/accounting/journal_details.jinja:51
 #: club/templates/club/club_detail.jinja:7 core/templates/core/page.jinja:31
 #: core/templates/core/user_base.jinja:8
-#: core/templates/core/user_tools.jinja:32
+#: core/templates/core/user_tools.jinja:37
 #: counter/templates/counter/counter_list.jinja:15
 #: counter/templates/counter/counter_list.jinja:18
 #: launderette/templates/launderette/launderette_list.jinja:14
@@ -158,6 +158,7 @@ msgstr "Éditer"
 #: accounting/templates/accounting/bank_account_details.jinja:19
 #: accounting/templates/accounting/bank_account_list.jinja:16
 #: core/templates/core/group_list.jinja:13
+#: launderette/templates/launderette/launderette_detail.jinja:13
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -206,8 +207,6 @@ msgstr "Fin"
 #: accounting/templates/accounting/journal_details.jinja:23
 #: counter/templates/counter/user_account.jinja:17
 #: counter/templates/counter/user_account.jinja:63
-#: launderette/templates/launderette/user_account.jinja:17
-#: launderette/templates/launderette/user_account.jinja:63
 msgid "Amount"
 msgstr "Montant"
 
@@ -241,7 +240,6 @@ msgstr "Voir"
 
 #: accounting/templates/accounting/journal_details.jinja:10
 #: counter/templates/counter/user_account.jinja:9
-#: launderette/templates/launderette/user_account.jinja:9
 msgid "Amount: "
 msgstr "Montant: "
 
@@ -265,9 +263,6 @@ msgstr "No"
 #: counter/templates/counter/user_account.jinja:15
 #: counter/templates/counter/user_account.jinja:36
 #: counter/templates/counter/user_account.jinja:61
-#: launderette/templates/launderette/user_account.jinja:15
-#: launderette/templates/launderette/user_account.jinja:36
-#: launderette/templates/launderette/user_account.jinja:61
 msgid "Date"
 msgstr "Date"
 
@@ -320,7 +315,7 @@ msgid "You can not make loops in clubs"
 msgstr "Vous ne pouvez pas faire de boucles dans les clubs"
 
 #: club/models.py:107 eboutic/models.py:12 eboutic/models.py:45
-#: launderette/models.py:72
+#: launderette/models.py:80
 msgid "user"
 msgstr "nom d'utilisateur"
 
@@ -376,7 +371,6 @@ msgstr "Éditer le club"
 #: core/templates/core/page_prop.jinja:8
 #: core/templates/core/pagerev_edit.jinja:24
 #: counter/templates/counter/counter_edit.jinja:8
-#: launderette/templates/launderette/counter_edit.jinja:8
 #: subscription/templates/subscription/subscription.jinja:12
 msgid "Save"
 msgstr "Sauver"
@@ -406,7 +400,7 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: club/templates/club/club_tools.jinja:4
-#: core/templates/core/user_tools.jinja:56
+#: core/templates/core/user_tools.jinja:61
 msgid "Club tools"
 msgstr "Outils club"
 
@@ -605,7 +599,6 @@ msgstr "Confirmation"
 
 #: core/templates/core/delete_confirm.jinja:8
 #: counter/templates/counter/counter_click.jinja:67
-#: launderette/templates/launderette/counter_click.jinja:67
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -656,7 +649,6 @@ msgstr "Merci de vous identifier pour voir cette page."
 
 #: core/templates/core/login.jinja:22
 #: counter/templates/counter/counter_main.jinja:48
-#: launderette/templates/launderette/counter_main.jinja:48
 msgid "login"
 msgstr "login"
 
@@ -890,27 +882,39 @@ msgstr "Gestion de Sith"
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: core/templates/core/user_tools.jinja:22
+#: core/templates/core/user_tools.jinja:19
+#: core/templates/core/user_tools.jinja:21 launderette/models.py:16
+#: launderette/templates/launderette/launderette_book.jinja:4
+#: launderette/templates/launderette/launderette_book_choose.jinja:4
+#: launderette/templates/launderette/launderette_main.jinja:4
+msgid "Launderette"
+msgstr "Laverie"
+
+#: core/templates/core/user_tools.jinja:26
 msgid "Counters"
 msgstr "Comptoirs"
 
-#: core/templates/core/user_tools.jinja:25
+#: core/templates/core/user_tools.jinja:29
+msgid "General management"
+msgstr "Gestion générale"
+
+#: core/templates/core/user_tools.jinja:30
 msgid "General counters management"
 msgstr "Gestion générale des comptoirs"
 
-#: core/templates/core/user_tools.jinja:26
+#: core/templates/core/user_tools.jinja:31
 msgid "Products management"
 msgstr "Gestion des produits"
 
-#: core/templates/core/user_tools.jinja:27
+#: core/templates/core/user_tools.jinja:32
 msgid "Products type management"
 msgstr "Gestion des types de produit"
 
-#: core/templates/core/user_tools.jinja:41
+#: core/templates/core/user_tools.jinja:46
 msgid "General accounting"
 msgstr "Comptabilité générale"
 
-#: core/templates/core/user_tools.jinja:49
+#: core/templates/core/user_tools.jinja:54
 msgid "Club account: "
 msgstr "Compte club : "
 
@@ -993,70 +997,56 @@ msgid "permanency"
 msgstr "permanence"
 
 #: counter/templates/counter/counter_click.jinja:20
-#: launderette/templates/launderette/counter_click.jinja:20
 msgid "Counter"
 msgstr "Comptoir"
 
 #: counter/templates/counter/counter_click.jinja:22
-#: launderette/templates/launderette/counter_click.jinja:22
 msgid "Club: "
 msgstr "Club : "
 
 #: counter/templates/counter/counter_click.jinja:25
-#: launderette/templates/launderette/counter_click.jinja:25
 msgid "Customer"
 msgstr "Client"
 
 #: counter/templates/counter/counter_click.jinja:30
-#: launderette/templates/launderette/counter_click.jinja:30
 msgid "Refilling"
 msgstr "Rechargement"
 
 #: counter/templates/counter/counter_click.jinja:35
 #: counter/templates/counter/counter_click.jinja:48
-#: launderette/templates/launderette/counter_click.jinja:35
-#: launderette/templates/launderette/counter_click.jinja:48
 msgid "Go"
 msgstr "Valider"
 
 #: counter/templates/counter/counter_click.jinja:40
-#: launderette/templates/launderette/counter_click.jinja:40
 msgid "Selling"
 msgstr "Vente"
 
 #: counter/templates/counter/counter_click.jinja:42
-#: launderette/templates/launderette/counter_click.jinja:42
 msgid "Not enough money"
 msgstr "Solde insuffisant"
 
 #: counter/templates/counter/counter_click.jinja:50
 #: eboutic/templates/eboutic/eboutic_main.jinja:23
 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:7
-#: launderette/templates/launderette/counter_click.jinja:50
 msgid "Basket: "
 msgstr "Panier : "
 
 #: counter/templates/counter/counter_click.jinja:58
 #: counter/templates/counter/counter_main.jinja:24
 #: eboutic/templates/eboutic/eboutic_main.jinja:30
-#: launderette/templates/launderette/counter_click.jinja:58
-#: launderette/templates/launderette/counter_main.jinja:24
 msgid "Total: "
 msgstr "Total : "
 
 #: counter/templates/counter/counter_click.jinja:62
-#: launderette/templates/launderette/counter_click.jinja:62
 msgid "Finish"
 msgstr "Terminer"
 
 #: counter/templates/counter/counter_click.jinja:69
 #: eboutic/templates/eboutic/eboutic_main.jinja:37
-#: launderette/templates/launderette/counter_click.jinja:69
 msgid "Products: "
 msgstr "Produits : "
 
 #: counter/templates/counter/counter_edit.jinja:4
-#: launderette/templates/launderette/counter_edit.jinja:4
 msgid "Edit counter"
 msgstr "Éditer le comptoir"
 
@@ -1074,135 +1064,107 @@ msgid "There is no counters in this website."
 msgstr "Il n'y a pas de comptoirs dans ce site web."
 
 #: counter/templates/counter/counter_main.jinja:12
-#: launderette/templates/launderette/counter_main.jinja:12
 #, python-format
 msgid "%(counter_name)s counter"
 msgstr "Comptoir %(counter_name)s"
 
 #: counter/templates/counter/counter_main.jinja:15
-#: launderette/templates/launderette/counter_main.jinja:15
 msgid "Sellings"
 msgstr "Ventes"
 
 #: counter/templates/counter/counter_main.jinja:17
-#: launderette/templates/launderette/counter_main.jinja:17
 msgid "Last selling: "
 msgstr "Dernière vente : "
 
 #: counter/templates/counter/counter_main.jinja:18
-#: launderette/templates/launderette/counter_main.jinja:18
 msgid "Client: "
 msgstr "Client : "
 
 #: counter/templates/counter/counter_main.jinja:18
-#: launderette/templates/launderette/counter_main.jinja:18
 msgid "New amount: "
 msgstr "Nouveau montant : "
 
 #: counter/templates/counter/counter_main.jinja:27
-#: launderette/templates/launderette/counter_main.jinja:27
 msgid "Enter client code:"
 msgstr "Entrez un code client : "
 
 #: counter/templates/counter/counter_main.jinja:31
-#: launderette/templates/launderette/counter_main.jinja:31
 msgid "validate"
 msgstr "valider"
 
 #: counter/templates/counter/counter_main.jinja:34
-#: launderette/templates/launderette/counter_main.jinja:34
 msgid "Please, login"
 msgstr "Merci de vous identifier"
 
 #: counter/templates/counter/counter_main.jinja:39
-#: launderette/templates/launderette/counter_main.jinja:39
 msgid "Barman: "
 msgstr "Barman : "
 
 #: counter/templates/counter/product_list.jinja:4
 #: counter/templates/counter/product_list.jinja:10
-#: launderette/templates/launderette/product_list.jinja:4
-#: launderette/templates/launderette/product_list.jinja:10
 msgid "Product list"
 msgstr "Liste des produits"
 
 #: counter/templates/counter/product_list.jinja:8
-#: launderette/templates/launderette/product_list.jinja:8
 msgid "New product"
 msgstr "Nouveau produit"
 
 #: counter/templates/counter/product_list.jinja:17
-#: launderette/templates/launderette/product_list.jinja:17
 msgid "There is no products in this website."
 msgstr "Il n'y a pas de produits dans ce site web."
 
 #: counter/templates/counter/producttype_list.jinja:4
 #: counter/templates/counter/producttype_list.jinja:10
-#: launderette/templates/launderette/producttype_list.jinja:4
-#: launderette/templates/launderette/producttype_list.jinja:10
 msgid "Product type list"
 msgstr "Liste des types de produit"
 
 #: counter/templates/counter/producttype_list.jinja:8
-#: launderette/templates/launderette/producttype_list.jinja:8
 msgid "New product type"
 msgstr "Nouveau type de produit"
 
 #: counter/templates/counter/producttype_list.jinja:17
-#: launderette/templates/launderette/producttype_list.jinja:17
 msgid "There is no product types in this website."
 msgstr "Il n'y a pas de types de produit dans ce site web."
 
 #: counter/templates/counter/user_account.jinja:4
-#: launderette/templates/launderette/user_account.jinja:4
 #, python-format
 msgid "%(user_name)s's account"
 msgstr "Compte de %(user_name)s"
 
 #: counter/templates/counter/user_account.jinja:8
-#: launderette/templates/launderette/user_account.jinja:8
 msgid "User account"
 msgstr "Compte utilisateur"
 
 #: counter/templates/counter/user_account.jinja:11
-#: launderette/templates/launderette/user_account.jinja:11
 msgid "Refillings"
 msgstr "Rechargements"
 
 #: counter/templates/counter/user_account.jinja:16
 #: counter/templates/counter/user_account.jinja:37
-#: launderette/templates/launderette/user_account.jinja:16
-#: launderette/templates/launderette/user_account.jinja:37
 msgid "Barman"
 msgstr "Barman"
 
 #: counter/templates/counter/user_account.jinja:32
-#: launderette/templates/launderette/user_account.jinja:32
 msgid "Buyings"
 msgstr "Achats"
 
 #: counter/templates/counter/user_account.jinja:38
-#: launderette/templates/launderette/user_account.jinja:38
 msgid "Product"
 msgstr "Produit"
 
 #: counter/templates/counter/user_account.jinja:39
-#: launderette/templates/launderette/user_account.jinja:39
 msgid "Quantity"
 msgstr "Quantité"
 
 #: counter/templates/counter/user_account.jinja:40
-#: launderette/templates/launderette/user_account.jinja:40
 msgid "Total"
 msgstr "Total"
 
 #: counter/templates/counter/user_account.jinja:57
-#: launderette/templates/launderette/user_account.jinja:57
 msgid "Invoices"
 msgstr "Factures"
 
 #: counter/templates/counter/user_account.jinja:62
-#: launderette/templates/launderette/user_account.jinja:62
 msgid "Items"
 msgstr "Articles"
 
@@ -1293,52 +1255,68 @@ msgstr "Vous n'avez pas assez d'argent pour acheter le panier"
 msgid "sellers"
 msgstr "vendeurs"
 
-#: launderette/models.py:16
-#: launderette/templates/launderette/launderette_book.jinja:4
-#: launderette/templates/launderette/launderette_main.jinja:4
-msgid "Launderette"
-msgstr "Laverie"
-
-#: launderette/models.py:37 launderette/models.py:53
+#: launderette/models.py:37 launderette/models.py:60
 msgid "launderette"
 msgstr "laverie"
 
-#: launderette/models.py:38
-msgid "is working"
-msgstr "est HS"
-
-#: launderette/models.py:41
-msgid "Machine"
-msgstr "Machine"
-
-#: launderette/models.py:54 launderette/models.py:69
+#: launderette/models.py:38 launderette/models.py:61 launderette/models.py:77
 msgid "type"
 msgstr "type"
 
-#: launderette/models.py:54 launderette/models.py:69
+#: launderette/models.py:38 launderette/models.py:61 launderette/models.py:77
+#: launderette/templates/launderette/launderette_book.jinja:26
 msgid "Washing"
 msgstr "Lavage"
 
-#: launderette/models.py:54 launderette/models.py:69
+#: launderette/models.py:38 launderette/models.py:61 launderette/models.py:77
+#: launderette/templates/launderette/launderette_book.jinja:30
 msgid "Drying"
 msgstr "Séchage"
 
-#: launderette/models.py:57
+#: launderette/models.py:39
+msgid "is working"
+msgstr "fonctionne"
+
+#: launderette/models.py:42
+msgid "Machine"
+msgstr "Machine"
+
+#: launderette/models.py:65
 msgid "Token"
 msgstr "Jeton"
 
-#: launderette/models.py:70
+#: launderette/models.py:78
 msgid "machine"
 msgstr "machine"
 
-#: launderette/models.py:71
+#: launderette/models.py:79
 msgid "token"
 msgstr "jeton"
 
+#: launderette/models.py:83
+msgid "Slot"
+msgstr "Créneau"
+
+#: launderette/templates/launderette/launderette_book.jinja:11
+msgid "Choose"
+msgstr "Choisir"
+
+#: launderette/templates/launderette/launderette_book.jinja:22
+msgid "Washing and drying"
+msgstr "Lavage et séchage"
+
 #: launderette/templates/launderette/launderette_detail.jinja:4
 msgid "Launderette admin"
 msgstr "Gestion de la laverie"
 
+#: launderette/templates/launderette/launderette_detail.jinja:8
+msgid "Machines"
+msgstr "Machines"
+
+#: launderette/templates/launderette/launderette_detail.jinja:9
+msgid "New machine"
+msgstr "Nouvelle machine"
+
 #: launderette/templates/launderette/launderette_list.jinja:4
 #: launderette/templates/launderette/launderette_list.jinja:10
 msgid "Launderette admin list"