codeforamerica · analoo · Dec 22, 2024 · Dec 23, 2024 · Dec 23, 2024 · Dec 23, 2024
diff --git a/src/main/java/org/ilgcc/app/inputs/Providerresponse.java b/src/main/java/org/ilgcc/app/inputs/Providerresponse.java
@@ -90,4 +90,6 @@ public class Providerresponse extends FlowInputs {
     private String providerIdentityCheckSSN;
 
     private String providerType;
+
+    private String providerConviction;
 }
diff --git a/src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java b/src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java
@@ -68,7 +68,8 @@ private Map<String, SubmissionField> prepareProviderResponse(Submission submissi
                 "providerResponseBusinessName",
                 "providerResponseContactPhoneNumber",
                 "providerResponseContactEmail",
-                "providerIdentityCheckSSN"
+                "providerIdentityCheckSSN",
+                "providerConviction"
         );
 
         Submission providerSubmission = providerSubmissionFromId(submission).get();

diff --git a/src/main/java/org/ilgcc/app/submission/conditions/ProviderHasConviction.java b/src/main/java/org/ilgcc/app/submission/conditions/ProviderHasConviction.java
@@ -0,0 +1,13 @@
+package org.ilgcc.app.submission.conditions;
+
+import formflow.library.data.Submission;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProviderHasConviction extends BasicCondition {
+
+    @Override
+    public Boolean run(Submission submission) {
+        return run(submission, "providerConviction", "true");
+    }
+}
diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
@@ -709,6 +709,8 @@ flow:
     condition: EnableProviderRegistration
     nextScreens:
       - name: registration-convictions-info
+        condition: ProviderHasConviction
+      - name: registration-household-members
   registration-convictions-info:
     condition: EnableProviderRegistration
     nextScreens:

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -1390,8 +1390,13 @@ registration-checks-trainings-notice.accordion.body2.ul1=You may need to do trai
 registration-checks-trainings-notice.accordion.body2.li1=CPR and first aid
 registration-checks-trainings-notice.accordion.body2.li2=Annual health and safety
 registration-checks-trainings-notice.accordion.body2.li3=Child abuse and neglect
-
 # registration-convictions
 registration-convictions.title=Past convictions
-=======
+registration-convictions.header=Have you ever been convicted of anything other than a minor traffic violation?
+registration-convictions.subtext=We're sorry to ask about this sensitive subject. This information is required to help decide if you are eligible to be a CCAP child provider.
+
+# registration-convictions-info
+registration-convictions-info.title=Past conviction details
 
+# registration-household-members
+registration-household-members.title=Household people
diff --git a/src/main/resources/pdf-map.yaml b/src/main/resources/pdf-map.yaml
@@ -165,6 +165,7 @@ inputFields:
   providerLicenseNumber: PROVIDER_LICENSE_NUMBER
   providerType: PROVIDER_TYPE
   providerIdentityCheckSSN: PROVIDER_SSN
+  providerConviction: PROVIDER_CONVICTION
   providerSignature: PROVIDER_SIGNATURE
   providerSignatureDate: PROVIDER_SIGNATURE_DATE
   clientResponseConfirmationCode: APPLICATION_CONFIRMATION_CODE

diff --git a/src/main/resources/templates/providerresponse/registration-convictions-info.html b/src/main/resources/templates/providerresponse/registration-convictions-info.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/head :: head(title='TEMPLATE')}"></head>
+<head th:replace="~{fragments/head :: head(title=#{registration-convictions-info.title})}"></head>
 <body>
 <div class="page-wrapper">
   <div th:replace="~{fragments/toolbar :: toolbar}"></div>
   <section class="slab">
     <div class="grid">
       <div th:replace="~{fragments/goBack :: goBackLink}"></div>
       <main id="content" role="main" class="form-card spacing-above-35">
-        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{placeholder}, subtext=#{placeholder})}"/>
+        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header='placeholder', subtext='placeholder')}"/>
         <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
           <th:block th:ref="formContent">
             <div class="form-card__content">

diff --git a/src/main/resources/templates/providerresponse/registration-convictions.html b/src/main/resources/templates/providerresponse/registration-convictions.html
@@ -8,14 +8,16 @@
     <div class="grid">
       <div th:replace="~{fragments/goBack :: goBackLink}"></div>
       <main id="content" role="main" class="form-card spacing-above-35">
-        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header='placeholder', subtext='placeholder')}"/>
+        <th:block th:replace="~{fragments/gcc-icons :: person}"></th:block>
+        <th:block
+                th:replace="~{fragments/cardHeaderForSingleInputScreen ::
+              cardHeaderForSingleInputScreen(header=#{registration-convictions.header}, subtext=#{registration-convictions.subtext}, required='true')}"/>
         <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
           <th:block th:ref="formContent">
             <div class="form-card__content">
-                <!-- Put inputs here -->
-            </div>
-            <div class="form-card__footer">
-              <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(text=#{general.inputs.continue})}"/>
+              <th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
+                  inputName='providerConviction',
+                  ariaDescribe='header')}"/>
             </div>
           </th:block>
         </th:block>
@@ -25,4 +27,6 @@
 </div>
 <th:block th:replace="~{fragments/footer :: footer}"/>
 </body>
-</html>
+</html>
+
+cfa:ye
diff --git a/src/main/resources/templates/providerresponse/registration-household-members.html b/src/main/resources/templates/providerresponse/registration-household-members.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/head :: head(title='TEMPLATE')}"></head>
+<head th:replace="~{fragments/head :: head(title=#{registration-household-members.title})}"></head>
 <body>
 <div class="page-wrapper">
   <div th:replace="~{fragments/toolbar :: toolbar}"></div>
   <section class="slab">
     <div class="grid">
       <div th:replace="~{fragments/goBack :: goBackLink}"></div>
       <main id="content" role="main" class="form-card spacing-above-35">
-        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{placeholder}, subtext=#{placeholder})}"/>
+        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header='placeholder', subtext='placeholder')}"/>
         <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
           <th:block th:ref="formContent">
             <div class="form-card__content">

diff --git a/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java b/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java
@@ -179,7 +179,6 @@ void LicenseExemptInProviderHomeFlow() {
         testPage.clickContinue();
         // registration-home-provider-dob
 
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -193,7 +192,10 @@ void LicenseExemptInProviderHomeFlow() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickYes();
+
+        // registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions-info.title"));
     }
 
     @Test
@@ -270,7 +272,6 @@ void LicenseExemptInChildHomeFlow() {
         testPage.clickContinue();
         // registration-home-provider-dob
 
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -284,7 +285,10 @@ void LicenseExemptInChildHomeFlow() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickNo();
+
+        // Skips registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-household-members.title"));
     }
 
     @Test
@@ -356,8 +360,6 @@ void LicensedChildCareHomeFlow() {
         testPage.clickContinue();
         // registration-home-provider-dob
 
-
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -369,7 +371,10 @@ void LicensedChildCareHomeFlow() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickYes();
+
+        // registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions-info.title"));
     }
 
     @Test
@@ -435,7 +440,6 @@ void LicensedChildCareCenterFlow() {
 
         // registration-home-provider-dob
 
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -447,8 +451,12 @@ void LicensedChildCareCenterFlow() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickNo();
+
+        // Skips registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-household-members.title"));
     }
+
     @Test
     void LicensedGroupChildCareCenterFlow() {
         createAValidLink();
@@ -518,7 +526,6 @@ void LicensedGroupChildCareCenterFlow() {
         testPage.clickContinue();
         // registration-home-provider-dob
 
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -530,7 +537,10 @@ void LicensedGroupChildCareCenterFlow() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickYes();
+
+        // registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions-info.title"));
     }
 
     @Test
@@ -630,7 +640,6 @@ void LicenseExemptChildCareCenter() {
 
         // registration-home-provider-dob
 
-
         // registration-checks-trainings-intro
         testPage.navigateToFlowScreen("providerresponse/registration-checks-trainings-intro");
 
@@ -644,7 +653,10 @@ void LicenseExemptChildCareCenter() {
 
         // registration-convictions
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions.title"));
-        testPage.clickContinue();
+        testPage.clickYes();
+
+        // registration-convictions-info
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-convictions-info.title"));
     }
 
     private void createAValidLink() {

diff --git a/src/test/java/org/ilgcc/app/pdf/ProviderApplicationPreparerFlagOnTest.java b/src/test/java/org/ilgcc/app/pdf/ProviderApplicationPreparerFlagOnTest.java
@@ -90,6 +90,8 @@ public void setsValidatedAddressWhenSelected() {
                 .with("providerMailingCity_validated", "Chicago")
                 .with("providerMailingState_validated", "IL")
                 .with("providerMailingZipCode_validated", "60115-1234")
+                .with("providerIdentityCheckSSN", "123-23-24244")
+                .with("providerConviction", "true")
                 .build();
 
         submissionRepositoryService.save(providerSubmission);
@@ -141,6 +143,11 @@ public void setsValidatedAddressWhenSelected() {
         assertThat(result.get("providerResponseContactEmail")).isEqualTo(
                 new SingleField("providerResponseContactEmail", "[email protected]", null));
 
+        assertThat(result.get("providerIdentityCheckSSN")).isEqualTo(
+                new SingleField("providerIdentityCheckSSN", "123-23-24244", null));
+        assertThat(result.get("providerConviction")).isEqualTo(
+                new SingleField("providerConviction", "true", null));
+
     }
 
     @Test