* 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
95 lines
2.6 KiB
Python
95 lines
2.6 KiB
Python
import datetime
|
|
|
|
from .models import Note, Sujet
|
|
from utilisateurs.models import Professionnel
|
|
|
|
from django import forms
|
|
from django_select2.forms import Select2Widget
|
|
|
|
### NOTES
|
|
|
|
class NoteForm(forms.ModelForm):
|
|
""" Generic Note form """
|
|
class Meta:
|
|
model = Note
|
|
fields = ['sujet', 'text', 'created_by', 'created_date', 'created_time']
|
|
widgets = {
|
|
'sujet': Select2Widget(),
|
|
'text': forms.Textarea(attrs={'rows':4}),
|
|
}
|
|
|
|
|
|
|
|
class SimpleNoteForm(forms.ModelForm):
|
|
""" Simple note with only 'sujet' and 'text' fields.
|
|
|
|
Usefull with children of 'Note' that defines all 'note_*'
|
|
special methods.
|
|
"""
|
|
class Meta(NoteForm.Meta):
|
|
fields = ['sujet', 'text']
|
|
|
|
|
|
|
|
class UserNoteForm(NoteForm):
|
|
""" Form that sets 'created_by' with current user id.
|
|
|
|
It requires 'request' object at initialization
|
|
"""
|
|
class Meta(NoteForm.Meta):
|
|
fields = ['sujet', 'text', 'created_date', 'created_time']
|
|
|
|
def __init__(self, **kwargs):
|
|
request = kwargs.pop('request')
|
|
super().__init__(**kwargs)
|
|
try:
|
|
self.author = Professionnel.objects.get(pk=request.user.pk)
|
|
except Professionnel.DoesNotExist:
|
|
msg = "%s should not have been initiated with '%s' user" % (self, request.user)
|
|
raise RuntimeError(msg)
|
|
|
|
def save(self, commit=True):
|
|
instance = super().save(commit=False)
|
|
instance.created_by = self.author
|
|
if commit:
|
|
instance.save()
|
|
return instance
|
|
|
|
|
|
|
|
class AutoNoteForm(UserNoteForm):
|
|
class Meta(UserNoteForm.Meta):
|
|
fields = ['text']
|
|
|
|
def __init__(self, **kwargs):
|
|
self.sujet = kwargs.pop('sujet')
|
|
super().__init__(**kwargs)
|
|
|
|
def save(self, commit=True):
|
|
inst = super().save(commit=False)
|
|
inst.sujet = self.sujet
|
|
if commit:
|
|
inst.save()
|
|
return inst
|
|
|
|
|
|
|
|
### SUJETS
|
|
|
|
current_year = datetime.date.today().year
|
|
YEAR_CHOICE = tuple(year - 2 for year in range(current_year, current_year + 10))
|
|
|
|
class SujetCreateForm(forms.ModelForm):
|
|
class Meta:
|
|
model = Sujet
|
|
fields = ['nom', 'surnom', 'prenom', 'genre', 'premiere_rencontre']
|
|
widgets = {
|
|
'premiere_rencontre': forms.SelectDateWidget( empty_label=("Année", "Mois", "Jour"),
|
|
years = YEAR_CHOICE,
|
|
),
|
|
}
|
|
|
|
class SelectSujetForm(forms.Form):
|
|
|
|
sujet = forms.ModelChoiceField(queryset=Sujet.objects.all(), widget=Select2Widget)
|