Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Show stop date if needed, change to "add from favourites"

Browse source
This commit is contained in:
Midgard 2020-08-17 10:57:10 +02:00
parent 48d67cbd89
commit 1bea3d2fcc
Signed by: midgard
GPG key ID: 511C112F1331BBB4
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/templates/order.html
View file

@ -53,15 +53,17 @@
{% endif %} {% endif %}
</dd> </dd>
<br/>
<br/>
<dt>Opens</dt> <dt>Opens</dt>
<dd>{{ order.starttime.strftime("%d/%m/%Y %H:%M") }}</dd> <dd>{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}</dd>
<dt>Closes</dt> <dt>Closes</dt>
<dd> <dd>
{% if order.stoptime %} {% if order.stoptime %}
{{ order.stoptime.strftime("%H:%M") }} ({{ order.stoptime|countdown }}) {% set stoptimefmt = (
"%H:%M" if order.stoptime.date() == order.starttime.date()
else "%Y-%m-%d, %H:%M"
) %}
{{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }})
{% else %} {% else %}
Never Never
{% endif %} {% endif %}
@ -140,8 +142,8 @@
</form> </form>
</div><!-- </div><!--
--><div class="box" id="from_history"> --><div class="box" id="from_favourites">
<h3>Add from history</h3> <h3>Add from favourites</h3>
<ul> <ul>
<li>Todo</li> <li>Todo</li>
</ul> </ul>
@ -339,7 +341,7 @@ h3 {
column-width: 150px; column-width: 150px;
} }
#from_history ul, #my_items ul, #per_person ul { #from_favourites ul, #my_items ul, #per_person ul {
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
} }