python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

website restyling, minor fixes

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-13 16:40:43 +02:00
parent 8bac5d8bd4
commit 46b807ec1e
36 changed files with 390 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
maraudes/views.py
View File

@@ -23,7 +23,11 @@ from .forms import ( RencontreForm, RencontreInlineFormSet, SignalementForm,
MaraudeAutoDateForm, MonthSelectForm, )
from website import decorators as website
webpage = website.webpage(ajax=False, permissions=['maraudes.view_maraudes'])
webpage = website.webpage(
ajax=False,
permissions=['maraudes.view_maraudes'],
app_menu=["maraudes/menu_dernieres_maraudes.html", "maraudes/menu_administration.html"]
)
@@ -46,7 +50,7 @@ class DerniereMaraudeMixin(object):
@webpage
class IndexView(DerniereMaraudeMixin, generic.FormView):
class IndexView(DerniereMaraudeMixin, generic.TemplateView):
class PageInfo:
title = "Maraude - Tableau de bord"
@@ -54,10 +58,6 @@ class IndexView(DerniereMaraudeMixin, generic.FormView):
header_small = "Tableau de bord"
template_name = "maraudes/index.html"
form_class = SignalementForm
def get_panels(self):
return ["maraudes/panel_dernieres_maraudes.html", "maraudes/panel_admin.html"]
## MARAUDES
@@ -75,15 +75,9 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['notes'] = Note.objects.filter( #TODO: use better selection,
# using time range.
created_date=self.object.date
).by_time()
context['notes'] = self.object.get_observations()
return context
def get_panels(self):
return ["maraudes/panel_dernieres_maraudes.html"]
@webpage
@@ -138,12 +132,6 @@ class CompteRenduCreateView(generic.DetailView):
def post(self, request, *args, **kwargs):
self.get_forms(request.POST, request.FILES)
if self.form.has_changed():
if not self.inline_formset.has_changed():
if request.GET['finalize'] == "True":
return self.finalize()
messages.warning(request, "Vous devez ajouter une observation !")
return self.get(request, new_form=False)
if not self.form.is_valid() or not self.inline_formset.is_valid():
return self.get(request, new_form=False)
rencontre = self.form.save(commit=False)