be087464fc
* 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
39 lines
1.2 KiB
Python
39 lines
1.2 KiB
Python
from django.db import models
|
|
|
|
from notes.models import Note
|
|
from . import managers
|
|
|
|
# Extends 'notes' module
|
|
|
|
class Observation(Note):
|
|
""" Note dans le cadre d'une rencontre """
|
|
|
|
objects = managers.ObservationManager()
|
|
rencontre = models.ForeignKey( 'maraudes.Rencontre',
|
|
models.CASCADE,
|
|
related_name="observations"
|
|
)
|
|
|
|
# Note attributes proxies
|
|
def note_author(self): return self.rencontre.maraude.referent
|
|
def note_date(self): return self.rencontre.date
|
|
def note_time(self): return self.rencontre.heure_debut
|
|
def note_labels(self): return [self.rencontre.lieu, self.rencontre.heure_debut]
|
|
def note_bg_colors(self): return ("info", "info")
|
|
|
|
class Appel(Note):
|
|
|
|
entrant = models.BooleanField( "Appel entrant ?")
|
|
|
|
def note_labels(self): return ["Reçu" if self.entrant else "Émis", self.created_by]
|
|
def note_bg_colors(self): return ("warning", "info")
|
|
|
|
|
|
class Signalement(Note):
|
|
|
|
source = models.ForeignKey("utilisateurs.Organisme")
|
|
|
|
def note_labels(self): return [self.source, self.created_by]
|
|
def note_bg_colors(self): return ('danger', 'info')
|
|
|