* 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
93 lines
2.8 KiB
Python
93 lines
2.8 KiB
Python
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 """
|
|
|
|
def all_of(self, maraudeur):
|
|
""" Retourne la liste des maraudes de 'maraudeur' """
|
|
# Le référent ne peut participer qu'en tant que référent
|
|
if maraudeur.is_superuser:
|
|
return self.get_queryset().filter(referent=maraudeur.id)
|
|
|
|
# Un maraudeur peut occasionnellement être référent
|
|
maraudes_ref = self.get_queryset().filter(referent=maraudeur.id)
|
|
maraudes_bin = self.get_queryset().filter(binome=maraudeur.id)
|
|
if not maraudes_ref:
|
|
return maraudes_bin
|
|
|
|
return maraudes_bin | maraudes_ref
|
|
|
|
def get_next_of(self, maraudeur):
|
|
""" Retourne la prochaine maraude de 'maraudeur' """
|
|
return self.all_of(maraudeur).filter(
|
|
date__gte=datetime.date.today()
|
|
).order_by(
|
|
'date'
|
|
).first()
|
|
|
|
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=date
|
|
).order_by(
|
|
'date'
|
|
)
|
|
|
|
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=date
|
|
).order_by(
|
|
'date'
|
|
)
|
|
|
|
@cached_property
|
|
def today(self):
|
|
return timezone.localtime(timezone.now()).date()
|
|
|
|
@cached_property
|
|
def next(self):
|
|
""" Prochaine maraude """
|
|
return self.get_future().first()
|
|
|
|
@cached_property
|
|
def last(self):
|
|
""" Dernière maraude """
|
|
return self.get_past().last()
|
|
|
|
@cached_property
|
|
def in_progress(self):
|
|
""" Retourne la maraude en cours, ou None """
|
|
d, t = timezone.now().date(), timezone.now().time()
|
|
|
|
# Prendre le jour précédent s'il est entre minuit et 2h du matin
|
|
depassement = False
|
|
if t <= datetime.time(2):
|
|
d = d - datetime.timedelta(days=1)
|
|
depassement = True
|
|
|
|
maraude_du_jour = self.get(date=d)
|
|
|
|
if maraude_du_jour:
|
|
if depassement or t >= maraude_du_jour.heure_debut:
|
|
return maraude_du_jour
|
|
return None
|
|
|
|
|
|
|
|
class ObservationManager(Manager):
|
|
|
|
def get_for_sujet(self, sujet):
|
|
return self.filter(sujet=sujet)
|
|
|
|
def get_first_for_sujet(self, sujet):
|
|
return self.filter(sujet=sujet).order_by('date').first()
|