Merge branch 'main' of https://github.com/Miningmark/yumekai-website

Miningmark · Jan 29, 2025 · 79397ff · 79397ff
2 parents 6e29d64 + 114fe7a
commit 79397ff
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 1 deletion.
diff --git a/src/pages/api/registrationAsShowact.js b/src/pages/api/registrationAsShowact.js
@@ -31,6 +31,8 @@ CREATE TABLE registration_showact (
     performance_time INT NOT NULL,
     deconstruction_time INT NOT NULL,
     accomodation VARCHAR(100),
+    required_equipment TEXT,
+    brought_equipment TEXT,
     website VARCHAR(100),
     instagram VARCHAR(100),
     message TEXT,
@@ -114,6 +116,8 @@ export default async function handler(req, res) {
   const performanceTime = fields.performanceTime[0];
   const deconstructionTime = fields.deconstructionTime[0];
   const accomodation = fields.accomodation[0];
+  const requiredEquipment = fields.requiredEquipment[0];
+  const broughtEquipment = fields.broughtEquipment[0];
   const website = fields.website[0];
   const instagram = fields.instagram[0];
   const message = fields.message[0];
@@ -213,6 +217,26 @@ export default async function handler(req, res) {
   if (!accomodationValidation.check)
     errors.push({ field: "accomodation", message: accomodationValidation.description });
 
+  //Benötigte Technik Validierung
+  const requiredEquipmentValidation = validateString(
+    requiredEquipment,
+    "Benötigte Ausrüstung",
+    0,
+    2500
+  );
+  if (!requiredEquipmentValidation.check)
+    errors.push({ field: "requiredEquipment", message: requiredEquipmentValidation.description });
+
+  //Mitgebrachte Technik Validierung
+  const broughtEquipmentValidation = validateString(
+    broughtEquipment,
+    "Mitgebrachte Ausrüstung",
+    0,
+    2500
+  );
+  if (!broughtEquipmentValidation.check)
+    errors.push({ field: "broughtEquipment", message: broughtEquipmentValidation.description });
+
   //Website Validierung
   const websiteValidation = validateString(website, "Website", 0, 100);
   if (!websiteValidation.check)
@@ -340,6 +364,8 @@ export default async function handler(req, res) {
         performance_time,
         deconstruction_time,
         accomodation,
+        required_equipment,
+        brought_equipment,
         website,
         instagram,
         message,
@@ -349,7 +375,7 @@ export default async function handler(req, res) {
         showact_conditions,
         image_url,
         file_url
-    ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`;
+    ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`;
 
     const values = [
       clientIp,
@@ -368,6 +394,8 @@ export default async function handler(req, res) {
       performanceTime,
       deconstructionTime,
       accomodation,
+      requiredEquipment || null,
+      broughtEquipment || null,
       website || null,
       instagram || null,
       message || null,
@@ -398,6 +426,8 @@ export default async function handler(req, res) {
       performanceTime,
       deconstructionTime,
       accomodation,
+      requiredEquipment,
+      broughtEquipment,
       website,
       instagram,
       message,

diff --git a/src/pages/registration/registrationAsShowact.js b/src/pages/registration/registrationAsShowact.js
@@ -91,6 +91,8 @@ export default function RegistrationAsShowact() {
   const [performanceTime, setPerformanceTime] = useState("");
   const [deconstructionTime, setDeconstructionTime] = useState("");
   const [accomodation, setAccomodation] = useState("");
+  const [requiredEquipment, setRequiredEquipment] = useState("");
+  const [broughtEquipment, setBroughtEquipment] = useState("");
 
   const [website, setWebsite] = useState("");
   const [instagram, setInstagram] = useState("");
@@ -129,6 +131,8 @@ export default function RegistrationAsShowact() {
     performanceTime: useRef(null),
     deconstructionTime: useRef(null),
     accomodation: useRef(null),
+    requiredEquipment: useRef(null),
+    broughtEquipment: useRef(null),
     website: useRef(null),
     instagram: useRef(null),
     file: useRef(null),
@@ -227,6 +231,32 @@ export default function RegistrationAsShowact() {
     if (!accomodationValidation.check)
       newErrors.push({ field: "accomodation", message: accomodationValidation.description });
 
+    //Benötigte Technik Validierung
+    const requiredEquipmentValidation = validateString(
+      requiredEquipment,
+      "Benötigte Technik",
+      0,
+      2500
+    );
+    if (!requiredEquipmentValidation.check)
+      newErrors.push({
+        field: "requiredEquipment",
+        message: requiredEquipmentValidation.description,
+      });
+
+    //Mitgebrachte Technik Validierung
+    const broughtEquipmentValidation = validateString(
+      broughtEquipment,
+      "Mitgebrachte Technik",
+      0,
+      2500
+    );
+    if (!broughtEquipmentValidation.check)
+      newErrors.push({
+        field: "broughtEquipment",
+        message: broughtEquipmentValidation.description,
+      });
+
     //Website Validierung
     const websiteValidation = validateString(website, "Website", 0, 100);
     if (!websiteValidation.check)
@@ -305,6 +335,8 @@ export default function RegistrationAsShowact() {
     formData.append("performanceTime", performanceTime);
     formData.append("deconstructionTime", deconstructionTime);
     formData.append("accomodation", accomodation);
+    formData.append("requiredEquipment", requiredEquipment);
+    formData.append("broughtEquipment", broughtEquipment);
     formData.append("website", website);
     formData.append("instagram", instagram);
     formData.append("message", message);
@@ -348,6 +380,8 @@ export default function RegistrationAsShowact() {
         setPerformanceTime("");
         setDeconstructionTime("");
         setAccomodation("");
+        setRequiredEquipment("");
+        setBroughtEquipment("");
         setWebsite("");
         setInstagram("");
         setMessage("");
@@ -630,6 +664,20 @@ export default function RegistrationAsShowact() {
               isError={errors.some((error) => error.field === "accomodation")}
               require
             />
+            <InputOptionTextArea
+              title="Benötigte Technik"
+              inputText={requiredEquipment}
+              inputChange={setRequiredEquipment}
+              inputRef={refs.requiredEquipment}
+              isError={errors.some((error) => error.field === "requiredEquipment")}
+            />
+            <InputOptionTextArea
+              title="Mitgebrachte Technik"
+              inputText={broughtEquipment}
+              inputChange={setBroughtEquipment}
+              inputRef={refs.broughtEquipment}
+              isError={errors.some((error) => error.field === "broughtEquipment")}
+            />
 
             <Spacer />
             <h2>Allgemeines</h2>

diff --git a/src/util/email_registrationShowact.js b/src/util/email_registrationShowact.js
@@ -19,6 +19,8 @@ export default function emailRegistrationShowact({
   performanceTime,
   deconstructionTime,
   accomodation,
+  requiredEquipment,
+  broughtEquipment,
   website,
   instagram,
   message,
@@ -71,6 +73,10 @@ export default function emailRegistrationShowact({
       <br />
       Unterkunft: ${accomodation}
       <br />
+      Benötigte Technik: ${requiredEquipment || "Keine angegebe"}
+      <br />
+      Mitgebrachte Technik: ${broughtEquipment || "Keine angegebe"}
+      <br />
       Webseite: ${website || "Keine Webseite angegeben"}
       <br />
       Instagram: ${instagram || "Kein Instagram angegeben"}