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.

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

DO NOT REVIEW -- INFORMATIONAL -- B 18434 UI wireup payload #11878

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6fac3c6
inital draft
AMA113 Dec 22, 2023
c4ee6f4
populate address when check box is clicked
r-mettler Dec 23, 2023
f89fb83
functional checkbox
AMA113 Dec 26, 2023
1c814de
forms set for origin and destination
AMA113 Dec 29, 2023
071a0f1
daily save
AMA113 Dec 29, 2023
0610efc
database migration file for ppm_shipments table
AMA113 Jan 9, 2024
a2c1aea
manifist document
AMA113 Jan 9, 2024
82c16e1
changes to DateAndLocationForm
AMA113 Jan 9, 2024
d5d1c75
changes to DateAndLocationForm
AMA113 Jan 17, 2024
ee5ed66
Added Origin and Destination address fields
AMA113 Jan 18, 2024
53822a2
Merge branch 'main' of github.com:transcom/mymove into B-17919
AMA113 Jan 18, 2024
a10799b
changes to DateAndLocationForm and Test
AMA113 Jan 22, 2024
0e91f28
Merge branch 'main' of github.com:transcom/mymove into B-17919
AMA113 Jan 22, 2024
aa3cef2
updated tests, still some failures
r-mettler Jan 23, 2024
06fbbc4
changes to DateAndLocation.test
AMA113 Jan 23, 2024
f475bfd
fixing more tests
r-mettler Jan 24, 2024
25d3d4a
fixed requiredAlerts test failures
r-mettler Jan 24, 2024
d18e544
resolved tests for DateAndLocationForm
r-mettler Jan 25, 2024
b759893
can't finish these tests because UI needs more updates for these to work
r-mettler Jan 25, 2024
43b94e1
Merge branch 'B-17919' of github.com:transcom/mymove into B-17919
AMA113 Jan 25, 2024
1683423
fixed html labels to display correct verbiage
AMA113 Jan 25, 2024
2646c26
formatted code
AMA113 Jan 25, 2024
2213b87
fixed verbiage on checkbox
AMA113 Jan 26, 2024
e7244b1
took out unassigned variables
AMA113 Jan 26, 2024
14c105e
Merge branch 'B-17919' into B-18434-UI-Wireup-Payload
MInthavongsay Jan 26, 2024
19fb09e
update unused variables
r-mettler Jan 26, 2024
22b2817
update comments
r-mettler Jan 27, 2024
93f2c9b
Merge branch 'main' of github.com:transcom/mymove into B-17919
r-mettler Jan 27, 2024
aae48b8
remove more unused variables
r-mettler Jan 27, 2024
4bc1aa4
comment out submitsDateAndLocation test, update in 18434 with new UI
r-mettler Jan 27, 2024
ca1f75a
just checking it in for ppl to look at.
MInthavongsay Jan 29, 2024
cc411c2
Merge branch 'main' of github.com:transcom/mymove into B-17919
r-mettler Jan 29, 2024
6470d7d
validation changes, change variables used to store addresses
r-mettler Jan 29, 2024
813b5f6
fixed tests for createMTOShipment, patchMTOShipment to be updated wit…
r-mettler Jan 30, 2024
68b22a9
save new update to accommodate 4 new addresses on PPM. Changes also a…
MInthavongsay Jan 30, 2024
f068681
code cleanup
r-mettler Jan 30, 2024
a9f83df
merged rickys changes and updates to get save/update/display to work …
MInthavongsay Jan 30, 2024
41d3eba
delete commented block
MInthavongsay Jan 30, 2024
023a1da
Merge branch 'B-17919' into B-18434-UI-Wireup-Payload
MInthavongsay Jan 30, 2024
929e50e
update schema to make pickup and destination addresses required in in…
MInthavongsay Feb 1, 2024
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
28 changes: 28 additions & 0 deletions pkg/factory/ppm_shipment_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,34 @@ func buildPPMShipmentWithBuildType(db *pop.Connection, customs []Customization,
ppmShipment.W2Address = &w2AddressResult
}

oldDutyLocationAddress := ppmShipment.Shipment.MoveTaskOrder.Orders.OriginDutyLocation.Address
pickupAddress := BuildAddress(db, []Customization{
{
Model: models.Address{
StreetAddress1: "987 New Street",
City: oldDutyLocationAddress.City,
State: oldDutyLocationAddress.State,
PostalCode: oldDutyLocationAddress.PostalCode,
},
},
}, nil)
ppmShipment.PickupAddressID = &pickupAddress.ID
ppmShipment.PickupAddress = &pickupAddress

newDutyLocationAddress := ppmShipment.Shipment.MoveTaskOrder.Orders.NewDutyLocation.Address
destinationAddress := BuildAddress(db, []Customization{
{
Model: models.Address{
StreetAddress1: "123 New Street",
City: newDutyLocationAddress.City,
State: newDutyLocationAddress.State,
PostalCode: newDutyLocationAddress.PostalCode,
},
},
}, nil)
ppmShipment.DestinationAddressID = &destinationAddress.ID
ppmShipment.DestinationAddress = &destinationAddress

// Overwrite values with those from customizations
testdatagen.MergeModels(&ppmShipment, cPPMShipment)

Expand Down
32 changes: 32 additions & 0 deletions pkg/gen/ghcapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading