Merge pull request #1127 from fedspendingtransparency/staging

6.0.6 Data Lab and Citizen's Guide Release
fedspendingtransparency · Oct 8, 2019 · 89bfe61 · 89bfe61
2 parents 19fc859 + 958e924
commit 89bfe61
Show file tree

Hide file tree

Showing 13 changed files with 6,605 additions and 540 deletions.
diff --git a/assets/ffg/components/glossary/glossary.js b/assets/ffg/components/glossary/glossary.js
diff --git a/assets/ffg/spending/categories.js b/assets/ffg/spending/categories.js
diff --git a/assets/js/dendrogram.js b/assets/js/dendrogram.js
diff --git a/citizens-guide/src/components/glossary/glossary.js b/citizens-guide/src/components/glossary/glossary.js
@@ -200,7 +200,7 @@ function resizeTermListDiv() {
 }
 
 function onFfgPage() {
-    if (window.location.pathname.indexOf('americas-finance-guide') === -1 && window.location.host.indexOf('localhost') === -1) {
+    if (window.location.pathname.indexOf('americas-finance-guide') === -1) {
         return false;
     }
 
@@ -219,7 +219,7 @@ function showGlossary(el) {
     }
 
     if (!onFfgPage()) {
-        window.location = 'https://' + window.location.host + '/americas-finance-guide/?glossary';
+        window.location = 'https://' + window.location.host + '/americas-finance-guide/index.html?glossary';
         return;
     }
 

diff --git a/citizens-guide/src/spending/categories/init.js b/citizens-guide/src/spending/categories/init.js
@@ -3,6 +3,7 @@ import { byYear } from '../data-spending';
 import { drawChart as barChart } from './bar/chart';
 import colors from '../../globalSass/colors.scss';
 import { establishContainer } from '../../utils';
+import Mapping from "../../../../_data/object_mapping.yml";
 
 const d3 = { select, selectAll },
     chartTitle = d3.select('h2.chart-title .title-text'),
@@ -13,7 +14,7 @@ const d3 = { select, selectAll },
 
 let svg,
     config = {
-        data: byYear(2018),
+        data: byYear(Mapping.current_fy.value),
         sectionColor: colors.colorSpendingPrimary,
         dataType: 'category',
         accessibilityAttrs : {
@@ -58,41 +59,29 @@ function showMore() {
 
 function changeDataTypeClickFunction(){
     d3.select('#toggle-spending-data-type')
-        .on('click', function () {
-            const dataController = d3.select("#spending-chart-toggle"),
-                curData = dataController.attr('data-active');
-
-            let dataType = curData === 'function' ? 'agency' : 'function';
-            changeDataType(dataType);
-        });
+    .on('click', function () {
+        let dataType;
+        const dataController = d3.select("#spending-chart-toggle"),
+        curData = dataController.attr('data-active');
 
-    d3.select('.spending-chart-toggle__label--categories')
-        .on('click', function(){
-            const dataType = 'function';
+        if (curData === 'category' || curData === 'function') {
+            dataType = 'agency';
             changeDataType(dataType);
-        });
-    d3.select('.spending-chart-toggle__label--agency')
-        .on('click', function(){
-            const dataType = 'agency';
+        } else {
+            dataType = 'category';
             changeDataType(dataType);
-        });
+        } 
+    });
 }
 
 function changeDataType(dataType){
-    const dataController = d3.select("#spending-chart-toggle"),
-        curData = dataController.attr('data-active');
-
-    if(dataType === curData){
-        return;
-    }
-
+    const dataController = d3.select("#spending-chart-toggle");
     config.dataType = dataType;
     dataController.attr('data-active', dataType);
     initChart();
 }
 
 function spendingIndexClickFunctions() {
-
     d3.select('#filter-by-name')
         .on('input', function () {
             const v = this.value.toLowerCase(),
@@ -130,7 +119,7 @@ export function init(_config){
     }
 
     spendingIndexClickFunctions();
-    if(config.dataType){
+    if (config.dataType) {
         changeDataTypeClickFunction();
     }
     initSection();

diff --git a/data-lab-data/accounts_obligations_link_update_FY19Q3.csv b/data-lab-data/accounts_obligations_link_update_FY19Q3.csv
diff --git a/documentation/release-notes/6.0.0.md b/documentation/release-notes/6.0.0.md
diff --git a/documentation/release-notes/6.0.1.md b/documentation/release-notes/6.0.1.md
@@ -0,0 +1,18 @@
+# Release notes - Data Analytics (Data Lab) - Version R6.0.1 - Colleges and Universities Patch Release
+
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/DA-3327 | Fedscope (Federal Employees Analysis)- choices for occupation type dynamically update based on selected agency |
+| https://federal-spending-transparency.atlassian.net/browse/DA-3881 | Develop 404 page based on approved mockup |
+| https://federal-spending-transparency.atlassian.net/browse/DA-3882 | create custom event for resources in nav and page |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4170 | 508 - Add unique ID tags to C&U visualizations |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4254 | Map mobile view - cant use finger on individual school bubbles |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4270 | C&U - Mobile - Search Box for Map, Agencies, and Sunburst Not Working Correctly |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4316 | C&U - 02 Alma Mater - Default Map Search List to Alphabetical Order |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4375 | C&U - IE Bubble Chart When Zoomed is Covering Next Section on Scroll |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4382 | Hero image not centrally aligned |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4392 | Sunburst - Solve Text Wrapping issues |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4430 | Create Google Analytics event(s) in C&U |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4501 | C&U - Download Button in Wrong Place on IE |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4512 | Fix Reddit Link |
diff --git a/documentation/release-notes/6.0.2.md b/documentation/release-notes/6.0.2.md
@@ -0,0 +1,6 @@
+# Release notes - Data Analytics (Data Lab) - Version R6.0.2 - Security Patch Release
+
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4570 | Security fixes |
diff --git a/documentation/release-notes/6.0.3.md b/documentation/release-notes/6.0.3.md
@@ -0,0 +1,6 @@
+# Release notes - Data Analytics (Data Lab) - Version R6.0.3 - Patch Release (Sprint 60)
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4377 | Update CU Social Share Options |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4424 | Map mobile view - Difficult to use finger on individual school bubbles |
diff --git a/documentation/release-notes/6.0.4.md b/documentation/release-notes/6.0.4.md
@@ -20,6 +20,7 @@
 | https://federal-spending-transparency.atlassian.net/browse/CG-1624 | Social Media Sharing is broken in Firefox |
 
 ### Stories
+
 | Ticket | Description |
 |---------------- | -------- |
 | https://federal-spending-transparency.atlassian.net/browse/CG-1541 | update all instances of country comparison to use public download files |

diff --git a/documentation/release-notes/6.0.5.md b/documentation/release-notes/6.0.5.md
@@ -0,0 +1,32 @@
+# Release notes - Citizens Guide - Version R6.0.5 - AFG Refresh Patch Release (no Data Lab tickets)
+
+### Bugs
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1548 | Anecdotes do not open in Edge |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1604 | Mobile - Deficit & Debt - Dots are clunky |
+
+
+### Stories
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1540 | Remove non-public data files. |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1577 | Ensure that no years are hard-coded (e.g. 2018) |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1581 | Dev - update front matter on top of each page |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1607 | Remove hard-coded annual numbers  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1630 | [Overview] Update numbers/objects in code with variables (Jekyll-dependent)  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1663 | [Revenue] Update numbers/objects in code with variables (Jekyll-dependent)  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1664 | [Spending] Update numbers/objects in code with variables (Jekyll-dependent)  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1665 | [Deficit] Update numbers/objects in code with variables (Jekyll-dependent)  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1666 | [Debt] Update numbers/objects in code with variables (Jekyll-dependent)  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1669 | Color Consistency - Debt Country Comparison page, 'Revenue' box is old blue color |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1691 | Move glossary csv to a more standardized location |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1701 | Fix Dot Charts on Landing Pages in Mobile |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1702 | Revenue Trends & Spending Trends chart in mobile showing NaN when using higher numbers from dummy dataset  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1709 | in trends charts, when using fiscal years 2015-2019, figure out why two lines appear in the charts where there should only be one  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1713 | Color Consistency - Spending And GDP page, revenue dots are the old blue color |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1717 | fix the links in the Data Sources accordions, must use the variables from the .yml file |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1753 | add new variables to the .yml for the number of dots in each chapter's dot chart, and add the variable to the html  |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1754 | catch-all ticket for small issues we find with the yml/html this sprint |
diff --git a/documentation/release-notes/6.0.6.md b/documentation/release-notes/6.0.6.md
@@ -0,0 +1,10 @@
+# Release notes: Version R6.0.6 (Citizen Guide and Data Lab Tickets)
+
+## Fixes
+***
+
+| Ticket | Description |
+|---------------- | -------- |
+| https://federal-spending-transparency.atlassian.net/browse/CG-1828 | fixed bug where category toggle stops working on subsequent clicks |
+| n/a | Glossary fix in FIR Infrastructure |
+| https://federal-spending-transparency.atlassian.net/browse/DA-4752 | Added FY19 Q3 to Federal Account Explorer Dendrogram Visualization |