review contact info (#339)

codeforamerica · Oct 12, 2023 · b74ab2d · b74ab2d
1 parent ee44696
commit b74ab2d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 18 deletions.
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -507,10 +507,21 @@ phone-number-nudge.p1=A caseworker may need to contact you by phone about your a
 phone-number-nudge.add-phone-number=Add a phone number
 phone-number-nudge.skip-phone-number=Continue without it
 
+
+# Review contact info
+review-contact-info.title=Review contact information
+review-contact-info.header=Let's review your info
+review-contact-info.name=Name
+review-contact-info.mailing-address=Mailing Address
+review-contact-info.contact-information=Contact information
+review-contact-info.this-looks-correct=This looks correct
+review-contact-info.edit=Edit my info
+
 # Job search
 job-search.title=Job search
 job-search.header=Is anyone in your household currently looking for a job?
 
 # Job search who
 job-search-who.title = Job search who
-job-search-who.header=Who in your household is looking for a job?
+job-search-who.header=Who in your household is looking for a job?
+
diff --git a/src/main/resources/templates/laDigitalAssister/mailingAddress.html b/src/main/resources/templates/laDigitalAssister/mailingAddress.html
@@ -16,6 +16,7 @@
 
             </div>
             <div class="form-card__footer">
+              <th:block th:replace="~{fragments/continueButton :: continue}" />
 
               <th:block th:replace="~{fragments/continueButton :: continue}" />
 

diff --git a/src/main/resources/templates/laDigitalAssister/reviewContactInfo.html b/src/main/resources/templates/laDigitalAssister/reviewContactInfo.html
@@ -1,31 +1,51 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}">
-<head th:replace="fragments/head :: head(title='Review Contact Information')"></head>
+<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/head :: head(title=#{review-contact-info.title})}"></head>
 <body>
 <div class="page-wrapper">
-  <div th:replace="fragments/toolbar :: toolbar"></div>
+  <div th:replace="~{fragments/toolbar :: toolbar}"></div>
   <section class="slab">
     <div class="grid">
-      <div th:replace="fragments/goBack :: goBackLink"></div>
+      <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=#{}, subtext=#{})"/>-->
-        <th:block th:replace="'fragments/form' :: form(action=${formAction}, content=~{::formContent})">
-          <th:block th:ref="formContent">
-            <div class="form-card__content">
-
-            </div>
+        <th:block
+            th:replace="~{fragments/cardHeader :: cardHeader(header=#{review-contact-info.header})}"/>
+          <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::reviewContent})}">
+            <th:block th:ref="reviewContent">
+              <div class="form-card__content">
+                <b th:text="#{review-contact-info.name}"></b>
+                <div class="spacing-above-15">
+                  <p th:text="${fieldData.firstName} + ' ' + ${fieldData.lastName}"></p>
+                </div>
+                <hr class="spacing-below-35 spacing-above-35">
+                <b th:text="#{review-contact-info.mailing-address}"></b>
+                <div class="spacing-above-15">
+                  <p class="spacing-below-5" th:text="${fieldData.homeAddressStreetAddress1}"></p>
+                  <p class="spacing-below-5" th:text="${fieldData.homeAddressStreetAddress2}"></p>
+                  <p class="spacing-below-5" th:text="${fieldData.homeAddressCity} + ', ' + ${fieldData.homeAddressState}"></p>
+                  <p th:text="${fieldData.homeAddressZipCode}"></p>
+                </div>
+                <hr class="spacing-below-35 spacing-above-35">
+                <b th:text="#{review-contact-info.contact-information}"></b>
+                <div class="spacing-above-15">
+                  <p class="spacing-below-5" th:text="${fieldData.phoneNumber}"></p>
+                  <p class="spacing-below-5" th:text="${fieldData.emailAddress}"></p>
+                </div>
+                <hr class="spacing-below-35 spacing-above-35">
+
+              </div>
             <div class="form-card__footer">
-              <th:block th:replace="~{fragments/continueButton :: continue}" />
-
-
+              <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
+                  text=#{review-contact-info.this-looks-correct})}"/>
+              <a class="button button--secondary" th:text="#{review-contact-info.edit}"
+                      th:href="'/flow/' + ${flow} + '/personalInfo'"></a>
             </div>
           </th:block>
         </th:block>
       </main>
     </div>
   </section>
 </div>
-<th:block th:replace="fragments/footer :: footer" />
+<th:block th:replace="~{fragments/footer :: footer}" />
 </body>
-</html>
+</html>
diff --git a/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java b/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java
@@ -72,7 +72,7 @@ void fullDigitalAssisterFlow() {
     assertThat(testPage.getTitle()).isEqualTo("Contact info");
     testPage.enter("phoneNumber", "123-456-7891");
     testPage.clickContinue();
-    assertThat(testPage.getTitle()).isEqualTo("Review Contact Information");
+    assertThat(testPage.getTitle()).isEqualTo("Review contact information");
 
     // Household
     testPage.navigateToFlowScreen("laDigitalAssister/multiplePersonHousehold");
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
                 </div>
                 <div class="form-card__footer">
+                  <th:block th:replace="~{fragments/continueButton :: continue}" />
                   <th:block th:replace="~{fragments/continueButton :: continue}" />
@@ Expand Down @@