Skip to content

Commit

Permalink
Merge branch 'VACMS-17863-add-validation-ext-field-in-phone-paragraph…
Browse files Browse the repository at this point in the history
…' of github.com:department-of-veterans-affairs/va.gov-cms into VACMS-17863-add-validation-ext-field-in-phone-paragraph
  • Loading branch information
dsasser committed Feb 25, 2025
2 parents 2364297 + 1b9d8b5 commit 1b18df5
Show file tree
Hide file tree
Showing 32 changed files with 857 additions and 404 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/runbook-vba-facility-launch.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Facility CMS link: <insert_facility_link>
### Publishing
- [ ] Set the VBA Facility to Published, and note approvals in the revision log
- [ ] Ask Michelle Middaugh to update the facility URL in Sandy's Database to the modernized URL. This eliminates the need for a URL change request ([LH confirmed](https://dsva.slack.com/archives/C02BTJTDFTN/p1730395863667449?thread_ts=1730395217.135779&cid=C02BTJTDFTN)).
- [ ] Create a [redirect request](https://github.com/department-of-veterans-affairs/va.gov-team/issues/new?assignees=kristinoletmuskat%2C+strelich%2C+Agile6MSkinner&labels=sitewide+CAIA%2C+Sitewide+IA%2C+Facilities%2C+Regional+Office%2C+sitewide%2C+VA.gov+frontend%2C+Redirect+request&projects=&template=redirect-request.md&title=Redirect+Request) to redirect the previous TeamSite page to the modernized page.
- [ ] Create a [redirect request](https://github.com/department-of-veterans-affairs/va.gov-team/issues/new?assignees=mnorthuis%2C+Agile6MSkinner&labels=sitewide+CAIA%2C+Sitewide+IA%2C+Facilities%2C+Regional+Office%2C+sitewide%2C+VA.gov+frontend%2C+Redirect+request&projects=&template=redirect-request.md&title=Redirect+Request) to redirect the previous TeamSite page to the modernized page.
- [ ] **Indicate in ticket** that this is a [page level redirect for a Teamsite using the injected header](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/engineering/redirect-implementation-strategy.md#3-subdomain--vagov-page-level-cross-domain-redirect-for-a-subdomain-that-loads-proxy-rewrite-js) -- it can be done within proxy rewrite as a client-side redirect

## Facilities PM / DM tasks
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/taxonomy-add-term.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ body:
**Technical Coordination**
- [ ] Work with Lighthouse to update the Facilities API to accept new value
- This step can begin as soon as the API ID has been finalized and saved as Draft in Drupal
- [ ] Drupal contributor must update the [vamc-facility-health-services view](https://main-8ry6zt2asg946vdfuiryyamuc9gkuyzc.demo.cms.va.gov/admin/structure/views/view/facility_services/edit/vamc_facility_health_services_page?destination=/admin/content/facilities/vamc-facility-health-services) to add the new Service to the Services filter list
**Launch & Change Management**
- [ ] Once Content Review and Technical Coordination are complete, term can be published in Drupal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ public function run(Request $request, string $app_root, string $site_path) {
$html = $this->loadMaintenanceHtml($app_root, $site_path);
$expected_update_duration = '10';
$html = preg_replace('/\{\{\s*update_duration\s*\}\}/', $expected_update_duration, $html);
throw new ServiceUnavailableHttpException(120, $html);
$headers = [
'Content-Type' => 'text/html',
];
throw new ServiceUnavailableHttpException(120, $html, NULL, 503, $headers);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ a.form-builder-button--secondary:hover {

/* button group */
.form-builder-button-group {
display: flex;
gap: var(--units-1p5);
margin-top: var(--units-4);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.form-builder-non-editable-pattern__main-content {
width: 600px;
}

#heading-with-label-step-label {
margin-bottom: var(--units-5);
margin-top: var(--units-4);
}

.form-builder-non-editable-pattern__step_description > p {
margin-bottom: var(--units-4);
}

.form-builder-non-editable-pattern__default-appearance > img {
margin-top: var(--units-2);
}

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@ public function layout($nid) {
],
'#your_personal_info' => [
'status' => $this->digitalForm->getStepStatus('your_personal_info'),
'url' => '',
'url' => $this->getPageUrl('name_and_dob'),
],
'#address_info' => [
'status' => $this->digitalForm->getStepStatus('address_info'),
'url' => '',
'url' => $this->getPageUrl('address_info'),
],
'#contact_info' => [
'status' => $this->digitalForm->getStepStatus('contact_info'),
Expand Down Expand Up @@ -382,15 +382,95 @@ public function layout($nid) {
* The node id of the Digital Form.
*/
public function nameAndDob($nid) {
$formName = 'NameAndDob';
$subtitle = 'Subtitle Placeholder';
$nodeFound = $this->loadDigitalForm($nid);
if (!$nodeFound) {
throw new NotFoundHttpException();
}

$pageContent = [
'#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'name_and_dob',
'#preview' => [
'alt_text' => 'Name-and-date-of-birth preview',
'url' => '/modules/custom/va_gov_form_builder/images/name-and-dob.png',
],
'#primary_button' => [
'label' => 'Save and continue',
'url' => $this->getPageUrl('layout'),
],
'#secondary_button' => [
'label' => 'Next page',
'url' => $this->getPageUrl('identification_info'),
],
];
$subtitle = $this->digitalForm->getTitle();
$breadcrumbs = $this->generateBreadcrumbs('layout', 'Personal information');
$libraries = ['page_content__layout__non_editable_pattern'];

return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
}

/**
* Identification-info page.
*
* @param string $nid
* The node id of the Digital Form.
*/
public function identificationInfo($nid) {
$nodeFound = $this->loadDigitalForm($nid);
if (!$nodeFound) {
throw new NotFoundHttpException();
}

$pageContent = [
'#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'identification_info',
'#preview' => [
'alt_text' => 'Identification-information preview',
'url' => '/modules/custom/va_gov_form_builder/images/identification-info.png',
],
'#primary_button' => [
'label' => 'Save and continue',
'url' => $this->getPageUrl('layout'),
],
'#secondary_button' => [
'label' => 'Previous page',
'url' => $this->getPageUrl('name_and_dob'),
],
];
$subtitle = $this->digitalForm->getTitle();
$breadcrumbs = $this->generateBreadcrumbs('layout', 'Personal information');
$libraries = ['page_content__layout__non_editable_pattern'];

return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
}

/**
* Address-info page.
*
* @param string $nid
* The node id of the Digital Form.
*/
public function addressInfo($nid) {
$nodeFound = $this->loadDigitalForm($nid);
if (!$nodeFound) {
throw new NotFoundHttpException();
}

return $this->getFormPage($formName, $subtitle);
$pageContent = [
'#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'address_info',
'#preview' => [
'alt_text' => 'Address-information preview',
'url' => '/modules/custom/va_gov_form_builder/images/address-info.png',
],
'#primary_button' => [
'label' => 'Save and continue',
'url' => $this->getPageUrl('layout'),
],
];
$subtitle = $this->digitalForm->getTitle();
$breadcrumbs = $this->generateBreadcrumbs('layout', 'Address information');
$libraries = ['page_content__layout__non_editable_pattern'];

return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
}

/**
Expand All @@ -407,12 +487,18 @@ public function reviewAndSign($nid) {

$pageContent = [
'#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'review_and_sign',
'#statement_of_truth_preview_url' => '/modules/custom/va_gov_form_builder/images/statement-of-truth.png',
'#return_to_layout_url' => $this->getPageUrl('layout'),
'#preview' => [
'alt_text' => 'Statement-of-truth preview',
'url' => '/modules/custom/va_gov_form_builder/images/statement-of-truth.png',
],
'#primary_button' => [
'label' => 'Save and continue',
'url' => $this->getPageUrl('layout'),
],
];
$subtitle = $this->digitalForm->getTitle();
$breadcrumbs = $this->generateBreadcrumbs('layout', 'Review page');
$libraries = ['review_and_sign'];
$libraries = ['page_content__layout__non_editable_pattern'];

return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
}
Expand Down
170 changes: 0 additions & 170 deletions docroot/modules/custom/va_gov_form_builder/src/Form/NameAndDob.php

This file was deleted.

Loading

0 comments on commit 1b18df5

Please sign in to comment.