diff --git a/maraudes/templates/maraudes/menu.html b/maraudes/templates/maraudes/menu.html index 71ca0a8..257cc93 100644 --- a/maraudes/templates/maraudes/menu.html +++ b/maraudes/templates/maraudes/menu.html @@ -6,22 +6,12 @@ Tableau de bord -
  • +   Compte-rendu -
  • {% else %}> - -   - Compte-rendu - - {% endif %} +
  •   diff --git a/maraudes/urls.py b/maraudes/urls.py index c97ecba..d9cee6e 100644 --- a/maraudes/urls.py +++ b/maraudes/urls.py @@ -6,6 +6,7 @@ from . import views urlpatterns = [ url(r'^$', views.IndexView.as_view(), name="index"), + url(r'^compte-rendu$', views.redirect_to_current_compterendu, name="cr-link"), url(r'^planning/$', views.PlanningView.as_view(), name="planning"), url(r'^lieu/create/$', views.LieuCreateView.as_view(), name="lieu-create"), url(r'^(?P[0-9]+)/create/$', views.CompteRenduCreateView.as_view(), name="create"), diff --git a/maraudes/views.py b/maraudes/views.py index 6404696..2399890 100644 --- a/maraudes/views.py +++ b/maraudes/views.py @@ -67,8 +67,22 @@ class IndexView(NoteFormMixin, MaraudeurMixin, generic.TemplateView): return context - ## COMPTE-RENDU DE MARAUDE + + +def redirect_to_current_compterendu(request): + prochaine_maraude = Maraude.objects.get_next_of(request.user) + current_date = timezone.localtime(timezone.now()).date() + if not prochaine_maraude.date == current_date: + return redirect("maraudes:index") + + kwargs = {'pk': prochaine_maraude.pk} + if not prochaine_maraude.est_terminee(): + return redirect("maraudes:create", **kwargs) + else: + return redirect("notes:details-maraude", **kwargs) + + class CompteRenduCreateView(MaraudeurMixin, generic.DetailView): """ Vue pour la création d'un compte-rendu de maraude """