Merge branch 'dev' of github.com:codeforboston/cliff-effects into ref…

…actor-3

src/utils/charts/PROGRAM_CHART_VALUES.js → src/forms/output/BENEFIT_CHART_VALUES.js

@@ -1,5 +1,5 @@
 
-const PROGRAM_CHART_VALUES = {
+const BENEFIT_CHART_VALUES = {
   earned: {
     name:  `Earned`,
     color: `rgb(136, 187, 236)`,
@@ -18,4 +18,4 @@ const PROGRAM_CHART_VALUES = {
   },
 };
 
-export { PROGRAM_CHART_VALUES };
+export { BENEFIT_CHART_VALUES };

src/forms/output/BenefitsLines.js

@@ -18,22 +18,22 @@ import {
 
 // LOGIC
 import { timescaleMultipliers } from '../../utils/convert-by-timescale';
-import { getChartData } from '../../utils/charts/getChartData';
-import { toFancyMoneyStr } from '../../utils/charts/chartFormatting';
+import { getChartData } from './getChartData';
+import { toFancyMoneyStr } from './chartFormatting';
 import {
   formatMoneyWithK,
   textFromTranslatedElement,
 } from './chartStringTransformers';
 import { zoom } from './zoom';
 
 // DATA
-import { PROGRAM_CHART_VALUES } from '../../utils/charts/PROGRAM_CHART_VALUES';
+import { BENEFIT_CHART_VALUES } from './BENEFIT_CHART_VALUES';
 
 
 // Graphs get things in monthly values, so we'll convert from there
 let multipliers = timescaleMultipliers.fromMonthly,
     // Each graph controls its own scaling
-    limits      = PROGRAM_CHART_VALUES.limits;
+    limits      = BENEFIT_CHART_VALUES.limits;
 
 /** Graph of each benefit as household income changes. Uses Highchart lib.
  * @class

src/forms/output/GraphHolder.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Message } from 'semantic-ui-react';
 
 // CUSTOM COMPONENTS
-import { GraphTimeButtons } from '../../components/GraphTimeButtons';
+import { GraphTimeButtons } from './GraphTimeButtons';
 
 
 /** Keeps track of time interval currently requested

src/forms/output/ResourcesColumns.js

@@ -17,8 +17,8 @@ import {
 
 // LOGIC
 import { timescaleMultipliers } from '../../utils/convert-by-timescale';
-import { getChartData } from '../../utils/charts/getChartData';
-import { toFancyMoneyStr } from '../../utils/charts/chartFormatting';
+import { getChartData } from './getChartData';
+import { toFancyMoneyStr } from './chartFormatting';
 import {
   formatMoneyWithK,
   textFromTranslatedElement,

src/forms/output/StackedResources.js

@@ -18,22 +18,22 @@ import {
 
 // LOGIC
 import { timescaleMultipliers } from '../../utils/convert-by-timescale';
-import { getChartData } from '../../utils/charts/getChartData';
-import { toFancyMoneyStr } from '../../utils/charts/chartFormatting';
+import { getChartData } from './getChartData';
+import { toFancyMoneyStr } from './chartFormatting';
 import {
   formatMoneyWithK,
   textFromTranslatedElement,
 } from './chartStringTransformers';
 import { zoom } from './zoom';
 
 // DATA
-import { PROGRAM_CHART_VALUES } from '../../utils/charts/PROGRAM_CHART_VALUES';
+import { BENEFIT_CHART_VALUES } from './BENEFIT_CHART_VALUES';
 
 
 // Graphs get things in monthly values, so we'll convert from there
 let multipliers = timescaleMultipliers.fromMonthly,
     // Each graph controls its own scaling
-    limits      = PROGRAM_CHART_VALUES.limits;
+    limits      = BENEFIT_CHART_VALUES.limits;
 
 
 // Still @todo

src/forms/output/Summary.js

@@ -9,7 +9,7 @@ import {
 
 // DATA
 // Colors and text for parts of the chart
-import { PROGRAM_CHART_VALUES } from '../../utils/charts/PROGRAM_CHART_VALUES';
+import { BENEFIT_CHART_VALUES } from './BENEFIT_CHART_VALUES';
 
 // DATA MANIPULATION
 import { cloneDeep } from 'lodash';
@@ -65,8 +65,8 @@ let totalLastItemsOfArraysInObject = function (accumulated) {
  *      accumulate values.
  *
  * @example
- * // In PROGRAM_CHART_VALUES.js
- * let PROGRAM_CHART_VALUES = {
+ * // In BENEFIT_CHART_VALUES.js
+ * let BENEFIT_CHART_VALUES = {
  *  benefit1: { name: "B1" },
  *  benefit2: { name: "B2" },
  * };
@@ -99,7 +99,7 @@ let totalLastItemsOfArraysInObject = function (accumulated) {
  * // }
  * 
  * Unfortunately, stll relies on an outside value -
- *     PROGRAM_CHART_VALUES.
+ *     BENEFIT_CHART_VALUES.
  * 
  * @typedef {object} benefit
  * @property {string} label Name to be displayed for the benefit
@@ -136,7 +136,7 @@ let fillInMoneyValues = (keys, sourceObject, index) => {
       moneyValues.earned = amount;
     } else {
       moneyValues.benefits.push({
-        label:  PROGRAM_CHART_VALUES[ itemKey ].name,
+        label:  BENEFIT_CHART_VALUES[ itemKey ].name,
         amount: amount,
       });
       // Add up all benefits (we're not including earned income)

src/utils/charts/getChartData.js → src/forms/output/getChartData.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { PROGRAM_CHART_VALUES } from '../../utils/charts/PROGRAM_CHART_VALUES';
+import { BENEFIT_CHART_VALUES } from './BENEFIT_CHART_VALUES';
 
 // LOGIC
 import { applyAndPushBenefits } from '../../benefits/applyAndPushBenefits';
@@ -72,7 +72,7 @@ const getChartData = function (incomes, multiplier, client, activeBenefitsInOrde
   // Return in the same order as it was asked for
   for (let benefiti = 0; benefiti < benefits.length; benefiti++) {
     let benefitName   = benefits[ benefiti ],
-        graphFrosting = PROGRAM_CHART_VALUES[ benefitName ];
+        graphFrosting = BENEFIT_CHART_VALUES[ benefitName ];
 
     // All the graph info for that benefit
     benefitDatasets.push({

src/test/components/GraphTimeButtons.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { GraphTimeButtons } from '../../components/GraphTimeButtons';
+import { GraphTimeButtons } from '../../forms/output/GraphTimeButtons';
 
 describe('<GraphTimeButtons>', () => {
   it('renders Weekly, Monthly, and Yearly buttons', () => {