| duplicate-id | WCAG 2 Level A, WCAG 4.1.1 | minor | -1 | +8 | |
| 2 | +Heading levels should only increase by one | +heading-order | +Best practice | +moderate | +1 | +
|---|---|---|---|---|---|
| 3 | +Links must be distinguishable without relying on color | +link-in-text-block | +WCAG 2 Level A, WCAG 1.4.1 | +serious | +1 | +
| 4 | +Page should contain a level-one heading | +page-has-heading-one | +Best practice | +moderate | +1 | +
| 5 | All page content should be contained by landmarks | region | Best practice | @@ -172,7 +196,7 @@
@@ -185,6 +209,360 @@
#app-root > .TitleAnnouncer_HiddenTitleAnnouncer__IxWhC[aria-live="polite"] |
|
| 2 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 3 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 4 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 5 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 6 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 7 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+ |||
| 8 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+
Ensures the order of headings is semantically correct
+| # | +Issue Description | ++ To solve this violation, you need to... + | +
|---|---|---|
| 1 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
|
+
Ensure links are distinguished from surrounding text in a way that does not rely on color
+| # | +Issue Description | ++ To solve this violation, you need to... + | +
|---|---|---|
| 1 | +
+ Element location +Element source + |
+
+
+
+ Fix any of the following: +
Related node: + |
+
Ensure that the page, or at least one of its frames contains a level-one heading
+| # | +Issue Description | ++ To solve this violation, you need to... + | +
|---|---|---|
| 1 | +
+ Element location +Element source + |
+
+
+
+ Fix all of the following: +
|
+
*** DO NOT REPLY directly to this email ***
+This is a confirmation that your counselor has approved move details for the assigned move code abc123 from origDutyLocation to destDutyLocation in the MilMove system.
+What this means to you: If you are doing a Personally Procured Move (PPM), you can start moving your personal property.
+Next steps for a PPM:
Next steps for government arranged shipments:
Thank you,
USTRANSCOM MilMove Team
The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974. Failure to protect Privacy Act information could result in a $5,000 fine.
` htmlContent, err := notification.RenderHTML(suite.AppContextWithSessionForTest(&auth.Session{ @@ -99,9 +104,12 @@ func (suite *NotificationSuite) TestMoveCounseledTextTemplateRender() { } expectedTextContent := `*** DO NOT REPLY directly to this email *** + This is a confirmation that your counselor has approved move details for the assigned move code abc123 from origDutyLocation to destDutyLocation in the MilMove system. + What this means to you: If you are doing a Personally Procured Move (PPM), you can start moving your personal property. + Next steps for a PPM: * Remember to get legible certified weight tickets for both the empty and full weights for every trip you perform. If you do not upload legible certified weight tickets, your PPM incentive (or Actual Expense Reimbursement for Civilians) could be affected. Failure to obtain weight tickets will result in losing eligibility to receive your incentive. Note: To receive allowance for Pro-Gear, you must identify allowable items and provide weight tickets separately for Pro-Gear. @@ -110,12 +118,15 @@ Note: To receive allowance for Pro-Gear, you must identify allowable items and p * Storage costs cannot be paid in advance. * If your counselor approved an Advance Operating Allowance (AOA, or cash advance) for a PPM, log into MilMove{content}
-| User | +Workload | +Assignment | +
|---|---|---|
|
+ {userName(user)} + |
+
+ {user.workload || 0} + |
+ + + | +
Do you want movers to pick up any belongings from a third address?
@@ -414,9 +415,15 @@ class MtoShipmentForm extends Component { data-testid="has-tertiary-pickup" label="Yes" name="hasTertiaryPickup" - value="yes" + value="true" title="Yes, I have a third pickup address" - checked={hasTertiaryPickup === 'yes'} + checked={hasTertiaryPickup === 'true'} + disabled={ + !isPreceedingAddressComplete( + hasSecondaryPickup, + values.secondaryPickup.address, + ) + } />Do you want movers to deliver any belongings to a third address?
@@ -569,9 +584,15 @@ class MtoShipmentForm extends Component { data-testid="has-tertiary-delivery" label="Yes" name="hasTertiaryDelivery" - value="yes" + value="true" title="Yes, I have a third delivery address" - checked={hasTertiaryDelivery === 'yes'} + checked={hasTertiaryDelivery === 'true'} + disabled={ + !isPreceedingAddressComplete( + hasSecondaryDelivery, + values.secondaryDelivery.address, + ) + } />
We can use the zip of your new duty location.
@@ -616,7 +643,7 @@ class MtoShipmentForm extends Component {
You can add the specific delivery address later, once you know it.
We can use the zip of the HOR, PLEAD or HOS you entered with your orders.
diff --git a/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx b/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
index 424bbe04d55..4205d3e9155 100644
--- a/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
+++ b/src/components/Customer/MtoShipmentForm/MtoShipmentForm.test.jsx
@@ -388,24 +388,24 @@ describe('MtoShipmentForm component', () => {
await userEvent.click(screen.getByTitle('Yes, I have a second delivery address'));
const streetAddress1 = await screen.findAllByLabelText(/Address 1/);
- expect(streetAddress1.length).toBe(3);
- expect(streetAddress1[2]).toHaveAttribute('name', 'secondaryDelivery.address.streetAddress1');
+ expect(streetAddress1[0]).toHaveAttribute('name', 'pickup.address.streetAddress1');
+ expect(streetAddress1[1]).toHaveAttribute('name', 'delivery.address.streetAddress1');
const streetAddress2 = await screen.findAllByLabelText(/Address 2/);
- expect(streetAddress2.length).toBe(3);
- expect(streetAddress2[2]).toHaveAttribute('name', 'secondaryDelivery.address.streetAddress2');
+ expect(streetAddress2[0]).toHaveAttribute('name', 'pickup.address.streetAddress2');
+ expect(streetAddress2[1]).toHaveAttribute('name', 'delivery.address.streetAddress2');
const city = screen.getAllByTestId('City');
- expect(city.length).toBe(3);
- expect(city[2]).toHaveAttribute('aria-label', 'secondaryDelivery.address.city');
+ expect(city[0]).toHaveAttribute('aria-label', 'pickup.address.city');
+ expect(city[1]).toHaveAttribute('aria-label', 'delivery.address.city');
const state = await screen.getAllByTestId(/State/);
- expect(state.length).toBe(3);
- expect(state[2]).toHaveAttribute('aria-label', 'secondaryDelivery.address.state');
+ expect(state[0]).toHaveAttribute('aria-label', 'pickup.address.state');
+ expect(state[1]).toHaveAttribute('aria-label', 'delivery.address.state');
const zip = await screen.getAllByTestId(/ZIP/);
- expect(zip.length).toBe(3);
- expect(zip[2]).toHaveAttribute('aria-label', 'secondaryDelivery.address.postalCode');
+ expect(zip[0]).toHaveAttribute('aria-label', 'pickup.address.postalCode');
+ expect(zip[1]).toHaveAttribute('aria-label', 'delivery.address.postalCode');
});
it('goes back when the back button is clicked', async () => {
diff --git a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.jsx b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.jsx
index 51ca8552b27..e4ab0bf904c 100644
--- a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.jsx
+++ b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.jsx
@@ -36,7 +36,6 @@ const OrdersInfoForm = ({ ordersTypeOptions, initialValues, onSubmit, onBack })
const [hasDependents, setHasDependents] = useState(false);
const [isOconusMove, setIsOconusMove] = useState(false);
const [enableUB, setEnableUB] = useState(false);
-
const [isHasDependentsDisabled, setHasDependentsDisabled] = useState(false);
const [prevOrderType, setPrevOrderType] = useState('');
const [filteredOrderTypeOptions, setFilteredOrderTypeOptions] = useState(ordersTypeOptions);
diff --git a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
index ca158d027cd..f4df895c05a 100644
--- a/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
+++ b/src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
@@ -21,6 +21,7 @@ import { OptionalAddressSchema } from 'components/Customer/MtoShipmentForm/valid
import { requiredAddressSchema, partialRequiredAddressSchema } from 'utils/validation';
import { isBooleanFlagEnabled } from 'utils/featureFlags';
import RequiredTag from 'components/form/RequiredTag';
+import { isSecondaryAddressCompletePPM } from 'shared/utils';
let meta = '';
@@ -276,6 +277,12 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
value="true"
title="Yes, I have a third delivery address"
checked={values.hasTertiaryPickupAddress === 'true'}
+ disabled={
+ !isSecondaryAddressCompletePPM(
+ values.hasSecondaryPickupAddress,
+ values.secondaryPickupAddress.address,
+ )
+ }
/>
Download service item documentation:
+ {serviceRequestDocUploads.map((file) => ( + + ))} +Download service item documentation:
+ {serviceRequestDocUploads.map((file) => ( + + ))} +Download service item documentation:
- {serviceRequestDocUploads.map((file) => ( - - ))} -Download service item documentation:
+ {serviceRequestDocUploads.map((file) => ( + + ))} +