Merge pull request #1077 from fedspendingtransparency/staging

R6.0.4 Prod deploy
fedspendingtransparency · Sep 3, 2019 · 2c821e2 · 2c821e2
2 parents f4c803e + 3017b9c
commit 2c821e2
Show file tree

Hide file tree

Showing 53 changed files with 268,522 additions and 385 deletions.
diff --git a/_includes/colleges/colleges-share.html b/_includes/colleges/colleges-share.html
@@ -6,14 +6,13 @@
          category: 'Share Menu - Click Item',
          action: item
      });
-
-     return false;
  }
 </script>
 
 <div class="popup new-share-button">
   <span class="viz-share-icon" aria-hidden="true">
-    {% include svgs/share.svg %} Share
+    {% include svgs/share.svg %}
+    <span class="share-text">Share</span>
   </span>
   <span class="popuptext right newpopup" id="sharePopup">
     <div class="share-buttons">

diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html
@@ -82,7 +82,7 @@ <h1 class="accordion__heading">Instructions</h1>
       <div class="chart-footer">
         <div>
           <span class='faded'>Updated as of March 2019 / </span>
-          <a class="download-data" href='assets/js/colleges-and-universities/download-files/Agency_Section_Download.csv'>
+          <a class="download-data" href='data-lab-data/CU/updated_CU_data/Agency_Section_Download_V2.csv'>
             {% include svgs/download_icon.svg %}
             &nbsp;Download
           </a>

diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html
@@ -85,7 +85,7 @@ <h1 class="accordion__heading">Instructions</h1>
     <div class="chart-footer">
       <div>
         <span class='faded'>Updated as of March 2019 / </span>
-        <a class="download-data" href='assets/js/colleges-and-universities/download-files/Institutions_Section_Download.csv'>
+        <a class="download-data" href='data-lab-data/CU/updated_CU_data/Institutions_Section_Download_V2.csv'>
           {% include svgs/download_icon.svg %}
           &nbsp;Download
         </a>

diff --git a/_includes/new-share-menu.html b/_includes/new-share-menu.html
@@ -6,8 +6,6 @@
             category: 'Share Menu - Click Item',
             action: item
         });
-
-        return false;
     }
 </script>
 

diff --git a/_includes/share-menu.html b/_includes/share-menu.html
@@ -6,8 +6,6 @@
             category: 'Share Menu - Click Item',
             action: item
         });
-
-        return false;
     }
 </script>
 

diff --git a/assets/ffg/debt/countryComparison.js b/assets/ffg/debt/countryComparison.js
diff --git a/assets/ffg/deficit/countryComparison.js b/assets/ffg/deficit/countryComparison.js
diff --git a/assets/ffg/revenue/categories.js b/assets/ffg/revenue/categories.js
diff --git a/assets/ffg/revenue/countryComparison.js b/assets/ffg/revenue/countryComparison.js
diff --git a/assets/ffg/revenue/trends.js b/assets/ffg/revenue/trends.js
diff --git a/assets/ffg/spending/categories.js b/assets/ffg/spending/categories.js
diff --git a/assets/ffg/spending/countryComparison.js b/assets/ffg/spending/countryComparison.js
diff --git a/assets/ffg/spending/trends.js b/assets/ffg/spending/trends.js
diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js
@@ -365,7 +365,7 @@ function zoomTo(v) {
 	 Make a table, a bubble table ;;;;
 **/
 function createBubbleTable(data) {
-	d3.csv("/data-lab-data/CU_bubble_chart_table.csv", function (err, data) {
+	d3.csv("/data-lab-data/CU/updated_CU_data/CU_bubble_chart_table_v2.csv", function (err, data) {
 		if (err) {
 			return err;
 		}
@@ -495,9 +495,9 @@ tooltipClose.click(function () {
 *   Main Method
 */
 
-d3.csv("/data-lab-data/CU_bubble_chart.csv", function (err1, data) {
+d3.csv("/data-lab-data/CU/updated_CU_data/CU_bubble_chart_V2.csv", function (err1, data) {
 	if (err1) { return err1; }
-	d3.csv("/data-lab-data/CU/Bubble_Chart_Agency_Hover_data.csv", function (err2, rawPopoverData) {
+	d3.csv("/data-lab-data/CU/updated_CU_data/Bubble_Chart_Agency_Hover_data_v2.csv", function (err2, rawPopoverData) {
 		if (err2) { return err2; }
 
 		popoverData = _.keyBy(rawPopoverData, 'agency');

diff --git a/assets/js/colleges-and-universities/agenciesBubbleDetail.js b/assets/js/colleges-and-universities/agenciesBubbleDetail.js
@@ -3,15 +3,15 @@
 
 (function () {
     const detailContainer = d3.select('#bubble-detail').append('section').classed('bubble-detail', true),
-        tables = {},
-        detailData = {},
-        tableControl = [
-            'total',
-            'funding',
-            'investments',
-            'institutions'
-        ], // for controlling the order of positioning tables
-        activeClass = 'bubble-detail--active';
+          tables = {},
+          detailData = {},
+          tableControl = [
+              'total',
+              'funding',
+              'investments',
+              'institutions'
+          ], // for controlling the order of positioning tables
+          activeClass = 'bubble-detail--active';
 
     let agencyName, subAgencyName, done = 0;
 
@@ -42,8 +42,8 @@
 
         detailContainer.classed(activeClass, true);
 
-        agencyName.text(data.parent.name)
-        subAgencyName.text(data.name)
+        agencyName.text(data.parent.name);
+        subAgencyName.text(data.name);
 
         if (!detailData[data.name]) {
             console.warn(`no data for ${data.name}`);
@@ -131,23 +131,23 @@
     }
 
     function preloadData() {
-        d3.csv("/data-lab-data/CU/top5InstitutionsPerAgency_v3.csv", function (data) {
+	// top 5 inst per agency
+        d3.csv("/data-lab-data/CU/updated_CU_data/top5InstitutionsPerAgency_v2.csv", function (data) {
             data.forEach(indexData, 'institutions');
-
             done += 1;
         });
 
-        d3.csv("/data-lab-data/CU/top5InvestmentsPerAgency_v3.csv", function (data) {
+        d3.csv("/data-lab-data/CU/updated_CU_data/top5InvestmentsPerAgency_v2.csv", function (data) {
+	    // top 5 investments per agency..
             data.forEach(indexData, 'investments');
-
             done += 1;
-        })
+        });
 
-        d3.csv("/data-lab-data/CU/Agencies_RHP_summary.csv", function (data) {
+        d3.csv("/data-lab-data/CU/updated_CU_data/Agencies_RHP_summary_v2.csv", function (data) {
+	    // agencies rhp summary!
             data.forEach(indexData, 'funding');
-
             done += 1;
-        })
+        });
     }
 
     function disableMobile() {
@@ -172,8 +172,8 @@
 
         placeTables();
 
-        bubble.activateDetail = activateDetail
+        bubble.activateDetail = activateDetail;
     }
 
-    init()
-})()
+    init();
+})();
diff --git a/assets/js/colleges-and-universities/institutions.js b/assets/js/colleges-and-universities/institutions.js
@@ -45,7 +45,7 @@ function createMapbox() {
     }
 
     function renderAllSchools() {
-	$.getJSON('../../data-lab-data/CU_features_min.geojson', function(data) { 
+	$.getJSON('../../data-lab-data/CU/updated_CU_data/CU_mapbox_v2.geojson', function(data) { 
 
 	    let geoandname = data.features.map(function (ele) {
 		return {
@@ -139,7 +139,7 @@ function createMapbox() {
 
     // when the map first loads all resources!
     map.on('load', function() {
-	$.getJSON('../../data-lab-data/CU_features_min.geojson', function(data) {
+	$.getJSON('../../data-lab-data/CU/updated_CU_data/CU_mapbox_v2.geojson', function(data) {
 
 	    renderAllSchools(); // populate sidebar with list of all schools
 
@@ -346,7 +346,7 @@ function createMapbox() {
 }; // end function (createMapbox)
 
 function createInstTable() {
-    d3.csv('../../data-lab-data/CU/rhp.csv', function(err, data) {
+    d3.csv('data-lab-data/CU/updated_CU_data/instutions_table_view_data_v3.csv', function(err, data) {
 
 	let table = d3.select('#alma-mater-table').append('table')
             .attr('id', 'institution-table'); // id given to table for Datatables.js