coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-29 08:02:25 +00:00
Code Issues Releases Wiki Activity

Change string of draft product

Browse source
This commit is contained in:
Yoann Pétri 2019-06-10 01:26:54 +02:00
parent f715726a1e
commit ed5b4a6fa7
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gestion/models.py
View file

@ -98,7 +98,11 @@ class Product(models.Model):
history = HistoricalRecords() history = HistoricalRecords()
def __str__(self): 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): def user_ranking(self, pk):
""" """

6
gestion/templates/gestion/manage.html
View file

@ -133,7 +133,7 @@
{% if forloop.counter0|divisibleby:4 %} {% if forloop.counter0|divisibleby:4 %}
<tr style="text-align:center"> <tr style="text-align:center">
{% endif %} {% endif %}
<td><button class="product {% if product.adherentRequired %}special{% endif%}" target="{{product.pk}}">{{product.name}}</button></td> <td><button class="product {% if product.adherentRequired %}special{% endif%}" target="{{product.pk}}">{{product}}</button></td>
{% if forloop.counter|divisibleby:4 %} {% if forloop.counter|divisibleby:4 %}
</tr> </tr>
{% endif %} {% endif %}
@ -148,7 +148,7 @@
{% if forloop.counter0|divisibleby:4 %} {% if forloop.counter0|divisibleby:4 %}
<tr style="text-align:center"> <tr style="text-align:center">
{% endif %} {% endif %}
<td><button class="product {% if product.adherentRequired %}special{% endif%}" target="{{product.pk}}">{{product.name}}</button></td> <td><button class="product {% if product.adherentRequired %}special{% endif%}" target="{{product.pk}}">{{product}}</button></td>
{% if forloop.counter|divisibleby:4 %} {% if forloop.counter|divisibleby:4 %}
</tr> </tr>
{% endif %} {% endif %}
@ -164,7 +164,7 @@
{% if forloop.counter0|divisibleby:4 %} {% if forloop.counter0|divisibleby:4 %}
<tr style="text-align:center"> <tr style="text-align:center">
{% endif %} {% endif %}
<td><button class="menu {% if product.adherent_required %}special{% endif%}" target="{{product.pk}}">{{product.name}}</button></td> <td><button class="menu {% if product.adherent_required %}special{% endif%}" target="{{product.pk}}">{{product}}</button></td>
{% if forloop.counter|divisibleby:4 %} {% if forloop.counter|divisibleby:4 %}
</tr> </tr>
{% endif %} {% endif %}