From 1681833e8bf4d5b0f55bf44d2ba58e972b771499 Mon Sep 17 00:00:00 2001
From: Arthur Gerbaud <artus40@users.noreply.github.com>
Date: Wed, 17 Aug 2016 16:11:27 +0200
Subject: [PATCH] minor clean up

---
 maraudes/notes.py |  6 ------
 notes/admin.py    | 11 ++++++++++-
 notes/models.py   |  7 +++----
 sujets/views.py   |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/maraudes/notes.py b/maraudes/notes.py
index 1cfafc0..bc1220d 100644
--- a/maraudes/notes.py
+++ b/maraudes/notes.py
@@ -14,12 +14,6 @@ class Observation(Note):
                                     on_delete=models.CASCADE
                                 )
 
-    class Meta:
-        verbose_name = "Observation"
-
-    def __str__(self):
-        return "%s" % self.sujet
-
     # Note attributes proxies
     def note_author(self):      return self.rencontre.maraude.referent
     def note_date(self):        return self.rencontre.date
diff --git a/notes/admin.py b/notes/admin.py
index c1a6ee4..8132060 100644
--- a/notes/admin.py
+++ b/notes/admin.py
@@ -6,5 +6,14 @@ from .models import *
 @admin.register(Note)
 class NoteAdmin(admin.ModelAdmin):
 
-    list_display = ['created_date', 'sujet']
+    fieldsets = [
+        ('Contexte',
+            {'fields': ['created_by', ('created_date', 'created_time')]
+             }
+         ),
+         ('Note',
+          {'fields': ['sujet', 'text']})
+    ]
+
+    list_display = ['created_date', 'sujet', 'child_class', 'text']
     list_filter = ('sujet', 'created_date', 'created_by')
diff --git a/notes/models.py b/notes/models.py
index 2391d0f..64a3851 100644
--- a/notes/models.py
+++ b/notes/models.py
@@ -42,9 +42,7 @@ class Note(models.Model):
         return super().save(*args, **kwargs)
 
     def __str__(self):
-        return "%s [%s %s]" % ( self.child_class.__qualname__,
-                                self.created_date,
-                                self.created_time)
+        return "%s" % (self.child_class.__qualname__)
 
     def note_author(self):
         return None
@@ -106,7 +104,8 @@ class Note(models.Model):
         def getter(self):
             if not hasattr(self, private_name):
                 setattr(self,
-                        private_name,# Call *child instance* method
+                        private_name,
+                        # Call *child instance* method
                         getattr(self.cast(), 'note_%s' % name)()
                         )
             return getattr(self, private_name)
diff --git a/sujets/views.py b/sujets/views.py
index 85e0338..e7ce42b 100644
--- a/sujets/views.py
+++ b/sujets/views.py
@@ -10,7 +10,7 @@ webpage = website.webpage(
                     ajax=True,
                     permissions=['sujets.view_sujets'],
                     app_name="suivi",
-                    app_menu=["sujets/menu_sujet.html"]
+                    app_menu=[]
                 )
 ### Views
 
@@ -37,7 +37,7 @@ class SujetListView(generic.ListView):
     paginate_by = 10
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.app_menu = ["suivi/menu_sujets.html"]
+        self.insert_menu("suivi/menu_sujets.html")