From 55c1d7f02c10b7db6dafdfa100c409a5f76f6678 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludo_529@hotmail.com>
Date: Mon, 7 Jan 2019 22:51:02 +0100
Subject: [PATCH] Refactor templates

---
 bda/templates/bda/forms/attribution_label_table.html  |  7 +------
 bda/templates/bda/forms/date_tirage.html              |  1 +
 .../bda/forms/revente_other_label_table.html          | 11 +++--------
 bda/templates/bda/forms/revente_self_label_table.html |  9 ++-------
 bda/templates/bda/forms/revente_sold_label_table.html |  7 ++-----
 5 files changed, 9 insertions(+), 26 deletions(-)
 create mode 100644 bda/templates/bda/forms/date_tirage.html

diff --git a/bda/templates/bda/forms/attribution_label_table.html b/bda/templates/bda/forms/attribution_label_table.html
index d47af32d..b50b8290 100644
--- a/bda/templates/bda/forms/attribution_label_table.html
+++ b/bda/templates/bda/forms/attribution_label_table.html
@@ -1,6 +1 @@
-{% with spectacle=attribution.spectacle %}
-<td>{{ spectacle.title }}</td>
-<td data-sort-value="{{ spectacle.timestamp }}">{{ spectacle.date }}</td>
-<td data-sort-value="{{ spectacle.location }}">{{ spectacle.location }}</td>
-<td data-sort-value="{{ spectacle.price |stringformat:".3f" }}">{{ spectacle.price |floatformat }}€</td>
-{% endwith %}
\ No newline at end of file
+{% include 'bda/forms/spectacle_label_table.html' with spectacle=attribution.spectacle %}
\ No newline at end of file
diff --git a/bda/templates/bda/forms/date_tirage.html b/bda/templates/bda/forms/date_tirage.html
new file mode 100644
index 00000000..98b1c5e1
--- /dev/null
+++ b/bda/templates/bda/forms/date_tirage.html
@@ -0,0 +1 @@
+<td data-sort-value="{{ revente.date_tirage | date:"U" }}">{{ revente.date_tirage }}</td>
diff --git a/bda/templates/bda/forms/revente_other_label_table.html b/bda/templates/bda/forms/revente_other_label_table.html
index c2047ff3..99c82a08 100644
--- a/bda/templates/bda/forms/revente_other_label_table.html
+++ b/bda/templates/bda/forms/revente_other_label_table.html
@@ -1,8 +1,3 @@
-{% with spectacle=revente.attribution.spectacle user=revente.seller.user %}
-<td>{{ spectacle.title }}</td>
-<td data-sort-value="{{ spectacle.timestamp }}">{{ spectacle.date }}</td>
-<td data-sort-value="{{ spectacle.location }}">{{ spectacle.location }}</td>
-<td data-sort-value="{{ spectacle.price |stringformat:".3f" }}">{{ spectacle.price |floatformat }}€</td>
-<td>{{user.first_name}} {{user.last_name}}</td>
-<td data-sort-value="{{ revente.date_tirage | date:"U" }}">{{ revente.date_tirage }}</td>
-{% endwith %}
\ No newline at end of file
+{% include 'bda/forms/spectacle_label_table.html' with spectacle=revente.attribution.spectacle %}
+{% with user=revente.seller.user %} <td>{{user.first_name}} {{user.last_name}}</td> {% endwith%}
+{% include 'bda/forms/date_tirage.html' %}
\ No newline at end of file
diff --git a/bda/templates/bda/forms/revente_self_label_table.html b/bda/templates/bda/forms/revente_self_label_table.html
index 26700ee9..3f32b114 100644
--- a/bda/templates/bda/forms/revente_self_label_table.html
+++ b/bda/templates/bda/forms/revente_self_label_table.html
@@ -1,7 +1,2 @@
-{% with spectacle=revente.attribution.spectacle %}
-<td>{{ spectacle.title }}</td>
-<td data-sort-value="{{ spectacle.timestamp }}">{{ spectacle.date }}</td>
-<td data-sort-value="{{ spectacle.location }}">{{ spectacle.location }}</td>
-<td data-sort-value="{{ spectacle.price |stringformat:".3f" }}">{{ spectacle.price |floatformat }}€</td>
-<td data-sort-value="{{ revente.date_tirage | date:"U" }}">{% if revente.tirage_done %}Tirage infructueux{% else %}{{ revente.date_tirage }}{% endif %}</td>
-{% endwith %}
\ No newline at end of file
+{% include 'bda/forms/spectacle_label_table.html' with spectacle=revente.attribution.spectacle %}
+{% include 'bda/forms/date_tirage.html' %}
\ No newline at end of file
diff --git a/bda/templates/bda/forms/revente_sold_label_table.html b/bda/templates/bda/forms/revente_sold_label_table.html
index 92b83c44..31777648 100644
--- a/bda/templates/bda/forms/revente_sold_label_table.html
+++ b/bda/templates/bda/forms/revente_sold_label_table.html
@@ -1,7 +1,4 @@
-{% with spectacle=revente.attribution.spectacle user=revente.soldTo.user %}
-<td>{{ spectacle.title }}</td>
-<td data-sort-value="{{ spectacle.timestamp }}">{{ spectacle.date }}</td>
-<td data-sort-value="{{ spectacle.location }}">{{ spectacle.location }}</td>
-<td data-sort-value="{{ spectacle.price |stringformat:".3f" }}">{{ spectacle.price |floatformat }}€</td>
+{% include 'bda/forms/spectacle_label_table.html' with spectacle=revente.attribution.spectacle %}
+{% with user=revente.soldTo.user %}
 <td><a href="mailto:{{ user.email }}">{{user.first_name}} {{user.last_name}}</a></td>
 {% endwith %}
\ No newline at end of file