diff --git a/CHANGELOG.md b/CHANGELOG.md index acebac263c..d905f73e2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Anticipated release: June 29, 2020 - Update Actual Costs page to use "Actual Expenditures" ([#2291]) - Build the "Summary Budget by Activity" table to see staffing across all activities and not just by activity ([#2170]) - Update styling on the Program Activities page ([#2288]) +- Update State Cost Categories section for consistency ([#2256]) #### 🐛 Bugs fixed @@ -17,7 +18,7 @@ Anticipated release: June 29, 2020 #### ⚙️ Behind the scenes - Prevent negative FTE values from being entered in State Cost forms ([#2229]) -- Cleanup propType errors, other test errors/warnings ([#2309]) +- [Tech Debt] Cleanup propType errors, other test errors/warnings ([#2309]) # Previous releases @@ -31,3 +32,4 @@ See our [release history](https://github.com/18F/cms-hitech-apd/releases) [#2291]: https://github.com/18F/cms-hitech-apd/issues/2291 [#2170]: https://github.com/18F/cms-hitech-apd/issues/2170 [#2288]: https://github.com/18F/cms-hitech-apd/issues/2288 +[#2256]: https://github.com/18F/cms-hitech-apd/issues/2256 diff --git a/web/src/components/PersonCostForm.js b/web/src/components/PersonCostForm.js index 39339bf913..9f0b7549cf 100644 --- a/web/src/components/PersonCostForm.js +++ b/web/src/components/PersonCostForm.js @@ -18,7 +18,7 @@ const PersonCostForm = ({ items, costLabel, fteLabel, setCost, setFTE }) => {
{Object.entries(items).map(([year, { amt, perc }]) => ( -
{year} Costs
+
FFY {year} Cost
+ FFY 1972 - Costs + Cost
+ FFY 1973 - Costs + Cost
(
- {year} - Costs: + FFY {year} Cost: {costs[year]} | FTE: {fte[year]} | Total: {costs[year] * fte[year]} diff --git a/web/src/containers/ApdKeyPerson/__snapshots__/ApdKeyPersonForm.test.js.snap b/web/src/containers/ApdKeyPerson/__snapshots__/ApdKeyPersonForm.test.js.snap index eb7594e873..c7a45007a8 100644 --- a/web/src/containers/ApdKeyPerson/__snapshots__/ApdKeyPersonForm.test.js.snap +++ b/web/src/containers/ApdKeyPerson/__snapshots__/ApdKeyPersonForm.test.js.snap @@ -51,7 +51,7 @@ exports[`the ApdKeyPersonForm component renders correctly 1`] = ` checked={true} checkedChildren={ + FFY 1992 - - - - Costs: + Cost: 100 @@ -52,11 +50,9 @@ exports[`the ApdKeyPersonReview component renders correctly 1`] = ` key="1993" > + FFY 1993 - - - - Costs: + Cost: 300 @@ -103,11 +99,9 @@ exports[`the ApdKeyPersonReview component renders correctly 1`] = ` key="1992" > + FFY 1992 - - - - Costs: + Cost: 100 @@ -129,11 +123,9 @@ exports[`the ApdKeyPersonReview component renders correctly 1`] = ` key="1993" > + FFY 1993 - - - - Costs: + Cost: 300 diff --git a/web/src/containers/activity/NonPersonnelCost/NonPersonnelCostReview.js b/web/src/containers/activity/NonPersonnelCost/NonPersonnelCostReview.js index e4da118a41..11ada6a29e 100644 --- a/web/src/containers/activity/NonPersonnelCost/NonPersonnelCostReview.js +++ b/web/src/containers/activity/NonPersonnelCost/NonPersonnelCostReview.js @@ -21,7 +21,7 @@ const NonPersonnelCostReview = ({
{Object.entries(years).map(([year, cost]) => (
- {year} Costs: {cost} + FFY {year} Cost: {cost}
))}
diff --git a/web/src/containers/activity/NonPersonnelCost/__snapshots__/NonPersonnelCostReview.test.js.snap b/web/src/containers/activity/NonPersonnelCost/__snapshots__/NonPersonnelCostReview.test.js.snap index 76b9c5060c..336453e825 100644 --- a/web/src/containers/activity/NonPersonnelCost/__snapshots__/NonPersonnelCostReview.test.js.snap +++ b/web/src/containers/activity/NonPersonnelCost/__snapshots__/NonPersonnelCostReview.test.js.snap @@ -16,8 +16,9 @@ exports[`the NonPersonnelCostReview component renders correctly 1`] = ` key="1487" > + FFY 1487 - Costs: + Cost: @@ -28,8 +29,9 @@ exports[`the NonPersonnelCostReview component renders correctly 1`] = ` key="1488" > + FFY 1488 - Costs: + Cost: diff --git a/web/src/containers/activity/StatePerson/StatePersonReview.js b/web/src/containers/activity/StatePerson/StatePersonReview.js index 2cdf552a30..263f5e0f14 100644 --- a/web/src/containers/activity/StatePerson/StatePersonReview.js +++ b/web/src/containers/activity/StatePerson/StatePersonReview.js @@ -21,8 +21,7 @@ const StatePersonReview = ({
{Object.entries(years).map(([year, { amt, perc }]) => (
- {year} - Costs: + FFY {year} Cost: {amt} | FTEs: {perc} | Total: {amt * perc} diff --git a/web/src/containers/activity/StatePerson/__snapshots__/StatePersonForm.test.js.snap b/web/src/containers/activity/StatePerson/__snapshots__/StatePersonForm.test.js.snap index f6dc72a6e6..c67c8dcb62 100644 --- a/web/src/containers/activity/StatePerson/__snapshots__/StatePersonForm.test.js.snap +++ b/web/src/containers/activity/StatePerson/__snapshots__/StatePersonForm.test.js.snap @@ -25,7 +25,7 @@ exports[`the StatePersonForm component renders correctly 1`] = ` value="personnel desc" /> + FFY 2003 - - - - Costs: + Cost: 85938 @@ -42,11 +40,9 @@ exports[`the StatePersonReview component renders correctly 1`] = ` key="2004" > + FFY 2004 - - - - Costs: + Cost: 37523 diff --git a/web/src/containers/viewOnly/ApdStateProfile.js b/web/src/containers/viewOnly/ApdStateProfile.js index 038f7f5710..ff96e53d3a 100644 --- a/web/src/containers/viewOnly/ApdStateProfile.js +++ b/web/src/containers/viewOnly/ApdStateProfile.js @@ -9,8 +9,7 @@ const ApdStateProfile = ({ stateProfile, keyPersonnel }) => {
{Object.keys(person.costs).map(year => (
- {year} - Costs: + FFY {year} Cost: {person.costs[year]} | FTE: {person.fte[year]} | Total: {person.costs[year] * person.fte[year]} diff --git a/web/src/containers/viewOnly/activities/Activity.js b/web/src/containers/viewOnly/activities/Activity.js index 05d00d2fdb..c9b6e53d5f 100644 --- a/web/src/containers/viewOnly/activities/Activity.js +++ b/web/src/containers/viewOnly/activities/Activity.js @@ -60,7 +60,7 @@ const Activity = ({ activity, activityIndex }) => {
    {Object.entries(person.years).map(([year, { amt, perc }]) => (
  • - {year} Costs: {amt} |{' '} + FFY {year} Cost: {amt} |{' '} FTEs: {perc} | Total:{' '} {perc * amt}
    • @@ -82,7 +82,7 @@ const Activity = ({ activity, activityIndex }) => {
      {Object.entries(expense.years).map(([year, cost]) => (
    • - {year} Costs: {cost} + FFY {year} Cost: {cost}
      • ))}
    @@ -116,7 +116,7 @@ const Activity = ({ activity, activityIndex }) => {
      {Object.entries(contractor.years).map(([year, cost]) => (
    • - {year} Costs: {cost} + FFY {year} Cost: {cost} {contractor.hourly.useHourly === true && (

      Number of hours: {contractor.hourly.data[year].hours}

      @@ -130,7 +130,7 @@ const Activity = ({ activity, activityIndex }) => { ))}

    - Total cost: + Total Cost: {contractor.totalCost}