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

Remaster (#38)

Browse Source 
* 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
This commit is contained in:
artus40
2017-06-11 17:16:17 +02:00
committed by GitHub
parent 0be59a61a7
commit be087464fc
155 changed files with 3568 additions and 1988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
website/mixins.py
View File

@@ -1,102 +1,13 @@
from django.core.exceptions import ImproperlyConfigured
from django.contrib.auth.decorators import user_passes_test
from django.template import Template, Context
from django.views.generic.base import TemplateResponseMixin
## Mixins ##
class SpecialUserRequiredMixin(object):
""" Requires that the User is an instance of some class """
app_users = []
@classmethod
def as_view(cls, **initkwargs):
view = super().as_view(**initkwargs)
return cls.special_user_required(cls.app_users)(view)
@staticmethod
def special_user_required(authorized_users):
valid_cls = tuple(authorized_users)
if not valid_cls: # No restriction usually means misconfiguration !
raise ImproperlyConfigured(
'A view was configured as "restricted" with no restricting parameters !')
def check_special_user(user):
if isinstance(user, valid_cls):
return True
else:
return False
return user_passes_test(check_special_user)
def user_processor(request, context):
context['user_group'] = request.user.__class__.__qualname__
return context
def header_processor(header, context):
context['page_header'] = Template(header[0]).render(context)
context['page_header_small'] = Template(header[1]).render(context) if len(header) == 2 else ''
context['page_title'] = " - ".join((context['page_header'], context['page_header_small']))
return context
class WebsiteTemplateMixin(TemplateResponseMixin):
""" Mixin for easy integration of 'website' templates
If 'content_template' is not defined, value will fallback to template_name
in child view.
"""
base_template = "base_site.html"
content_template = None
app_name = None
class Configuration:
stylesheets = ['css/base.css']
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.user = None
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_context_data(self, **kwargs):
context = Context(super().get_context_data(**kwargs))
#Website processor
context['stylesheets'] = self.Configuration.stylesheets
context['active_app'] = self.app_name # Set by Webpage decorator
# User processor
context = header_processor(self.header, context)
context = user_processor(self.request, context)
#Webpage
context['content_template'] = self.get_content_template()
return context
class WebsiteAjaxTemplateMixin(WebsiteTemplateMixin):
class AjaxTemplateMixin:
""" Mixin that returns content_template instead of base_template when
request is Ajax.
"""
is_ajax = False
def dispatch(self, request, *args, **kwargs):
if not hasattr(self, 'content_template') or not self.content_template:
self.content_template = self.get_content_template()
if not hasattr(self, 'ajax_template'):
self.ajax_template = '%s_inner.html' % self.content_template.split(".")[0]
self.ajax_template = '%s_inner.html' % self.template_name.split(".")[0]
if request.is_ajax():
self.is_ajax = True
return super().dispatch(request, *args, **kwargs)