From 91079e135835aba77fd6972061461d28daa324f0 Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Sun, 14 Aug 2016 15:02:42 +0200 Subject: [PATCH] many fixes --- .../templates/suivi/menu_administration.html | 7 -- suivi/templates/suivi/menu_sujets.html | 6 ++ suivi/views.py | 20 ++--- sujets/models.py | 76 +++++++++---------- sujets/views.py | 66 +++++++--------- website/mixins.py | 46 +++++++---- website/templates/navbar.html | 8 +- 7 files changed, 118 insertions(+), 111 deletions(-) delete mode 100644 suivi/templates/suivi/menu_administration.html diff --git a/suivi/templates/suivi/menu_administration.html b/suivi/templates/suivi/menu_administration.html deleted file mode 100644 index 0b30157..0000000 --- a/suivi/templates/suivi/menu_administration.html +++ /dev/null @@ -1,7 +0,0 @@ -{% if user.is_superuser %}{% load bootstrap3 %} -
  • Administration - -{% endif %} diff --git a/suivi/templates/suivi/menu_sujets.html b/suivi/templates/suivi/menu_sujets.html index 8ce2f45..5151bda 100644 --- a/suivi/templates/suivi/menu_sujets.html +++ b/suivi/templates/suivi/menu_sujets.html @@ -2,4 +2,10 @@
  • Sujets diff --git a/suivi/views.py b/suivi/views.py index 579d5f0..a3d207e 100644 --- a/suivi/views.py +++ b/suivi/views.py @@ -10,36 +10,36 @@ from sujets.models import Sujet webpage = website.webpage( ajax=False, permissions=['sujets.view_sujets'], - app_menu=["suivi/menu_sujets.html", "suivi/menu_administration.html"] + app_menu=["suivi/menu_sujets.html"] ) @webpage class IndexView(generic.TemplateView): - template_name = "suivi/index.html" - class PageInfo: title = "Suivi des bénéficiaires" header = "Suivi" header_small = "Tableau de bord" + #TemplateView + template_name = "suivi/index.html" - def get_panels(self): - return ["suivi/panel_sujets.html", "suivi/panel_admin.html"] from notes.mixins import NoteFormMixin @webpage class SuiviSujetView(NoteFormMixin, generic.DetailView): - model = Sujet - template_name = "suivi/details.html" - context_object_name = "sujet" - class PageInfo: title = "Sujet - {{sujet}}" header = "{{sujet}}" header_small = "suivi" - + #DetailView + model = Sujet + template_name = "suivi/details.html" + context_object_name = "sujet" + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.app_menu.insert(0, "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/models.py b/sujets/models.py index 36c0998..b0a4899 100644 --- a/sujets/models.py +++ b/sujets/models.py @@ -1,44 +1,11 @@ from django.utils import timezone from django.core.urlresolvers import reverse - from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ from django.db import models -# Create your models here. - -class Personne(models.Model): - """ Modèle de base d'une personne - - genre - - nom - - prénom - """ - - HOMME = 'M' - FEMME = 'Mme' - GENRE_CHOICES = ( - (HOMME, 'Homme'), - (FEMME, 'Femme'), - ) - genre = models.CharField(max_length=3, - choices=GENRE_CHOICES, - default=HOMME) - nom = models.CharField(max_length=32, blank=True) - prenom = models.CharField(max_length=32, blank=True) - surnom = models.CharField(max_length=64, blank=True) - - def __str__(self): - string = '%s ' % self.genre - if self.nom: string += '%s ' % self.nom - if self.surnom: string += '"%s" ' % self.surnom - if self.prenom: string += '%s' % self.prenom - return string - - def clean(self): - if not any([self.nom, self.prenom, self.surnom]): - raise ValidationError(_("Vous devez remplir au moins un nom, prénom ou surnom")) - return super().clean() +### Item choices # Item: Parcours institutionnel PARCOURS_INSTITUTIONNEL = "Institutionnel" @@ -81,15 +48,49 @@ RESSOURCES_CHOICES = ( ) -from django.db import models + +### Models +# - Personne +# - Sujet + +class Personne(models.Model): + """ Modèle de base d'une personne + - genre + - nom + - prénom + """ + + HOMME = 'M' + FEMME = 'Mme' + GENRE_CHOICES = ( + (HOMME, 'Homme'), + (FEMME, 'Femme'), + ) + genre = models.CharField(max_length=3, + choices=GENRE_CHOICES, + default=HOMME) + nom = models.CharField(max_length=32, blank=True) + prenom = models.CharField(max_length=32, blank=True) + surnom = models.CharField(max_length=64, blank=True) + + def __str__(self): + string = '%s ' % self.genre + if self.nom: string += '%s ' % self.nom + if self.surnom: string += '"%s" ' % self.surnom + if self.prenom: string += '%s' % self.prenom + return string + + def clean(self): + if not any([self.nom, self.prenom, self.surnom]): + raise ValidationError(_("Vous devez remplir au moins un nom, prénom ou surnom")) + return super().clean() + class Sujet(Personne): """ Personne faisant l'objet d'un suivi par la maraude - """ # referent = models.ForeignKey("utilisateurs.Professionnel", related_name="suivis") - premiere_rencontre = models.DateField(default=timezone.now) age = models.SmallIntegerField(blank=True, null=True) @@ -113,7 +114,6 @@ class Sujet(Personne): default=RESSOURCES_NR) connu_siao = models.NullBooleanField("Connu du SIAO ?") - class Meta: verbose_name = "Sujet" ordering = ('surnom', 'nom', 'prenom') diff --git a/sujets/views.py b/sujets/views.py index 26af8cd..85e0338 100644 --- a/sujets/views.py +++ b/sujets/views.py @@ -1,85 +1,77 @@ from django.shortcuts import render - from django.views import generic -from website import decorators as website from .models import Sujet +from .forms import SujetCreateForm -from django.forms import ModelForm - - +### Webpage config +from website import decorators as website webpage = website.webpage( ajax=True, permissions=['sujets.view_sujets'], app_name="suivi", - app_menu=["suivi/menu_sujets.html", "suivi/menu_administration.html"] + app_menu=["sujets/menu_sujet.html"] ) -# Create your views here. - -# TODO: deal with setting an active_app name other than module name +### Views @webpage class SujetDetailsView(generic.DetailView): - template_name = "sujets/sujet_details.html" - model = Sujet - class PageInfo: title = "Sujet - {{ sujet }}" header = "{{ sujet }}" header_small = "suivi" + #DetailView + template_name = "sujets/sujet_details.html" + model = Sujet + + @webpage class SujetListView(generic.ListView): - model = Sujet - template_name = "sujets/sujet_liste.html" - class PageInfo: title = "Sujet - Liste des sujets" header = "Liste des sujets" + #ListView + model = Sujet + template_name = "sujets/sujet_liste.html" + paginate_by = 10 + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.app_menu = ["suivi/menu_sujets.html"] + + @webpage class SujetUpdateView(generic.edit.UpdateView): - template_name = "sujets/sujet_update.html" - model = Sujet - fields = '__all__' - class PageInfo: title = "Mise à jour - {{sujet}}" header = "{{sujet}}" header_small = "mise à jour" + #UpdateView + template_name = "sujets/sujet_update.html" + model = Sujet + fields = '__all__' - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - print('SujetUpdateView init:', self.__class__.__bases__) - -class SujetCreateForm(ModelForm): - class Meta: - model = Sujet - fields = ['nom', 'surnom', 'prenom', 'genre', 'premiere_rencontre'] @webpage class SujetCreateView(generic.edit.CreateView): - template_name = "sujets/sujet_create.html" - form_class = SujetCreateForm - class PageInfo: title = "Nouveau sujet" header = "Nouveau sujet" - + # Special permissions def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.permissions += ['sujets.add_sujet'] - + #CreateView + template_name = "sujets/sujet_create.html" + form_class = SujetCreateForm def post(self, request, *args, **kwargs): if 'next' in self.request.POST: self.success_url = self.request.POST["next"] return super().post(self, request, *args, **kwargs) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - try: - context['next'] = self.request.GET['next'] - except: - context['next'] = None + try: context['next'] = self.request.GET['next'] + except:context['next'] = None return context diff --git a/website/mixins.py b/website/mixins.py index 993418c..f0b6563 100644 --- a/website/mixins.py +++ b/website/mixins.py @@ -6,19 +6,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.template import Template, Context from django.views.generic.base import ContextMixin, TemplateResponseMixin -## Utils ## -APP_ICONS = { - 'maraudes': 'road', - 'suivi': 'eye-open', -} -def get_apps_config(app_names): - _apps = [] - for name in app_names: - app_config = apps.get_app_config(name) - app_config.menu_icon = APP_ICONS[name] - _apps.append(app_config) - return _apps ## Mixins ## @@ -63,12 +51,12 @@ class WebsiteTemplateMixin(TemplateResponseMixin): class Configuration: stylesheets = ['base.css'] navbar_apps = ['maraudes', 'suivi'] - apps = get_apps_config(navbar_apps) 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) @@ -86,10 +74,38 @@ class WebsiteTemplateMixin(TemplateResponseMixin): self.content_template = self.template_name return self.content_template + def get_apps_config(self): + """ Load additionnal config data on each app registered in navbar""" + ## Utils ## + APP_ICONS = { + 'maraudes': 'road', + 'suivi': 'eye-open', + } + app_names = self.Configuration.navbar_apps + self._apps = [] + for name in app_names: + app_config = apps.get_app_config(name) + app_config.menu_icon = APP_ICONS[name] + #Known Issue: there is actually no 'suivi.view_suivi' permission yet ! + app_config.disabled = not self.request.user.has_perm('%s.view_%s' % (name, name)) + print(self.request.user, app_config, '-> has perm:', not app_config.disabled) + self._apps.append(app_config) + return self._apps + + @property + def apps(self): + if not hasattr(self, '_apps'): + self._apps = self.get_apps_config() + return self._apps + def get_active_app(self): if not self.app_name: self.app_name = self.__class__.__module__.split(".")[0] - return apps.get_app_config(self.app_name) + active_app = apps.get_app_config(self.app_name) + if not active_app in self.apps: #TODO: how do we deal with this ? + print("%s must be registered in Configuration.navbar_apps" % active_app) + return None + return active_app @property def active_app(self): @@ -122,7 +138,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin): self._update_context_with_rendered_blocks(context) #Website processor context['stylesheets'] = self.Configuration.stylesheets - context['apps'] = self.Configuration.apps + context['apps'] = self.apps context['active_app'] = self.active_app # User processor context = user_processor(self.request, context) diff --git a/website/templates/navbar.html b/website/templates/navbar.html index 9be3572..8a9bee3 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -12,7 +12,7 @@