Vorausfüllen von Teilnehmernamen unterschiedet nun Veranstaltungen fü…

…r Kinder
MissionsgemeindeWeinstadt · Mar 12, 2021 · 572e8a8 · 572e8a8
1 parent f5202f8
commit 572e8a8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/booking.php b/booking.php
@@ -174,6 +174,11 @@ function handleSaveBookingAction()
       echo 'showErrorMsg("Der Name darf kein Semikolon enthalten.");';
       return;
     }
+    if (contains($surname, '|') or contains($lastname, '|'))
+    {
+      echo 'showErrorMsg("Der Name darf keinen senkrechten Strich enthalten.");';
+      return;
+    }
     $person = $surname . ',' . $lastname;
     if (in_array($person, $persons))
     {
@@ -235,8 +240,19 @@ function handleSaveBookingAction()
   # update client row
   if (!$asAdmin)
   {
+    $personGroups = explode('|', getClientValue('lastListOfPersons'), 2);
+    if ($event['isKidsEvent'] == 1)
+    {
+      if (count($personGroups) < 2)
+        $personGroups[] = '';
+      $personGroups[1] = $listOfPersons;
+    }
+    else
+    {
+      $personGroups[0] = $listOfPersons;
+    }
     $clientValues = [];
-    $clientValues['lastListOfPersons'] = $listOfPersons;
+    $clientValues['lastListOfPersons'] = implode('|', $personGroups);
     $clientValues['lastPhoneNumber'] = $phoneNumber;
     $clientValues['lastAddressLine1'] = $addressLine1;
     $clientValues['lastAddressLine2'] = $addressLine2;

diff --git a/create-database.sql b/create-database.sql
@@ -54,6 +54,7 @@ CREATE TABLE event (
   bookingClosingTimestamp TIMESTAMP NULL,
   canceled TINYINT,
   isHighPriority TINYINT,
+  isKidsEvent TINYINT,
   remark TEXT,
   insertTimestamp TIMESTAMP NULL,
   editClientId INT,

diff --git a/event.php b/event.php
@@ -505,7 +505,12 @@ function getEventFields()
   $field['visibleInList'] = false;
   $fields[] = $field;
 
+  $field = newBooleanField('isKidsEvent', 'Für Kinder');
+  $field['visibleInList'] = false;
+  $fields[] = $field;
+
   $field = newBooleanField('isHighPriority', 'Hohe Priorität');
+  $field['visibleInList'] = false;
   $fields[] = $field;
 
   $field = newBooleanField('canceled', 'Abgesagt');

diff --git a/ui.php b/ui.php
@@ -407,7 +407,12 @@ function renderMainPageSaveBookingForm($event, $asAdmin, $persons = null, $booki
 
   if (!$asAdmin && $persons == null)
   {
-    $persons = explode(';', getClientValue('lastListOfPersons'));
+    $personGroups = explode('|', getClientValue('lastListOfPersons'), 2);
+    if ($event['isKidsEvent'] == 1 && count($personGroups) == 2)
+      $personGroup = $personGroups[1];
+    else
+      $personGroup = $personGroups[0];
+    $persons = explode(';', $personGroup);
   }
   $phoneNumber = getClientValue('lastPhoneNumber');
   $addressLine1 = getClientValue('lastAddressLine1');

diff --git a/update-database-1.6-1.8.sql b/update-database-1.6-1.8.sql
@@ -1,2 +1,3 @@
 ALTER TABLE event
-ADD (isHighPriority TINYINT);
+ADD (isHighPriority TINYINT,
+     isKidsEvent TINYINT);