Format launderette

launderette/models.py

@@ -27,12 +27,13 @@ from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
-from counter.models import Counter, Product
+from counter.models import Counter
 from core.models import User
 from club.models import Club
 
 # Create your models here.
 
+
 class Launderette(models.Model):
     name = models.CharField(_('name'), max_length=30)
     counter = models.OneToOneField(Counter, verbose_name=_('counter'), related_name='launderette')
@@ -78,6 +79,7 @@ class Launderette(models.Model):
     def token_list(self):
         return [t.id for t in self.get_token_list()]
 
+
 class Machine(models.Model):
     name = models.CharField(_('name'), max_length=30)
     launderette = models.ForeignKey(Launderette, related_name='machines', verbose_name=_('launderette'))
@@ -103,6 +105,7 @@ class Machine(models.Model):
     def get_absolute_url(self):
         return reverse('launderette:launderette_admin', kwargs={"launderette_id": self.launderette.id})
 
+
 class Token(models.Model):
     name = models.CharField(_('name'), max_length=5)
     launderette = models.ForeignKey(Launderette, related_name='tokens', verbose_name=_('launderette'))
@@ -140,6 +143,7 @@ class Token(models.Model):
         else:
             return False
 
+
 class Slot(models.Model):
     start_date = models.DateTimeField(_('start date'))
     type = models.CharField(_('type'), max_length=10, choices=settings.SITH_LAUNDERETTE_MACHINE_TYPES)
@@ -157,5 +161,3 @@ class Slot(models.Model):
     def __str__(self):
         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)
-
-

launderette/urls.py

@@ -22,7 +22,7 @@
 #
 #
 
-from django.conf.urls import url, include
+from django.conf.urls import url
 
 from launderette.views import *
 

launderette/views.py

@@ -26,11 +26,8 @@ from datetime import datetime, timedelta
 from collections import OrderedDict
 import pytz
 
-from django.shortcuts import render
+from django.views.generic import ListView, DetailView, TemplateView
-from django.views.generic import ListView, DetailView, RedirectView, TemplateView
 from django.views.generic.edit import UpdateView, CreateView, DeleteView, BaseFormView
-from django.forms.models import modelform_factory
-from django.forms import CheckboxSelectMultiple
 from django.utils.translation import ugettext as _
 from django.utils import dateparse, timezone
 from django.core.urlresolvers import reverse_lazy
@@ -38,7 +35,6 @@ from django.conf import settings
 from django.db import transaction, DataError
 from django import forms
 from django.template import defaultfilters
-from django.utils import formats
 
 from core.models import Page, User
 from club.models import Club
@@ -49,6 +45,7 @@ from counter.views import GetUserForm
 
 # For users
 
+
 class LaunderetteMainView(TemplateView):
     """Main presentation view"""
     template_name = 'launderette/launderette_main.jinja'
@@ -59,11 +56,13 @@ class LaunderetteMainView(TemplateView):
         kwargs['page'] = Page.objects.filter(name='launderette').first()
         return kwargs
 
+
 class LaunderetteBookMainView(CanViewMixin, ListView):
     """Choose which launderette to book"""
     model = Launderette
     template_name = 'launderette/launderette_book_choose.jinja'
 
+
 class LaunderetteBookView(CanViewMixin, DetailView):
     """Display the launderette schedule"""
     model = Launderette
@@ -100,7 +99,8 @@ class LaunderetteBookView(CanViewMixin, DetailView):
         return super(LaunderetteBookView, self).get(request, *args, **kwargs)
 
     def check_slot(self, type, date=None):
-        if date is None: date = self.date
+        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:
@@ -137,6 +137,7 @@ class LaunderetteBookView(CanViewMixin, DetailView):
                     kwargs['planning'][date].append(None)
         return kwargs
 
+
 class SlotDeleteView(CanEditPropMixin, DeleteView):
     """Delete a slot"""
     model = Slot
@@ -154,6 +155,7 @@ class LaunderetteListView(CanEditPropMixin, ListView):
     model = Launderette
     template_name = 'launderette/launderette_list.jinja'
 
+
 class LaunderetteEditView(CanEditPropMixin, UpdateView):
     """Edit a launderette"""
     model = Launderette
@@ -161,6 +163,7 @@ class LaunderetteEditView(CanEditPropMixin, UpdateView):
     fields = ['name']
     template_name = 'core/edit.jinja'
 
+
 class LaunderetteCreateView(CanCreateMixin, CreateView):
     """Create a new launderette"""
     model = Launderette
@@ -174,6 +177,7 @@ class LaunderetteCreateView(CanCreateMixin, CreateView):
         form.instance.counter = c
         return super(LaunderetteCreateView, self).form_valid(form)
 
+
 class ManageTokenForm(forms.Form):
     action = forms.ChoiceField(choices=[("BACK", _("Back")), ("ADD", _("Add")), ("DEL", _("Delete"))], initial="BACK",
                                label=_("Action"), widget=forms.RadioSelect)
@@ -210,6 +214,7 @@ class ManageTokenForm(forms.Form):
                 except:
                     self.add_error(None, _("Token %(token_name)s does not exists") % {'token_name': t})
 
+
 class LaunderetteAdminView(CanEditPropMixin, BaseFormView, DetailView):
     """The admin page of the launderette"""
     model = Launderette
@@ -253,6 +258,7 @@ class LaunderetteAdminView(CanEditPropMixin, BaseFormView, DetailView):
     def get_success_url(self):
         return reverse_lazy('launderette:launderette_admin', args=self.args, kwargs=self.kwargs)
 
+
 class GetLaunderetteUserForm(GetUserForm):
     def clean(self):
         cleaned_data = super(GetLaunderetteUserForm, self).clean()
@@ -261,6 +267,7 @@ class GetLaunderetteUserForm(GetUserForm):
             raise forms.ValidationError(_("User has booked no slot"))
         return cleaned_data
 
+
 class LaunderetteMainClickView(CanEditMixin, BaseFormView, DetailView):
     """The click page of the launderette"""
     model = Launderette
@@ -301,6 +308,7 @@ class LaunderetteMainClickView(CanEditMixin, BaseFormView, DetailView):
     def get_success_url(self):
         return reverse_lazy('launderette:click', args=self.args, kwargs=self.kwargs)
 
+
 class ClickTokenForm(forms.BaseForm):
     def clean(self):
         with transaction.atomic():
@@ -332,6 +340,7 @@ class ClickTokenForm(forms.BaseForm):
             self.last_basket['last_total'] = str(total)
         return self.cleaned_data
 
+
 class LaunderetteClickView(CanEditMixin, DetailView, BaseFormView):
     """The click page of the launderette"""
     model = Launderette
@@ -401,7 +410,6 @@ class LaunderetteClickView(CanEditMixin, DetailView, BaseFormView):
         return reverse_lazy('launderette:main_click', args=self.args, kwargs=self.kwargs)
 
 
-
 class MachineEditView(CanEditPropMixin, UpdateView):
     """Edit a machine"""
     model = Machine
@@ -409,6 +417,7 @@ class MachineEditView(CanEditPropMixin, UpdateView):
     fields = ['name', 'launderette', 'type', 'is_working']
     template_name = 'core/edit.jinja'
 
+
 class MachineDeleteView(CanEditPropMixin, DeleteView):
     """Edit a machine"""
     model = Machine
@@ -416,6 +425,7 @@ class MachineDeleteView(CanEditPropMixin, DeleteView):
     template_name = 'core/delete_confirm.jinja'
     success_url = reverse_lazy('launderette:launderette_list')
 
+
 class MachineCreateView(CanCreateMixin, CreateView):
     """Create a new machine"""
     model = Machine
@@ -429,6 +439,3 @@ class MachineCreateView(CanCreateMixin, CreateView):
             if obj is not None:
                 ret['launderette'] = obj.id
         return ret
-
-
-