From 9fbe7d38a75ee564d9c1eece7d877da6e18c30bb Mon Sep 17 00:00:00 2001
From: Hannah <hannah@Hannahs-MacBook-Air.local>
Date: Tue, 14 Jul 2026 23:51:05 -0600
Subject: [PATCH] additional changes 2

---
 .../vbs-page/vbs-page.component.html          | 40 +++++++++----------
 Server/src/routes/api/vbs.js                  | 25 ++++++++----
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/Client/src/app/components/vbs-page/vbs-page.component.html b/Client/src/app/components/vbs-page/vbs-page.component.html
index 8ee794d..3fc3be1 100644
--- a/Client/src/app/components/vbs-page/vbs-page.component.html
+++ b/Client/src/app/components/vbs-page/vbs-page.component.html
@@ -10,25 +10,25 @@
             <h2 id="studentInfo" class="center" style="margin:25px;">Student Information</h2>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('firstName')">
-              <mat-label>Student First Name</mat-label>
+              <mat-label>First Name</mat-label>
               <input matInput type="text" formControlName="firstName" required>
               <mat-error>Please enter student first name</mat-error>
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('lastName')">
-              <mat-label>Student Last Name</mat-label>
+              <mat-label>Last Name</mat-label>
               <input matInput type="text" formControlName="lastName" required>
               <mat-error>Please enter student last name</mat-error>
               </mat-form-field>
             </div>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('grade')">
-                <mat-label>Student Grade</mat-label>
+                <mat-label>Grade</mat-label>
                 <input matInput type="number" formControlName="grade" required>
                 <mat-error>Please enter student grade</mat-error>
               </mat-form-field>
               <mat-form-field class="w-100" [class.background-error]="hasErrors('dob')">
-                <mat-label>Student Birthday</mat-label>
+                <mat-label>Birthday</mat-label>
                 <input matInput [matDatepicker]="picker" (click)="picker.open()" formControlName="dob" required readonly>
                 <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
                 <mat-datepicker touchUi #picker></mat-datepicker>
@@ -44,7 +44,7 @@
                   </mat-radio-group>
               </div>
               <mat-form-field *ngIf="form.get('hasAllergies').value === 'true'" class="w-100" [class.background-error]="hasErrors('allergies')">
-                <mat-label>Student Allergies</mat-label>
+                <mat-label>Allergies</mat-label>
                 <textarea matInput type="text" formControlName="allergies"></textarea>
                 <mat-error>Please enter student allergies</mat-error>
               </mat-form-field>
@@ -58,7 +58,7 @@
                   </mat-radio-group>
               </div>
               <mat-form-field *ngIf="form.get('hasDietaryRestrictions').value === 'true'" class="w-100" [class.background-error]="hasErrors('dietaryRestrictions')">
-                <mat-label>Student Dietary Restrictions</mat-label>
+                <mat-label>Dietary Restrictions</mat-label>
                 <textarea matInput type="text" formControlName="dietaryRestrictions"></textarea>
                 <mat-error>Please enter student dietary restrictions</mat-error>
               </mat-form-field>
@@ -90,38 +90,38 @@
             <h2 id="parentInfo" class="center" style="margin:25px;">Parent/Guardian Information</h2>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentFirstName')">
-              <mat-label>Parent/Guardian First Name</mat-label>
+              <mat-label>First Name</mat-label>
               <input matInput type="text" formControlName="parentFirstName" required>
               <mat-error>Please enter parent/guardian name</mat-error>
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentLastName')">
-              <mat-label>Parent/Guardian Last Name</mat-label>
+              <mat-label>Last Name</mat-label>
               <input matInput type="text" formControlName="parentLastName" required>
               <mat-error>Please enter parent/guardian name</mat-error>
               </mat-form-field>
             </div>
             <div class="form-row-1-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('address1')">
-              <mat-label>Parent/Guardian Address Line 1</mat-label>
+              <mat-label>Address Line 1</mat-label>
               <input matInput type="text" formControlName="address1" required>
               <mat-error>Please enter parent/guardian address</mat-error>
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('address2')">
-              <mat-label>Parent/Guardian Address Line 2</mat-label>
+              <mat-label>Address Line 2</mat-label>
               <input matInput type="text" formControlName="address2">
               </mat-form-field>
             </div>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('city')">
-              <mat-label>Parent/Guardian City</mat-label>
+              <mat-label>City</mat-label>
               <input matInput type="text" formControlName="city" required>
               <mat-error>Please enter parent/guardian city</mat-error>
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('state')">
-              <mat-label>Parent/Guardian State *</mat-label>
+              <mat-label>State *</mat-label>
               <mat-select formControlName="state">
                 <!-- Empty option to allow clearing the choice -->
                 <mat-option [value]="null">-- Select a State --</mat-option>
@@ -136,31 +136,31 @@
               
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('zip')">
-              <mat-label>Parent/Guardian Zip</mat-label>
+              <mat-label>Zip</mat-label>
               <input matInput type="text" formControlName="zip" required>
               <mat-error>Please enter parent/guardian zip</mat-error>
               </mat-form-field>
             </div>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentHomePhone')">
-              <mat-label>Parent/Guardian Home Phone</mat-label>
+              <mat-label>Home Phone</mat-label>
               <input matInput type="tel" formControlName="parentHomePhone">
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentMobilePhone')">
-              <mat-label>Parent/Guardian Mobile Phone</mat-label>
+              <mat-label>Mobile Phone</mat-label>
               <input matInput type="tel" formControlName="parentMobilePhone" required>
               <mat-error>Please enter parent/guardian mobile phone (must be 10 digits)</mat-error>
               </mat-form-field>
             </div>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentWorkPhone')">
-              <mat-label>Parent/Guardian Work Phone</mat-label>
+              <mat-label>Work Phone</mat-label>
               <input matInput type="tel" formControlName="parentWorkPhone">
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('parentEmail')">
-              <mat-label>Parent/Guardian Email</mat-label>
+              <mat-label>Email</mat-label>
               <input matInput type="email" formControlName="parentEmail" required>
               <mat-error>Please enter parent/guardian email</mat-error>
               </mat-form-field>
@@ -178,17 +178,17 @@
             </div>
             <div class="form-row-2-col">
               <mat-form-field class="w-100" [class.background-error]="hasErrors('emergencyFirstName')">
-              <mat-label>Emergency Contact First Name</mat-label>
+              <mat-label>First Name</mat-label>
               <input matInput type="text" formControlName="emergencyFirstName">
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('emergencyLastName')">
-              <mat-label>Emergency Contact Last Name</mat-label>
+              <mat-label>Last Name</mat-label>
               <input matInput type="text" formControlName="emergencyLastName">
               </mat-form-field>
 
               <mat-form-field class="w-100" [class.background-error]="hasErrors('emergencyPhone')">
-              <mat-label>Emergency Contact Phone</mat-label>
+              <mat-label>Phone</mat-label>
               <input matInput type="tel" formControlName="emergencyPhone">
               </mat-form-field>
             </div>
diff --git a/Server/src/routes/api/vbs.js b/Server/src/routes/api/vbs.js
index 7bbdaff..6e7f1e8 100644
--- a/Server/src/routes/api/vbs.js
+++ b/Server/src/routes/api/vbs.js
@@ -73,13 +73,24 @@ function generateRegistrationEmailHTML(data) {
     return String(val).trim();
   };
 
-  const formatDate = (date) => {
-    if (date === '') return date;
-    return new Intl.DateTimeFormat('en-US', {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit'
-    }).format(date);
+  const formatDate = (dateString) => {
+    try {
+        if (!dateString || typeof dateString !== "string") {
+        throw new Error("Invalid date string.");
+        }
+
+        const [date] = dateString.split("T");
+        const [year, month, day] = date.split("-");
+
+        if (!year || !month || !day) {
+        throw new Error("Invalid date format.");
+        }
+
+        return `${month}/${day}/${year}`;
+    } catch (error) {
+        console.error("Error formatting date:", error.message);
+        return dateString;
+    }
   }
 
   // Define the layout sections and human-readable labels