Use display weights for ingredients.

This commit is contained in:
Chris Giacofei 2024-06-27 12:55:12 -04:00
parent b39bfdd267
commit 7c25b8924a

View File

@ -52,9 +52,7 @@ font-size: .8em;
-->
<dl class="row">
<dt>Batch Size</dt>
<dd>{{ recipe.batch_size }} gal</dd>
<dt>Actual Volume</dt>
<dd>{{ recipe.final_volume|floatformat:2 }} gal</dd>
<dd>{{ recipe.batch_size_display|floatformat:2 }} gal</dd>
<dt>Mash Efficiency</dt>
<dd>{{ recipe.efficiency|floatformat:2 }} %</dd>
</dl>
@ -76,7 +74,7 @@ font-size: .8em;
<div class="col-md">
<div class="container-fluid">
<div class="d-flex justify-content-between bg-dark text-white">
<div class="ms-2 my-1">Fermentables ({{ recipe.fermentable_weight|floatformat:2 }} lbs)</div>
<div class="ms-2 my-1">Fermentables ({{ recipe.total_fermentable_display|floatformat:2 }} lbs)</div>
<div>
<button type="button" class="btn btn-dark btn-sm"><b>%</b></button>
<button type="button" class="btn btn-dark btn-sm"><b>OG</b></button>
@ -99,7 +97,7 @@ font-size: .8em;
<tr onclick="window.location='{% url 'beer:update_fermentable' f.fermentable.id %}';">
<td>{{ f.quantity_display|floatformat:2 }} lb</td>
<td>{{ f.fermentable.name }}<br>
<span class="text-muted">{{ f.fermentable.get_fermentable_type_display }} {{ f.lovibond_contributed }} L</span>
<span class="text-muted">{{ f.fermentable.get_fermentable_type_display }} {{ f.fermentable.lovibond|floatformat:0 }} &deg;L</span>
</td>
<td>{{ f.percent|floatformat:1 }} %</td>
</tr>
@ -115,7 +113,7 @@ font-size: .8em;
<div class="col-md">
<div class="container-fluid">
<div class="d-flex justify-content-between bg-dark text-white">
<div class="ms-2 my-1">Hops ({{ recipe.hop_weight|floatformat:2 }} oz)</div>
<div class="ms-2 my-1">Hops ({{ recipe.total_hop_display|floatformat:2 }} oz)</div>
<div>
<button type="button" class="btn btn-dark btn-sm"><b>IBU</b></button>
<button type="button" class="btn btn-dark btn-sm"><i class="fa fa-plus"></i><b>ADD</b></button>