début de réorganisation de la partie statistique

This commit is contained in:
artus40
2017-08-14 19:12:18 +02:00
parent 0c887afaa3
commit c8c59b92a2
8 changed files with 116 additions and 111 deletions

View File

@@ -5,21 +5,25 @@ 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"
)
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")
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):

View File

@@ -2,8 +2,6 @@ import datetime
import calendar
import logging
logger = logging.getLogger(__name__)
from django.utils import timezone
from django.shortcuts import redirect, reverse
from django.views import generic
@@ -13,19 +11,21 @@ from django.contrib import messages
from utilisateurs.mixins import MaraudeurMixin
from .models import ( Maraude, Maraudeur,
CompteRendu,
Rencontre, Lieu,
Planning, )
from .models import (Maraude, Maraudeur,
CompteRendu,
Rencontre, Lieu,
Planning,)
from .notes import Signalement
# Forms
from .forms import ( RencontreForm,
ObservationInlineFormSet,
MaraudeHiddenDateForm, MonthSelectForm,
AppelForm, SignalementForm,
SendMailForm )
from .forms import (RencontreForm,
ObservationInlineFormSet,
MaraudeHiddenDateForm, MonthSelectForm,
AppelForm, SignalementForm,
SendMailForm)
from notes.mixins import NoteFormMixin
logger = logging.getLogger(__name__)
def derniers_sujets_rencontres():
""" Renvoie le 'set' des sujets rencontrés dans les deux dernières maraudes """