Browse code

Update

Benjamin Roth authored on31/08/2023 14:16:35
Showing1 changed files
... ...
@@ -63,7 +63,7 @@
63 63
                     {% endfor %}
64 64
                 </fieldset>
65 65
                 <fieldset>
66
-                    <legend>Lage(n)</legend>
66
+                    <legend>Lage(n)<sup class="text-danger">*</sup></legend>
67 67
                     {% for value,label in buchen.lage %}
68 68
                         <label><input type="checkbox" name="lage[]" value="{{ value }}"{{ value in buchung.lage ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
69 69
                     {% endfor %}
Browse code

Update

Benjamin Roth authored on30/08/2023 22:08:09
Showing1 changed files
... ...
@@ -1,10 +1,10 @@
1 1
 {% block content %}
2 2
     {% if modal %}<div class="modal-content">{% endif %}
3
-    <div id="wa-booking-{{ id }}" class="frame">
3
+    <div id="wa-booking-{{ id }}" hx-target="this" hx-swap="outerHTML" class="frame">
4 4
         <div class="frame__header">
5 5
             <h3>Reservierung</h3>
6
-            <div class="row">
7
-                <div class="col-md-6">
6
+            <div class="grid-md u-gap-2">
7
+                <div class="grid-c-6 mb-2 mb-0-md">
8 8
                     <div class="u-flex u-items-center u-gap-1">
9 9
                         <i class="icon-uhr-outline"></i>
10 10
                         <div class="t-label">Tag/Urzeit</div>
... ...
@@ -12,52 +12,37 @@
12 12
                     <div class="">{{ slot.time|date('d.m.Y H:i') }}</div>
13 13
                 </div>
14 14
 
15
-                <div class="col-md-6">
15
+                <div class="grid-c-6 mb-2 mb-0-md">
16 16
                     <div class="u-flex u-items-center u-gap-1">
17 17
                         <i class="icon-standort-outline"></i>
18 18
                         <div class="t-label">Standort</div>
19 19
                     </div>
20 20
                     <div class="">{{ standort.title }}</div>
21 21
                 </div>
22
-            </div>
23
-
24
-            <div class="row">
25
-                <div class="col-md-6">
26
-                    <div class="u-flex u-items-center u-gap-1">
27
-                        <i class="icon-behaelter-outline"></i>
28
-                        <div class="t-label">Verfügbare Behälterkapazität</div>
29
-                    </div>
30
-                    <div class="">{{ slot.behaelterAvailable }}</div>
31
-                </div>
32 22
 
33
-                <div class="col-md-6">
34
-                    <div class="u-flex u-items-center u-gap-1">
35
-                        <i class="icon-reben-outline"></i>
36
-                        <div class="t-label">Verarbeitete Sorten</div>
23
+                {% if slot.anmerkungen %}
24
+                    <div class="grid-c-12 mb-2 mb-0-md">
25
+                        <div class="u-flex u-items-center u-gap-1">
26
+                            <i class="icon-info-outline"></i>
27
+                            <div class="t-label">Anmerkungen</div>
28
+                        </div>
29
+                        {{ slot.anmerkungen|raw }}
37 30
                     </div>
38
-                    <div class="">{{ slot.sorte|join(', ') }}</div>
39
-                </div>
31
+                {% endif %}
40 32
             </div>
41
-
42
-            {% if slot.anmerkungen %}
43
-                <div>
44
-                    <div class="u-flex u-items-center u-gap-1">
45
-                        <i class="icon-info-outline"></i>
46
-                        <div class="t-label">Anmerkungen</div>
47
-                    </div>
48
-                    {{ slot.anmerkungen|raw }}
49
-                </div>
50
-            {% endif %}
51 33
         </div>
52 34
 
53 35
         <div class="divider m-0 mb-2"></div>
54 36
 
55 37
         <div class="frame__body">
56 38
             <h3>Reservierung ändern</h3>
39
+            {% if toast is defined %}
40
+                {{ toast|raw }}
41
+            {% endif %}
57 42
             <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation" enctype="multipart/form-data">
58 43
                 <input type="hidden" name="id" value="{{ id }}">
59 44
                 <fieldset>
60
-                    <label for="res-behaelter">Liefernde Behältermenge</label>
45
+                    <label for="res-behaelter"><strong>Liefernde Behältermenge</strong><sup class="text-danger">*</sup></label>
61 46
                     <select id="res-behaelter" name="behaelter" required>
62 47
                         <option value="">-</option>
63 48
                         {% for option in buchen.behaelter %}
... ...
@@ -66,21 +51,33 @@
66 51
                     </select>
67 52
                 </fieldset>
68 53
                 <fieldset>
69
-                  <legend>Anliefernde Rebsorte(n)</legend>
54
+                  <legend>Anliefernde Rebsorte(n)<sup class="text-danger">*</sup></legend>
70 55
                     {% for value,label in buchen.sorten %}
71 56
                         <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
72 57
                     {% endfor %}
73 58
                 </fieldset>
59
+                <fieldset>
60
+                    <legend>Ernteart(en)<sup class="text-danger">*</sup></legend>
61
+                    {% for value,label in buchen.ernteart %}
62
+                        <label><input type="checkbox" name="ernteart[]" value="{{ value }}"{{ value in buchung.ernteart ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
63
+                    {% endfor %}
64
+                </fieldset>
65
+                <fieldset>
66
+                    <legend>Lage(n)</legend>
67
+                    {% for value,label in buchen.lage %}
68
+                        <label><input type="checkbox" name="lage[]" value="{{ value }}"{{ value in buchung.lage ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
69
+                    {% endfor %}
70
+                </fieldset>
74 71
                 {% if file is defined %}
75 72
                     <fieldset>
76 73
                         <div class="t-label">Aktuelle Datei</div>
77 74
                         <div class="u-flex u-items-center u-gap-1"><a href="{{ file.link }}">{{ file.name }}</a> <a href="javascript:;" hx-get="/_ajax/vr_wa/v1/slot?do=booking&id={{ id }}&modal=false&deleteFile=true" hx-target="closest .frame" hx-swap="outerHTML" class="tag tag__close-btn tag--danger tag--xs"></a></div>
78 75
                     </fieldset>
79 76
                     <fieldset>
80
-                        <label for="res-upload">Datei überschreiben</label>
77
+                        <label for="res-upload"><strong>Datei überschreiben</strong></label>
81 78
                 {% else %}
82 79
                     <fieldset>
83
-                        <label for="res-upload">Datei hochladen</label>
80
+                        <label for="res-upload"><strong>Datei hochladen</strong></label>
84 81
                 {% endif %}
85 82
                     <input type="file" id="res-upload" name="upload">
86 83
                 </fieldset>
Browse code

Lot's of changes and improvements

Benjamin Roth authored on30/08/2023 17:18:43
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 14
 
15 15
                 <div class="col-md-6">
16 16
                     <div class="u-flex u-items-center u-gap-1">
17
-                        <i class="icon-uhr-standort"></i>
17
+                        <i class="icon-standort-outline"></i>
18 18
                         <div class="t-label">Standort</div>
19 19
                     </div>
20 20
                     <div class="">{{ standort.title }}</div>
Browse code

Lot's of changes and improvements

Benjamin Roth authored on29/08/2023 15:05:02
Showing1 changed files
... ...
@@ -4,28 +4,47 @@
4 4
         <div class="frame__header">
5 5
             <h3>Reservierung</h3>
6 6
             <div class="row">
7
-                <div class="col">
8
-                    <i class="icon-uhr-outline u-justify-center"></i>
9
-                    <div class="t-label">Tag/Urzeit</div>
7
+                <div class="col-md-6">
8
+                    <div class="u-flex u-items-center u-gap-1">
9
+                        <i class="icon-uhr-outline"></i>
10
+                        <div class="t-label">Tag/Urzeit</div>
11
+                    </div>
10 12
                     <div class="">{{ slot.time|date('d.m.Y H:i') }}</div>
11 13
                 </div>
12 14
 
13
-                <div class="col">
14
-                    <i class="icon-behaelter-outline u-justify-center"></i>
15
-                    <div class="t-label">Verfügbare Behälterkapazität</div>
16
-                    <div class="">{{ buchung.behaelter }}</div>
15
+                <div class="col-md-6">
16
+                    <div class="u-flex u-items-center u-gap-1">
17
+                        <i class="icon-uhr-standort"></i>
18
+                        <div class="t-label">Standort</div>
19
+                    </div>
20
+                    <div class="">{{ standort.title }}</div>
21
+                </div>
22
+            </div>
23
+
24
+            <div class="row">
25
+                <div class="col-md-6">
26
+                    <div class="u-flex u-items-center u-gap-1">
27
+                        <i class="icon-behaelter-outline"></i>
28
+                        <div class="t-label">Verfügbare Behälterkapazität</div>
29
+                    </div>
30
+                    <div class="">{{ slot.behaelterAvailable }}</div>
17 31
                 </div>
18 32
 
19
-                <div class="col">
20
-                    <i class="icon-reben-outline u-justify-center"></i>
21
-                    <div class="t-label">Verarbeitete Sorten</div>
22
-                    <div class="">{{ buchung.sorten|join(', ') }}</div>
33
+                <div class="col-md-6">
34
+                    <div class="u-flex u-items-center u-gap-1">
35
+                        <i class="icon-reben-outline"></i>
36
+                        <div class="t-label">Verarbeitete Sorten</div>
37
+                    </div>
38
+                    <div class="">{{ slot.sorte|join(', ') }}</div>
23 39
                 </div>
24 40
             </div>
25 41
 
26 42
             {% if slot.anmerkungen %}
27 43
                 <div>
28
-                    <div class="t-label">Anmerkungen</div>
44
+                    <div class="u-flex u-items-center u-gap-1">
45
+                        <i class="icon-info-outline"></i>
46
+                        <div class="t-label">Anmerkungen</div>
47
+                    </div>
29 48
                     {{ slot.anmerkungen|raw }}
30 49
                 </div>
31 50
             {% endif %}
Browse code

Update

Benjamin Roth authored on15/08/2023 18:18:52
Showing1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 {% block content %}
2 2
     {% if modal %}<div class="modal-content">{% endif %}
3
-    <div id="wa-slot-{{ id }}" class="frame">
3
+    <div id="wa-booking-{{ id }}" class="frame">
4 4
         <div class="frame__header">
5 5
             <h3>Reservierung</h3>
6 6
             <div class="row">
... ...
@@ -79,13 +79,13 @@
79 79
             (function ($) {
80 80
 
81 81
                 window.modals = window.modals || []
82
-                window.modals.wa_slots = window.modals.wa_slots || []
82
+                window.modals.wa_bookings = window.modals.wa_bookings || []
83 83
 
84
-                if (window.modals.wa_slots.details{{ id }} === undefined)
84
+                if (window.modals.wa_bookings.details{{ id }} === undefined)
85 85
                 {
86
-                    window.modals.wa_slots.details{{ id }} = new jBox('Modal', {
86
+                    window.modals.wa_bookings.details{{ id }} = new jBox('Modal', {
87 87
                     closeButton: 'box',
88
-                    content: $('#wa-slot-{{ id }}'),
88
+                    content: $('#wa-booking-{{ id }}'),
89 89
                     maxWidth: 650,
90 90
                     minWidth: 100,
91 91
                     minHeight: 100,
... ...
@@ -96,8 +96,8 @@
96 96
                     addClass: ''
97 97
                 }).open();
98 98
                 } else {
99
-                    window.modals.wa_slots.details{{ id }}.content.empty();
100
-                    window.modals.wa_slots.details{{ id }}.setContent($('#wa-slot-{{ id }}')).open();
99
+                    window.modals.wa_bookings.details{{ id }}.content.empty();
100
+                    window.modals.wa_bookings.details{{ id }}.setContent($('#wa-booking-{{ id }}')).open();
101 101
                 }
102 102
 
103 103
             })(jQuery);
Browse code

Update

Benjamin Roth authored on15/08/2023 17:55:14
Showing1 changed files
... ...
@@ -35,7 +35,7 @@
35 35
 
36 36
         <div class="frame__body">
37 37
             <h3>Reservierung ändern</h3>
38
-            <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation">
38
+            <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation" enctype="multipart/form-data">
39 39
                 <input type="hidden" name="id" value="{{ id }}">
40 40
                 <fieldset>
41 41
                     <label for="res-behaelter">Liefernde Behältermenge</label>
... ...
@@ -52,6 +52,19 @@
52 52
                         <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
53 53
                     {% endfor %}
54 54
                 </fieldset>
55
+                {% if file is defined %}
56
+                    <fieldset>
57
+                        <div class="t-label">Aktuelle Datei</div>
58
+                        <div class="u-flex u-items-center u-gap-1"><a href="{{ file.link }}">{{ file.name }}</a> <a href="javascript:;" hx-get="/_ajax/vr_wa/v1/slot?do=booking&id={{ id }}&modal=false&deleteFile=true" hx-target="closest .frame" hx-swap="outerHTML" class="tag tag__close-btn tag--danger tag--xs"></a></div>
59
+                    </fieldset>
60
+                    <fieldset>
61
+                        <label for="res-upload">Datei überschreiben</label>
62
+                {% else %}
63
+                    <fieldset>
64
+                        <label for="res-upload">Datei hochladen</label>
65
+                {% endif %}
66
+                    <input type="file" id="res-upload" name="upload">
67
+                </fieldset>
55 68
                 <fieldset>
56 69
                     <button type="submit">Speichern</button>
57 70
                 </fieldset>
Browse code

Update

Benjamin Roth authored on15/08/2023 00:23:42
Showing1 changed files
... ...
@@ -22,6 +22,13 @@
22 22
                     <div class="">{{ buchung.sorten|join(', ') }}</div>
23 23
                 </div>
24 24
             </div>
25
+
26
+            {% if slot.anmerkungen %}
27
+                <div>
28
+                    <div class="t-label">Anmerkungen</div>
29
+                    {{ slot.anmerkungen|raw }}
30
+                </div>
31
+            {% endif %}
25 32
         </div>
26 33
 
27 34
         <div class="divider m-0 mb-2"></div>
Browse code

Update

Benjamin Roth authored on15/08/2023 00:19:43
Showing1 changed files
... ...
@@ -27,7 +27,6 @@
27 27
         <div class="divider m-0 mb-2"></div>
28 28
 
29 29
         <div class="frame__body">
30
-
31 30
             <h3>Reservierung ändern</h3>
32 31
             <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation">
33 32
                 <input type="hidden" name="id" value="{{ id }}">
Browse code

Update

Benjamin Roth authored on10/08/2023 16:00:36
Showing1 changed files
... ...
@@ -1,39 +1,54 @@
1 1
 {% block content %}
2 2
     {% if modal %}<div class="modal-content">{% endif %}
3
-    <div id="wa-slot-{{ id }}">
4
-            <dl>
5
-                <dt>Tag/Uhrzeit</dt>
6
-                <dd>{{ slot.time|date('d.m.Y H:i') }}</dd>
3
+    <div id="wa-slot-{{ id }}" class="frame">
4
+        <div class="frame__header">
5
+            <h3>Reservierung</h3>
6
+            <div class="row">
7
+                <div class="col">
8
+                    <i class="icon-uhr-outline u-justify-center"></i>
9
+                    <div class="t-label">Tag/Urzeit</div>
10
+                    <div class="">{{ slot.time|date('d.m.Y H:i') }}</div>
11
+                </div>
12
+
13
+                <div class="col">
14
+                    <i class="icon-behaelter-outline u-justify-center"></i>
15
+                    <div class="t-label">Verfügbare Behälterkapazität</div>
16
+                    <div class="">{{ buchung.behaelter }}</div>
17
+                </div>
18
+
19
+                <div class="col">
20
+                    <i class="icon-reben-outline u-justify-center"></i>
21
+                    <div class="t-label">Verarbeitete Sorten</div>
22
+                    <div class="">{{ buchung.sorten|join(', ') }}</div>
23
+                </div>
24
+            </div>
25
+        </div>
7 26
 
8
-                <dt>Gebuchte Behälterkapazität</dt>
9
-                <dd>{{ buchung.behaelter }}</dd>
27
+        <div class="divider m-0 mb-2"></div>
28
+
29
+        <div class="frame__body">
10 30
 
11
-                <dt>Anliefernde Sorten</dt>
12
-                <dd>{{ buchung.sorten|join(', ') }}</dd>
13
-            </dl>
14 31
             <h3>Reservierung ändern</h3>
15 32
             <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation">
16 33
                 <input type="hidden" name="id" value="{{ id }}">
17
-                <div class="dflex">
18
-                    <div>
19
-                        <label for="res-behaelter">Liefernde Behältermenge</label>
20
-                        <select id="res-behaelter" name="behaelter" required>
21
-                            <option value="">-</option>
22
-                            {% for option in buchen.behaelter %}
23
-                                <option value="{{ option }}"{{ buchung.behaelter == option ? ' selected' : '' }}>{{ option }}</option>
24
-                            {% endfor %}
25
-                        </select>
26
-                    </div>
27
-                    <fieldset>
28
-                      <legend>Anliefernde Rebsorte(n)</legend>
29
-                        {% for value,label in buchen.sorten %}
30
-                            <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
34
+                <fieldset>
35
+                    <label for="res-behaelter">Liefernde Behältermenge</label>
36
+                    <select id="res-behaelter" name="behaelter" required>
37
+                        <option value="">-</option>
38
+                        {% for option in buchen.behaelter %}
39
+                            <option value="{{ option }}"{{ buchung.behaelter == option ? ' selected' : '' }}>{{ option }}</option>
31 40
                         {% endfor %}
32
-                    </fieldset>
33
-                    <div>
34
-                        <button type="submit">Speichern</button>
35
-                    </div>
36
-                </div>
41
+                    </select>
42
+                </fieldset>
43
+                <fieldset>
44
+                  <legend>Anliefernde Rebsorte(n)</legend>
45
+                    {% for value,label in buchen.sorten %}
46
+                        <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
47
+                    {% endfor %}
48
+                </fieldset>
49
+                <fieldset>
50
+                    <button type="submit">Speichern</button>
51
+                </fieldset>
37 52
             </form>
38 53
         </div>
39 54
     {% if modal %}</div>{% endif %}
Browse code

Update

Benjamin Roth authored on09/08/2023 16:04:53
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,72 @@
1
+{% block content %}
2
+    {% if modal %}<div class="modal-content">{% endif %}
3
+    <div id="wa-slot-{{ id }}">
4
+            <dl>
5
+                <dt>Tag/Uhrzeit</dt>
6
+                <dd>{{ slot.time|date('d.m.Y H:i') }}</dd>
7
+
8
+                <dt>Gebuchte Behälterkapazität</dt>
9
+                <dd>{{ buchung.behaelter }}</dd>
10
+
11
+                <dt>Anliefernde Sorten</dt>
12
+                <dd>{{ buchung.sorten|join(', ') }}</dd>
13
+            </dl>
14
+            <h3>Reservierung ändern</h3>
15
+            <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation">
16
+                <input type="hidden" name="id" value="{{ id }}">
17
+                <div class="dflex">
18
+                    <div>
19
+                        <label for="res-behaelter">Liefernde Behältermenge</label>
20
+                        <select id="res-behaelter" name="behaelter" required>
21
+                            <option value="">-</option>
22
+                            {% for option in buchen.behaelter %}
23
+                                <option value="{{ option }}"{{ buchung.behaelter == option ? ' selected' : '' }}>{{ option }}</option>
24
+                            {% endfor %}
25
+                        </select>
26
+                    </div>
27
+                    <fieldset>
28
+                      <legend>Anliefernde Rebsorte(n)</legend>
29
+                        {% for value,label in buchen.sorten %}
30
+                            <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>
31
+                        {% endfor %}
32
+                    </fieldset>
33
+                    <div>
34
+                        <button type="submit">Speichern</button>
35
+                    </div>
36
+                </div>
37
+            </form>
38
+        </div>
39
+    {% if modal %}</div>{% endif %}
40
+{% endblock %}
41
+
42
+{% block modal %}
43
+    {% if modal %}
44
+        <script>
45
+            (function ($) {
46
+
47
+                window.modals = window.modals || []
48
+                window.modals.wa_slots = window.modals.wa_slots || []
49
+
50
+                if (window.modals.wa_slots.details{{ id }} === undefined)
51
+                {
52
+                    window.modals.wa_slots.details{{ id }} = new jBox('Modal', {
53
+                    closeButton: 'box',
54
+                    content: $('#wa-slot-{{ id }}'),
55
+                    maxWidth: 650,
56
+                    minWidth: 100,
57
+                    minHeight: 100,
58
+                    width: 650,
59
+                    overlay: true,
60
+                    closeOnClick: false,
61
+                    zIndex: 'auto',
62
+                    addClass: ''
63
+                }).open();
64
+                } else {
65
+                    window.modals.wa_slots.details{{ id }}.content.empty();
66
+                    window.modals.wa_slots.details{{ id }}.setContent($('#wa-slot-{{ id }}')).open();
67
+                }
68
+
69
+            })(jQuery);
70
+        </script>
71
+    {% endif %}
72
+{% endblock %}