diff --git a/gestion/models.py b/gestion/models.py index 9d70830..8cd64bf 100644 --- a/gestion/models.py +++ b/gestion/models.py @@ -98,7 +98,11 @@ class Product(models.Model): history = HistoricalRecords() def __str__(self): - return self.name + if self.draft_category == self.DRAFT_NONE: + return self.name + "(" + str(self.amount) + " €)" + else: + return self.name + " (" + str(self.amount) + " €, " + str(self.deg) + "°)" + def user_ranking(self, pk): """ diff --git a/gestion/templates/gestion/manage.html b/gestion/templates/gestion/manage.html index 931264f..80b3aa0 100644 --- a/gestion/templates/gestion/manage.html +++ b/gestion/templates/gestion/manage.html @@ -133,7 +133,7 @@ {% if forloop.counter0|divisibleby:4 %} {% endif %} - + {% if forloop.counter|divisibleby:4 %} {% endif %} @@ -148,7 +148,7 @@ {% if forloop.counter0|divisibleby:4 %} {% endif %} - + {% if forloop.counter|divisibleby:4 %} {% endif %} @@ -164,7 +164,7 @@ {% if forloop.counter0|divisibleby:4 %} {% endif %} - + {% if forloop.counter|divisibleby:4 %} {% endif %}