wip: first working version

templates/booking/edit.html.twig

@@ -2,6 +2,14 @@
 
 {% block content %}
     {{ form_start(form) }}
+    {% if not form.vars.valid %}
+        <article>
+            <header>
+                <strong>Fehler</strong>
+            </header>
+            {{ form_errors(form) }}
+        </article>
+    {% endif %}
     {% for child in form.participants %}
         {% set participant = child.vars.data %}
         <details{% if not child.vars.valid %} open{% endif %}>
@@ -57,6 +65,9 @@
             <fieldset class="grid">
                 {{ form_row(child.transportationServiceTo) }}
                 {{ form_row(child.transportationServiceFro) }}
+                {% if child.pickup is defined %}
+                    {{ form_row(child.pickup) }}
+                {% endif %}
             </fieldset>
         </details>
     {% endfor %}

templates/booking/index.html.twig

@@ -1,14 +1,12 @@
 {% extends 'layout.html.twig' %}
 
 {% block content %}
-    <table>
-        <thead>
+    <div class="overflow-auto">
+        <table>
+            <thead>
             <tr>
                 <th scope="col">
-                    Buchungsdatum
-                </th>
-                <th scope="col">
-                    Reisedatum
+                    Buchungsdatum/<br>Reisedatum
                 </th>
                 <th scope="col">
                     Reise
@@ -17,25 +15,19 @@
                     Vorgangsnr.
                 </th>
                 <th scope="col">
-                    Preis
-                </th>
-                <th scope="col">
-                    offen
+                    Preis/<br>offen
                 </th>
                 <th scope="col">
                     Status
                 </th>
                 <th scope="col"></th>
             </tr>
-        </thead>
-        <tbody>
+            </thead>
+            <tbody>
             {% for booking in bookings %}
                 <tr>
                     <td>
-                        {{ booking.bookingDate | date('d.m.Y') }}
-                    </td>
-                    <td>
-                        {{ booking.travelDate | date('d.m.Y') }}
+                        {{ booking.bookingDate | date('d.m.Y') }}/<br>{{ booking.travelDate | date('d.m.Y') }}
                     </td>
                     <td>
                         {{ booking.travel }}
@@ -44,10 +36,7 @@
                         {{ booking.bookingNumber }}
                     </td>
                     <td>
-                        {{ booking.price|format_currency('EUR') }}
-                    </td>
-                    <td>
-                        {{ booking.balance ? booking.balance|format_currency('EUR') : '-' }}
+                        {{ booking.price|format_currency('EUR') }}/<br>{{ booking.balance ? booking.balance|format_currency('EUR') : '-' }}
                     </td>
                     <td>
                         {{ booking.status }}
@@ -76,6 +65,7 @@
                     </td>
                 </tr>
             {% endfor %}
-        </tbody>
-    </table>
+            </tbody>
+        </table>
+    </div>
 {% endblock %}

templates/layout.html.twig

@@ -42,6 +42,13 @@
             </nav>
         {% endif %}
         <div id="content">
+            {% for label, messages in app.flashes %}
+                {% for message in messages %}
+                    <article>
+                        {{ message }}
+                    </article>
+                {% endfor %}
+            {% endfor %}
             {% block content %}{% endblock %}
             <div id="loading-indicator">
                 <progress />

templates/personal_data/index.html.twig

@@ -5,23 +5,25 @@
         Persönliche Daten
     </h2>
     {{ form_start(form) }}
-    <fieldset class="grid">
-        {{ form_row(form.gender) }}
-        {{ form_row(form.firstName) }}
-        {{ form_row(form.name) }}
-        {{ form_row(form.dateOfBirth) }}
-    </fieldset>
-    <fieldset class="grid">
-        {{ form_row(form.street) }}
-        {{ form_row(form.postCode) }}
-        {{ form_row(form.city) }}
-        {{ form_row(form.country) }}
-    </fieldset>
-    <fieldset class="grid">
-        {{ form_row(form.email) }}
-        {{ form_row(form.phone) }}
-        {{ form_row(form.mobile) }}
-    </fieldset>
+    <div class="grid">
+        <div>
+            {{ form_row(form.gender) }}
+            {{ form_row(form.firstName) }}
+            {{ form_row(form.name) }}
+            {{ form_row(form.dateOfBirth) }}
+        </div>
+        <div>
+            {{ form_row(form.street) }}
+            {{ form_row(form.postCode) }}
+            {{ form_row(form.city) }}
+            {{ form_row(form.country) }}
+        </div>
+        <div>
+            {{ form_row(form.email) }}
+            {{ form_row(form.phone) }}
+            {{ form_row(form.mobile) }}
+        </div>
+    </div>
     {{ form_rest(form) }}
     <button type="submit">
         Speichern