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

starts create budget lines #729

Merged
merged 121 commits into from
Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
8e7ace3
starts create budget lines
fpigeonjr Mar 9, 2023
4a8d360
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Mar 9, 2023
ef36327
adds go back functionality
fpigeonjr Mar 9, 2023
bf21f9b
adds ProjectSelect
fpigeonjr Mar 9, 2023
c2582d4
adds uswds js
fpigeonjr Mar 10, 2023
ab9a8c1
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Mar 10, 2023
68d7528
removes banner
fpigeonjr Mar 10, 2023
012cdcf
updates to comboBox
fpigeonjr Mar 10, 2023
03f1b4d
adds hard-coded step indicators
fpigeonjr Mar 10, 2023
302a38c
adds Agreement Selector
fpigeonjr Mar 10, 2023
6ccfc8b
wip
fpigeonjr Mar 10, 2023
f8e7864
adds Can select
fpigeonjr Mar 10, 2023
6728b15
cleanup
fpigeonjr Mar 10, 2023
4b87a7f
rename comp and better layout
fpigeonjr Mar 10, 2023
81673c6
adds text area
fpigeonjr Mar 10, 2023
ad50cbc
Merge branch 'main' into OPS-674-BL-FrontEnd
tdonaworth Mar 16, 2023
ab95495
Merge branch 'main' into OPS-674-BL-FrontEnd
tdonaworth Mar 16, 2023
ee6a73d
created state
tdonaworth Mar 17, 2023
aa0882c
fixed oidc redirect_url issue
tdonaworth Mar 17, 2023
0c8d6f6
created ResearchProject api functions
tdonaworth Mar 17, 2023
cc75c79
created initial Agreements api functions
tdonaworth Mar 17, 2023
7008de8
started wiring up the CreateBudgetLine page -WIP
tdonaworth Mar 17, 2023
f659da0
upped the token timeout for local dev environment
tdonaworth Mar 17, 2023
884ea42
added more research_project examples
tdonaworth Mar 17, 2023
b222410
WIP
tdonaworth Mar 17, 2023
2408cab
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Mar 17, 2023
2f21a7d
wip
fpigeonjr Mar 20, 2023
51c833e
read-ahead is working
fpigeonjr Mar 20, 2023
929337a
WIP - kinda working
tdonaworth Mar 21, 2023
e44253b
pre-load data
tdonaworth Mar 22, 2023
a1ce547
getAllAgreements
tdonaworth Mar 22, 2023
b74d2d5
adds agreements
fpigeonjr Mar 22, 2023
c62ca33
cleanup
fpigeonjr Mar 22, 2023
0a7e9f2
Merge branch 'OPS-737_Project_Search_Component_Custom' into OPS-674-B…
fpigeonjr Mar 22, 2023
26323b1
updates button layout
fpigeonjr Mar 22, 2023
8860969
better redux state on selected
fpigeonjr Mar 23, 2023
409f1d2
Task 739 (#780)
fpigeonjr Mar 23, 2023
ba7cf5f
adds test data
fpigeonjr Mar 23, 2023
3aa39b3
state improvements
fpigeonjr Mar 23, 2023
2a19b56
better team leaders
fpigeonjr Mar 23, 2023
d859c81
starts agreement summary box
fpigeonjr Mar 23, 2023
84ef9dc
styles
fpigeonjr Mar 23, 2023
963e4c2
Merge pull request #781 from HHS/task740
tdonaworth Mar 24, 2023
71ee13a
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Mar 27, 2023
6178f87
starts procurement shop select
fpigeonjr Mar 27, 2023
bd1349d
resets state
fpigeonjr Mar 27, 2023
4d7c670
cleanup
fpigeonjr Mar 28, 2023
690df71
consistant naming
fpigeonjr Mar 28, 2023
5633988
better naming
fpigeonjr Mar 28, 2023
34347f6
adds state
fpigeonjr Mar 28, 2023
9df06a5
starts description (#795)
fpigeonjr Mar 28, 2023
5a740dd
Task744 amount (#796)
fpigeonjr Mar 28, 2023
252e828
adds CanSelect
fpigeonjr Mar 28, 2023
7377bf5
better state and resets form
fpigeonjr Mar 28, 2023
9471dab
adds date select (#798)
fpigeonjr Mar 29, 2023
3009bf0
moves BLI link to nav
fpigeonjr Mar 29, 2023
4390861
Task746 notes (#799)
fpigeonjr Mar 29, 2023
b3d8361
Task-747 table preview (#800)
fpigeonjr Apr 5, 2023
f82c8e6
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Apr 5, 2023
8e7cb6a
Ops 674 bl front end ps hookup (#820)
xlorepdarkhelm Apr 5, 2023
876a8f0
comment for style sheet
fpigeonjr Apr 5, 2023
e7b1b95
no longer needed
fpigeonjr Apr 5, 2023
282b95c
better msg
fpigeonjr Apr 6, 2023
41e4e03
update button text for update
fpigeonjr Apr 6, 2023
91b87d3
better tooltip text
fpigeonjr Apr 6, 2023
4f5b80e
Task 819 (#825)
fpigeonjr Apr 10, 2023
5cf5d1e
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Apr 11, 2023
c034e24
Merge branch 'main' into OPS-674-BL-FrontEnd
tdonaworth Apr 12, 2023
479b173
Task 751 (#843)
fpigeonjr Apr 12, 2023
0136c37
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Apr 12, 2023
bf2a6bf
adds keyboard trap
fpigeonjr Apr 12, 2023
052ff3c
refactored StepIndicator to a dynamic component
tdonaworth Apr 12, 2023
28e8f43
added unit tests
tdonaworth Apr 12, 2023
906045a
Updated to add the `complete` style
tdonaworth Apr 12, 2023
8ef1f90
refactor to use new `StepIndicator`
fpigeonjr Apr 12, 2023
1fd92b8
Merge branch 'OPS-674-BL-Frontend_StepIndicator
fpigeonjr Apr 12, 2023
7ce0e2a
Alert feedback
fpigeonjr Apr 12, 2023
2ec1013
wired up agreements (#850)
tdonaworth Apr 12, 2023
6d482c6
accounts for null in `created_on` for budget_lines
fpigeonjr Apr 13, 2023
febf1dd
adds some date needed to budget lines
fpigeonjr Apr 13, 2023
4312a37
accounts for status `IN_EXECUTION`
fpigeonjr Apr 13, 2023
867ce96
reverse not needed?
fpigeonjr Apr 13, 2023
4655e4c
fixes dropdown 0 bug
fpigeonjr Apr 13, 2023
d4dbd09
disables Agreement if no Project is selected
fpigeonjr Apr 13, 2023
2112313
adds dates and fees
fpigeonjr Apr 13, 2023
592fa05
updated agreement and proc_shop models
tdonaworth Apr 13, 2023
3957661
resets selected agreement on back
fpigeonjr Apr 13, 2023
7ce5093
Merge branch 'OPS-674-BL-FrontEnd' of https://github.com/HHS/OPRE-OPS…
tdonaworth Apr 13, 2023
f000e1b
updated sample data
tdonaworth Apr 13, 2023
4d7dbb2
Can updates from new can states
fpigeonjr Apr 13, 2023
340504c
fixes state issues with CanSelect
fpigeonjr Apr 13, 2023
b868291
properly sets can on create new bli
fpigeonjr Apr 14, 2023
9e4dc68
Getting logic in place.
xlorepdarkhelm Apr 13, 2023
10d5bf3
Adding summaries.
xlorepdarkhelm Apr 13, 2023
235803f
Getting formatting fixed.
xlorepdarkhelm Apr 14, 2023
f704bba
🤞🏿maybe fixes sort
fpigeonjr Apr 14, 2023
7743e7b
Merge pull request #853 from HHS/OPS-809_Total_Summary_Cards
xlorepdarkhelm Apr 14, 2023
354cf5c
fixes setting month with zero issue
fpigeonjr Apr 14, 2023
cfc96b1
only displays pop if present
fpigeonjr Apr 14, 2023
24cf4be
cleanup
fpigeonjr Apr 14, 2023
e843bfc
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Apr 17, 2023
10f6549
creates new yarn.lock due to build issues
fpigeonjr Apr 17, 2023
43260b3
Task 844 (#857)
fpigeonjr Apr 18, 2023
fdad05f
allows for empty bli
fpigeonjr Apr 18, 2023
378e8b6
small refactor
fpigeonjr Apr 18, 2023
2d45da0
small refactor
fpigeonjr Apr 18, 2023
cfbfe5e
adds test for AgreementSelect
fpigeonjr Apr 18, 2023
fb5bdb5
adds test for Project select
fpigeonjr Apr 18, 2023
8e7dd27
cleanup
fpigeonjr Apr 18, 2023
1d7e579
adds test for Flow
fpigeonjr Apr 18, 2023
40f9b36
adds test for DesiredAwardDate
fpigeonjr Apr 18, 2023
ae479b5
adds test
fpigeonjr Apr 18, 2023
ef82d89
adds tests
fpigeonjr Apr 18, 2023
c800890
Update researchProjectDetail.cy.js
fpigeonjr Apr 18, 2023
f6cd2e3
a11y fixes
fpigeonjr Apr 19, 2023
0463e9a
Merge branch 'main' into OPS-674-BL-FrontEnd
fpigeonjr Apr 19, 2023
52befc5
checks to ensure user is logged in
fpigeonjr Apr 19, 2023
1335510
black magic
fpigeonjr Apr 19, 2023
a0a075c
tests pass
fpigeonjr Apr 19, 2023
e15cfc2
updated Research Project tests as a result of data change.
tdonaworth Apr 19, 2023
2d357b9
updated e2e to comply with code.
tdonaworth Apr 19, 2023
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
134 changes: 70 additions & 64 deletions backend/data_tools/data/agreements_and_blin_data.json5
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
{
procurement_shop: [
{
id: 1,
name: "Product Service Center",
abbr: "PSC",
fee: 0,
},
{
id: 2,
name: "Government Contracting Services",
abbr: "GCS",
fee: 0,
},
{
id: 3,
name: "National Institute of Health",
abbr: "NIH",
fee: 0.5,
},
{
id: 4,
name: "Interior Business Center",
abbr: "IBC",
fee: 4.8,
},
],
product_service_code: [
{
id: 1,
Expand Down Expand Up @@ -45,6 +71,7 @@
type: "contract",
agreement_type: "CONTRACT",
research_project_id: 1,
procurement_shop_id: 1,
},
{
id: 2,
Expand All @@ -59,6 +86,7 @@
type: "direct",
agreement_type: "DIRECT_ALLOCATION",
research_project_id: 1,
procurement_shop_id: 3,
},
{
id: 3,
Expand All @@ -73,6 +101,7 @@
type: "grant",
agreement_type: "GRANT",
research_project_id: 2,
procurement_shop_id: 3,
},
{
id: 4,
Expand All @@ -87,6 +116,7 @@
type: "iaa",
agreement_type: "IAA",
research_project_id: 2,
procurement_shop_id: 3,
},
{
id: 5,
Expand All @@ -101,6 +131,7 @@
type: "iaa-aa",
agreement_type: "MISCELLANEOUS",
research_project_id: 3,
procurement_shop_id: 3,
},
{
id: 6,
Expand All @@ -115,6 +146,7 @@
type: "contract",
agreement_type: "CONTRACT",
research_project_id: 3,
procurement_shop_id: 4,
},
],
contract_agreement: [
Expand Down Expand Up @@ -167,8 +199,8 @@
agreement_id: 1,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "LI 2",
Expand All @@ -177,8 +209,8 @@
agreement_id: 1,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 1",
Expand All @@ -187,8 +219,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -197,8 +229,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 1",
Expand All @@ -207,8 +239,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -217,8 +249,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 1",
Expand All @@ -227,8 +259,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -237,8 +269,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -247,8 +279,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -258,8 +290,8 @@
can_fiscal_year_can_id: 4,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -268,8 +300,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -278,8 +310,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -288,8 +320,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -298,8 +330,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -308,8 +340,8 @@
agreement_id: 2,
amount: 2000000.0,
status: "IN_EXECUTION",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -318,8 +350,8 @@
agreement_id: 2,
amount: 1000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -328,8 +360,8 @@
agreement_id: 2,
amount: 3000000.0,
status: "OBLIGATED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -338,8 +370,8 @@
agreement_id: 2,
amount: 7000000.0,
status: "PLANNED",
date_needed: null,
psc_fee_amount: null,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
{
line_description: "Line Item 2",
Expand All @@ -348,34 +380,8 @@
agreement_id: 2,
amount: 500000.0,
status: "OBLIGATED",
date_needed: null,
psc_fee_amount: null,
},
],
procurement_shop: [
{
id: 1,
name: "Product Service Center",
abbr: "PSC",
fee: 0,
},
{
id: 2,
name: "Government Contracting Services",
abbr: "GCS",
fee: 0,
},
{
id: 3,
name: "National Institute of Health",
abbr: "NIH",
fee: 0.5,
},
{
id: 4,
name: "Interior Business Center",
abbr: "IBC",
fee: 4.8,
date_needed: "2023-06-13T14:03:25.765487",
psc_fee_amount: 0.5,
},
],
}
Loading