From 53dad74220f74b7bdccc8a4cf00d894eedbaa731 Mon Sep 17 00:00:00 2001
From: SevenWaysDP <sergej.hoffmann@dataport.de>
Date: Thu, 19 Mar 2026 12:31:30 +0100
Subject: [PATCH 1/2] BC-7341 - Refactor date input fields in registration and
 first login forms for improved accessibility and consistency

---
 views/firstLogin/sections/birthdate.hbs      | 15 +++++++++------
 views/firstLogin/sections/birthdate_U14.hbs  | 17 +++++++++++------
 views/firstLogin/sections/birthdate_UE14.hbs | 17 ++++++++++-------
 views/firstLogin/sections/birthdate_UE16.hbs | 15 +++++++++------
 views/registration/registration-parent.hbs   | 20 +++++++++++---------
 views/registration/registration-student.hbs  | 20 +++++++++++---------
 6 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/views/firstLogin/sections/birthdate.hbs b/views/firstLogin/sections/birthdate.hbs
index e21f33f14f..609473b390 100644
--- a/views/firstLogin/sections/birthdate.hbs
+++ b/views/firstLogin/sections/birthdate.hbs
@@ -3,12 +3,15 @@
   <p>{{$t "firstLogin.birthdate.text.weNeedYourDateOfBirth" }}</p>
   <div class="row">
     <div class="form-group col-md-6 col-sm-12">
-        {{> "lib/forms/form-date-input"
-                label=($t "global.label.dateOfBirth")
-                id="studentBirthdate"
-                dataMinDate=(datePickerTodayMinus 100 0 0)
-                dataMaxDate=(datePickerTodayMinus 4 0 0)
-        }}
+      <label for="studentBirthdate">{{$t "global.label.dateOfBirth" }}</label>
+      <input
+        class="form-control linked"
+        type="date"
+        id="studentBirthdate"
+        name="studentBirthdate"
+        min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"
+        max="{{datePickerTodayMinus 4 0 0 'YYYY-MM-DD'}}"
+        />  
     </div>
   </div>
 </section>
diff --git a/views/firstLogin/sections/birthdate_U14.hbs b/views/firstLogin/sections/birthdate_U14.hbs
index 8afdcfe089..e14eb9eaf2 100644
--- a/views/firstLogin/sections/birthdate_U14.hbs
+++ b/views/firstLogin/sections/birthdate_U14.hbs
@@ -3,12 +3,17 @@
   <p>{{$t "firstLogin.birthdate.text.weNeedYourDateOfBirth" }}</p>
   <div class="row">
     <div class="form-group col-md-6 col-sm-12">
-        {{> "lib/forms/form-date-input"
-                label=($t "global.label.dateOfBirth")
-                id="studentBirthdate"
-                dataMinDate=(datePickerTodayMinus 14 0 -1)
-                dataMaxDate=(datePickerTodayMinus 4 0 0)
-        }}
+        <label for="studentBirthdate">{{$t "global.label.dateOfBirth" }}</label>
+        <input
+          class="form-control linked"
+          type="date"
+          id="studentBirthdate"
+          name="studentBirthdate"
+          value="{{user.birthday}}"
+          min="{{datePickerTodayMinus 14 0 -1 'YYYY-MM-DD'}}"
+          max="{{datePickerTodayMinus 4 0 0 'YYYY-MM-DD'}}"
+          {{#if user.birthday}}readonly{{/if}}
+          />
     </div>
   </div>
 </section>
diff --git a/views/firstLogin/sections/birthdate_UE14.hbs b/views/firstLogin/sections/birthdate_UE14.hbs
index d318f969ea..3be189865e 100644
--- a/views/firstLogin/sections/birthdate_UE14.hbs
+++ b/views/firstLogin/sections/birthdate_UE14.hbs
@@ -3,13 +3,16 @@
   <p>{{$t "firstLogin.birthdate.text.weNeedYourDateOfBirth" }}</p>
   <div class="row">
     <div class="form-group col-md-6 col-sm-12">
-        {{> "lib/forms/form-date-input"
-                label=($t "global.label.dateOfBirth")
-                id="studentBirthdate"
-                value=(datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0)
-                dataMinDate=(datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1)
-                dataMaxDate=(datePickerTodayMinus 14 0 0)
-        }}
+          <label for="studentBirthdate">{{$t "global.label.dateOfBirth" }}</label>
+          <input
+            class="form-control linked"
+            type="date"
+            id="studentBirthdate"
+            name="studentBirthdate"
+            value="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0 'YYYY-MM-DD'}}"
+            min="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1 'YYYY-MM-DD'}}"
+            max="{{datePickerTodayMinus 14 0 0 'YYYY-MM-DD'}}"
+            />  
     </div>
   </div>
 </section>
diff --git a/views/firstLogin/sections/birthdate_UE16.hbs b/views/firstLogin/sections/birthdate_UE16.hbs
index ce4203758f..e1a9b7926d 100644
--- a/views/firstLogin/sections/birthdate_UE16.hbs
+++ b/views/firstLogin/sections/birthdate_UE16.hbs
@@ -3,12 +3,15 @@
   <p>{{$t "firstLogin.birthdate.text.weNeedYourDateOfBirth" }}</p>
   <div class="row">
     <div class="form-group col-md-6 col-sm-12">
-        {{> "lib/forms/form-date-input"
-                label=($t "global.label.dateOfBirth")
-                id="studentBirthdate"
-                dataMinDate=(datePickerTodayMinus 100 0 0)
-                dataMaxDate=(datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0)
-        }}
+      <label for="studentBirthdate">{{$t "global.label.dateOfBirth" }}</label>
+      <input
+        class="form-control linked"
+        type="date"
+        id="studentBirthdate"
+        name="studentBirthdate"
+        min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"
+        max="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0 'YYYY-MM-DD'}}"
+        />  
     </div>
   </div>
 </section>
diff --git a/views/registration/registration-parent.hbs b/views/registration/registration-parent.hbs
index 484f92f84c..70f3550c9c 100644
--- a/views/registration/registration-parent.hbs
+++ b/views/registration/registration-parent.hbs
@@ -42,15 +42,17 @@
         </div>
 
         <div class="form-group">
-          {{> "lib/forms/form-date-input"
-                  label=($t "registration._registration.global.label.studentsDateOfBirth")
-                  id="birthDate"
-                  value=user.birthday
-                  required=true
-                  readonly=(isset user.birthday)
-                  dataMinDate=(datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1)
-                  dataMaxDate=(datePickerTodayMinus 4 0 0)
-          }}
+          <label for="birthDate">{{$t "registration._registration.global.label.studentsDateOfBirth" }}</label>
+          <input
+            class="form-control linked"
+            type="date"
+            id="birthDate"
+            name="birthDate"
+            value="{{user.birthday}}"
+            min="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1 'YYYY-MM-DD'}}"
+            max="{{datePickerTodayMinus 4 0 0 'YYYY-MM-DD'}}"
+            {{#if user.birthday}}readonly{{/if}}
+            />
         </div>
 
         <div class="form-group">
diff --git a/views/registration/registration-student.hbs b/views/registration/registration-student.hbs
index 49256b9f7b..a468e85828 100644
--- a/views/registration/registration-student.hbs
+++ b/views/registration/registration-student.hbs
@@ -38,15 +38,17 @@
         </div>
 
         <div class="form-group">
-              {{> "lib/forms/form-date-input"
-                      label=($t "registration._registration.global.label.studentsDateOfBirth")
-                      id="birthDate"
-                      value=user.birthday
-                      required=true
-                      readonly=(isset user.birthday)
-                      dataMinDate=(datePickerTodayMinus 100 0 0)
-                      dataMaxDate=(datePickerTodayMinus 4 0 0)
-              }}
+          <label for="birthDate">{{$t "registration._registration.global.label.studentsDateOfBirth" }}</label>
+          <input
+            class="form-control linked"
+            type="date"
+            id="birthDate"
+            name="birthDate"
+            value="{{user.birthday}}"
+            min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"
+            max="{{datePickerTodayMinus 4 0 0 'YYYY-MM-DD'}}"
+            {{#if user.birthday}}readonly{{/if}}
+            />
         </div>
 
         <div class="form-group">

From adbc9a4636dc622f2be85d323c11ca0c892296a7 Mon Sep 17 00:00:00 2001
From: SevenWaysDP <sergej.hoffmann@dataport.de>
Date: Mon, 23 Mar 2026 12:21:21 +0100
Subject: [PATCH 2/2] Add data-testid attributes to date input fields for
 improved testing

---
 views/firstLogin/sections/birthdate.hbs      | 1 +
 views/firstLogin/sections/birthdate_U14.hbs  | 1 +
 views/firstLogin/sections/birthdate_UE14.hbs | 1 +
 views/firstLogin/sections/birthdate_UE16.hbs | 1 +
 views/registration/registration-parent.hbs   | 1 +
 views/registration/registration-student.hbs  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/views/firstLogin/sections/birthdate.hbs b/views/firstLogin/sections/birthdate.hbs
index 609473b390..9871dd064a 100644
--- a/views/firstLogin/sections/birthdate.hbs
+++ b/views/firstLogin/sections/birthdate.hbs
@@ -8,6 +8,7 @@
         class="form-control linked"
         type="date"
         id="studentBirthdate"
+        data-testid="form-date-input-studentBirthdate"
         name="studentBirthdate"
         min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"
         max="{{datePickerTodayMinus 4 0 0 'YYYY-MM-DD'}}"
diff --git a/views/firstLogin/sections/birthdate_U14.hbs b/views/firstLogin/sections/birthdate_U14.hbs
index e14eb9eaf2..a7e1423a67 100644
--- a/views/firstLogin/sections/birthdate_U14.hbs
+++ b/views/firstLogin/sections/birthdate_U14.hbs
@@ -8,6 +8,7 @@
           class="form-control linked"
           type="date"
           id="studentBirthdate"
+          data-testid="form-date-input-studentBirthdate"
           name="studentBirthdate"
           value="{{user.birthday}}"
           min="{{datePickerTodayMinus 14 0 -1 'YYYY-MM-DD'}}"
diff --git a/views/firstLogin/sections/birthdate_UE14.hbs b/views/firstLogin/sections/birthdate_UE14.hbs
index 3be189865e..263671ec62 100644
--- a/views/firstLogin/sections/birthdate_UE14.hbs
+++ b/views/firstLogin/sections/birthdate_UE14.hbs
@@ -8,6 +8,7 @@
             class="form-control linked"
             type="date"
             id="studentBirthdate"
+            data-testid="form-date-input-studentBirthdate"
             name="studentBirthdate"
             value="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0 'YYYY-MM-DD'}}"
             min="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1 'YYYY-MM-DD'}}"
diff --git a/views/firstLogin/sections/birthdate_UE16.hbs b/views/firstLogin/sections/birthdate_UE16.hbs
index e1a9b7926d..d53d349dc1 100644
--- a/views/firstLogin/sections/birthdate_UE16.hbs
+++ b/views/firstLogin/sections/birthdate_UE16.hbs
@@ -8,6 +8,7 @@
         class="form-control linked"
         type="date"
         id="studentBirthdate"
+        data-testid="form-date-input-studentBirthdate"
         name="studentBirthdate"
         min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"
         max="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 0 'YYYY-MM-DD'}}"
diff --git a/views/registration/registration-parent.hbs b/views/registration/registration-parent.hbs
index 70f3550c9c..f14e07a24b 100644
--- a/views/registration/registration-parent.hbs
+++ b/views/registration/registration-parent.hbs
@@ -47,6 +47,7 @@
             class="form-control linked"
             type="date"
             id="birthDate"
+            data-testid="form-date-input-birthDate"
             name="birthDate"
             value="{{user.birthday}}"
             min="{{datePickerTodayMinus CONSENT_WITHOUT_PARENTS_MIN_AGE_YEARS 0 -1 'YYYY-MM-DD'}}"
diff --git a/views/registration/registration-student.hbs b/views/registration/registration-student.hbs
index a468e85828..ff4bc38009 100644
--- a/views/registration/registration-student.hbs
+++ b/views/registration/registration-student.hbs
@@ -43,6 +43,7 @@
             class="form-control linked"
             type="date"
             id="birthDate"
+            data-testid="form-date-input-birthDate"
             name="birthDate"
             value="{{user.birthday}}"
             min="{{datePickerTodayMinus 100 0 0 'YYYY-MM-DD'}}"