diff --git a/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java b/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java index ec62af7aa..c68b98546 100644 --- a/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java +++ b/src/main/java/org/ladocuploader/app/inputs/LaDigitalAssister.java @@ -67,6 +67,10 @@ public class LaDigitalAssister extends FlowInputs { private String receivedOutOfStateBenefits; + private String buyPrepareMealsSeparateIndicator; + + private String preparesFood; + private String migrantOrSeasonalFarmWorkerInd; private String citizenshipInd; diff --git a/src/main/java/org/ladocuploader/app/submission/conditions/PreparesFoodTogether.java b/src/main/java/org/ladocuploader/app/submission/conditions/PreparesFoodTogether.java new file mode 100644 index 000000000..b47c04813 --- /dev/null +++ b/src/main/java/org/ladocuploader/app/submission/conditions/PreparesFoodTogether.java @@ -0,0 +1,12 @@ +package org.ladocuploader.app.submission.conditions; + +import formflow.library.data.Submission; +import org.springframework.stereotype.Component; + +@Component +public class PreparesFoodTogether extends BasicCondition { + @Override + public Boolean run(Submission submission) { + return run(submission, "buyPrepareMealsSeparateIndicator", "true"); + } +} diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml index 71fb983bc..6ba4cc926 100644 --- a/src/main/resources/flows-config.yaml +++ b/src/main/resources/flows-config.yaml @@ -118,6 +118,8 @@ flow: - name: householdPrepareFood householdPrepareFood: nextScreens: + - name: householdSeasonalFarmWorker + condition: PreparesFoodTogether - name: householdPrepareFoodWho householdPrepareFoodWho: nextScreens: diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index c1124bc51..a90748973 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -480,6 +480,12 @@ pregnancy.header=Are you pregnant? out-of-state-benefits.title=Out of state benefits out-of-state-benefits.header=Have you received cash assistance or SNAP benefits from another state? +# Household prepare food +household-prepare-food.title=Prepare food +household-prepare-food.header=Does everyone in your household buy and prepare food with you? +household-prepare-food-who.title=Prepare food who +household-prepare-food-who.header=Who in your household buys and prepares food with you? + # Seasonal farmworker seasonal-farmworker.title=Seasonal farm worker seasonal-farmworker.header=Is anyone in your household a migrant or seasonal farm worker? diff --git a/src/main/resources/templates/laDigitalAssister/householdPrepareFood.html b/src/main/resources/templates/laDigitalAssister/householdPrepareFood.html index 996398337..c66d8ac1c 100644 --- a/src/main/resources/templates/laDigitalAssister/householdPrepareFood.html +++ b/src/main/resources/templates/laDigitalAssister/householdPrepareFood.html @@ -1,6 +1,6 @@ - +
@@ -8,22 +8,20 @@
- - + + -
- -
-
- -
+
- + \ No newline at end of file diff --git a/src/main/resources/templates/laDigitalAssister/householdPrepareFoodWho.html b/src/main/resources/templates/laDigitalAssister/householdPrepareFoodWho.html index 996398337..eaeac077a 100644 --- a/src/main/resources/templates/laDigitalAssister/householdPrepareFoodWho.html +++ b/src/main/resources/templates/laDigitalAssister/householdPrepareFoodWho.html @@ -1,6 +1,6 @@ - +
@@ -8,15 +8,19 @@
- - + +
- + +
- +
@@ -24,6 +28,6 @@
- + \ No newline at end of file diff --git a/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java b/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java index 875bb4cf9..e61b6de5f 100644 --- a/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java +++ b/src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java @@ -107,7 +107,14 @@ void fullDigitalAssisterFlow() { assertThat(testPage.getTitle()).isEqualTo("Job search who"); // SNAP - testPage.navigateToFlowScreen("laDigitalAssister/householdSeasonalFarmWorker"); + testPage.navigateToFlowScreen("laDigitalAssister/householdPrepareFood"); + assertThat(testPage.getTitle()).isEqualTo("Prepare food"); + testPage.clickButton("No"); + + assertThat(testPage.getTitle()).isEqualTo("Prepare food who"); + testPage.clickElementById("preparesFood-you"); + testPage.clickContinue(); + assertThat(testPage.getTitle()).isEqualTo("Seasonal farm worker"); testPage.clickButton("Yes");