From 7f08b1db2364ddc0fcc6d9b654842547e8d8994a Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Sat, 19 Nov 2016 13:28:36 +0100 Subject: [PATCH] added 'tables' template tags to display objects lists in 'maraudes' and 'sujets' --- .../templates/maraudes/list_table_cell.html | 12 +++++++ maraudes/templates/maraudes/liste.html | 26 ++-------------- maraudes/views.py | 2 +- notes/templatetags/notes.py | 2 -- sujets/templates/sujets/list_table_cell.html | 6 ++++ sujets/templates/sujets/sujet_liste.html | 11 ++----- sujets/views.py | 2 +- website/templates/tables/table.html | 13 ++++++++ website/templates/tables/table_cell.html | 1 + website/templatetags/tables.py | 31 +++++++++++++++++++ website/views.py | 1 + 11 files changed, 71 insertions(+), 36 deletions(-) create mode 100644 maraudes/templates/maraudes/list_table_cell.html create mode 100644 sujets/templates/sujets/list_table_cell.html create mode 100644 website/templates/tables/table.html create mode 100644 website/templates/tables/table_cell.html create mode 100644 website/templatetags/tables.py diff --git a/maraudes/templates/maraudes/list_table_cell.html b/maraudes/templates/maraudes/list_table_cell.html new file mode 100644 index 0000000..d1c8336 --- /dev/null +++ b/maraudes/templates/maraudes/list_table_cell.html @@ -0,0 +1,12 @@ +{% if object.est_terminee %} + +{% else %} + +{% endif %} + {{object.date}} + +{{ object.binome }} & {{ object.referent }} +{% if object.est_terminee %} +{{object.rencontres.count}} rencontres +{% endif %} + diff --git a/maraudes/templates/maraudes/liste.html b/maraudes/templates/maraudes/liste.html index a26baa8..72a941a 100644 --- a/maraudes/templates/maraudes/liste.html +++ b/maraudes/templates/maraudes/liste.html @@ -1,4 +1,5 @@ {% load bootstrap3 %} +{% load tables %}
@@ -7,30 +8,7 @@
- - {% for maraude in object_list %} - - - - {% endfor %} -
-
- {% if maraude.est_terminee %} - - {% elif perms.maraudes.can_add_compterendu %} - - {% else %} - - {% endif %} - {{maraude.date}} - {% if user.is_superuser %} - {% bootstrap_icon "edit" %} - {% endif %}
-
- {{maraude.rencontres.count}} rencontres - {{ maraude.binome }} & {{ maraude.referent }} -
-
+ {% table object_list cols=2 cell_template="maraudes/list_table_cell.html" %} {% if is_paginated %}
    diff --git a/maraudes/views.py b/maraudes/views.py index 615ddee..cf45dd5 100644 --- a/maraudes/views.py +++ b/maraudes/views.py @@ -115,7 +115,7 @@ class MaraudeListView(DerniereMaraudeMixin, generic.ListView): model = CompteRendu template_name = "maraudes/liste.html" - paginate_by = 10 + paginate_by = 30 class PageInfo: title = "Maraude - Liste des maraudes" diff --git a/notes/templatetags/notes.py b/notes/templatetags/notes.py index eb63476..96fbfed 100644 --- a/notes/templatetags/notes.py +++ b/notes/templatetags/notes.py @@ -1,5 +1,3 @@ -from notes.models import Note - from django import template register = template.Library() diff --git a/sujets/templates/sujets/list_table_cell.html b/sujets/templates/sujets/list_table_cell.html new file mode 100644 index 0000000..fdc8d1e --- /dev/null +++ b/sujets/templates/sujets/list_table_cell.html @@ -0,0 +1,6 @@ +{{object}} +
    + {{ object.notes.count }} notes +
    + + diff --git a/sujets/templates/sujets/sujet_liste.html b/sujets/templates/sujets/sujet_liste.html index 66b9a9c..dd670de 100644 --- a/sujets/templates/sujets/sujet_liste.html +++ b/sujets/templates/sujets/sujet_liste.html @@ -1,3 +1,4 @@ +{% load tables %} {% load bootstrap3 %}
    @@ -28,14 +29,7 @@
    {% if object_list %} - - {% for sujet in object_list %} - - - - - {% endfor %} -
    {{sujet}}{{ sujet.notes.count }} notes
    + {% table object_list cols=3 cell_template="sujets/list_table_cell.html" %} {% if is_paginated %}
      @@ -47,6 +41,7 @@ {% endif %}{% endif %}
    +
    diff --git a/sujets/views.py b/sujets/views.py index 5382885..ead08c0 100644 --- a/sujets/views.py +++ b/sujets/views.py @@ -35,7 +35,7 @@ class SujetListView(generic.ListView): #ListView model = Sujet template_name = "sujets/sujet_liste.html" - paginate_by = 10 + paginate_by = 30 def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.insert_menu("suivi/menu_sujets.html") diff --git a/website/templates/tables/table.html b/website/templates/tables/table.html new file mode 100644 index 0000000..dfe7b2c --- /dev/null +++ b/website/templates/tables/table.html @@ -0,0 +1,13 @@ + + {% for row in rows %} + + {% for object in row %} + + {% endfor %} + + {% endfor %} +
    + {% if object %} + {% include cell_template with object=object %} + {%endif%} +
    diff --git a/website/templates/tables/table_cell.html b/website/templates/tables/table_cell.html new file mode 100644 index 0000000..3cbd38c --- /dev/null +++ b/website/templates/tables/table_cell.html @@ -0,0 +1 @@ +{{ object }} diff --git a/website/templatetags/tables.py b/website/templatetags/tables.py new file mode 100644 index 0000000..b0fe817 --- /dev/null +++ b/website/templatetags/tables.py @@ -0,0 +1,31 @@ +from django import template +from itertools import zip_longest + +register = template.Library() + +def get_columns(iterable, cols): + cols_len = len(iterable) // cols + if len(iterable) % cols != 0: + cols_len += 1 + for i in range(cols): + yield iterable[i*cols_len:(i+1)*cols_len] + +@register.inclusion_tag("tables/table.html") +def table(object_list, cols=2, cell_template="tables/table_cell.html"): + """ Render object list in table of given columns number """ + return { + 'cell_template': cell_template, + 'rows': tuple(zip_longest( *get_columns(object_list, cols), + fillvalue=None + )) + } + +@register.inclusion_tag("tables/header_table.html") +def header_table(object_list, cols=2): + """ Display object list in table of given columns number """ + return { + 'cols': cols, + 'rows': tuple(zip_longest( *get_columns(object_list, cols), + fillvalue=None + )) + } diff --git a/website/views.py b/website/views.py index 7637126..83e63c1 100644 --- a/website/views.py +++ b/website/views.py @@ -31,5 +31,6 @@ 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('/')