From 90e8ece78340624b4edc547e355994cf90d5b712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Mon, 22 Aug 2016 01:57:28 +0200 Subject: [PATCH] =?UTF-8?q?Affichage=20et=20auth=20sur=20les=20caisses=20e?= =?UTF-8?q?t=20relev=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Auth K-Fêt fonctionne - Affichage repris --- kfet/templates/kfet/checkout.html | 34 +++++++++---- kfet/templates/kfet/checkout_create.html | 3 ++ kfet/templates/kfet/checkout_read.html | 48 +++++++++---------- kfet/templates/kfet/checkout_update.html | 41 +++++++++++----- .../kfet/checkoutstatement_create.html | 29 ++++++++--- kfet/templates/kfet/left_checkout.html | 13 +++++ kfet/views.py | 3 +- 7 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 kfet/templates/kfet/left_checkout.html diff --git a/kfet/templates/kfet/checkout.html b/kfet/templates/kfet/checkout.html index 2e2cea17..43d19950 100644 --- a/kfet/templates/kfet/checkout.html +++ b/kfet/templates/kfet/checkout.html @@ -1,22 +1,36 @@ {% extends "kfet/base.html" %} -{% block title %}Caisses{% endblock %} +{% block title %}Liste des caisses{% endblock %} {% block content-header-title %}Caisses{% endblock %} {% block content %}
-
-
- Créer une caisse +
+
+
+
{{ checkouts|length }} caisses
+
+
+ Créer un compte +
+
+
+
+ {% include 'kfet/base_messages.html' %} +
+
+

Liste des caisses

+
+ +
+
- - {% endblock %} diff --git a/kfet/templates/kfet/checkout_create.html b/kfet/templates/kfet/checkout_create.html index 53e5ef8c..0e283825 100644 --- a/kfet/templates/kfet/checkout_create.html +++ b/kfet/templates/kfet/checkout_create.html @@ -16,6 +16,9 @@

{{ field.help_text|safe }}

{% endif %} {% endfor %} + {% if not perms.kfet.add_checkout %} + + {% endif %} diff --git a/kfet/templates/kfet/checkout_read.html b/kfet/templates/kfet/checkout_read.html index 2e9fa932..77804af7 100644 --- a/kfet/templates/kfet/checkout_read.html +++ b/kfet/templates/kfet/checkout_read.html @@ -6,32 +6,32 @@ {% block content %}
-
-
- Modifier - Effectuer un relevé +
+
+ {% include 'kfet/left_checkout.html' %} +
+
+
+ {% include "kfet/base_messages.html" %} +
+
+

Relevés

+
+ {% with statements=checkout.statements.all %} + {% if not statements %} + Pas de relevé + {% else %} +
    + {% for statement in statements %} +
  • {{ statement }}
    • + {% endfor %} +
+ {% endif %} + {% endwith %} +
+
-

Nom: {{ checkout.name }}

-

Valide du {{ checkout.valid_from|date:'l j F Y, G:i' }} au {{ checkout.valid_to|date:'l j F Y, G:i' }}

-

Créée par: {{ checkout.created_by }}

-

Balance: {{ checkout.balance }} €

-

Protected: {{ checkout.is_protected }}

- -Relevés: -{% with statements=checkout.statements.all %} -{% if not statements %} - Pas de relevé -{% else %} -
    - {% for statement in statements %} -
  • {{ statement }}
    • - {% endfor %} -
-{% endif %} -{% endwith %} - - {% endblock %} diff --git a/kfet/templates/kfet/checkout_update.html b/kfet/templates/kfet/checkout_update.html index 121176aa..2b3d9183 100644 --- a/kfet/templates/kfet/checkout_update.html +++ b/kfet/templates/kfet/checkout_update.html @@ -6,18 +6,35 @@ {% block content %} -
- {% csrf_token %} - {% for field in form %} - {{ field.errors }} - {{ field.label_tag }} -
{{ field }}
- {% if field.help_text %} -

{{ field.help_text|safe }}

- {% endif %} - {% endfor %} - -
+
+
+
+ {% include 'kfet/left_checkout.html' %} +
+
+
+ {% include "kfet/base_messages.html" %} +
+
+
+ {% csrf_token %} + {% for field in form %} + {{ field.errors }} + {{ field.label_tag }} +
{{ field }}
+ {% if field.help_text %} +

{{ field.help_text|safe }}

+ {% endif %} + {% endfor %} + {% if not perms.kfet.add_checkout %} + + {% endif %} + +
+
+
+
+