coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-22 19:33:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'degree' into dev

Browse source
This commit is contained in:
Yoann Pétri 2019-01-22 20:42:13 +01:00
commit f377ffb7c2
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gestion/templates/gestion/kegs_list.html
View file

@ -33,6 +33,7 @@
<th>Quantité vendue</th> <th>Quantité vendue</th>
<th>Montant vendu</th> <th>Montant vendu</th>
<th>Prix du fût</th> <th>Prix du fût</th>
<th>Degré</th>
<th>Historique</th> <th>Historique</th>
<th>Administrer</th> <th>Administrer</th>
</tr> </tr>
@ -47,6 +48,7 @@
<td>{{ kegH.quantitySold }} L</td> <td>{{ kegH.quantitySold }} L</td>
<td>{{ kegH.amountSold }} €</td> <td>{{ kegH.amountSold }} €</td>
<td>{{ kegH.keg.amount }} €</td> <td>{{ kegH.keg.amount }} €</td>
<td>{{ kegH.keg.pinte.deg }}°</td>
<td><a href="{% url 'gestion:kegH' kegH.keg.pk %}">Voir</a></td> <td><a href="{% url 'gestion:kegH' kegH.keg.pk %}">Voir</a></td>
<td>{% if perms.gestion.close_keg %}<a href="{% url 'gestion:closeDirectKeg' kegH.keg.pk %}" class="button small"><i class="fa fa-fill"></i> Fermer</a> {% endif %}{% if perms.gestion.change_keg %}<a href="{% url 'gestion:editKeg' kegH.keg.pk %}" class="button small"><i class="fa fa-pencil-alt"></i> Modifier</a>{% endif %}</td> <td>{% if perms.gestion.close_keg %}<a href="{% url 'gestion:closeDirectKeg' kegH.keg.pk %}" class="button small"><i class="fa fa-fill"></i> Fermer</a> {% endif %}{% if perms.gestion.change_keg %}<a href="{% url 'gestion:editKeg' kegH.keg.pk %}" class="button small"><i class="fa fa-pencil-alt"></i> Modifier</a>{% endif %}</td>
</tr> </tr>
@ -78,6 +80,7 @@
<th>Code barre</th> <th>Code barre</th>
<th>Capacité</th> <th>Capacité</th>
<th>Prix du fût</th> <th>Prix du fût</th>
<th>Degré</th>
<th>Historique</th> <th>Historique</th>
<th>Administrer</th> <th>Administrer</th>
</tr> </tr>
@ -90,6 +93,7 @@
<td>{{ keg.barcode }}</td> <td>{{ keg.barcode }}</td>
<td>{{ keg.capacity }} L</td> <td>{{ keg.capacity }} L</td>
<td>{{ keg.amount }} €</td> <td>{{ keg.amount }} €</td>
<td>{{ keg.pinte.deg }}°</td>
<td><a href="{% url 'gestion:kegH' keg.pk %}">Voir</a></td> <td><a href="{% url 'gestion:kegH' keg.pk %}">Voir</a></td>
<td>{% if perms.gestion.open_keg %}{% if keg.stockHold > 0 %}<a href="{% url 'gestion:openDirectKeg' keg.pk %}" class="button small"><i class="fa fa-fill-drip"></i> Percuter</a> {% endif %}{% endif %}{% if perms.gestion.change_keg %}<a href="{% url 'gestion:editKeg' keg.pk %}" class="button small"><i class="fa fa-pencil-alt"></i> Modifier</a>{% endif %}</td> <td>{% if perms.gestion.open_keg %}{% if keg.stockHold > 0 %}<a href="{% url 'gestion:openDirectKeg' keg.pk %}" class="button small"><i class="fa fa-fill-drip"></i> Percuter</a> {% endif %}{% endif %}{% if perms.gestion.change_keg %}<a href="{% url 'gestion:editKeg' keg.pk %}" class="button small"><i class="fa fa-pencil-alt"></i> Modifier</a>{% endif %}</td>
</tr> </tr>

2
templates/home.html
View file

@ -23,7 +23,7 @@
Les bières pressions actuellement en Coopé : Les bières pressions actuellement en Coopé :
<ul> <ul>
{% for keg in kegs %} {% for keg in kegs %}
<li>{{keg}} ({% if keg.pinte %} Pinte : {{keg.pinte.amount}}€,{% endif %}{% if keg.demi %} Demi : {{keg.demi.amount}}€,{% endif %}{% if keg.galopin %} Galopin : {{keg.galopin.amount}}€{% endif %})</li> <li>{{keg}} ({% if keg.pinte %} Pinte : {{keg.pinte.amount}}€,{% endif %}{% if keg.demi %} Demi : {{keg.demi.amount}}€,{% endif %}{% if keg.galopin %} Galopin : {{keg.galopin.amount}}€{% endif %}) : {{keg.pinte.deg}}°</li>
{% endfor %} {% endfor %}
</ul> </ul>
</section> </section>