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

Compare commits

base: Ruderverein-Donau-Linz:06f9fcc42723642ef6624336639f6f1aec2ab49c
Branches Tags
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:test
...
compare: Ruderverein-Donau-Linz:4e1de0c8868fb419e90e9e97fe55ee590391ddc8
Branches Tags
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:test

2 Commits
06f9fcc427 ... 4e1de0c886

Author SHA1 Message Date
philipp
4e1de0c886 Merge pull request 'show 'no reservations' if no reservations :-)' (#336) from reservations into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m57s
Details
CI/CD Pipeline / deploy-staging (push) Successful in 5m39s
Details
CI/CD Pipeline / deploy-main (push) Has been skipped
Details 
Reviewed-on: #336
 2024-04-02 21:31:53 +02:00
philipp
244eb1be07 show 'no reservations' if no reservations :-)
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
Details
CI/CD Pipeline / deploy-main (push) Has been cancelled
Details
CI/CD Pipeline / test (push) Has been cancelled
Details
2024-04-02 21:31:02 +02:00
3 changed files with 26 additions and 26 deletions
Show Stats Expand all files Collapse all files

46
templates/includes/macros.html.tera
View File

@ -1,28 +1,28 @@
{% macro boatreservation() %} {% macro boatreservation() %}
{% if reservations %} <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3">
<div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3"> <h2 class="h2">Reservierungen ({{ reservations | length }})</h2>
<h2 class="h2">Reservierungen ({{ reservations | length }})</h2> <div class="grid grid-cols-1 gap-3 mb-3 w-full">
<div class="grid grid-cols-1 gap-3 mb-3 w-full"> {% for reservation in reservations %}
{% for reservation in reservations %} <div class="pt-2 px-3 border-t text-primary-900 dark:text-white">
<div class="pt-2 px-3 border-t text-primary-900 dark:text-white"> <strong class="block">
<strong class="block"> {{ reservation.start_date | date(format="%d.%m.%Y") }}
{{ reservation.start_date | date(format="%d.%m.%Y") }} {% if reservation.end_date != reservation.start_date %}
{% if reservation.end_date != reservation.start_date %} -
- {{ reservation.end_date | date(format="%d.%m.%Y") }}
{{ reservation.end_date | date(format="%d.%m.%Y") }} {% endif %}
{% endif %} <small>({{ reservation.time_desc }})</small>
<small>({{ reservation.time_desc }})</small> </strong>
</strong> <span class="block">
<span class="block"> {{ reservation.boat.name }}
{{ reservation.boat.name }} <small>({{ reservation.user_applicant.name }})</small>
<small>({{ reservation.user_applicant.name }})</small> </span>
</span> <span class="text-sm italic">{{ reservation.usage }}</span>
<span class="text-sm italic">{{ reservation.usage }}</span> </div>
</div> {% else %}
{% endfor %} <p class="p-3 text-center text-black dark:text-white">Keine Reservierung</p>
</div> {% endfor %}
</div> </div>
{% endif %} </div>
{% endmacro boatreservation %} {% endmacro boatreservation %}
{% macro header(loggedin_user) %} {% macro header(loggedin_user) %}
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10"> <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">

4
templates/kiosk.html.tera
View File

@ -16,12 +16,12 @@
<div>{{ log::show_boats(only_ones=false) }}</div> <div>{{ log::show_boats(only_ones=false) }}</div>
</div> </div>
</div> </div>
<div class="md:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow"> <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
<h2 class="h2">Neue Ausfahrt</h2> <h2 class="h2">Neue Ausfahrt</h2>
<div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div> <div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div>
</div> </div>
<div> <div>
<div class="bg-white dark:bg-primary-900 rounded-md shadow"> <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
<h2 class="h2">Am Wasser</h2> <h2 class="h2">Am Wasser</h2>
<div> <div>
{% if on_water | length > 0 %} {% if on_water | length > 0 %}

2
templates/log.html.tera
View File

@ -11,7 +11,7 @@
<div>{{ log::show_boats(only_ones=false) }}</div> <div>{{ log::show_boats(only_ones=false) }}</div>
</div> </div>
</div> </div>
<div class="md:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow"> <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
<h2 class="h2">Neue Ausfahrt</h2> <h2 class="h2">Neue Ausfahrt</h2>
<div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div> <div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div>
</div> </div>