generated from codeforamerica/form-flow-starter-app
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding room rental screens, other cleanup
- Loading branch information
Showing
14 changed files
with
140 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/main/java/org/ladocuploader/app/submission/conditions/HasRoomRental.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package org.ladocuploader.app.submission.conditions; | ||
|
|
||
| import formflow.library.data.Submission; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| public class HasRoomRental extends BasicCondition { | ||
|
|
||
| @Override | ||
| public Boolean run(Submission submission) { | ||
| return run(submission, "roomRentalInd", "true"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 8 additions & 10 deletions
18
src/main/resources/templates/laDigitalAssister/householdRoomRental.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,27 @@ | ||
| <!DOCTYPE html> | ||
| <html th:lang="${#locale.language}"> | ||
| <head th:replace="~{fragments/head :: head(title='Scaffold')}"></head> | ||
| <head th:replace="~{fragments/head :: head(title=#{household-room-rental.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=#{}, subtext=#{})}"/>--> | ||
| <th:block th:replace="~{fragments/icons :: 'householdFamilyIncome'}"></th:block> | ||
| <th:block | ||
| th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{household-room-rental.header})}"/> | ||
| <th:block th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::formContent})}"> | ||
| <th:block th:ref="formContent"> | ||
| <div class="form-card__content"> | ||
|
|
||
| </div> | ||
| <div class="form-card__footer"> | ||
|
|
||
| </div> | ||
| <th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo( | ||
| inputName='roomRentalInd', | ||
| ariaDescribe='header')}"/> | ||
| </th:block> | ||
| </th:block> | ||
| </main> | ||
| </div> | ||
| </section> | ||
| </div> | ||
| <th:block th:replace="~{fragments/footer :: footer}" /> | ||
| <th:block th:replace="~{fragments/footer :: footer}"/> | ||
| </body> | ||
| </html> |
16 changes: 10 additions & 6 deletions
16
src/main/resources/templates/laDigitalAssister/householdRoomRentalWho.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,33 @@ | ||
| <!DOCTYPE html> | ||
| <html th:lang="${#locale.language}"> | ||
| <head th:replace="~{fragments/head :: head(title='Scaffold')}"></head> | ||
| <head th:replace="~{fragments/head :: head(title=#{household-room-rental-who.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=#{}, subtext=#{})}"/>--> | ||
| <th:block th:replace="~{fragments/icons :: householdFamilyIncome}"></th:block> | ||
| <th:block | ||
| th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{household-room-rental-who.header})}"/> | ||
| <th:block th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::formContent})}"> | ||
| <th:block th:ref="formContent"> | ||
| <div class="form-card__content"> | ||
|
|
||
| <th:block th:replace="~{'fragments/inputs/householdCheckboxFieldset' :: | ||
| householdCheckboxFieldset(inputName='roomRentals')}"> | ||
| </th:block> | ||
| </div> | ||
| <div class="form-card__footer"> | ||
|
|
||
| <div class="form-card__footer"> | ||
| <th:block th:replace="fragments/inputs/submitButton :: submitButton(text=#{general.inputs.continue})"/> | ||
| </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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters