Merge pull request #4969 from ONRR/dev

Dev-->master
DOI-ONRR · Feb 11, 2020 · de212dc · de212dc
2 parents 2ae4f78 + 8f09735
commit de212dc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -11,7 +11,7 @@ let config = {
   siteMetadata: {
     title: 'Natural Resources Revenue Data',
     description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.',
-    version: 'v5.5.4',
+    version: 'v5.5.5',
     googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   plugins: [

diff --git a/src/components/sections/DisbursmentTrends/DisbursementTrends.js b/src/components/sections/DisbursmentTrends/DisbursementTrends.js
@@ -300,13 +300,12 @@ const aggregateData= (data) => {
     ]
     let currentYear=data[0].Fiscal_Year
 
-
     for(let ii=0; ii<data.length; ii++) {
 	let item=data[ii];
 	if(item.Fund_Type.match(/U.S. Treasury/))  {
 	    sumData(item,r,0,currentYear); //sum into us treasury
 	} else if (item.Fund_Type.match(/State/))  {
-	    sumData(item,r,1, currentYear); //sum into state
+	  sumData(item,r,1, currentYear); //sum into state
 	} else if (item.Fund_Type.match(/Reclamation/))  {
 	    sumData(item,r,2, currentYear); //sum into Reclamation
 	} else if (item.Fund_Type.match(/American Indian/))  {
@@ -324,20 +323,19 @@ const aggregateData= (data) => {
 		       r[i].histData=a.slice(-10);
 		       return a.slice(-10)
 		     })
-
-
     return r;
 }
 
 const sumData= (item,r,index,currentYear) => {
-    let previousYear=currentYear - 1;
+  let previousYear=currentYear - 1;
     if(item.Fiscal_Year==currentYear) r[index].current+=item._Total_ ;
     if(item.Fiscal_Year==previousYear) r[index].previous+=item._Total_;
-    if(r[0].histSum[item.Fiscal_Year]) {
-	if(! isNaN(Number(item._Total_)))  r[index].histSum[item.Fiscal_Year]+=Number(item._Total_);
+    if (r[index].histSum[item.Fiscal_Year]) {
+      if(! isNaN(Number(item._Total_)))   r[index].histSum[item.Fiscal_Year]+=Number(item._Total_);
     } else {
-	r[index].histSum[item.Fiscal_Year]=Number(item._Total_);
+      r[index].histSum[item.Fiscal_Year]=Number(item._Total_);
     }
+
 }
 
 

diff --git a/src/components/sections/WhatsNew/WhatsNew.js b/src/components/sections/WhatsNew/WhatsNew.js
@@ -7,7 +7,11 @@ const WhatsNew = props => (
   <section className={styles.root + ' slab-delta'}>
   	<div className="container-page-wrapper">
       <h2>What's new</h2>
-      <p>In our latest release on February 7, 2020, we made the following changes:</p>
+      <p>In our latest release on February 11, 2020, we made the following changes:</p>
+      <ul className="list-bullet ribbon-card-top-list">
+        <li>Fixed bug with state and county disbursements trend line</li>
+        </ul>
+      <p>In our release on February 7, 2020, we made the following changes:</p>
       <ul className="list-bullet ribbon-card-top-list">
         <li>Added <Link to="/downloads/federal-disbursements-by-month/">monthly disbursements data for December 2019</Link></li>
         <li>Added <Link to="/explore/#revenue">calendar year revenue data for 2019</Link></li>