diff --git a/maraudes/templates/compte_rendu/menu/creation.html b/maraudes/templates/compte_rendu/menu/creation.html new file mode 100644 index 0000000..92196ee --- /dev/null +++ b/maraudes/templates/compte_rendu/menu/creation.html @@ -0,0 +1,54 @@ +{% load bootstrap3 %} +
  • Création + + + diff --git a/maraudes/templates/compte_rendu/menu_creation.html b/maraudes/templates/compte_rendu/menu_creation.html index 17335d7..e69de29 100644 --- a/maraudes/templates/compte_rendu/menu_creation.html +++ b/maraudes/templates/compte_rendu/menu_creation.html @@ -1,56 +0,0 @@ -{% if user.is_superuser %}{% load bootstrap3 %} -
  • Création - -{% endif %} - - - diff --git a/maraudes/templates/maraudes/menu_administration.html b/maraudes/templates/maraudes/menu/admin_menu.html similarity index 100% rename from maraudes/templates/maraudes/menu_administration.html rename to maraudes/templates/maraudes/menu/admin_menu.html diff --git a/maraudes/templates/maraudes/menu_dernieres_maraudes.html b/maraudes/templates/maraudes/menu/dernieres_maraudes.html similarity index 100% rename from maraudes/templates/maraudes/menu_dernieres_maraudes.html rename to maraudes/templates/maraudes/menu/dernieres_maraudes.html diff --git a/maraudes/tests.py b/maraudes/tests.py index 8ac20c7..97e0765 100644 --- a/maraudes/tests.py +++ b/maraudes/tests.py @@ -7,7 +7,7 @@ from django.test import TestCase from .models import Maraude, Maraudeur, ReferentMaraude # Create your tests here. -from alsa.base_data import MARAUDEURS +from maraudes_project.base_data import MARAUDEURS MARAUDE_DAYS = [ True, True, False, True, True, False, False diff --git a/maraudes/urls.py b/maraudes/urls.py index 8b8099c..7087ffa 100644 --- a/maraudes/urls.py +++ b/maraudes/urls.py @@ -6,11 +6,11 @@ from . import views urlpatterns = [ url(r'^$', views.IndexView.as_view(), name="index"), - url(r'planning/$', views.PlanningView.as_view(), name="planning"), - url(r'liste/$', views.MaraudeListView.as_view(), name="liste"), - url(r'lieu/create/$', views.LieuCreateView.as_view(), name="lieu-create"), + url(r'^planning/$', views.PlanningView.as_view(), name="planning"), + url(r'^liste/$', views.MaraudeListView.as_view(), name="liste"), + url(r'^lieu/create/$', views.LieuCreateView.as_view(), name="lieu-create"), # Compte-rendus de maraude url(r'^(?P[0-9]+)/$', views.MaraudeDetailsView.as_view(), name="details"), url(r'^(?P[0-9]+)/update/$', views.CompteRenduUpdateView.as_view(), name="update"), - url(r'^(?P[0-9]+)/cr/$', views.CompteRenduCreateView.as_view(), name="create"), + url(r'^(?P[0-9]+)/create/$', views.CompteRenduCreateView.as_view(), name="create"), ] diff --git a/maraudes/views.py b/maraudes/views.py index cf45dd5..652c50b 100644 --- a/maraudes/views.py +++ b/maraudes/views.py @@ -25,11 +25,24 @@ from .forms import ( RencontreForm, RencontreInlineFormSet, from utilisateurs.models import Maraudeur from website import decorators as website -webpage = website.webpage( +maraudes = website.app_config( + name="maraudes", + groups=[Maraudeur], + menu=["maraudes/menu/dernieres_maraudes.html"], + admin_menu=["maraudes/menu/admin_menu.html"], ajax=False, - app_users=[Maraudeur], - app_menu=["maraudes/menu_dernieres_maraudes.html", "maraudes/menu_administration.html"] ) +compte_rendu = website.app_config( + name="maraudes", + groups=[Maraudeur], + menu=["compte_rendu/menu/creation.html"], + ajax=False, + ) +maraudes_ajax = website.app_config( + name="maraudes", + groups=[Maraudeur], + ajax=True, +) from django.core.mail import send_mail @@ -51,7 +64,7 @@ class DerniereMaraudeMixin(object): -@webpage +@maraudes class IndexView(DerniereMaraudeMixin, generic.TemplateView): class PageInfo: @@ -88,7 +101,7 @@ class IndexView(DerniereMaraudeMixin, generic.TemplateView): return Maraude.objects.next ## MARAUDES -@webpage +@maraudes class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView): """ Vue détaillé d'un compte-rendu de maraude """ @@ -109,7 +122,7 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView): -@webpage +@maraudes class MaraudeListView(DerniereMaraudeMixin, generic.ListView): """ Vue de la liste des compte-rendus de maraude """ @@ -129,7 +142,7 @@ class MaraudeListView(DerniereMaraudeMixin, generic.ListView): ## COMPTE-RENDU DE MARAUDE -@webpage +@compte_rendu class CompteRenduCreateView(generic.DetailView): """ Vue pour la création d'un compte-rendu de maraude """ @@ -147,8 +160,8 @@ class CompteRenduCreateView(generic.DetailView): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - # Overrides app_menu and replace it - self.app_menu = ["compte_rendu/menu_creation.html"] + #WARNING: Overrides app_menu and replace it + self._user_menu = ["compte_rendu/menu/creation.html"] def get_forms(self, *args, initial=None): self.form = RencontreForm(*args, @@ -235,7 +248,7 @@ class CompteRenduCreateView(generic.DetailView): -@webpage +@compte_rendu class CompteRenduUpdateView(generic.DetailView): """ Vue pour mettre à jour le compte-rendu de la maraude """ @@ -301,7 +314,7 @@ class CompteRenduUpdateView(generic.DetailView): ## PLANNING -@webpage +@maraudes class PlanningView(generic.TemplateView): """ Display and edit the planning of next Maraudes """ @@ -371,7 +384,7 @@ class PlanningView(generic.TemplateView): ## LIEU -@website.webpage(ajax=True, permissions=['maraudes.add_lieu']) +@maraudes_ajax class LieuCreateView(generic.edit.CreateView): model = Lieu template_name = "maraudes/lieu_create.html" diff --git a/suivi/templates/suivi/menu/admin_sujets.html b/suivi/templates/suivi/menu/admin_sujets.html index 90f35b8..49572ed 100644 --- a/suivi/templates/suivi/menu/admin_sujets.html +++ b/suivi/templates/suivi/menu/admin_sujets.html @@ -1,4 +1,3 @@ -{% if user.is_superuser %} {% load bootstrap3 %}
  • @@ -9,4 +8,3 @@
  • {% bootstrap_icon "wrench" %} Gérer les sujets
    • -{% endif %} diff --git a/suivi/templates/suivi/menu/sujets.html b/suivi/templates/suivi/menu/sujets.html index 81bbeb0..206e163 100644 --- a/suivi/templates/suivi/menu/sujets.html +++ b/suivi/templates/suivi/menu/sujets.html @@ -1,6 +1,6 @@ {% load bootstrap3 %}
  • - Liste des sujets + Liste des sujets {% bootstrap_icon "list" %}
    • diff --git a/suivi/urls.py b/suivi/urls.py index 3867732..b98ddf8 100644 --- a/suivi/urls.py +++ b/suivi/urls.py @@ -1,9 +1,9 @@ from django.conf.urls import url from . import views -from sujets import views as sujets_views urlpatterns = [ url(r'^$', views.IndexView.as_view(), name="index"), + url(r'liste/$', views.SujetListView.as_view(), name="liste"), url(r'(?P[0-9]+)/$', views.SuiviSujetView.as_view(), name="details"), ] diff --git a/suivi/views.py b/suivi/views.py index a9b30da..67b11c0 100644 --- a/suivi/views.py +++ b/suivi/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, reverse +from django.shortcuts import reverse, redirect from django.views import generic from django.utils import timezone @@ -9,15 +9,17 @@ from notes.forms import AutoNoteForm # Create your views here. from utilisateurs.models import Maraudeur from website import decorators as website -webpage = website.webpage( +suivi = website.app_config( + name="suivi", + groups=[Maraudeur], + menu=["suivi/menu/sujets.html"], + admin_menu=["suivi/menu/admin_sujets.html"], ajax=False, - app_users=[Maraudeur], - app_menu=["suivi/menu/sujets.html", "suivi/menu/admin_sujets.html"] ) -@webpage +@suivi class IndexView(NoteFormMixin, generic.TemplateView): class PageInfo: title = "Suivi des bénéficiaires" @@ -36,10 +38,33 @@ class IndexView(NoteFormMixin, generic.TemplateView): #TemplateView template_name = "suivi/index.html" +@suivi +class SujetListView(generic.ListView): + class PageInfo: + title = "Sujet - Liste des sujets" + header = "Liste des sujets" + #ListView + model = Sujet + template_name = "sujets/sujet_liste.html" + paginate_by = 30 + def post(self, request, **kwargs): + from watson import search as watson + search_text = request.POST.get('q') + results = watson.filter(Sujet, search_text) + if results.count() == 1: + return redirect(results[0].get_absolute_url()) + self.queryset = results + return self.get(request, **kwargs) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['query_text'] = self.request.POST.get('q', None) + return context - -@webpage +# Import app_config from 'sujets' application, using +# its admin_menu option +from sujets.views import sujets +@sujets class SuiviSujetView(NoteFormMixin, generic.DetailView): class PageInfo: title = "Sujet - {{sujet}}" @@ -59,9 +84,6 @@ class SuiviSujetView(NoteFormMixin, generic.DetailView): model = Sujet template_name = "suivi/details.html" context_object_name = "sujet" - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.insert_menu("sujets/menu_sujet.html") def get_context_data(self, *args, **kwargs): context = super().get_context_data(*args, **kwargs) context['notes'] = self.object.notes.by_date(reverse=True) diff --git a/sujets/forms.py b/sujets/forms.py index a040c4b..fe51717 100644 --- a/sujets/forms.py +++ b/sujets/forms.py @@ -5,7 +5,7 @@ from .models import Sujet import datetime current_year = datetime.date.today().year -YEAR_CHOICE = (year - 2 for year in range(current_year, current_year + 10)) +YEAR_CHOICE = tuple(year - 2 for year in range(current_year, current_year + 10)) class SujetCreateForm(ModelForm): class Meta: diff --git a/sujets/urls.py b/sujets/urls.py index 85f8067..7352f69 100644 --- a/sujets/urls.py +++ b/sujets/urls.py @@ -5,6 +5,5 @@ from . import views urlpatterns = [ url(r'(?P[0-9]+)/$', views.SujetDetailsView.as_view(), name="details"), url(r'(?P[0-9]+)/update/$', views.SujetUpdateView.as_view(), name="update"), - url(r'liste/$', views.SujetListView.as_view(), name="liste"), url(r'create/$', views.SujetCreateView.as_view(), name="create"), ] diff --git a/sujets/views.py b/sujets/views.py index 627d425..865e082 100644 --- a/sujets/views.py +++ b/sujets/views.py @@ -7,15 +7,16 @@ from .forms import SujetCreateForm ### Webpage config from utilisateurs.models import Maraudeur from website import decorators as website -webpage = website.webpage( +sujets = website.app_config( + name="suivi", + groups=[Maraudeur], + menu=["suivi/menu/sujets.html"], + admin_menu=["sujets/menu/admin_sujet.html"], ajax=True, - app_users=[Maraudeur], - app_name="suivi", - app_menu=["sujets/menu/admin_sujet.html"] ) ### Views -@webpage +@sujets class SujetDetailsView(generic.DetailView): class PageInfo: title = "Sujet - {{ sujet }}" @@ -27,33 +28,10 @@ class SujetDetailsView(generic.DetailView): -@webpage -class SujetListView(generic.ListView): - class PageInfo: - title = "Sujet - Liste des sujets" - header = "Liste des sujets" - #ListView - model = Sujet - template_name = "sujets/sujet_liste.html" - paginate_by = 30 - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.insert_menu("sujets/menu/admin_sujet.html") - def post(self, request, **kwargs): - from watson import search as watson - search_text = request.POST.get('q') - results = watson.filter(Sujet, search_text) - if results.count() == 1: - return redirect(results[0].get_absolute_url()) - self.queryset = results - return self.get(request, **kwargs) - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context['query_text'] = self.request.POST.get('q', None) - return context -@webpage + +@sujets class SujetUpdateView(generic.edit.UpdateView): class PageInfo: title = "Mise à jour - {{sujet}}" @@ -66,7 +44,7 @@ class SujetUpdateView(generic.edit.UpdateView): -@webpage +@sujets class SujetCreateView(generic.edit.CreateView): class PageInfo: title = "Nouveau sujet" diff --git a/utilisateurs/models.py b/utilisateurs/models.py index f6a3b73..12817be 100644 --- a/utilisateurs/models.py +++ b/utilisateurs/models.py @@ -2,7 +2,7 @@ import datetime from django.db import models -from django.contrib.auth.models import User +from django.contrib.auth.models import User, AnonymousUser # Create your models here. class SingletonModel(models.Model): @@ -20,6 +20,13 @@ class SingletonModel(models.Model): except cls.DoesNotExist: return cls() +## Visiteur + +class Visiteur(AnonymousUser): + + def __str__(self): + return "Visiteur" + class Organisme(models.Model): """ Organisme : Association, Entreprise, Service public, ...""" diff --git a/website/decorators.py b/website/decorators.py index 8151198..7ca9e3a 100644 --- a/website/decorators.py +++ b/website/decorators.py @@ -5,16 +5,19 @@ def _insert_bases(cls, bases): new_bases = tuple(bases) + old_bases cls.__bases__ = new_bases -def webpage(**options): - """ Class decorators that insert needed bases according to options : +def app_config(**options): + """ Insert per-application configuration options : + -- name : name of the app to register under in navbar + -- groups : user groups needed to access this application + -- menu : user menu templates to be used + -- admin_menu : admin menu templates, only appear for superuser -- ajax : view will return content_template for Ajax requests - -- permissions : list of permissions needed to access view """ + name = options.pop('name', None) + groups = options.pop('groups', []) #Transition from app_users + menu = options.pop('menu', []) + admin_menu = options.pop('admin_menu', []) ajax = options.pop('ajax', False) - permissions = options.pop('permissions', []) - app_menu = options.pop('app_menu', []) - app_name = options.pop('app_name', None) - app_users = options.pop('app_users', []) new_bases = [] if ajax: @@ -22,18 +25,15 @@ def webpage(**options): else: new_bases.append(WebsiteTemplateMixin) - if permissions: - new_bases.append(PermissionRequiredMixin) - if app_users: + if groups: #TODO: use group instaed of user class new_bases.append(SpecialUserRequiredMixin) def class_decorator(cls): _insert_bases(cls, new_bases) - if permissions: - cls.permissions = permissions - cls.app_menu = app_menu.copy() #avoid conflict between Views - cls.app_name = app_name - cls.app_users = app_users.copy() + cls._user_menu = menu + cls._admin_menu = admin_menu + cls.app_name = name + cls.app_users = groups.copy() return cls return class_decorator diff --git a/website/mixins.py b/website/mixins.py index 6d1168c..ffd1ba5 100644 --- a/website/mixins.py +++ b/website/mixins.py @@ -57,50 +57,14 @@ def user_processor(request, context): context['user_group'] = request.user.groups.first() return context -class WebsiteTemplateMixin(TemplateResponseMixin): - """ Mixin for easy integration of 'website' templates - Each child can specify: - - title : title of the page - - header : header of the page - - header_small : sub-header of the page +class NavbarMixin(object): - If 'content_template' is not defined, value will fallback to template_name - in child view. - """ - base_template = "base_site.html" - content_template = None + registered_apps = ['maraudes', 'suivi'] app_name = None - class Configuration: - stylesheets = ['base.css'] - navbar_apps = ['maraudes', 'suivi'] - page_blocks = ['header', 'header_small', 'title'] - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.user = None - self._page_blocks = [] - if not hasattr(self, "PageInfo"): - raise ImproperlyConfigured("You must define a PageInfo on ", self) - for attr, val in self.PageInfo.__dict__.items(): - if attr[0] is not "_" and type(val) is str: - setattr(self, attr, Template(val)) - self._page_blocks.append(attr) - - def get_template_names(self): - """ Ensure same template for all children views. """ - return [self.base_template] - - def get_content_template(self): - # Ensure easy integration with generic views - if hasattr(self, 'template_name'): - self.content_template = self.template_name - else: - raise ImproperlyConfigured(self, "has no template defined !") - return self.content_template - def get_apps_config(self): """ Load additionnal config data on each app registered in navbar Add : @@ -112,7 +76,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin): 'maraudes': 'road', 'suivi': 'eye-open', } - app_names = self.Configuration.navbar_apps + app_names = self.registered_apps self._apps = [] for name in app_names: app_config = apps.get_app_config(name) @@ -147,16 +111,64 @@ class WebsiteTemplateMixin(TemplateResponseMixin): self._active_app = self.get_active_app() return self._active_app - def get_menu(self): + @property + def menu(self): """ Renvoie la liste des templates utilisés comme menu pour l'application active """ - return self.app_menu + if not self.request.user.is_superuser: + return self._user_menu + return self._user_menu + self._admin_menu + + + +class WebsiteTemplateMixin(NavbarMixin, TemplateResponseMixin): + """ Mixin for easy integration of 'website' templates + + Each child can specify: + - title : title of the page + - header : header of the page + - header_small : sub-header of the page + + If 'content_template' is not defined, value will fallback to template_name + in child view. + """ + base_template = "base_site.html" + content_template = None + + _user_menu = [] + _admin_menu = [] + _groups = [] + + + class Configuration: + stylesheets = ['base.css'] + page_blocks = ['header', 'header_small', 'title'] + + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.user = None + self._page_blocks = [] + if not hasattr(self, "PageInfo"): + raise ImproperlyConfigured("You must define a PageInfo on ", self) + for attr, val in self.PageInfo.__dict__.items(): + if attr[0] is not "_" and type(val) is str: + setattr(self, attr, Template(val)) + self._page_blocks.append(attr) + + def get_template_names(self): + """ Ensure same template for all children views. """ + return [self.base_template] + + def get_content_template(self): + # Ensure easy integration with generic views + if hasattr(self, 'template_name'): + self.content_template = self.template_name + else: + raise ImproperlyConfigured(self, "has no template defined !") + return self.content_template - def insert_menu(self, template_name): - """ Insert menu at beginning of self.app_menu """ - if not template_name in self.app_menu: - self.app_menu.insert(0, template_name) def _update_context_with_rendered_blocks(self, context): """ Render text for existing PageInfo attributes. @@ -178,7 +190,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin): context = user_processor(self.request, context) #Webpage context['content_template'] = self.get_content_template() - context['app_menu'] = self.get_menu() + context['app_menu'] = self.menu return context class WebsiteAjaxTemplateMixin(WebsiteTemplateMixin): @@ -201,9 +213,4 @@ class WebsiteAjaxTemplateMixin(WebsiteTemplateMixin): return [self.ajax_template] return super().get_template_names() -class WebsiteProtectedMixin(WebsiteTemplateMixin, PermissionRequiredMixin): - pass - -class WebsiteProtectedWithAjaxMixin(WebsiteAjaxTemplateMixin, PermissionRequiredMixin): - pass diff --git a/website/templates/navbar.html b/website/templates/navbar.html index 7c7c86f..861e2cb 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -23,6 +23,9 @@
      + {% if next %} +

      Vous n'avez pas l'autorisation
      d'accéder à cette page.

      + {%endif%} {% if user.is_authenticated %} {% if user.is_superuser %}
    • {% bootstrap_icon "wrench" %} Administration
      • {% endif %}
    • {% bootstrap_icon "log-out" %} Déconnecter
      • @@ -30,7 +33,6 @@
    • {% csrf_token %} {% if next %} -

      Vous devez vous connecter
      pour accéder à cette page.

      {% endif %}
      diff --git a/website/views.py b/website/views.py index 83e63c1..fa085a1 100644 --- a/website/views.py +++ b/website/views.py @@ -3,7 +3,7 @@ from django.urls import reverse from django import views from .mixins import WebsiteTemplateMixin -from django.contrib.auth.views import login +from django.contrib.auth import login, authenticate from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect class Index(WebsiteTemplateMixin, views.generic.TemplateView): @@ -16,21 +16,33 @@ class Index(WebsiteTemplateMixin, views.generic.TemplateView): header = "La Maraude ALSA" header_small = "accueil" - def _get_user_entry_point(self): - # Should find best entry point according to user Group + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["next"] = self.request.GET.get("next", "") + return context + + + +def _get_entry_point(user): + from utilisateurs.models import Maraudeur + + if isinstance(user, Maraudeur): return reverse('maraudes:index') - - def get(self, request, *args, **kwargs): - if request.user.is_authenticated(): - return redirect(self._get_user_entry_point()) - return super().get(request, *args, **kwargs) - - + else: + return reverse('index') def login_view(request): if request.method == 'GET': return HttpResponsePermanentRedirect('/') elif request.method == 'POST': - #TODO: authenticate instead of mis-using 'login' view. - response = login(request) - return HttpResponseRedirect('/') + username = request.POST['username'] + password = request.POST['password'] + user = authenticate(username=username, password=password) + if user is not None: + login(request, user) + next = request.POST.get('next', None) + if not next: + next = _get_entry_point(user) + return HttpResponseRedirect(next) + else: + return HttpResponseRedirect('/')