Merge pull request 'require-necessary-fields' (#590 ) from require-necessary-fields into staging

Reviewed-on: #590
require necessary fields
2024-06-10 20:59:38 +02:00 · 2024-06-10 20:58:42 +02:00 · 2024-06-10 20:00:25 +02:00 · 2024-06-10 19:08:22 +02:00
2 changed files with 2 additions and 2 deletions
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@ -70,7 +70,7 @@
    </form>
 {% endmacro new %}
 {% macro boat_select(id="boat_id") %}
-    {{ macros::select(label="Boot", data=boats, name="boat_id", id=id, display=["name", " (","cat",")"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true, nonSelectableDefault=" -- Wähle ein Boot aus ---") }}
+    {{ macros::select(label="Boot", data=boats, name="boat_id", required=true, id=id, display=["name", " (","cat",")"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true, nonSelectableDefault=" -- Wähle ein Boot aus ---") }}
 {% endmacro boat_select %}
 {% macro rower_select(id, selected, amount_seats='', class='', init='false', cox_on_boat='', steering_person_id='') %}
    {#{% if not amount_seats or amount_seats > 1 %}#}
--- a/templates/trailerreservations.html.tera
+++ b/templates/trailerreservations.html.tera
@ -19,7 +19,7 @@
        <div class="hidden">
            <div id="new-reservation">
                <form action="/trailerreservation/new" method="post" class="grid gap-3">
-                    {{ macros::select(label="Anhänger", data=trailers, name="trailer_id", id="trailer_id", display=["name"], wrapper_class="col-span-4", nonSelectableDefault=" -- Wähle einen Hänger aus ---") }}
+                    {{ macros::select(label="Anhänger", data=trailers, name="trailer_id", id="trailer_id", display=["name"], wrapper_class="col-span-4", nonSelectableDefault=" -- Wähle einen Hänger aus ---", required=true) }}
                    {% if not loggedin_user %}{{ macros::select(label='Reserviert von', data=user, name='user_id_applicant') }}{% endif %}
                    {{ macros::input(label='Beginn', name='start_date', type='date', required=true, wrapper_class='col-span-4') }}
                    {{ macros::input(label='Ende', name='end_date', type='date', required=true, wrapper_class='col-span-4') }}
Author	SHA1	Message	Date
philipp	08fc324cc6	Merge pull request 'require-necessary-fields' (#590 ) from require-necessary-fields into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m51s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m45s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #590	2024-06-10 20:59:38 +02:00
philipp	5f4d8982a8	require necessary fields Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details	2024-06-10 20:58:42 +02:00
philipp	0e2ef9e256	Merge pull request 'add trailer reservation funcitonality; Fixes #443 ' (#588 ) from trailer-reservation into main All checks were successful CI/CD Pipeline / test (push) Successful in 10m3s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m7s Details Reviewed-on: #588	2024-06-10 20:00:25 +02:00
philipp	c9b67f5790	Merge pull request 'add delete trip button in edit window; Fixes #449 ' (#586 ) from delte-trip-btn into main All checks were successful CI/CD Pipeline / test (push) Successful in 10m53s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m5s Details Reviewed-on: #586	2024-06-10 19:08:22 +02:00