Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 49 Pull Requests Actions Packages Projects Wiki Activity

[TASK] improve log and stats look & feel

Browse Source
This commit is contained in:
Marie Birner
2023-09-28 11:52:14 +02:00
committed by philipp
parent 97df1f16a4
commit 3cb14835cc
5 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
templates/includes/forms/log.html.tera
View File

@ -33,7 +33,7 @@
{% if allow_any_shipmaster %}
<div>
<label for="shipmaster" class=" small text-gray-600 ">Schiffsführer</label>
<label for="shipmaster" class=" text-sm text-gray-600 ">Schiffsführer</label>
<select name="shipmaster" id="shipmaster" class="input rounded-md h-10">
<optgroup label="Steuerleute">
@ -71,7 +71,7 @@
{{ macros::input(label='Ankunftszeit', name='arrival', type='datetime-local') }}
<div class="relative">
<label for="destination" class="small text-gray-600">Ziel</label>
<label for="destination" class="text-sm text-gray-600">Ziel</label>
<input class="input rounded-md set-distance-js" type="search" list="destinations" placeholder="Destination" id="destination" name="destination" value="" data-relation="distance_in_km"/>
<datalist id="destinations">
@ -89,7 +89,7 @@
{{ macros::input(label="Kommentar", name="comments", type="text", wrapper_class="col-span-2") }}
<div class="col-span-2">
<label for="logtype" class=" small text-gray-600 ">Typ</label>
<label for="logtype" class=" text-sm text-gray-600 ">Typ</label>
{{ macros::select(data=logtypes, name='logtype', default="Normal") }}
</div>
<input type="submit" value="Ausfahrt starten" class="btn btn-primary w-full col-span-2 m-auto"/>
@ -99,7 +99,7 @@
{% macro boat_select(only_ones) %}
<div class="col-span-2">
<label for="boat_id" class=" small text-gray-600 ">Boot</label>
<label for="boat_id" class=" text-sm text-gray-600 ">Boot</label>
{% if not only_ones %}
{{ macros::select(data=boats, name='boat_id', display=["name", " (","amount_seats", " x)"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water"], class="col-span-2") }}
{% else %}
@ -112,7 +112,7 @@
{% macro rower_select(id, selected, amount_seats='', class='', init='false') %}
{% if not amount_seats or amount_seats > 1 %}
<div class="{{ class }}">
<label for="{{id}}" class="small text-gray-600 ">Ruderer</label>
<label for="{{id}}" class="text-sm text-gray-600 ">Ruderer</label>
<select style="width: 100%;" multiple name="rowers[]" id="{{id}}" class="w-full" data-seats="{{amount_seats}}" data-init={{init}}>
{% for user in users %}
{% set_global sel = false %}
@ -192,7 +192,14 @@
<div class="border-t bg-white px-3 py-1" data-filterable="true" data-filter="{{ log.boat.name }} {{ log.shipmaster_user.name }} {% for rower in log.rowers %} {{ rower.name }} {% endfor %}">
<div>
<strong>{{ log.boat.name }}</strong> <small class="text-gray-600">({{ log.shipmaster_user.name }}{% if log.shipmaster_only_steering %} - handgesteuert {% endif %})</small>
<small class="block text-gray-600">{{ log.departure | date(format='%d.%m.%Y - %H:%M') }} {% if state == "completed" %}- {{ log.arrival | date(format='%d.%m.%Y - %H:%M') }}{% endif %}</small>
<small class="block text-gray-600">
{% if state == "completed" and log.departure | date(format='%d.%m.%Y') == log.arrival | date(format='%d.%m.%Y') %}
{{ log.departure | date(format='%d.%m.%Y')}} ({{ log.departure | date(format='%H:%M')}} - {{ log.arrival | date(format='%H:%M')}})
{% else %}
{{ log.departure | date(format='%d.%m.%Y (%H:%M)') }} {% if state == "completed" %}- {{ log.arrival | date(format='%d.%m.%Y (%H:%M)') }}{% endif %}
{% endif %}
</small>
{% set amount_rowers = log.rowers | length %}
{% set amount_guests = log.boat.amount_seats - amount_rowers -1 %}
{% if allowed_to_close and state == "on_water" %}
@ -203,21 +210,21 @@
{% if state == "completed" %}
<small class="text-gray-600">({{ log.distance_in_km }} km)</small>
{% endif %}
{% if log.comments %}
<span class="text-sm italic">- "{{ log.comments }}"</span>
{% endif %}
</div>
{% if amount_guests > 0 or log.rowers | length > 0 %}
Ruderer:
{% endif %}
{% if amount_guests > 0 %}
{{ amount_guests }}
Gäste (ohne Account),
{% endif %}
{% for rower in log.rowers %}
{{ rower.name }},
{% endfor %}
{% if log.comments %}
<div>
Kommentare:
{{ log.comments }}
<div class="text-sm text-gray-600">
Mitruderer:
{% for rower in log.rowers %}
{{ rower.name }}{% if not loop.last or amount_guests > 0 %}, {% endif %}
{% endfor %}
{% if amount_guests > 0 %}
{{ amount_guests }}
Gäste (ohne Account)
{% endif %}
</div>
{% endif %}
{% if log.logtype %}
@ -244,7 +251,7 @@
{{ log::rower_select(id="rowers"~log.id, selected=log.rowers, amount_seats=log.boat.amount_seats) }}
{% endif %}
<div class="relative">
<label for="destination" class="small text-gray-600">Ziel</label>
<label for="destination" class="text-sm text-gray-600">Ziel</label>
<input class="input rounded-md set-distance-js change-id-js" type="search" list="destinations" placeholder="Destination" required="required" id="destination{{ log.id }}" name="destination" value="{{log.destination}}" data-relation="distance_in_km{{log.id}}"/>
</div>
@ -257,7 +264,7 @@
{{ macros::input(label="Kommentar", name="comments", id="comments" ~ log.id, type="text", value=log.comments, class="rounded-md change-id-js") }}
<div>
<label for="logtype" class=" small text-gray-600 ">Typ</label>
<label for="logtype" class="text-sm text-gray-600 ">Typ</label>
{{ macros::select(data=logtypes, name="logtype", id="logtype" ~ log.id, default="Normal", selected_id=log.logtype, class="rounded-md change-id-js") }}
</div>
<input class="btn btn-primary" type="submit" value="Ausfahrt beenden"/>