Skip to content

Commit

Permalink
[CCAP-555] - Bug mitigated and Pages added to provider response (#908)
Browse files Browse the repository at this point in the history
  • Loading branch information
enyia21 authored Dec 13, 2024
1 parent 4ccfd9a commit 96646e8
Show file tree
Hide file tree
Showing 11 changed files with 511 additions and 26 deletions.
79 changes: 55 additions & 24 deletions src/main/resources/flows-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,7 @@ flow:
- name: provider-number
condition: IsPaidByCCAP
- name: registration-start
registration-start:
condition: EnableProviderRegistration
nextScreens:
- name: registration-getting-started
#Existing Provider Flow
provider-number:
crossFieldValidationAction: ValidateProviderNumber
beforeSaveAction: SaveApplicationId
Expand All @@ -546,21 +543,52 @@ flow:
- name: response
condition: IsConfirmationCodeActive
- name: submit-start
registration-family-response-intro:
condition: EnableProviderRegistration
nextScreens:
- name: confirmation-code
response:
beforeDisplayAction: FindApplicationData
nextScreens:
- name: provider-info
condition: ProviderAgreedToCare
- name: confirm-deny-care
provider-info:
nextScreens:
- name: service-address
service-address:
nextScreens:
- name: confirm-address
confirm-address:
nextScreens:
- name: mailing-address
condition: EnableProviderRegistration
- name: contact-info
mailing-address:
condition: EnableProviderRegistration
nextScreens:
- name: confirm-mailing-address
confirm-mailing-address:
condition: EnableProviderRegistration
nextScreens:
- name: contact-info
contact-info:
nextScreens:
- name: info-review
info-review:
afterSaveAction: UploadProviderSubmissionToS3
nextScreens:
- name: submit-complete-final
confirm-deny-care:
beforeDisplayAction: FormatChildrenWhoNeedCareNames
afterSaveAction: UploadProviderSubmissionToS3
nextScreens:
- name: submit-complete-final
#New Provider Type
registration-start:
condition: EnableProviderRegistration
nextScreens:
- name: registration-getting-started
registration-family-response-intro:
condition: EnableProviderRegistration
nextScreens:
- name: confirmation-code
registration-getting-started:
condition: EnableProviderRegistration
nextScreens:
Expand Down Expand Up @@ -600,31 +628,30 @@ flow:
registration-basic-info-intro:
condition: EnableProviderRegistration
nextScreens:
- name: provider-info
provider-info:
- name: registration-info
registration-info:
nextScreens:
- name: service-address
service-address:
- name: registration-service-address
registration-service-address:
nextScreens:
- name: confirm-address
confirm-address:
- name: registration-confirm-address
registration-confirm-address:
nextScreens:
- name: mailing-address
- name: registration-mailing-address
condition: EnableProviderRegistration
- name: contact-info
mailing-address:
- name: registration-contact-info
registration-mailing-address:
condition: EnableProviderRegistration
nextScreens:
- name: confirm-mailing-address
confirm-mailing-address:
- name: registration-confirm-mailing-address
registration-confirm-mailing-address:
condition: EnableProviderRegistration
nextScreens:
- name: contact-info
contact-info:
- name: registration-contact-info
registration-contact-info:
nextScreens:
- name: info-review
info-review:
afterSaveAction: UploadProviderSubmissionToS3
- name: registration-info-review
registration-info-review:
nextScreens:
- name: registration-home-provider-ssn
condition: EnableProviderRegistration
Expand Down Expand Up @@ -653,6 +680,10 @@ flow:
condition: EnableProviderRegistration
nextScreens:
- name: registration-start-date
registration-start-date:
condition: EnableProviderRegistration
nextScreens:
- name: submit-complete-final
submit-complete-final:
nextScreens:
- name: registration-getting-started
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<li id="full-name"
th:text="|${inputData.get('providerResponseFirstName')} ${inputData.get('providerResponseLastName')}|"></li>
</ol>
<a id="edit-parent-info-basic" th:href="|/flow/${flow}/info|"
<a id="edit-parent-info-basic" th:href="|/flow/${flow}/provider-info|"
th:text="#{provider-response-info-review.basic-info-edit}"></a>
<hr class="spacing-below-15 spacing-above-15">

Expand All @@ -41,7 +41,7 @@
<div id="zipcode"
th:text="${inputData.get('providerResponseServiceZipCode')}"></div>
<br>
<a id="edit-home-address" th:href="|/flow/${flow}/info|"
<a id="edit-home-address" th:href="|/flow/${flow}/service-address|"
th:text="#{provider-response-info-review.child-care-service-address-edit}"></a>
<hr class="spacing-below-15 spacing-above-15">
<p class="text--left"><strong
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title=#{provider-response-confirm-address.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/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent"
th:with="hasSuggestion=${T(org.ilgcc.app.utils.SubmissionUtilities).hasAddressSuggestion(submission, 'providerResponseService')}">
<div class="form-card__content">
<th:block th:if="${hasSuggestion}">
<th:block th:replace="~{fragments/inputs/overrides/addressSuggestionFound ::
addressSuggestionFound(
header=#{parent-confirm-address.header},
notice=#{parent-confirm-address.note-suggested-addr},
addressInputToCheck='providerResponseService',
inputName='useSuggestedProviderAddress')}"/>
</th:block>
<th:block th:unless="${hasSuggestion}">
<th:block th:replace="~{fragments/inputs/overrides/addressSuggestionNotFound ::
addressSuggestionNotFound(
header=#{parent-confirm-address.header},
notice=#{parent-confirm-address.note-addr-not-found},
addressInputToCheck='providerResponseService',
inputName='useSuggestedProviderAddress',
editAddressURL='/flow/providerresponse/registration-service-address')}"/>
</th:block>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title=#{confirm-mailing-address.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/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent"
th:with="hasSuggestion=${T(org.ilgcc.app.utils.SubmissionUtilities).hasAddressSuggestion(submission, 'providerMailing')}">
<div class="form-card__content">
<th:block th:if="${hasSuggestion}">
<th:block th:replace="~{fragments/inputs/overrides/addressSuggestionFound ::
addressSuggestionFound(
header=#{parent-confirm-address.header},
notice=#{parent-confirm-address.note-suggested-addr},
addressInputToCheck='providerMailing',
inputName='useSuggestedMailingAddress')}"/>
</th:block>
<th:block th:unless="${hasSuggestion}">
<th:block th:replace="~{fragments/inputs/overrides/addressSuggestionNotFound ::
addressSuggestionNotFound(
header=#{parent-confirm-address.header},
notice=#{parent-confirm-address.note-addr-not-found},
addressInputToCheck='providerMailing',
inputName='useSuggestedMailingAddress',
editAddressURL='/flow/providerresponse/registration-mailing-address')}"/>
</th:block>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title=#{provider-response-contact-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/gcc-icons :: typing}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{provider-response-contact-info.header})}"/>
<th:block
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::contact-info})}">
<th:block th:ref="contact-info">
<div class="form-card__content">
<th:block th:replace="~{fragments/inputs/text ::
text(inputName='providerResponseContactEmail',
label=#{provider-response-contact-info.email},
helpText=#{provider-response-contact-info.email-help})}" />
<th:block
th:replace="~{fragments/inputs/phone :: phone(
inputName='providerResponseContactPhoneNumber',
label=#{provider-response-contact-info.phone},
helpText=#{provider-response-contact-info.phone-help})}"/>
</div>
<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}"/>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title=#{parent-info-review.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/gcc-icons :: evaluatingInformation}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-review.header})}"/>
<th:block
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::info})}">
<th:block th:ref="info">
<div class="form-card__content">
<p class="text--left"><strong
th:text="#{provider-response-info-review.basic-info}"></strong>
</p>
<ol class="list--bulleted">
<li id="business-name"
th:text="${inputData.get('providerResponseBusinessName')}"></li>
<li id="full-name"
th:text="|${inputData.get('providerResponseFirstName')} ${inputData.get('providerResponseLastName')}|"></li>
</ol>
<a id="edit-parent-info-basic" th:href="|/flow/${flow}/registration-info|"
th:text="#{provider-response-info-review.basic-info-edit}"></a>
<hr class="spacing-below-15 spacing-above-15">

<p class="text--left"><strong
th:text="#{provider-response-info-review.child-care-service-address}"></strong>
</p>
<div id="address-1"
th:text="${inputData.get('providerResponseServiceStreetAddress1')}"></div>
<div id="address-2"
th:if="${inputData.containsKey('providerResponseServiceStreetAddress2')}"
th:text="${inputData.get('providerResponseServiceStreetAddress2')}"></div>
<div id="city-state"
th:text="|${inputData.get('providerResponseServiceCity')}, ${inputData.get('providerResponseServiceState')}|"></div>
<div id="zipcode"
th:text="${inputData.get('providerResponseServiceZipCode')}"></div>
<br>
<a id="edit-home-address" th:href="|/flow/${flow}/registration-service-address|"
th:text="#{provider-response-info-review.child-care-service-address-edit}"></a>
<hr class="spacing-below-15 spacing-above-15">
<p class="text--left"><strong
th:text="#{parent-info-review.contact.info}"></strong></p>
<ol class="list--bulleted">
<li id="email"
th:if="${!#strings.isEmpty(inputData.get('providerResponseContactEmail'))}"
th:text="${inputData.get('providerResponseContactEmail')}"></li>
<li id="phone"
th:if="${!#strings.isEmpty(inputData.get('providerResponseContactPhoneNumber'))}"
th:text="${inputData.get('providerResponseContactPhoneNumber')}"></li>
</ol>
<div th:if="${#strings.isEmpty(inputData['providerResponseContactEmail']) and #strings.isEmpty(inputData['providerResponseContactPhoneNumber'])}">
<p th:text="#{general.none-added}"></p>
</div>
<a id="edit-parent-contact-info-basic"
th:href="|/flow/${flow}/registration-contact-info|"
th:text="#{parent-info-review.contact.info.link}"></a>
</div>
<div class="form-card__footer">
<th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
text=#{general.button.continue})}" />
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title=#{provider-response-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/gcc-icons :: caring}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{provider-response-info.header})}"/>
<th:block
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::info})}">
<th:block th:ref="info">
<div class="form-card__content">
<th:block th:replace="~{fragments/inputs/text ::
text(inputName='providerResponseFirstName',
label=#{provider-response-info.first-name},
helpText=#{provider-response-info.first-name-help})}"/>
<th:block th:replace="~{fragments/inputs/text ::
text(inputName='providerResponseLastName',
label=#{provider-response-info.last-name},
helpText=#{provider-response-info.last-name-help})}"/>
<th:block th:replace="~{fragments/inputs/text ::
text(inputName='providerResponseBusinessName',
label=#{provider-response-info.business-name},
helpText=#{provider-response-info.business-name-help})}"/>
</div>
<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}"/>
</body>
</html>
Loading

0 comments on commit 96646e8

Please sign in to comment.