Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B 22097 int #14930

Open
wants to merge 31 commits into
base: integrationTesting
Choose a base branch
from
+124 −111
Open

B 22097 int #14930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
93499f5
initial merge of main with new migration process
MInthavongsay Feb 21, 2025
4e72bd7
Merge branch 'main' into B-21423-Prime-Int-SIT-Service-Item
MInthavongsay Feb 21, 2025
a7b9925
Merge branch 'main' into B-21423-Prime-Int-SIT-Service-Item
r-mettler Feb 24, 2025
ca78918
Merge branch 'main' into B-21322-MAIN
traskowskycaci Feb 25, 2025
0ed7005
MAIN rebase
MInthavongsay Feb 25, 2025
21c8594
MAIN rebase
MInthavongsay Feb 25, 2025
2fdfda4
MAIN rebase
MInthavongsay Feb 25, 2025
016ceea
Merge branch 'B-21423-Prime-Int-SIT-Service-Item' of github.com:trans…
MInthavongsay Feb 25, 2025
305b80e
Merge branch 'main' into B-21322-MAIN
traskowskycaci Feb 26, 2025
9389f9a
Merge branch 'main' into MAIN-B-21669-doc_viewer_file_upload_status_p…
samaysofo Feb 26, 2025
2cee433
Merge branch 'main' into B-21322-MAIN
traskowskycaci Feb 27, 2025
e65617d
Merge pull request #14233 from transcom/B-21322-MAIN
deandreJones Feb 27, 2025
45f5ba1
Merge branch 'main' into MAIN-B-21669-doc_viewer_file_upload_status_p…
samaysofo Feb 27, 2025
92c6140
Merge pull request #14909 from transcom/MAIN-B-21669-doc_viewer_file_…
brianmanley-caci Feb 28, 2025
34a4c24
Merge branch 'main' into MAIN-B-22653
danieljordan-caci Feb 28, 2025
18ec23f
Merge branch 'main' into MAIN-B-22769
danieljordan-caci Feb 28, 2025
e33868a
Merge remote-tracking branch 'origin/main' into MAIN-B-22660
danieljordan-caci Feb 28, 2025
6d24c0c
Merge pull request #14880 from transcom/MAIN-B-22660
deandreJones Feb 28, 2025
bc75feb
MAIN rebase
MInthavongsay Feb 28, 2025
ee87859
Merge branch 'main' into B-21423-Prime-Int-SIT-Service-Item
MInthavongsay Feb 28, 2025
20ef47d
Merge branch 'main' into MAIN-B-22769
danieljordan-caci Feb 28, 2025
e6e80e5
Merge pull request #14672 from transcom/B-21423-Prime-Int-SIT-Service…
r-mettler Feb 28, 2025
069057c
Merge branch 'main' into MAIN-B-22769
danieljordan-caci Feb 28, 2025
3338f43
MAIN rebase
MInthavongsay Feb 28, 2025
df502ed
Merge pull request #14874 from transcom/MAIN-B-22769
deandreJones Feb 28, 2025
3863d37
Merge branch 'main' into MAIN-B-22653
danieljordan-caci Feb 28, 2025
8ea5f45
Merge pull request #14889 from transcom/MAIN-B-22653
deandreJones Feb 28, 2025
5361681
Merge branch 'main' into B-21424-Address-Change
r-mettler Feb 28, 2025
02cd5a7
Merge pull request #14798 from transcom/B-21424-Address-Change
r-mettler Mar 3, 2025
c29d1c2
radio buttons are side by side now
loganwc Mar 3, 2025
b30d8d2
merge B-22097
loganwc Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/models/move.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ type Move struct {
TOODestinationAssignedUser *OfficeUser `json:"too_destination_assigned" belongs_to:"office_users" fk_id:"too_destination_assigned_id"`
CounselingOfficeID *uuid.UUID `json:"counseling_transportation_office_id" db:"counseling_transportation_office_id"`
CounselingOffice *TransportationOffice `json:"counseling_transportation_office" belongs_to:"transportation_offices" fk_id:"counseling_transportation_office_id"`
PrimeAcknowledgedAt *time.Time `db:"prime_acknowledged_at"`
PrimeAcknowledgedAt *time.Time `db:"prime_acknowledged_at"`
}

type MoveWithEarliestDate struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/mto_shipments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ type MTOShipment struct {
DestinationSITAuthEndDate *time.Time `json:"destination_sit_auth_end_date" db:"dest_sit_auth_end_date"`
MobileHome *MobileHome `json:"mobile_home" has_one:"mobile_home" fk_id:"shipment_id"`
MarketCode MarketCode `json:"market_code" db:"market_code"`
PrimeAcknowledgedAt *time.Time `db:"prime_acknowledged_at"`
PrimeAcknowledgedAt *time.Time `db:"prime_acknowledged_at"`
}

// TableName overrides the table name used by Pop.
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/rejected_office_users/rejected_office_users_list_fetcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (suite *RejectedOfficeUsersServiceSuite) TestFetchRejectedOfficeUserList()
factory.BuildOfficeUserWithRoles(suite.DB(), []factory.Customization{
{
Model: models.OfficeUser{
Status: &rejectedStatus,
Status: &rejectedStatus,
},
},
}, []roles.RoleType{roles.RoleTypeTOO})
Expand Down
229 changes: 121 additions & 108 deletions src/components/Customer/PPM/Booking/DateAndLocationForm/DateAndLocationForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,26 +227,29 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
<Fieldset>
<legend className="usa-label">Will you add items to your PPM from a second address?</legend>
<RequiredTag />
<Field
as={Radio}
data-testid="yes-secondary-pickup-address"
id="yes-secondary-pickup-address"
label="Yes"
name="hasSecondaryPickupAddress"
value="true"
checked={values.hasSecondaryPickupAddress === 'true'}
disabled={!isPreceedingAddressComplete('true', values.pickupAddress.address)}
/>
<Field
as={Radio}
data-testid="no-secondary-pickup-address"
id="no-secondary-pickup-address"
label="No"
name="hasSecondaryPickupAddress"
value="false"
checked={values.hasSecondaryPickupAddress === 'false'}
disabled={!isPreceedingAddressComplete('true', values.pickupAddress.address)}
/>

<div className={formStyles.radioGroup}>
<Field
as={Radio}
data-testid="yes-secondary-pickup-address"
id="yes-secondary-pickup-address"
label="Yes"
name="hasSecondaryPickupAddress"
value="true"
checked={values.hasSecondaryPickupAddress === 'true'}
disabled={!isPreceedingAddressComplete('true', values.pickupAddress.address)}
/>
<Field
as={Radio}
data-testid="no-secondary-pickup-address"
id="no-secondary-pickup-address"
label="No"
name="hasSecondaryPickupAddress"
value="false"
checked={values.hasSecondaryPickupAddress === 'false'}
disabled={!isPreceedingAddressComplete('true', values.pickupAddress.address)}
/>
</div>
</Fieldset>
</FormGroup>
{values.hasSecondaryPickupAddress === 'true' && (
Expand Down Expand Up @@ -276,38 +279,40 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
<legend className="usa-label">Will you add items to your PPM from a third address?</legend>
<RequiredTag />
<Fieldset>
<Field
as={Radio}
id="yes-tertiary-pickup-address"
data-testid="yes-tertiary-pickup-address"
label="Yes"
name="hasTertiaryPickupAddress"
value="true"
title="Yes, I have a third delivery address"
checked={values.hasTertiaryPickupAddress === 'true'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryPickupAddress,
values.secondaryPickupAddress.address,
)
}
/>
<Field
as={Radio}
id="no-tertiary-pickup-address"
data-testid="no-tertiary-pickup-address"
label="No"
name="hasTertiaryPickupAddress"
value="false"
title="No, I do not have a third delivery address"
checked={values.hasTertiaryPickupAddress === 'false'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryPickupAddress,
values.secondaryPickupAddress.address,
)
}
/>
<div className={formStyles.radioGroup}>
<Field
as={Radio}
id="yes-tertiary-pickup-address"
data-testid="yes-tertiary-pickup-address"
label="Yes"
name="hasTertiaryPickupAddress"
value="true"
title="Yes, I have a third delivery address"
checked={values.hasTertiaryPickupAddress === 'true'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryPickupAddress,
values.secondaryPickupAddress.address,
)
}
/>
<Field
as={Radio}
id="no-tertiary-pickup-address"
data-testid="no-tertiary-pickup-address"
label="No"
name="hasTertiaryPickupAddress"
value="false"
title="No, I do not have a third delivery address"
checked={values.hasTertiaryPickupAddress === 'false'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryPickupAddress,
values.secondaryPickupAddress.address,
)
}
/>
</div>
</Fieldset>
</FormGroup>
</div>
Expand Down Expand Up @@ -351,30 +356,36 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
/>
{fields}
<FormGroup>
<Fieldset>
<legend className="usa-label">Will you deliver part of your PPM to a second address?</legend>
<RequiredTag />
<Field
as={Radio}
data-testid="yes-secondary-destination-address"
id="hasSecondaryDestinationAddressYes"
label="Yes"
name="hasSecondaryDestinationAddress"
value="true"
checked={values.hasSecondaryDestinationAddress === 'true'}
disabled={!isPreceedingAddressComplete('true', values.destinationAddress.address)}
/>
<Field
as={Radio}
data-testid="no-secondary-destination-address"
id="hasSecondaryDestinationAddressNo"
label="No"
name="hasSecondaryDestinationAddress"
value="false"
checked={values.hasSecondaryDestinationAddress === 'false'}
disabled={!isPreceedingAddressComplete('true', values.destinationAddress.address)}
/>
</Fieldset>
<div className={formStyles.radioGroup}>
<Fieldset>
<legend className="usa-label">
Will you deliver part of your PPM to a second address?
</legend>
<RequiredTag />
<div className={formStyles.radioGroup}>
<Field
as={Radio}
data-testid="yes-secondary-destination-address"
id="hasSecondaryDestinationAddressYes"
label="Yes"
name="hasSecondaryDestinationAddress"
value="true"
checked={values.hasSecondaryDestinationAddress === 'true'}
disabled={!isPreceedingAddressComplete('true', values.destinationAddress.address)}
/>
<Field
as={Radio}
data-testid="no-secondary-destination-address"
id="hasSecondaryDestinationAddressNo"
label="No"
name="hasSecondaryDestinationAddress"
value="false"
checked={values.hasSecondaryDestinationAddress === 'false'}
disabled={!isPreceedingAddressComplete('true', values.destinationAddress.address)}
/>
</div>
</Fieldset>
</div>
</FormGroup>
{values.hasSecondaryDestinationAddress === 'true' && (
<>
Expand Down Expand Up @@ -404,38 +415,40 @@ const DateAndLocationForm = ({ mtoShipment, destinationDutyLocation, serviceMemb
<legend className="usa-label">Will you deliver part of your PPM to a third address?</legend>
<RequiredTag />
<Fieldset>
<Field
as={Radio}
id="has-tertiary-delivery"
data-testid="yes-tertiary-destination-address"
label="Yes"
name="hasTertiaryDestinationAddress"
value="true"
title="Yes, I have a third delivery address"
checked={values.hasTertiaryDestinationAddress === 'true'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryDestinationAddress,
values.secondaryDestinationAddress.address,
)
}
/>
<Field
as={Radio}
id="no-tertiary-delivery"
data-testid="no-tertiary-destination-address"
label="No"
name="hasTertiaryDestinationAddress"
value="false"
title="No, I do not have a third delivery address"
checked={values.hasTertiaryDestinationAddress === 'false'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryDestinationAddress,
values.secondaryDestinationAddress.address,
)
}
/>
<div className={formStyles.radioGroup}>
<Field
as={Radio}
id="has-tertiary-delivery"
data-testid="yes-tertiary-destination-address"
label="Yes"
name="hasTertiaryDestinationAddress"
value="true"
title="Yes, I have a third delivery address"
checked={values.hasTertiaryDestinationAddress === 'true'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryDestinationAddress,
values.secondaryDestinationAddress.address,
)
}
/>
<Field
as={Radio}
id="no-tertiary-delivery"
data-testid="no-tertiary-destination-address"
label="No"
name="hasTertiaryDestinationAddress"
value="false"
title="No, I do not have a third delivery address"
checked={values.hasTertiaryDestinationAddress === 'false'}
disabled={
!isPreceedingAddressComplete(
values.hasSecondaryDestinationAddress,
values.secondaryDestinationAddress.address,
)
}
/>
</div>
</Fieldset>
</FormGroup>
</div>
Expand Down
Loading