Merge pull request #318 from beawitcht/development

removes youth options
beawitcht · Aug 17, 2024 · 8775f31 · 8775f31
2 parents a8055d9 + 812919c
commit 8775f31
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/app/forms/input_form.py b/app/forms/input_form.py
@@ -27,8 +27,8 @@
 class InputForm(FlaskForm):
     countries = SelectField("Country", choices=['Choose...','England', 'Northern Ireland', 'Scotland', 'Wales'], validators=[
         DataRequired(), AnyOf(['England', 'Northern Ireland', 'Scotland', 'Wales'], message="Please select a country")])
-    services = SelectField("Services", choices=['Choose...','Adult (17+)', 'Youth (≤16)'], validators=[
-        DataRequired(), AnyOf(['Adult (17+)', 'Youth (≤16)'], message="Please select adult or youth services")])
+    services = SelectField("Services", choices=['Choose...','Adult (17+)'], validators=[
+        DataRequired(), AnyOf(['Adult (17+)'], message="Please select adult services")]) # 'Youth (≤16)' removed
     self_med = BooleanField("I am self medicating")
     self_med_likely = BooleanField("I am likely to start self medicating")
     no_self_med = BooleanField("I am not currently or likely to start self medicating")

diff --git a/app/static/js/transinformed.js b/app/static/js/transinformed.js
@@ -2,7 +2,7 @@ window.addEventListener('load', function () {
     infoButtons(document.getElementById("gicLabelBtn"), document.getElementById("gicInfoLabel"));
     infoButtons(document.getElementById("sharedCareLabelBtn"), document.getElementById("sharedCareInfoLabel"));
     infoButtons(document.getElementById("bridgingDesiredLabelBtn"), document.getElementById("bridgingDesiredInfoLabel"));
-    infoButtons(document.getElementById("under16LabelBtn"), document.getElementById("under16InfoLabel"));
+    // infoButtons(document.getElementById("under16LabelBtn"), document.getElementById("under16InfoLabel"));
     infoButtons(document.getElementById("fixedAddressLabelBtn"), document.getElementById("fixedAddressInfoLabel"));
     infoButtons(document.getElementById("noIdProofLabelBtn"), document.getElementById("noIdProofInfoLabel"));
     infoButtons(document.getElementById("immLetterLabelBtn"), document.getElementById("immLetterInfoLabel"));
@@ -37,7 +37,7 @@ window.addEventListener('load', function () {
     document.getElementById('immigrationCheck').addEventListener('click', revealContentImmigration);
 
     //Age checkbox
-    document.getElementById('under16Check').addEventListener('click', checkAgeStatus);
+   // document.getElementById('under16Check').addEventListener('click', checkAgeStatus);
 
     document.getElementById("docx").addEventListener('click', submitActionsDocx);
     document.getElementById("pdf").addEventListener('click', submitActionsPdf);
@@ -157,14 +157,14 @@ function serviceFilters() {
         $("#privateProviderList option[value='Other (Non-UK Based)']").hide();
 
     }
-    else if (!under16Check.checked) {
-        $('#grcCheckContainer').show();
-        $('#bridgingDesiredContainer').show();
-        $('#medStatusSection').show();
-        $('#bloodTestsContainer').show();
-        $("#privateProviderList option[value='GenderGP']").show();
-        $("#privateProviderList option[value='Other (Non-UK Based)']").show();
-    }
+    // else if (!under16Check.checked) {
+    //     $('#grcCheckContainer').show();
+    //     $('#bridgingDesiredContainer').show();
+    //     $('#medStatusSection').show();
+    //     $('#bloodTestsContainer').show();
+    //     $("#privateProviderList option[value='GenderGP']").show();
+    //     $("#privateProviderList option[value='Other (Non-UK Based)']").show();
+    // }
 
 
 }