Skip to content

Commit

Permalink
Merge pull request #14134 from transcom/B-21597-MAIN
Browse files Browse the repository at this point in the history
B-21597 Add Temporary Duty (TDY) Order Type MAIN
  • Loading branch information
cameroncaci authored Nov 7, 2024
2 parents c0f4f0b + 43c50b6 commit 75f147d
Show file tree
Hide file tree
Showing 52 changed files with 385 additions and 99 deletions.
1 change: 1 addition & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1025,4 +1025,5 @@
20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
20241017183144_add_AK_HI_duty_locations.up.sql
20241024114748_create_gbloc_aors.up.sql
20241029125015_add_orders_type_enum.up.sql
20241029144404_hdt-614-adjust-accomack-county.up.sql
18 changes: 18 additions & 0 deletions migrations/app/schema/20241029125015_add_orders_type_enum.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
-- Add enum values for order.orders_type

CREATE TYPE orders_type AS ENUM (
'PERMANENT_CHANGE_OF_STATION',
'LOCAL_MOVE',
'RETIREMENT',
'SEPARATION',
'WOUNDED_WARRIOR',
'BLUEBARK',
'SAFETY',
'TEMPORARY_DUTY');

COMMENT ON TYPE orders_type IS 'The type of orders.';
COMMENT ON COLUMN orders.orders_type IS 'MilMove supports 8 orders types: Permanent change of station (PCS), local move, retirement, separation, wounded warrior, bluebark, safety, and temporary duty (TDY).
In general, the moving process starts with the job/travel orders a customer receives from their service. In the orders, information describing rank, the duration of job/training, and their assigned location will determine if their entire dependent family can come, what the customer is allowed to bring, and how those items will arrive to their new location.';

ALTER TABLE orders
ALTER COLUMN orders_type TYPE orders_type using orders_type::orders_type;
8 changes: 6 additions & 2 deletions pkg/gen/ghcapi/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/ghcmessages/orders_type.go

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

8 changes: 6 additions & 2 deletions pkg/gen/internalapi/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/internalmessages/orders_type.go

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

8 changes: 6 additions & 2 deletions pkg/gen/primeapi/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/primemessages/orders_type.go

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

8 changes: 6 additions & 2 deletions pkg/gen/primev2api/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/primev2messages/orders_type.go

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

8 changes: 6 additions & 2 deletions pkg/gen/primev3api/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/primev3messages/orders_type.go

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

8 changes: 6 additions & 2 deletions pkg/gen/supportapi/embedded_spec.go

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

5 changes: 4 additions & 1 deletion pkg/gen/supportmessages/orders_type.go

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

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import React from 'react';

import EditOrdersForm from './EditOrdersForm';

import { ORDERS_TYPE } from 'constants/orders';

const testInitialValues = {
orders_type: 'PERMANENT_CHANGE_OF_STATION',
orders_type: ORDERS_TYPE.PERMANENT_CHANGE_OF_STATION,
issue_date: '2020-11-08',
report_by_date: '2020-11-26',
has_dependents: 'no',
Expand Down Expand Up @@ -93,6 +95,7 @@ const testProps = {
{ key: 'LOCAL_MOVE', value: 'Local Move' },
{ key: 'RETIREMENT', value: 'Retirement' },
{ key: 'SEPARATION', value: 'Separation' },
{ key: 'TEMPORARY_DUTY', value: 'Temporary Duty (TDY)' },
],
currentDutyLocation: {},
};
Expand Down
Loading

0 comments on commit 75f147d

Please sign in to comment.