[CCAP-672] - implement registration-submit-confirmation screen and code cleanup

src/main/java/org/ilgcc/app/inputs/Gcc.java

@@ -629,7 +629,7 @@ public class Gcc extends FlowInputs {
     @NotBlank(message = "{errors.validate.signed-name}")
     private String partnerSignedName;
 
-    // submit-confirmation
+    // complete-submit-confirmation
     private String surveyDifficulty;
     private String surveyAdditionalComments;
     private String providerResponseSubmissionId;

src/main/java/org/ilgcc/app/inputs/Providerresponse.java

@@ -153,5 +153,10 @@ public class Providerresponse extends FlowInputs {
     @NotBlank(message = "{errors.validate.provider-signed-name}")
     private String providerSignedName;
 
+    // registration-submit-confirmation
+    private String providerSurveyFamilyDifficulty;
+    private String providerSurveyProviderDifficulty;
+    private String providerSurveyAdditionalComments;
+
     private String providerConfirmationEmailSent;
 }

src/main/resources/flows-config.yaml

@@ -429,10 +429,6 @@ flow:
   submit-next-steps:
     nextScreens:
       - name: complete-submit-confirmation
-  submit-confirmation:
-    beforeDisplayAction: FormatSubmittedAtDate
-    nextScreens:
-      - name: submit-confirmation
   next-steps-pdf-delivery:
     nextScreens:
       - name: complete-submit-confirmation
@@ -489,7 +485,6 @@ landmarks:
   afterSubmitPages:
     - submit-complete
     - submit-next-steps
-    - submit-confirmation
     - doc-upload-recommended-docs
     - doc-upload-add-files
     - doc-upload-submit-confirmation
@@ -746,7 +741,9 @@ flow:
     nextScreens:
       - name: registration-submit-confirmation
   registration-submit-confirmation:
-      nextScreens: null
+    beforeDisplayAction: FormatSubmittedAtDate
+    nextScreens:
+      - name: registration-submit-confirmation
   submit-complete-final:
     nextScreens:
       - name: registration-getting-started
@@ -775,6 +772,7 @@ landmarks:
   afterSubmitPages:
     - submit-complete-final
     - registration-submit-complete
+    - registration-submit-confirmation
     - registration-submit-next-steps
     - registration-doc-upload-recommended-docs
     - registration-doc-upload-add-files

src/main/resources/messages.properties

@@ -53,6 +53,12 @@ general.none-added=None added
 general.helptext-relevant-questions-only=Only answer the questions that are relevant.
 general.step-header=Step {0} of {1}
 
+general-survey-question.very-easy=Very easy
+general-survey-question.easy=Easy
+general-survey-question.neither=Neither easy nor difficult
+general-survey-question.difficult=Difficult
+general-survey-question.very-difficult=Very difficult
+
 general.day.validation=Make sure you entered the correct day.
 general.month.validation=Make sure you entered the correct month.
 general.year.validation=Make sure you entered the correct year.
@@ -778,30 +784,20 @@ next-steps-pdf-delivery.notice=<ul class="list--numbered"><li>Print your applica
 
 submit-next-steps.no-provider=<ul class="list--numbered"><li>A worker at your CCR&R, <strong>{0}</strong>, will start reviewing your application within 10 business days.</li><li>A worker will contact you to help you find a child care provider.</li><li>You will get a letter in the mail or email about your application.</li><li>You may be asked to send additional verification documents.</li></ul>
 
-submit-confirmation.title=Your application has been sent for review.
-submit-confirmation.subtext=Your application was sent to your CCR&R on {0} at {1}.
-submit-confirmation.download-text=Download a copy of your application
-submit-confirmation.rest-of-paragraph=and save for your records.
-submit-confirmation.experience=Tell us more about your experience with this website. (Optional)
-submit-confirmation.survey.label=How easy or difficult was the application experience overall?
-submit-confirmation.survey.very-easy=Very easy
-submit-confirmation.survey.easy=Easy
-submit-confirmation.survey.neither=Neither easy nor difficult
-submit-confirmation.survey.difficult=Difficult
-submit-confirmation.survey.very-difficult=Very difficult
-submit-confirmation.comments.label=Additional comments
-submit-confirmation.survey.complete=Thank you for your feedback.
-submit-confirmation.button.feedback=Submit feedback
-submit-confirmation.button.return=Return to home
+submit-confirmation.general.experience=Tell us more about your experience with this website. (Optional)
+submit-confirmation.general.comments.label=Additional comments
+submit-confirmation.general.survey.complete=Thank you for your feedback.
+submit-confirmation.general.call-text=<a id='call-ccrr' href='https://www.inccrra.org/about/sdasearch' target='_blank' data-mixpanel='call-ccrr'>Call your CCR&R</a> for any questions about your application status.
+submit-confirmation.general.button.feedback=Submit feedback
+submit-confirmation.general.button.return=Return to home
+submit-confirmation.general.subtext=<p>Completed on {0} at {1}.</p><p>Your confirmation code is: <strong>{2}</strong>
 
 #complete-submit-confirmation
 complete-submit-confirmation.title=Complete submit confirmation
 complete-submit-confirmation.header=You've finished the online application!
-complete-submit-confirmation.subtext=<p>Completed on {0} at {1}.</p><p>Your confirmation code is: <strong>{2}</strong>
 complete-submit-confirmation.download-text=Download your application
 complete-submit-confirmation.rest-of-download-paragraph=for your records.
-complete-submit-confirmation.call-text=Call your CCR&R
-complete-submit-confirmation.rest-of-call-paragraph=for any questions about your application status.
+complete-submit-confirmation.survey.label=How easy or difficult was the application experience overall?
 
 #
 #doc-upload-recommended-docs
@@ -1619,3 +1615,9 @@ registration-doc-upload-add-files.ein.body=Add a letter from the IRS that shows
 registration-doc-upload-add-files.license-exempt.header=License-exempt letter
 registration-doc-upload-add-files.license-exempt.body=Add your letter from your state licensing agency that says you don't need a license.
 registration-doc-upload-add-files.confirmation=I'm finished uploading
+
+#registration-submit-confirmation
+registration-submit-confirmation.title=CCAP registration complete
+registration-submit-confirmation.header=You've submitted your provider registration!
+registration-submit-confirmation.q1=How easy or difficult was the family's application response experience?
+registration-submit-confirmation.q2=How easy or difficult was the new provider registration experience?

src/main/resources/templates/fragments/inputs/surveyQuestion.html

@@ -0,0 +1,30 @@
+<th:block th:fragment="surveyQuestion"
+          th:assert="${!#strings.isEmpty(inputName)}, ${!#strings.isEmpty(label)}">
+    <th:block th:replace="~{fragments/inputs/radioFieldset ::
+                                radioFieldset(inputName=${inputName},
+                                label=${#messages.msg(label)},
+                                content=~{::radioContent})}">
+        <th:block th:ref="radioContent">
+            <th:block th:replace="~{fragments/inputs/radio :: radio(
+                                      inputName=${inputName},
+                                      value='very-easy',
+                                      label=#{general-survey-question.very-easy})}"/>
+            <th:block th:replace="~{fragments/inputs/radio :: radio(
+                                      inputName=${inputName},
+                                      value='easy',
+                                      label=#{general-survey-question.easy})}"/>
+            <th:block th:replace="~{fragments/inputs/radio :: radio(
+                                      inputName=${inputName},
+                                      value='neither',
+                                      label=#{general-survey-question.neither})}"/>
+            <th:block th:replace="~{fragments/inputs/radio :: radio(
+                                      inputName=${inputName},
+                                      value='difficult',
+                                      label=#{general-survey-question.difficult})}"/>
+            <th:block th:replace="~{fragments/inputs/radio :: radio(
+                                      inputName=${inputName},
+                                      value='very-difficult',
+                                      label=#{general-survey-question.very-difficult})}"/>
+        </th:block>
+    </th:block>
+</th:block>

src/main/resources/templates/gcc/complete-submit-confirmation.html

@@ -18,7 +18,7 @@
                 <th:block th:replace="~{fragments/gcc-icons :: check-mark}"></th:block>
                 <th:block th:replace="~{fragments/cardHeader :: cardHeader(
                     header=#{complete-submit-confirmation.header},
-                    subtext=#{complete-submit-confirmation.subtext(${submittedDate}, ${submittedTime}, ${submission.getShortCode()})})}"/>
+                    subtext=#{submit-confirmation.general.subtext(${submittedDate}, ${submittedTime}, ${submission.getShortCode()})})}"/>
                 <th:block
                         th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
                     <th:block th:ref="formContent">
@@ -35,70 +35,37 @@
                                 </li>
                             </ul>
                             <ul class="list--checkmark list--material-phone-in-talk">
-                                <li><a id="call-ccrr"
-                                       href="https://www.inccrra.org/about/sdasearch"
-                                       target="_blank"
-                                       data-mixpanel="call-ccrr"
-                                       th:text="#{complete-submit-confirmation.call-text}"></a>
-                                    <span
-                                            th:text="#{complete-submit-confirmation.rest-of-call-paragraph}"></span>
-                                </li>
+                                <li th:utext="#{submit-confirmation.general.call-text}"></li>
                             </ul>
                             <hr>
-                            <p th:text="#{submit-confirmation.experience}"></p>
+                            <p th:text="#{submit-confirmation.general.experience}"></p>
                             <th:block th:if="${hasSubmittedSurvey}">
                                 <div class="notice--success">
                                     <ul class="list--checkmark list--material-checkmark spacing-above-0">
                                         <li>
-                                            <span th:text="#{submit-confirmation.survey.complete}"></span>
+                                            <span th:text="#{submit-confirmation.general.survey.complete}"></span>
                                         </li>
                                     </ul>
                                 </div>
                             </th:block>
                             <th:block th:unless="${hasSubmittedSurvey}">
-                                <th:block th:replace="~{fragments/inputs/radioFieldset ::
-                                radioFieldset(inputName='surveyDifficulty',
-                                label=#{submit-confirmation.survey.label},
-                                content=~{::radioContent})}">
-                                    <th:block th:ref="radioContent">
-                                        <th:block th:replace="~{fragments/inputs/radio :: radio(
-                                      inputName='surveyDifficulty',
-                                      value='very-easy',
-                                      label=#{submit-confirmation.survey.very-easy})}"/>
-                                        <th:block th:replace="~{fragments/inputs/radio :: radio(
-                                      inputName='surveyDifficulty',
-                                      value='easy',
-                                      label=#{submit-confirmation.survey.easy})}"/>
-                                        <th:block th:replace="~{fragments/inputs/radio :: radio(
-                                      inputName='surveyDifficulty',
-                                      value='neither',
-                                      label=#{submit-confirmation.survey.neither})}"/>
-                                        <th:block th:replace="~{fragments/inputs/radio :: radio(
-                                      inputName='surveyDifficulty',
-                                      value='difficult',
-                                      label=#{submit-confirmation.survey.difficult})}"/>
-                                        <th:block th:replace="~{fragments/inputs/radio :: radio(
-                                      inputName='surveyDifficulty',
-                                      value='very-difficult',
-                                      label=#{submit-confirmation.survey.very-difficult})}"/>
-                                    </th:block>
-                                </th:block>
+                                <th:block th:replace="~{fragments/inputs/surveyQuestion :: surveyQuestion(inputName='surveyDifficulty', label='complete-submit-confirmation.survey.label')}"/>
                                 <th:block th:replace="~{fragments/inputs/textArea ::
                                   textArea(inputName='surveyAdditionalComments',
-                                  label=#{submit-confirmation.comments.label},
+                                  label=#{submit-confirmation.general.comments.label},
                                   rows='2',
                                   maxLength='1000')}"/>
                             </th:block>
                         </div>
                         <div class="form-card__footer">
                             <th:block th:if="${hasSubmittedSurvey}">
-                                <a th:text="#{submit-confirmation.button.return}" href="/"
+                                <a th:text="#{submit-confirmation.general.button.return}" href="/"
                                    id="return-to-home"
                                    class="button--primary button"></a>
                             </th:block>
                             <th:block th:unless="${hasSubmittedSurvey}">
                                 <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
-                                    text=#{submit-confirmation.button.feedback})}"/>
+                                    text=#{submit-confirmation.general.button.feedback})}"/>
                             </th:block>
                         </div>
                     </th:block>