Remaster (#38)

* setup new 'statistiques' module

* added 'graphos' package and created first test graph

* put graphos in requirements, deleted local folder

* added "load_csv" management command !

* added update of premiere_rencontre field in 'load_csv' management command

* added missing urls.py file

* added 'merge' action and view

* added 'info_completed' ratio

* linked sujets:merge views inside suivi:details

* added link to maraudes:details in notes table headers, if any

* Major reorganisation, moved 'suivi' and 'sujets' to 'notes', cleanup in 'maraudes', dropping 'website' mixins (mostly useless)

* small cleanup

* worked on Maraude and Sujet lists

* corrected missing line in notes.__init__

* restored 'details' view for maraudes and sujets insie 'notes' module

* worked on 'notes': added navigation between maraude's compte-rendu, right content in details, header to list tables

* changed queryset for CompteRenduDetailsView to all notes of same date, minor layout changes

* added right content to 'details-sujet', created 'statistiques' view and update templates

* restored 'statistiques' ajax view in 'details-sujet', fixed 'merge_two' util function

* added auto-creation of FicheStatistique (plus some tests), pagination for notes in 'details-sujet'

* added error-prone cases in paginator

* fixed non-working modals, added titles

* added UpdateStatistiques capacity in CompteRenduCreate view

* fixed missing AjaxTemplateMixin for CreateSujetView, worked on compte-rendu creation scripts

* fixed MaraudeManager.all_of() for common Maraudeurs, added color hints in planning

* re-instated statistiques module link and first test page

* added FinalizeView to send a mail before finalizing compte-rendu

* Added PieChart view for FicheStatistique fields

* small style updates, added 'age' and 'genre' fields from sujets in statistiques.PieChartView

* worked on statistiques, fixed small issues in 'notes' list views

* small theme change

* removed some dead code

* fixed notes.tests, fixed statistiques.info_completed display, added filter in SujetLisView

* added some tests

* added customised admin templates

* added authenticate in CustomAuthenticatationBackend, more verbose login thanks to messages

* added django-nose for test coverage

* Corrected raising exception on first migration

On first migration, qs.exists() would previously be called and raising an Exception, sot he migrations would fail.

* Better try block

* cleaned up custom settings.py, added some overrides of django base_settings

* corrected bad dictionnary key

maraudes/managers.py

@@ -1,10 +1,11 @@
 from django.db.models import Manager
 
 import datetime
+
 from django.utils import timezone
 from django.utils.functional import cached_property
 
-
+# TODO: What is really useful in there ??
 class MaraudeManager(Manager):
     """ Manager for Maraude objects """
 
@@ -20,24 +21,7 @@ class MaraudeManager(Manager):
         if not maraudes_ref:
             return maraudes_bin
 
-        cursor = 0
-        complete_list = []
-        for i, m in enumerate(maraudes_bin):
-            if cursor >= 0 and maraudes_ref[cursor].date < m.date:
-                complete_list.append(maraudes_ref[cursor])
-                complete_list.append(m)
-                if cursor < len(maraudes_ref) - 1:
-                    cursor += 1
-                else:
-                    cursor = -1
-            else:
-                complete_list.append(m)
-        # Don't lose remaining items of maraudes_ref
-        if cursor >= 0:
-            complete_list += maraudes_ref[cursor:]
-
-        return complete_list
-
+        return maraudes_bin | maraudes_ref
 
     def get_next_of(self, maraudeur):
         """ Retourne la prochaine maraude de 'maraudeur' """
@@ -47,22 +31,28 @@ class MaraudeManager(Manager):
                             'date'
                         ).first()
 
-    def get_future(self):
+    def get_future(self, date=None):
         """ Retourne la liste des prochaines maraudes """
+        if not date: date = self.today
         return self.get_queryset().filter(
-                            date__gte=datetime.date.today()
+                            date__gte=date
                         ).order_by(
                             'date'
                         )
 
-    def get_past(self):
+    def get_past(self, date=None):
         """ Retourne la liste des maraudes passées """
+        if not date: date = self.today
         return self.get_queryset().filter(
-                            date__lt=datetime.date.today()
+                            date__lt=date
                         ).order_by(
                             'date'
                         )
 
+    @cached_property
+    def today(self):
+        return timezone.localtime(timezone.now()).date()
+
     @cached_property
     def next(self):
         """ Prochaine maraude """