From c7536451936c108a1f7df443d50dfa84967e10bc Mon Sep 17 00:00:00 2001
From: artus40 <lecornemuseux@gmail.com>
Date: Fri, 9 Mar 2018 15:45:35 +0100
Subject: [PATCH] cleans up code of 'website' module, replaces hardcoded
 'year_of_bilan' value

---
 notes/views.py   |  2 +-
 urls.py          | 16 ----------------
 website/views.py | 18 ++++++++----------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/notes/views.py b/notes/views.py
index 6c49211..3e3de64 100644
--- a/notes/views.py
+++ b/notes/views.py
@@ -118,7 +118,7 @@ def rencontre_dans_le_mois(qs):
 
 
 def a_revoir_avant_bilan(qs):
-    year_of_bilan = 2017
+    year_of_bilan = timezone.now().date().year - 1 # Should be redacting report for last year :)
     included_set = set()
     for sujet in qs:
         most_recent_obs = Observation.objects.filter(sujet=sujet).order_by("-created_date").first()
diff --git a/urls.py b/urls.py
index e446013..467f10b 100644
--- a/urls.py
+++ b/urls.py
@@ -1,23 +1,7 @@
-"""maraudes_project URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.10/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
-    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
-"""
 from django.conf.urls import url, include
 from django.contrib import admin
 from website import urls as website_urls
 
-
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^', include(website_urls)),
diff --git a/website/views.py b/website/views.py
index 9642fbf..9f512a2 100644
--- a/website/views.py
+++ b/website/views.py
@@ -1,17 +1,16 @@
-from django.urls import reverse
 from django import views
-
+from django.urls import reverse
 from django.contrib.auth import login, authenticate
 from django.contrib import messages
 from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
 
-class Index(views.generic.TemplateView):
 
+class Index(views.generic.TemplateView):
     template_name = "index.html"
     app_menu = None
     header = ('La Maraude ALSA', 'accueil')
 
-    http_method_names = ['get',]
+    http_method_names = ['get', ]
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -19,7 +18,6 @@ class Index(views.generic.TemplateView):
         return context
 
 
-
 def _get_entry_point(user):
     from utilisateurs.models import Maraudeur
     if isinstance(user, Maraudeur):
@@ -27,6 +25,7 @@ def _get_entry_point(user):
     else:
         return reverse('index')
 
+
 def login_view(request):
     if request.method == 'GET':
         return HttpResponsePermanentRedirect('/')
@@ -36,12 +35,11 @@ def login_view(request):
         user = authenticate(username=username, password=password)
         if user is not None:
             login(request, user)
-            next = request.POST.get('next', None)
-            if not next:
-                next = _get_entry_point(user)
+            _next = request.POST.get('next', None)
+            if not _next:
+                _next = _get_entry_point(user)
             messages.success(request, "%s, vous êtes connecté !" % user)
-            return HttpResponseRedirect(next)
+            return HttpResponseRedirect(_next)
         else:
             messages.error(request, "Le nom d'utilisateur et/ou le mot de passe sont incorrects !")
             return HttpResponseRedirect('/')
-