Merge pull request 'staging' (#373 ) from staging into main

Reviewed-on: #373
Merge branch 'main' into staging
2024-04-15 11:26:20 +02:00 · 2024-04-15 11:25:49 +02:00 · 2024-04-15 11:23:07 +02:00 · 2024-04-14 20:28:42 +02:00 · 2024-04-14 20:22:18 +02:00 · 2024-04-14 19:57:26 +02:00
2 changed files with 56 additions and 52 deletions
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -218,18 +218,20 @@
                    {% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %}
                </div>
                {% if amount_guests > 0 or log.rowers | length > 0 %}
-                    <div class="text-sm text-gray-600 dark:text-gray-100">
-                        Ruderer:
-                        {% for rower in log.rowers -%}
-                            {{ rower.name -}}
-                            {% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
-                        {% endfor %}
-                        {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}
-                            Gäste
-                            <small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>:
-                            {{ amount_guests }}
-                        {% endif %}
-                    </div>
+                    {% if not log.boat.amount_seats == 1 %}
+                        <div class="text-sm text-gray-600 dark:text-gray-100">
+                            Ruderer:
+                            {% for rower in log.rowers -%}
+                                {{ rower.name -}}
+                                {% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
+                            {% endfor %}
+                            {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}
+                                Gäste
+                                <small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>:
+                                {{ amount_guests }}
+                            {% endif %}
+                        </div>
+                    {% endif %}
                {% endif %}
            {% endif %}
        </div>
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -34,18 +34,18 @@
                </a>
            </div>
            <div>
-                    <a href="#"
-                       class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
-                       data-sidebar="true"
-                       data-trigger="sidebar"
-                       data-header="Menü"
-                       data-body="#mobile-menu">
-                        {% include "includes/book" %}
-                        <span class="sr-only">Logbuch</span>
-                    </a>
-                    <div class="hidden">
-                        <div id="mobile-menu">
-			                {% if "Donau Linz" in loggedin_user.roles %}
+                <a href="#"
+                   class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
+                   data-sidebar="true"
+                   data-trigger="sidebar"
+                   data-header="Menü"
+                   data-body="#mobile-menu">
+                    {% include "includes/book" %}
+                    <span class="sr-only">Logbuch</span>
+                </a>
+                <div class="hidden">
+                    <div id="mobile-menu">
+                        {% if "Donau Linz" in loggedin_user.roles %}
                            <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
                            <a href="/log" class="block w-100 py-2 hover:text-primary-600 border-t">Ausfahrt eintragen</a>
                            <a href="/log/show"
@@ -57,35 +57,37 @@
                               class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
                            <a href="/boatreservation"
                               class="block w-100 py-2 hover:text-primary-600 border-t">Bootsreservierung</a>
-					{% endif %}
-                            {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-                                <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
-                            {% endif %}
-                            {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
-                                <a href="/admin/user"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
-                            {% endif %}
-                            {% if "admin" in loggedin_user.roles %}
-                                <a href="/admin/boat"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
-                            {% endif %}
-                            <a href="/auth/logout"
-                               class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen<svg class="inline h-4"
-                         width="24"
-                         height="24"
-                         viewbox="0 0 24 24"
-                         fill="none"
-                         stroke="currentColor"
-                         stroke-width="2"
-                         stroke-linecap="round"
-                         stroke-linejoin="round"
-                         class="feather feather-log-out">
-                        <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
-                        <polyline points="16 17 21 12 16 7"></polyline>
-                        <line x1="21" y1="12" x2="9" y2="12"></line>
-                    </svg></a>
-                        </div>
+                        {% endif %}
+                        {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+                            <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
+                        {% endif %}
+                        {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
+                            <a href="/admin/user"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
+                        {% endif %}
+                        {% if "admin" in loggedin_user.roles %}
+                            <a href="/admin/boat"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
+                        {% endif %}
+                        <a href="/auth/logout"
+                           class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen
+                            <svg class="inline h-4"
+                                 width="24"
+                                 height="24"
+                                 viewbox="0 0 24 24"
+                                 fill="none"
+                                 stroke="currentColor"
+                                 stroke-width="2"
+                                 stroke-linecap="round"
+                                 stroke-linejoin="round"
+                                 class="feather feather-log-out">
+                                <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
+                                <polyline points="16 17 21 12 16 7"></polyline>
+                                <line x1="21" y1="12" x2="9" y2="12"></line>
+                            </svg>
+                        </a>
                    </div>
+                </div>
            </div>
        </div>
    </header>
Author	SHA1	Message	Date
philipp	13808d0103	Merge pull request 'staging' (#373 ) from staging into main All checks were successful CI/CD Pipeline / test (push) Successful in 12m7s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 5m32s Details Reviewed-on: #373	2024-04-15 11:26:20 +02:00
philipp	4a3803df51	Merge branch 'main' into staging All checks were successful CI/CD Pipeline / test (push) Successful in 12m8s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m30s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-04-15 11:25:49 +02:00
philipp	d58d4642af	1x boats: don't show 'Ruderer: ' in logbook; Fixes #362 Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-04-15 11:23:07 +02:00
philipp	8db9e020c8	Merge pull request 'hide old verified boat damages' (#371 ) from hide-old-verified-boatdamages into staging All checks were successful CI/CD Pipeline / test (push) Successful in 12m11s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m39s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #371	2024-04-14 20:28:42 +02:00
philipp	a1b78db750	Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#368 ) from updates into staging Some checks are pending CI/CD Pipeline / test (push) Waiting to run Details CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details Reviewed-on: #368	2024-04-14 20:22:18 +02:00
philipp	297e0629a4	Merge pull request 'steering' (#366 ) from steering into staging All checks were successful CI/CD Pipeline / test (push) Successful in 12m0s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m35s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #366	2024-04-14 19:57:26 +02:00