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

notes/models.py

@@ -1,9 +1,74 @@
+import logging
+
 from django.utils import timezone
 from django.utils.html import format_html
+from django.core.exceptions import ValidationError
+from django.urls import reverse
 
 from django.db import models
 from . import managers
 
+logger = logging.getLogger(__name__)
+
+HOMME = 'M'
+FEMME = 'Mme'
+GENRE_CHOICES = (
+        (HOMME, 'Homme'),
+        (FEMME, 'Femme'),
+    )
+
+class Sujet(models.Model):
+    """ Personne faisant l'objet d'un suivi par la maraude
+    """
+
+    genre = models.CharField("Genre",
+                             max_length=3,
+                             choices=GENRE_CHOICES,
+                             default=HOMME)
+    nom = models.CharField(max_length=32, blank=True)
+    prenom = models.CharField(max_length=32, blank=True)
+    surnom = models.CharField(max_length=64, blank=True)
+
+    premiere_rencontre = models.DateField(
+                                    blank=True, null=True,
+                                    default=timezone.now
+                                    )
+    age = models.SmallIntegerField(
+                                blank=True, null=True
+                                )
+
+    # referent = models.ForeignKey("utilisateurs.Professionnel", related_name="suivis")
+
+    def __str__(self):
+        string = '%s ' % self.genre
+        if self.nom:    string += '%s ' % self.nom
+        if self.surnom: string += '"%s" ' % self.surnom
+        if self.prenom: string += '%s' % self.prenom
+        return string
+
+    def clean(self):
+        if not any([self.nom, self.prenom, self.surnom]):
+            raise ValidationError("Vous devez remplir au moins un nom, prénom ou surnom")
+        return super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()
+        if not self.id:
+            from statistiques.models import FicheStatistique
+            super().save(*args, **kwargs)
+            fiche = FicheStatistique.objects.create(sujet=self)
+        else:
+            return super().save(*args, **kwargs)
+
+    class Meta:
+        verbose_name = "Sujet"
+        ordering = ('surnom', 'nom', 'prenom')
+
+    def get_absolute_url(self):
+        return reverse("notes:details-sujet", kwargs={"pk": self.pk })
+
+
+
 class Note(models.Model):
     """ Note relative à un sujet.
 
@@ -19,11 +84,12 @@ class Note(models.Model):
     objects = managers.NoteManager()
 
     sujet = models.ForeignKey(
-                        'sujets.Sujet',
+                        Sujet,
                         related_name="notes",
                         on_delete=models.CASCADE
                         )
     text = models.TextField("Texte")
+
     created_by = models.ForeignKey(
                         'utilisateurs.Professionnel',
                         blank=True,
@@ -42,7 +108,11 @@ class Note(models.Model):
         return super().save(*args, **kwargs)
 
     def __str__(self):
-        return "%s" % (self.child_class.__qualname__)
+        return "<%s: %s>" % (self.child_class.__qualname__, self.sujet)
+
+    @classmethod
+    def __str__(cls):
+        return "<%s>" % cls.__qualname__
 
     def note_author(self):
         return None