cleaned up code for notes module

notes/admin.py

@@ -27,10 +27,10 @@ class NoteAdmin(admin.ModelAdmin):
 
     fieldsets = [
         ('Contexte', {
-                        'fields': ['created_by', ('created_date', 'created_time')]
-                        }),
+            'fields': ['created_by', ('created_date', 'created_time')]
+        }),
         ('Note', {
-                        'fields': ['sujet', 'text']}),
+            'fields': ['sujet', 'text']}),
     ]
 
     list_display = ['created_date', 'sujet', 'type_name', 'text']

notes/forms.py

@@ -16,8 +16,8 @@ class NoteForm(forms.ModelForm):
         widgets = {
             'sujet': Select2Widget(),
             'text': forms.Textarea(
-                            attrs={'rows': 4}
-                            ),
+                attrs={'rows': 4}
+            ),
         }
 
 
@@ -81,11 +81,12 @@ class SujetCreateForm(forms.ModelForm):
     class Meta:
         model = Sujet
         fields = ['nom', 'surnom', 'prenom', 'genre', 'premiere_rencontre']
-        widgets = {'premiere_rencontre': forms.SelectDateWidget(
-                                            empty_label=("Année", "Mois", "Jour"),
-                                            years=YEAR_CHOICE,
-                                            ),
-                   }
+        widgets = {
+            'premiere_rencontre': forms.SelectDateWidget(
+                empty_label=("Année", "Mois", "Jour"),
+                years=YEAR_CHOICE,
+            ),
+        }
 
 
 class SelectSujetForm(forms.Form):

notes/models.py

@@ -1,11 +1,10 @@
 import logging
-
 from django.utils import timezone
 from django.core.exceptions import ValidationError
 from django.shortcuts import reverse
-
 from django.db import models
 from . import managers
+from statistiques.models import FicheStatistique
 
 logger = logging.getLogger(__name__)
 
@@ -55,7 +54,6 @@ class Sujet(models.Model):
     def save(self, *args, **kwargs):
         self.clean()
         if not self.id:
-            from statistiques.models import FicheStatistique
             super().save(*args, **kwargs)
             FicheStatistique.objects.create(sujet=self)
         else:

notes/views.py

@@ -92,7 +92,6 @@ class MaraudeListView(ListView):
     ]
 
 
-
 def info_completed_filter(qs):
     completed_ratio = 70  # % of total fields completed
 
@@ -103,6 +102,7 @@ def info_completed_filter(qs):
 
     return qs.exclude(pk__in=excluded_set)
 
+
 def rencontre_dans_le_mois(qs):
     """ Renvoie les sujets du queryset pour lesquelles une observation a été enregistrée
     au cours des 30 derniers jours """
@@ -116,6 +116,7 @@ def rencontre_dans_le_mois(qs):
             included_set.add(sujet.pk)
     return qs.filter(pk__in=included_set)
 
+
 def a_revoir_avant_bilan(qs):
     year_of_bilan = 2017
     included_set = set()
@@ -125,6 +126,7 @@ def a_revoir_avant_bilan(qs):
             included_set.add(sujet.pk)
     return qs.filter(pk__in=included_set)
 
+
 class SujetListView(ListView):
     # ListView
     model = Sujet
@@ -268,7 +270,7 @@ class SujetCreateView(AjaxTemplateMixin, generic.edit.CreateView):
         context = super().get_context_data(**kwargs)
         try:
             context['next'] = self.request.GET['next']
-        except:
+        except KeyError:
             context['next'] = None
         return context