From 59e41d01d8b21fc093cbe3578780e70e7b72bdca Mon Sep 17 00:00:00 2001 From: brettvarney Date: Mon, 8 Jul 2019 09:51:39 -0500 Subject: [PATCH 01/77] wip --- _includes/colleges/colleges-share.html | 2 +- _includes/colleges/sectionone.html | 6 +-- _includes/colleges/sectionpre.html | 8 ++-- _includes/header.html | 36 ++++++++-------- _includes/svgs/arrow.svg | 11 ++--- _sass/C-a-U-mobile.scss | 4 +- _sass/C-a-U-share.scss | 18 ++++---- assets/icons/share.svg | 43 +++++++++++++++++++ css/C-a-U.scss | 4 +- .../colleges-and-universities.html | 8 ++-- 10 files changed, 90 insertions(+), 50 deletions(-) create mode 100755 assets/icons/share.svg diff --git a/_includes/colleges/colleges-share.html b/_includes/colleges/colleges-share.html index 1a5c82bc..a9a6edbf 100644 --- a/_includes/colleges/colleges-share.html +++ b/_includes/colleges/colleges-share.html @@ -13,7 +13,7 @@
-
+

Student Aid

@@ -62,7 +62,7 @@

Federal student aid is financial assistance provided through grants, scholarships, work-study, and loans to students for their educational expenses. This can include costs such as tuition, housing, transportation, books, and supplies.

-
+

Grants

@@ -73,7 +73,7 @@

A federal grant is an agreement through which a federal agency provides financial assistance to an individual or organization to be used for projects and expenses that contribute to public good. For example, in 2018, the Department of Commerce funded the University of Maryland, Baltimore County’s (UMBC) research for measuring and improving the robustness of Deep Learning algorithms.

-
+

Contracts

diff --git a/_includes/colleges/sectionpre.html b/_includes/colleges/sectionpre.html index 1a45ac90..8c86d3b7 100644 --- a/_includes/colleges/sectionpre.html +++ b/_includes/colleges/sectionpre.html @@ -24,7 +24,7 @@

-
+

01 @@ -41,7 +41,7 @@

-
+

02 @@ -58,7 +58,7 @@

-
+

03 @@ -75,7 +75,7 @@

-
+

04 diff --git a/_includes/header.html b/_includes/header.html index 165e878a..fcc6e90e 100755 --- a/_includes/header.html +++ b/_includes/header.html @@ -95,24 +95,24 @@
  • Resources @@ -120,13 +120,13 @@
  • America's Finance Guide @@ -134,15 +134,15 @@
    • diff --git a/_includes/svgs/arrow.svg b/_includes/svgs/arrow.svg index 527ac038..1992032d 100644 --- a/_includes/svgs/arrow.svg +++ b/_includes/svgs/arrow.svg @@ -1,12 +1,9 @@ - - Path 2 Copy 2 - Created with Sketch. - - - - + + + + diff --git a/_sass/C-a-U-mobile.scss b/_sass/C-a-U-mobile.scss index f9ab58e9..4a9bc630 100644 --- a/_sass/C-a-U-mobile.scss +++ b/_sass/C-a-U-mobile.scss @@ -2,7 +2,7 @@ $cuRed: #881E3D; /* Mobile View only */ @media (max-width: 949px) { - #aid-subsection { + .aid-subsection { padding-left: 1.5rem; padding-right: 1.5rem; } @@ -139,7 +139,7 @@ $cuRed: #881E3D; justify-content: space-evenly; - #aid-subsection { + .aid-subsection { padding-left: 1rem; padding-right: 1rem; } diff --git a/_sass/C-a-U-share.scss b/_sass/C-a-U-share.scss index 014f1f04..cfe158f5 100644 --- a/_sass/C-a-U-share.scss +++ b/_sass/C-a-U-share.scss @@ -6,20 +6,20 @@ } .newpopup { - top: 40px !important; + top: 40px !important; } .new-share-button .viz-share-icon:hover { - fill: #881E3D; + fill: #881E3D; } .viz-share-icon { - width: auto; - font-size: 1rem; - color: #4a4a4a; + width: auto; + font-size: 1rem; + color: #4a4a4a; - svg { - margin-right: 4px; - transform: translateY(4px); - } + img { + margin-right: 4px; + transform: translateY(4px); + } } diff --git a/assets/icons/share.svg b/assets/icons/share.svg new file mode 100755 index 00000000..f810c692 --- /dev/null +++ b/assets/icons/share.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/css/C-a-U.scss b/css/C-a-U.scss index 8fae73d1..9b939746 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -416,13 +416,13 @@ $cuRed: #881E3D; justify-content: space-around; padding-top: 2rem; - #aid-subsection { + .aid-subsection { padding-left: 1rem; padding-right: 1rem; width: 25%; } - #aid-subsection:last-child { + .aid-subsection:last-child { padding-right: 0; border-right: none; } diff --git a/static-snapshots/colleges-and-universities.html b/static-snapshots/colleges-and-universities.html index 2b2613fb..a172f6b1 100644 --- a/static-snapshots/colleges-and-universities.html +++ b/static-snapshots/colleges-and-universities.html @@ -331,7 +331,7 @@
    -
    +

    01 @@ -349,7 +349,7 @@

    -
    +

    02 @@ -367,7 +367,7 @@

    -
    +

    03 @@ -385,7 +385,7 @@

    -
    +

    04 From bea726c3dd195ec48fc05498bcd116f70d217ed9 Mon Sep 17 00:00:00 2001 From: brettvarney Date: Mon, 8 Jul 2019 14:32:26 -0500 Subject: [PATCH 02/77] wip need to adjust download hover color --- _includes/colleges/investment-categories.html | 2 +- _includes/colleges/sectionone.html | 12 +-- _includes/colleges/sectionpre.html | 1 - _includes/colleges/sectionthree.html | 2 +- _includes/colleges/sectiontwo.html | 2 +- _sass/C-a-U-mobile.scss | 2 +- .../svgs => assets/icons}/download_icon.svg | 0 css/C-a-U.scss | 95 ++++++------------- 8 files changed, 40 insertions(+), 76 deletions(-) rename {_includes/svgs => assets/icons}/download_icon.svg (100%) diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html index 86a2e01b..937f63b1 100644 --- a/_includes/colleges/investment-categories.html +++ b/_includes/colleges/investment-categories.html @@ -96,7 +96,7 @@

    Instructions

    diff --git a/_includes/colleges/sectionone.html b/_includes/colleges/sectionone.html index 84409401..3b5e55df 100644 --- a/_includes/colleges/sectionone.html +++ b/_includes/colleges/sectionone.html @@ -55,10 +55,10 @@

    Student Aid

    -
    +
    -

    +

    Federal student aid is financial assistance provided through grants, scholarships, work-study, and loans to students for their educational expenses. This can include costs such as tuition, housing, transportation, books, and supplies.

    @@ -66,10 +66,10 @@

    Grants

    -
    +
    -

    +

    A federal grant is an agreement through which a federal agency provides financial assistance to an individual or organization to be used for projects and expenses that contribute to public good. For example, in 2018, the Department of Commerce funded the University of Maryland, Baltimore County’s (UMBC) research for measuring and improving the robustness of Deep Learning algorithms.

    @@ -77,10 +77,10 @@

    Contracts

    -
    +
    -

    +

    A federal contract is an agreement where the federal government will purchase a good or service from an organization or individual for direct government use. For example, in 2018 the National Aeronautics and Space Administration used a federal contract to pay the California Institute of Technology to operate the Jet Propulsion Laboratory. This Laboratory is a center for robotic exploration of the solar system that carries out essential research and tasks like developing a self-directed spacecraft.

    diff --git a/_includes/colleges/sectionpre.html b/_includes/colleges/sectionpre.html index 8c86d3b7..b23c13c6 100644 --- a/_includes/colleges/sectionpre.html +++ b/_includes/colleges/sectionpre.html @@ -21,7 +21,6 @@

    -
    diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html index 2e573164..bd42d7cb 100644 --- a/_includes/colleges/sectionthree.html +++ b/_includes/colleges/sectionthree.html @@ -71,7 +71,7 @@

    Instructions

    diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html index b6d643fa..dd3bd644 100644 --- a/_includes/colleges/sectiontwo.html +++ b/_includes/colleges/sectiontwo.html @@ -78,7 +78,7 @@

    Instructions

    diff --git a/_sass/C-a-U-mobile.scss b/_sass/C-a-U-mobile.scss index 4a9bc630..0a820d2d 100644 --- a/_sass/C-a-U-mobile.scss +++ b/_sass/C-a-U-mobile.scss @@ -124,7 +124,7 @@ $cuRed: #881E3D; padding-left: 3.5rem; // align with the left! padding-right: 3.5rem; - #investment-subtext #aid-description { + #investment-subtext .aid-description { width: auto; } diff --git a/_includes/svgs/download_icon.svg b/assets/icons/download_icon.svg similarity index 100% rename from _includes/svgs/download_icon.svg rename to assets/icons/download_icon.svg diff --git a/css/C-a-U.scss b/css/C-a-U.scss index 9b939746..c6947a63 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -463,11 +463,11 @@ $cuRed: #881E3D; text-align: center; } - #aid-image { + .aid-image { text-align: center; } - #aid-description { + .aid-description { color: #555555; font-size: 15px; font-weight: 300; @@ -638,30 +638,9 @@ $cuRed: #881E3D; } .chart-footer { - color: $grey; - font-size: 12pt; - display: flex; - justify-content: flex-end; padding-right: 2rem; // align with mapbox padding-top: 5px; // small small space so we're not touching the canvas - - .faded { - opacity: 0.5; - line-height: 18pt; - } - - .download-data { - color: #4a4a4a; - margin-left: 12px; - fill: #4a4a4a; - cursor: pointer; - - &:hover { - color: $cuRed; - } - } } - } // end of alma-mater } // end of section-two @@ -749,32 +728,11 @@ $cuRed: #881E3D; display: flex; flex-direction: column; - .chart-footer { - color: $grey; - font-size: 12pt; max-width: 900px; margin: 0 auto 1rem; padding: 0 1rem; - display: flex; - justify-content: flex-end; width: calc(100% - 2rem); - - .faded { - opacity: 0.5; - line-height: 18pt; - } - - .download-data { - color: #4a4a4a; - margin-left: 12px; - fill: #4a4a4a; - - &:hover { - color: $cuRed; - cursor: pointer; - } - } } } @@ -1095,31 +1053,12 @@ $cuRed: #881E3D; } .chart-footer { - color: $grey; - font-size: 12pt; max-width: 900px; margin: 0 auto 1rem; padding: 0 1rem; - display: flex; - justify-content: flex-end; width: calc(100% - 2rem); - - .faded { - opacity: 0.5; - line-height: 18pt; - } - - .download-data { - color: #4a4a4a; - margin-left: 12px; - fill: #4a4a4a; - - &:hover { - color: $cuRed; - cursor: pointer; - } - } - } } // end of investment categories + } + } // end of investment categories } // end of section four .investmentCategories { @@ -1721,6 +1660,32 @@ $cuRed: #881E3D; display: block; } + .chart-footer { + color: $grey; + font-size: 12pt; + display: flex; + justify-content: flex-end; + + .faded { + opacity: 0.5; + line-height: 18pt; + } + + .download-data { + color: #4a4a4a; + margin-left: 12px; + fill: #4a4a4a; + cursor: pointer; + + &:hover { + color: $cuRed; + + img { + filter: invert(.5) sepia(1) saturate(5) hue-rotate(175deg); + } + } + } + } } // end of .CU // overrride mapbox From 1668018a58d21654ece3cb4bc6b09da2196dbfa2 Mon Sep 17 00:00:00 2001 From: brettvarney Date: Tue, 9 Jul 2019 11:17:30 -0500 Subject: [PATCH 03/77] wip replace download svg --- _includes/colleges/investment-categories.html | 2 +- _includes/colleges/sectionthree.html | 2 +- _includes/colleges/sectiontwo.html | 2 +- _includes/svgs/download-solid.svg | 12 ++++++++++++ assets/icons/download_icon.svg | 16 ---------------- css/C-a-U.scss | 3 ++- 6 files changed, 17 insertions(+), 20 deletions(-) create mode 100755 _includes/svgs/download-solid.svg delete mode 100644 assets/icons/download_icon.svg diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html index 937f63b1..7752c4ff 100644 --- a/_includes/colleges/investment-categories.html +++ b/_includes/colleges/investment-categories.html @@ -96,7 +96,7 @@

    Instructions

    diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html index bd42d7cb..f0510d87 100644 --- a/_includes/colleges/sectionthree.html +++ b/_includes/colleges/sectionthree.html @@ -71,7 +71,7 @@

    Instructions

    diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html index dd3bd644..cea19bf3 100644 --- a/_includes/colleges/sectiontwo.html +++ b/_includes/colleges/sectiontwo.html @@ -78,7 +78,7 @@

    Instructions

    diff --git a/_includes/svgs/download-solid.svg b/_includes/svgs/download-solid.svg new file mode 100755 index 00000000..4ec644a5 --- /dev/null +++ b/_includes/svgs/download-solid.svg @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/assets/icons/download_icon.svg b/assets/icons/download_icon.svg deleted file mode 100644 index a0f188ba..00000000 --- a/assets/icons/download_icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/css/C-a-U.scss b/css/C-a-U.scss index c6947a63..a61b4fcf 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -1681,7 +1681,8 @@ $cuRed: #881E3D; color: $cuRed; img { - filter: invert(.5) sepia(1) saturate(5) hue-rotate(175deg); + filter: brightness(0.5) sepia(1); + // filter: invert(.5) sepia(1) saturate(75.5%) hue-rotate(322deg) brightness(42.7%); } } } From 9a947c17f4577ec5a486600b4531a0a30e40744d Mon Sep 17 00:00:00 2001 From: brettvarney Date: Thu, 11 Jul 2019 09:23:44 -0500 Subject: [PATCH 04/77] fix download icons --- _includes/svgs/download-solid.svg | 2 +- _includes/svgs/search-solid.svg | 1 + css/C-a-U.scss | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_includes/svgs/download-solid.svg b/_includes/svgs/download-solid.svg index 4ec644a5..f883ece6 100755 --- a/_includes/svgs/download-solid.svg +++ b/_includes/svgs/download-solid.svg @@ -2,7 +2,7 @@ role="img" class="svg-inline--fa fa-download fa-w-16" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 20 20" + viewBox="0 0 512 512" > diff --git a/css/C-a-U.scss b/css/C-a-U.scss index 2b11a5d9..9cebd37c 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -1047,9 +1047,9 @@ $cuRed: #881E3D; display: none; .svg-inline--fa.fa-w-16 { - width: 1em; color: #666; } + input { width: calc(100% - 4rem); padding: 1rem 2rem; @@ -1061,6 +1061,10 @@ $cuRed: #881E3D; // border: none; } + .svg-inline--fa.fa-w-16 { + width: 1em; + } + .investmentCategories { padding-left: 5%; padding-right: 5%; From db2ff72cec0a44b8594fb5cb6dc7b5abe0c153bb Mon Sep 17 00:00:00 2001 From: brettvarney Date: Mon, 15 Jul 2019 09:52:45 -0500 Subject: [PATCH 05/77] add ga-on to event --- entries/ffg/bp/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entries/ffg/bp/index.html b/entries/ffg/bp/index.html index 43e3ab45..ccbd1f1a 100644 --- a/entries/ffg/bp/index.html +++ b/entries/ffg/bp/index.html @@ -49,7 +49,9 @@

    In 2018,
    the federal government
    - +
    From b65411761a885f56499d4bf65d1921ca48ddb27f Mon Sep 17 00:00:00 2001 From: brettvarney Date: Mon, 15 Jul 2019 09:56:00 -0500 Subject: [PATCH 06/77] update tracking code (to see what happens) --- entries/ffg/bp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entries/ffg/bp/index.html b/entries/ffg/bp/index.html index ccbd1f1a..5c775094 100644 --- a/entries/ffg/bp/index.html +++ b/entries/ffg/bp/index.html @@ -49,7 +49,7 @@

    In 2018,
    the federal government
    -
    From 79587bfe5ae188e6b4ec0312f758da15bb31e4a3 Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Tue, 16 Jul 2019 15:07:47 -0400 Subject: [PATCH 07/77] fixed depth 1 --- _includes/colleges/investment-categories.html | 13 +-- .../investment-categories.js | 81 +++++++++++-------- .../investmentCategoriesDetail.js | 2 +- css/C-a-U.scss | 4 + 4 files changed, 59 insertions(+), 41 deletions(-) diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html index 9bfe18ec..4c6ebb7e 100644 --- a/_includes/colleges/investment-categories.html +++ b/_includes/colleges/investment-categories.html @@ -11,7 +11,8 @@

    Now that we know how much money was invested in higher education, are you curious to know how the money was used? This visualization allows you to discover the various categories the government uses to classify funding. - Note: Product and Service Codes (PSCs) are used to categorize contract purchases of products and services and Federal Assistance Listings are used to categorize grant funding. + Note: + Product and Service Codes (PSCs) are used to categorize contract purchases of products and services and Federal Assistance Listings are used to categorize grant funding.

    @@ -29,14 +30,14 @@

    Instructions

    - - + + - - + +

    {% include viz-footer-info.html - body="The data used to create the Daily Spending Tracker is sourced from the Bureau of the Fiscal Service’s Daily Treasury Statement (DTS) archive. The download and transformation scripts come from the Federal Treasury API, developed for the treasury.io tool. The data goes through three stages of cleaning prior to reaching its completed state: download, parse, and aggregate." +body="The data used to create the Daily Spending Tracker is sourced from the Bureau of the Fiscal Service’s Daily Treasury Statement (DTS) archive. The download and transformation scripts come from the Federal Treasury API, developed for the treasury.io tool. The data goes through three stages of cleaning prior to reaching its completed state: download, parse, and aggregate." link="dts-more.html" %} @@ -121,4 +121,4 @@ - \ No newline at end of file + From ad5b2c7b1dc80fc74e5320236a553855f545b52f Mon Sep 17 00:00:00 2001 From: Varney Date: Fri, 19 Jul 2019 10:31:52 -0500 Subject: [PATCH 17/77] add click analytics to top menu --- _includes/header.html | 298 ++++++++++++++++++++++++++++---------- entries/ffg/bp/index.html | 2 +- 2 files changed, 224 insertions(+), 76 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 165e878a..0033342c 100755 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,11 +5,17 @@ USAspending.gov -
  • - + Data Lab
    • @@ -18,7 +24,11 @@
    An official website of the U.S. government
    - U.S. flag + U.S. flag
    {% include info-banner.html %} @@ -26,124 +36,262 @@
    +
    - -
    + diff --git a/entries/ffg/bp/index.html b/entries/ffg/bp/index.html index 5c775094..94723cac 100644 --- a/entries/ffg/bp/index.html +++ b/entries/ffg/bp/index.html @@ -49,7 +49,7 @@

    In 2018,
    the federal government
    -
    From 21bb216d827fd5c7ce158543464b16d94c9b6479 Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Fri, 19 Jul 2019 11:34:00 -0400 Subject: [PATCH 18/77] tweak --- .../investment-categories.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/colleges-and-universities/investment-categories.js b/assets/js/colleges-and-universities/investment-categories.js index 6d647336..24f5b48c 100755 --- a/assets/js/colleges-and-universities/investment-categories.js +++ b/assets/js/colleges-and-universities/investment-categories.js @@ -138,7 +138,7 @@ function updateCenter(d) { const dataTypeLabel = dataType === 'CFDA' ? '' : dataType + ' '; - const labelFontSize = 1; + let labelFontSize = 1; const lineHeight = 1.1; const doubleSpace = 2; const mediumText = 1.25; @@ -156,7 +156,7 @@ function updateCenter(d) { .text('Total FY2018 ' + categoryLabel + ' Funding') .attr('class', 'center-heading') .style('font-size', function() { - return labelFontSize + "em"; + return labelFontSize * mediumText + "em"; }) .attr('dy', '0') ; @@ -181,7 +181,7 @@ function updateCenter(d) { .attr('text-anchor', 'middle') .text(dataTypeLabel + 'Category') .attr('class', 'center-heading') - .style('font-size', labelFontSize * mediumText + "em") + .style('font-size', labelFontSize + "em") .attr('dy', '0') ; @@ -191,7 +191,7 @@ function updateCenter(d) { .attr('text-anchor', 'middle') .text(d.name) .attr('class', 'center-title') - .style('font-size', labelFontSize * largeText + "em") + .style('font-size', labelFontSize * mediumText + "em") .call(wordWrap, boundingBox) ; @@ -202,7 +202,7 @@ function updateCenter(d) { .attr('text-anchor', 'middle') .text('Total FY2018 Funding') .attr('class', 'center-heading') - .style('font-size', labelFontSize * mediumText + "em") + .style('font-size', labelFontSize + "em") ; centerGroup.append('tspan') @@ -211,7 +211,7 @@ function updateCenter(d) { .attr('text-anchor', 'middle') .text(formatNumber(d.value)) .attr('class', 'center-amount') - .style('font-size', labelFontSize * exLargeText + "em") + .style('font-size', labelFontSize * largeText + "em") ; } else { From c6cd765d9148d8470e611d4d8aa10ec9a963cd2b Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Fri, 19 Jul 2019 11:53:02 -0400 Subject: [PATCH 19/77] tweak text size --- .../investment-categories.js | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/assets/js/colleges-and-universities/investment-categories.js b/assets/js/colleges-and-universities/investment-categories.js index 24f5b48c..c7323af0 100755 --- a/assets/js/colleges-and-universities/investment-categories.js +++ b/assets/js/colleges-and-universities/investment-categories.js @@ -234,6 +234,8 @@ function updateCenter(d) { .text(d.parent.name) .attr('class', 'center-title') .style('font-size', labelFontSize * largeText + "em") + .call(wordWrap, boundingBox) + ; centerGroup.append('tspan') @@ -271,28 +273,18 @@ function updateCenter(d) { const maxHeight = bbox.height; const maxWidth = bbox.width; let scale = 1; - let max = maxHeight; if(maxHeight >= maxWidth) { - - if(maxHeight >= boundingBox) { - scale = boundingBox / maxHeight; - } else { - scale = maxHeight / boundingBox; + if (maxHeight > boundingBox) { + scale = boundingBox / maxHeight; + centerGroup.attr("transform", "scale(" + scale + ")"); } - max = maxHeight; - centerGroup.attr("transform", "scale(" + scale + ")"); - } else { - if (maxWidth >= boundingBox) { - scale = boundingBox / maxWidth; - } else { - scale = maxWidth / boundingBox; + if(maxWidth > boundingBox) { + scale = boundingBox / maxWidth; + centerGroup.attr("transform", "scale(" + scale + ")"); } - - max = maxWidth; - centerGroup.attr("transform", "scale(" + scale + ")"); } const padding = 16 * scale; // 1em = 16px From bc56ef8394e245dde8b6ac80ee9a277445aa7466 Mon Sep 17 00:00:00 2001 From: Varney Date: Fri, 19 Jul 2019 11:11:31 -0500 Subject: [PATCH 20/77] add click analytics to mobile top menu --- _includes/header.html | 54 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 0033342c..ed698ecc 100755 --- a/_includes/header.html +++ b/_includes/header.html @@ -203,40 +203,76 @@ From 343a0253a4e4f54bf1967c3fe4e9b9df486e29d5 Mon Sep 17 00:00:00 2001 From: Varney Date: Fri, 19 Jul 2019 12:40:56 -0500 Subject: [PATCH 21/77] add click analytics to man page content --- index.html | 66 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/index.html b/index.html index 49731de8..93637074 100755 --- a/index.html +++ b/index.html @@ -10,9 +10,11 @@
    -
    - +

    Federal Investment in Higher Education

    @@ -39,11 +41,12 @@

    -
    -
    - +

    Visualizing the Daily Treasury Statement

    @@ -52,12 +55,12 @@

    {% include landing-dts.html %}     -
    -
    - - +

    Contract Spending Analysis @@ -66,7 +69,6 @@

    How has federal
    contract spending
    changed over time?

    -
    @@ -77,11 +79,11 @@

    -
    - - - +

    Contract Explorer @@ -93,14 +95,12 @@

    -

    The federal government spends about $500 billion each year on contracts. Learn more about contract recipients and what agencies receive from these contracts.

    -
    @@ -108,7 +108,10 @@

    More Analyses

    - +

    Your Guide to America's Finances

    @@ -134,16 +137,15 @@

    well as the deficit and debt in 2018.

    -

    -
    -
    -
    - +

    Federal Account Explorer @@ -156,8 +158,10 @@

    - - +

    Federal Employees @@ -173,7 +177,10 @@

    - +

    Budget Function @@ -187,7 +194,10 @@

    - +

    Competition in Contracting @@ -206,7 +216,9 @@

    - +

    From 5e9bf3e2566fd68451d1fd90988951a339999226 Mon Sep 17 00:00:00 2001 From: Varney Date: Fri, 19 Jul 2019 13:46:54 -0500 Subject: [PATCH 22/77] readability cleanup --- assets/js/fedscope-tool/dataModule.js | 102 ++++----- assets/js/fedscope-tool/fedscope.js | 300 +++++++++++++------------- 2 files changed, 201 insertions(+), 201 deletions(-) diff --git a/assets/js/fedscope-tool/dataModule.js b/assets/js/fedscope-tool/dataModule.js index da1f2ca0..6bc5bd7f 100644 --- a/assets/js/fedscope-tool/dataModule.js +++ b/assets/js/fedscope-tool/dataModule.js @@ -2,60 +2,60 @@ --- window.dataModule = { - mem: {}, + mem: { }, - loadStates: (cb) => { - d3.json("../../../data-lab-data/fedscope-tool/states.json", ( - error, - data - ) => { - if (error) throw error; - window.dataModule.mem.states = data; - cb(data); - }); - }, + loadStates: (cb) => { + d3.json("../../../data-lab-data/fedscope-tool/states.json", ( + error, + data + ) => { + if (error) throw error; + window.dataModule.mem.states = data; + cb(data); + }); + }, - loadAgencies: (cb) => { - d3.json("../../../data-lab-data/fedscope-tool/agencies.json", ( - error, - data - ) => { - if (error) throw error; - window.dataModule.mem.agencies = data; - cb(data); - }); - }, + loadAgencies: (cb) => { + d3.json("../../../data-lab-data/fedscope-tool/agencies.json", ( + error, + data + ) => { + if (error) throw error; + window.dataModule.mem.agencies = data; + cb(data); + }); + }, - loadOccupationCategories: (cb) => { - d3.json( - "../../../data-lab-data/fedscope-tool/occupationCategories.json", - (error, data) => { - if (error) throw error; - window.dataModule.mem.occupationCategories = data; - cb(data); - } - ); - }, + loadOccupationCategories: (cb) => { + d3.json( + "../../../data-lab-data/fedscope-tool/occupationCategories.json", + (error, data) => { + if (error) throw error; + window.dataModule.mem.occupationCategories = data; + cb(data); + } + ); + }, - loadEmployeeCountData: (cbs, props) => { - d3.json("../../../data-lab-data/fedscope-tool/employees.json", ( - error, - data - ) => { - if (error) throw error; - window.dataModule.mem.employeeCounts = data; - cbs.forEach((cb) => cb(data, props)); - }); - }, + loadEmployeeCountData: (cbs, props) => { + d3.json("../../../data-lab-data/fedscope-tool/employees.json", ( + error, + data + ) => { + if (error) throw error; + window.dataModule.mem.employeeCounts = data; + cbs.forEach((cb) => cb(data, props)); + }); + }, - loadEmployeeSalaryData: (cbs, props) => { - d3.json( - "../../../data-lab-data/fedscope-tool/employeeSalaries.json", - (error, data) => { - if (error) throw error; - window.dataModule.mem.employeeSalaries = data; - cbs.forEach((cb) => cb(data, props)); - } - ); - } + loadEmployeeSalaryData: (cbs, props) => { + d3.json( + "../../../data-lab-data/fedscope-tool/employeeSalaries.json", + (error, data) => { + if (error) throw error; + window.dataModule.mem.employeeSalaries = data; + cbs.forEach((cb) => cb(data, props)); + } + ); + } }; diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 36305c77..e4e3682f 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -2,154 +2,154 @@ --- $(() => { - const { - dataModule, barchartModule, mapModule, treemapModule - } = window; - - const { - loadEmployeeCountData, - loadEmployeeSalaryData, - loadStates, - loadAgencies, - loadOccupationCategories, - mem - } = dataModule; - - loadStates((states) => { - loadAgencies((agencies) => { - loadOccupationCategories((occupationCategories) => { - loadEmployeeCountData([mapModule.draw, barchartModule.draw], { - states, - agencies, - occupationCategories - }); - - loadEmployeeSalaryData([treemapModule.draw], { - agencies - }); - - const sorter = (a, b) => { - if (a.name < b.name) return -1; - if (a.name > b.name) return 1; - return 0; - }; - - const stateDropdownOptions = Object.values(states) - .sort(sorter) - .map((s) => ``); - $("#barchartStateDropdown").append(...stateDropdownOptions); - - const agencyDropdownOptions = Object.values(agencies) - .sort(sorter) - .map((a) => ``); - $("#mapAgencyDropdown").append(...agencyDropdownOptions); - $("#barchartAgencyDropdown").append(...agencyDropdownOptions); - - const occupationDropdownOptions = Object.values(occupationCategories) - .sort(sorter) - .map((o) => ``); - $("#mapOccupationDropdown") - .append('') - .append(...occupationDropdownOptions) - ; - }); - }); - }); - - $("#mapFilter").click(() => { - const filterAgencies = $("#mapAgencyDropdown").val(); - const filterOccupations = $("#mapOccupationDropdown").val(); - const { employeeCounts, states, occupationCategories } = mem; - let newData = [...employeeCounts]; - - const filterAgenciesName = $("#mapAgencyDropdown option:selected").text(); - const filterOccupationsName = $("#mapOccupationDropdown option:selected").text(); - - window.Analytics.event({ - category: 'Federal Employees - Panel 2 - Filter', - action: filterAgenciesName + " - " + filterOccupationsName - }); - - if (filterAgencies) { - newData = newData.filter((e) => - filterAgencies.some((a) => e.agencyId === +a) - ); - } - - if (filterOccupations.length && filterOccupations[0] !== 'any') { - newData = newData.filter((e) => - filterOccupations.some((o) => e.occupationCategoryId === +o) - ); - } - - mapModule.draw(newData, { - states, - occupationCategories - }); - }); - - $("#mapMask") - .find("#button1") - .click((e) => { - e.preventDefault(); - - $("#mapAgencyDropdown > option").attr("selected", false); - $("#mapOccupationDropdown > option").attr("selected", false); - - const { employeeCounts, states, occupationCategories } = mem; - - mapModule.draw([...employeeCounts], { - states, - occupationCategories - }); - }); - - $("#barchartFilter").click(() => { - const filterStates = $("#barchartStateDropdown").val(); - const filterAgencies = $("#barchartAgencyDropdown").val(); - - const filterStatesName = $("#barchartStateDropdown option:selected").text(); - const filterAgenciesName = $("#barchartAgencyDropdown option:selected").text(); - - window.Analytics.event({ - category: 'Federal Employees - Panel 3 - Filter', - action: filterAgenciesName + " - " + filterStatesName - }); - - const { employeeCounts, agencies, occupationCategories } = mem; - let newData = employeeCounts; - - if (filterStates) { - newData = newData.filter((e) => - filterStates.some((s) => e.stateAbbreviation === s) - ); - } - - if (filterAgencies) { - newData = newData.filter((e) => - filterAgencies.some((a) => e.agencyId === +a) - ); - } - - barchartModule.draw(newData, { - agencies, - occupationCategories - }); - }); - - $("#barchartMask") - .find("#button1") - .click((e) => { - e.preventDefault(); - - $("#barchartAgencyDropdown > option").attr("selected", false); - $("#barchartStateDropdown > option").attr("selected", false); - - const { employeeCounts, states, occupationCategories } = mem; - - barchartModule.draw([...employeeCounts], { - states, - occupationCategories - }); - }); + const { + dataModule, barchartModule, mapModule, treemapModule + } = window; + + const { + loadEmployeeCountData, + loadEmployeeSalaryData, + loadStates, + loadAgencies, + loadOccupationCategories, + mem + } = dataModule; + + loadStates((states) => { + loadAgencies((agencies) => { + loadOccupationCategories((occupationCategories) => { + loadEmployeeCountData([mapModule.draw, barchartModule.draw], { + states, + agencies, + occupationCategories + }); + + loadEmployeeSalaryData([treemapModule.draw], { + agencies + }); + + const sorter = (a, b) => { + if (a.name < b.name) return -1; + if (a.name > b.name) return 1; + return 0; + }; + + const stateDropdownOptions = Object.values(states) + .sort(sorter) + .map((s) => ``); + $("#barchartStateDropdown").append(...stateDropdownOptions); + + const agencyDropdownOptions = Object.values(agencies) + .sort(sorter) + .map((a) => ``); + $("#mapAgencyDropdown").append(...agencyDropdownOptions); + $("#barchartAgencyDropdown").append(...agencyDropdownOptions); + + const occupationDropdownOptions = Object.values(occupationCategories) + .sort(sorter) + .map((o) => ``); + $("#mapOccupationDropdown") + .append('') + .append(...occupationDropdownOptions) + ; + }); + }); + }); + + $("#mapFilter").click(() => { + const filterAgencies = $("#mapAgencyDropdown").val(); + const filterOccupations = $("#mapOccupationDropdown").val(); + const { employeeCounts, states, occupationCategories } = mem; + let newData = [...employeeCounts]; + + const filterAgenciesName = $("#mapAgencyDropdown option:selected").text(); + const filterOccupationsName = $("#mapOccupationDropdown option:selected").text(); + + window.Analytics.event({ + category: 'Federal Employees - Panel 2 - Filter', + action: filterAgenciesName + " - " + filterOccupationsName + }); + + if (filterAgencies) { + newData = newData.filter((e) => + filterAgencies.some((a) => e.agencyId === +a) + ); + } + + if (filterOccupations.length && filterOccupations[0] !== 'any') { + newData = newData.filter((e) => + filterOccupations.some((o) => e.occupationCategoryId === +o) + ); + } + + mapModule.draw(newData, { + states, + occupationCategories + }); + }); + + $("#mapMask") + .find("#button1") + .click((e) => { + e.preventDefault(); + + $("#mapAgencyDropdown > option").attr("selected", false); + $("#mapOccupationDropdown > option").attr("selected", false); + + const { employeeCounts, states, occupationCategories } = mem; + + mapModule.draw([...employeeCounts], { + states, + occupationCategories + }); + }); + + $("#barchartFilter").click(() => { + const filterStates = $("#barchartStateDropdown").val(); + const filterAgencies = $("#barchartAgencyDropdown").val(); + + const filterStatesName = $("#barchartStateDropdown option:selected").text(); + const filterAgenciesName = $("#barchartAgencyDropdown option:selected").text(); + + window.Analytics.event({ + category: 'Federal Employees - Panel 3 - Filter', + action: filterAgenciesName + " - " + filterStatesName + }); + + const { employeeCounts, agencies, occupationCategories } = mem; + let newData = employeeCounts; + + if (filterStates) { + newData = newData.filter((e) => + filterStates.some((s) => e.stateAbbreviation === s) + ); + } + + if (filterAgencies) { + newData = newData.filter((e) => + filterAgencies.some((a) => e.agencyId === +a) + ); + } + + barchartModule.draw(newData, { + agencies, + occupationCategories + }); + }); + + $("#barchartMask") + .find("#button1") + .click((e) => { + e.preventDefault(); + + $("#barchartAgencyDropdown > option").attr("selected", false); + $("#barchartStateDropdown > option").attr("selected", false); + + const { employeeCounts, states, occupationCategories } = mem; + + barchartModule.draw([...employeeCounts], { + states, + occupationCategories + }); + }); }); From 9619b1327b95299ca5b3de21cc57ed83cb03dd33 Mon Sep 17 00:00:00 2001 From: Varney Date: Fri, 19 Jul 2019 14:13:19 -0500 Subject: [PATCH 23/77] more readability --- assets/js/fedscope-tool/fedscope.js | 74 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index e4e3682f..e0d6297f 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -15,9 +15,9 @@ $(() => { mem } = dataModule; - loadStates((states) => { - loadAgencies((agencies) => { - loadOccupationCategories((occupationCategories) => { + loadStates(states => { + loadAgencies(agencies => { + loadOccupationCategories(occupationCategories => { loadEmployeeCountData([mapModule.draw, barchartModule.draw], { states, agencies, @@ -36,18 +36,19 @@ $(() => { const stateDropdownOptions = Object.values(states) .sort(sorter) - .map((s) => ``); + .map(s => ``) + ; $("#barchartStateDropdown").append(...stateDropdownOptions); const agencyDropdownOptions = Object.values(agencies) .sort(sorter) - .map((a) => ``); + .map(a => ``) + ; $("#mapAgencyDropdown").append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); - const occupationDropdownOptions = Object.values(occupationCategories) - .sort(sorter) - .map((o) => ``); + const occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); + let occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); $("#mapOccupationDropdown") .append('') .append(...occupationDropdownOptions) @@ -71,14 +72,14 @@ $(() => { }); if (filterAgencies) { - newData = newData.filter((e) => - filterAgencies.some((a) => e.agencyId === +a) + newData = newData.filter(e => + filterAgencies.some(a => e.agencyId === +a) ); } if (filterOccupations.length && filterOccupations[0] !== 'any') { - newData = newData.filter((e) => - filterOccupations.some((o) => e.occupationCategoryId === +o) + newData = newData.filter(e => + filterOccupations.some(o => e.occupationCategoryId === +o) ); } @@ -88,26 +89,23 @@ $(() => { }); }); - $("#mapMask") - .find("#button1") - .click((e) => { - e.preventDefault(); + $("#mapMask").find("#button1").click(e => { + e.preventDefault(); - $("#mapAgencyDropdown > option").attr("selected", false); - $("#mapOccupationDropdown > option").attr("selected", false); + $("#mapAgencyDropdown > option").attr("selected", false); + $("#mapOccupationDropdown > option").attr("selected", false); - const { employeeCounts, states, occupationCategories } = mem; + const { employeeCounts, states, occupationCategories } = mem; - mapModule.draw([...employeeCounts], { - states, - occupationCategories - }); + mapModule.draw([...employeeCounts], { + states, + occupationCategories }); + }); $("#barchartFilter").click(() => { const filterStates = $("#barchartStateDropdown").val(); const filterAgencies = $("#barchartAgencyDropdown").val(); - const filterStatesName = $("#barchartStateDropdown option:selected").text(); const filterAgenciesName = $("#barchartAgencyDropdown option:selected").text(); @@ -120,14 +118,14 @@ $(() => { let newData = employeeCounts; if (filterStates) { - newData = newData.filter((e) => - filterStates.some((s) => e.stateAbbreviation === s) + newData = newData.filter(e => + filterStates.some(s => e.stateAbbreviation === s) ); } if (filterAgencies) { - newData = newData.filter((e) => - filterAgencies.some((a) => e.agencyId === +a) + newData = newData.filter(e => + filterAgencies.some(a => e.agencyId === +a) ); } @@ -137,19 +135,17 @@ $(() => { }); }); - $("#barchartMask") - .find("#button1") - .click((e) => { - e.preventDefault(); + $("#barchartMask").find("#button1").click(e => { + e.preventDefault(); - $("#barchartAgencyDropdown > option").attr("selected", false); - $("#barchartStateDropdown > option").attr("selected", false); + $("#barchartAgencyDropdown > option").attr("selected", false); + $("#barchartStateDropdown > option").attr("selected", false); - const { employeeCounts, states, occupationCategories } = mem; + const { employeeCounts, states, occupationCategories } = mem; - barchartModule.draw([...employeeCounts], { - states, - occupationCategories - }); + barchartModule.draw([...employeeCounts], { + states, + occupationCategories }); + }); }); From 295c2b1ed14a8a08fd7d50967371d426e4a5bb55 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Fri, 19 Jul 2019 15:15:47 -0500 Subject: [PATCH 24/77] wip 1st pass, not tested --- assets/js/fedscope-tool/fedscope.js | 39 +++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index e0d6297f..70b77746 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -15,6 +15,9 @@ $(() => { mem } = dataModule; + let occupationDropdownMasterList; + let occupationDropdownOptions; + loadStates(states => { loadAgencies(agencies => { loadOccupationCategories(occupationCategories => { @@ -47,8 +50,9 @@ $(() => { $("#mapAgencyDropdown").append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); - const occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); - let occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); + occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); + // filterOccupationsList(); + occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); $("#mapOccupationDropdown") .append('') .append(...occupationDropdownOptions) @@ -57,6 +61,37 @@ $(() => { }); }); + // let changes = 0; + // $("#mapAgencyDropdown").change(() => { + // changes++; + // let local_change = changes; + + // setTimeout(function () { // wait 1 sec to see if they're done making changes + // if (local_change === changes) { + // filterOccupationsList($(this).val()); + // } + // }, 1000); + // }) + + // function filterOccupationsList(selectedAgencies) { + // if (selectedAgencies) { + // occupationDropdownOptions = occupationDropdownMasterList + // .filter() + // .map(o => ``); + // } else { + // occupationDropdownOptions = occupationDropdownMasterList + // .map(o => ``); + // } + + // $('#mapAgencyDropdown') + // .find('option') + // .remove() + // .end() + // .append('') + // .append(...occupationDropdownOptions) + // ; + // } + $("#mapFilter").click(() => { const filterAgencies = $("#mapAgencyDropdown").val(); const filterOccupations = $("#mapOccupationDropdown").val(); From 54c578fc07914e3aeb588cf0fa11312ef1454c0c Mon Sep 17 00:00:00 2001 From: xjackk Date: Mon, 22 Jul 2019 09:51:26 -0400 Subject: [PATCH 25/77] hide map panel, add head tags for cu share --- _includes/head.html | 3 +++ assets/js/colleges-and-universities/institutions.js | 5 +++-- entries/colleges-and-universities.html | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 727a88d5..2376df6c 100755 --- a/_includes/head.html +++ b/_includes/head.html @@ -35,6 +35,9 @@ {% if page.colleges %} + {% if page.socialMediaImage %} + + {% endif %} {% endif %} diff --git a/assets/js/colleges-and-universities/institutions.js b/assets/js/colleges-and-universities/institutions.js index 34071b55..06fbbbd1 100644 --- a/assets/js/colleges-and-universities/institutions.js +++ b/assets/js/colleges-and-universities/institutions.js @@ -310,8 +310,9 @@ function createMapbox() { // click for righthand panel map.on('click', 'unclustered-point', function(e) { - // call global - instmap.activateDetail(e.features[0].properties); + if ($(window).width() > 949) { + instmap.activateDetail(e.features[0].properties); + } }); }); // end getjson (get map function) diff --git a/entries/colleges-and-universities.html b/entries/colleges-and-universities.html index e13bf60e..5ca229a9 100644 --- a/entries/colleges-and-universities.html +++ b/entries/colleges-and-universities.html @@ -9,7 +9,6 @@ socialMediaText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" --- -
    {% include colleges/sectionpre.html %} {% include colleges/sectionone.html %} @@ -24,7 +23,6 @@ %}
    - From cd2db08567c64732d03815fbbd81c43f1227f0c0 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 09:39:33 -0500 Subject: [PATCH 26/77] DA-3327 wip first try to filter occupations by agency --- assets/js/fedscope-tool/fedscope.js | 72 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 70b77746..e62b6519 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -51,46 +51,46 @@ $(() => { $("#barchartAgencyDropdown").append(...agencyDropdownOptions); occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); - // filterOccupationsList(); - occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); - $("#mapOccupationDropdown") - .append('') - .append(...occupationDropdownOptions) - ; + filterOccupationsList(); + // occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); + // $("#mapOccupationDropdown") + // .append('') + // .append(...occupationDropdownOptions) + // ; }); }); }); - // let changes = 0; - // $("#mapAgencyDropdown").change(() => { - // changes++; - // let local_change = changes; - - // setTimeout(function () { // wait 1 sec to see if they're done making changes - // if (local_change === changes) { - // filterOccupationsList($(this).val()); - // } - // }, 1000); - // }) - - // function filterOccupationsList(selectedAgencies) { - // if (selectedAgencies) { - // occupationDropdownOptions = occupationDropdownMasterList - // .filter() - // .map(o => ``); - // } else { - // occupationDropdownOptions = occupationDropdownMasterList - // .map(o => ``); - // } - - // $('#mapAgencyDropdown') - // .find('option') - // .remove() - // .end() - // .append('') - // .append(...occupationDropdownOptions) - // ; - // } + let changes = 0; + $("#mapAgencyDropdown").change(() => { + changes++; + let local_change = changes; + + setTimeout(function () { // wait 1 sec to see if they're done making changes + if (local_change === changes) { + filterOccupationsList($("#mapAgencyDropdown").val()); + } + }, 1000); + }) + + function filterOccupationsList(selectedAgencies) { + if (selectedAgencies) { + occupationDropdownOptions = occupationDropdownMasterList + .filter(o => selectedAgencies.includes(o.id)) + .map(o => ``); + } else { + occupationDropdownOptions = occupationDropdownMasterList + .map(o => ``); + } + + $('#mapAgencyDropdown') + .find('option') + .remove() + .end() + .append('') + .append(...occupationDropdownOptions) + ; + } $("#mapFilter").click(() => { const filterAgencies = $("#mapAgencyDropdown").val(); From db7cd6d07d7b93f31e1b9401059788c5bdc0e5cd Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 09:55:17 -0500 Subject: [PATCH 27/77] weird jQuery transpilation? --- assets/js/fedscope-tool/fedscope.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index e62b6519..a1b1fb63 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -83,8 +83,8 @@ $(() => { .map(o => ``); } - $('#mapAgencyDropdown') - .find('option') + $("#mapAgencyDropdown") + .find("option") .remove() .end() .append('') From 9a2b2a7561587a8c0baaf7340e3f8c752d8a6f42 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 10:20:51 -0500 Subject: [PATCH 28/77] fix list appending to (oops) --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index a1b1fb63..1e15cdb0 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -83,7 +83,7 @@ $(() => { .map(o => ``); } - $("#mapAgencyDropdown") + $("#mapOccupationDropdown") .find("option") .remove() .end() From 4b2c8aa55f08f9b6941c682fa94c76a369ba6786 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 10:33:10 -0500 Subject: [PATCH 29/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 1e15cdb0..f84c22ed 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -52,11 +52,6 @@ $(() => { occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); filterOccupationsList(); - // occupationDropdownOptions = occupationDropdownMasterList.map(o => ``); - // $("#mapOccupationDropdown") - // .append('') - // .append(...occupationDropdownOptions) - // ; }); }); }); @@ -75,6 +70,7 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { + const { employeeCounts } = mem; occupationDropdownOptions = occupationDropdownMasterList .filter(o => selectedAgencies.includes(o.id)) .map(o => ``); From f519f290a0ba20dd7b99e32a4aa131d121a72e65 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 10:56:13 -0500 Subject: [PATCH 30/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index f84c22ed..891769ea 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -71,8 +71,13 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { const { employeeCounts } = mem; + const agencyOccupationIds = employeeCounts.map(e => { + if (selectedAgencies.includes(e.agencyId)) { + return e.occupationCategoryId; + } + }); occupationDropdownOptions = occupationDropdownMasterList - .filter(o => selectedAgencies.includes(o.id)) + .filter(o => agencyOccupationIds.includes(o.id)) .map(o => ``); } else { occupationDropdownOptions = occupationDropdownMasterList From 796b913f0f72463a85c7e259d3593cfd9448e27c Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 11:32:59 -0500 Subject: [PATCH 31/77] DA-3227 wip --- assets/js/fedscope-tool/fedscope.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 891769ea..ca6f341d 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -71,9 +71,10 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { const { employeeCounts } = mem; - const agencyOccupationIds = employeeCounts.map(e => { + const agencyOccupationIds = []; + employeeCounts.array.forEach(e => { if (selectedAgencies.includes(e.agencyId)) { - return e.occupationCategoryId; + agencyOccupationIds.push(e.occupationCategoryId); } }); occupationDropdownOptions = occupationDropdownMasterList From 0a4007a44a40e5293459ff78a44427ef8833b590 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 11:43:43 -0500 Subject: [PATCH 32/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index ca6f341d..8ae93e01 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -72,7 +72,7 @@ $(() => { if (selectedAgencies) { const { employeeCounts } = mem; const agencyOccupationIds = []; - employeeCounts.array.forEach(e => { + for (let e in employeeCounts) { if (selectedAgencies.includes(e.agencyId)) { agencyOccupationIds.push(e.occupationCategoryId); } From a9444ff51fc9945c49c324041ac479ec289d9c86 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 11:54:53 -0500 Subject: [PATCH 33/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 8ae93e01..99fed33f 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -72,7 +72,7 @@ $(() => { if (selectedAgencies) { const { employeeCounts } = mem; const agencyOccupationIds = []; - for (let e in employeeCounts) { + for (let e of employeeCounts) { if (selectedAgencies.includes(e.agencyId)) { agencyOccupationIds.push(e.occupationCategoryId); } From 5cebdbed4ac2f09a7336e5bef5773b22b7e938ee Mon Sep 17 00:00:00 2001 From: xjackk Date: Mon, 22 Jul 2019 12:56:38 -0400 Subject: [PATCH 34/77] map click mobile fix --- .../colleges-and-universities/institutions.js | 60 ++++++++++++------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/assets/js/colleges-and-universities/institutions.js b/assets/js/colleges-and-universities/institutions.js index 227041fb..9e1b5f31 100644 --- a/assets/js/colleges-and-universities/institutions.js +++ b/assets/js/colleges-and-universities/institutions.js @@ -7,7 +7,7 @@ let agenciesTopFive; let categoriesTopFive; function numberWithCommas(x) { - return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } function createMapbox() { @@ -46,14 +46,6 @@ function createMapbox() { function renderAllSchools() { $.getJSON('../../data-lab-data/CU_features_min.geojson', function(data) { - let realData = data; - let realDataArr = []; - realDataArr = JSON.parse(realData); - console.log(realDataArr); - -// let sortedData = realData.features.sort(compare); -// let sortedData = realData.features.sort((a,b) => (a.Recipient > b.Recipient) ? 1 : ((b.Recipient > a.Recipient) ? -1 : 0)); -// console.log(sortedData); let geoandname = data.features.map(function (ele) { return { @@ -90,9 +82,10 @@ function createMapbox() { }); tooltip.setLngLat(mobileMatched[0].coord.coordinates) .setHTML(mobileTooltip) - .addTo(map) - ; - $("#map-search-ul--mobile").hide(); // hide mobile search list + .addTo(map); + + + $("#map-search-ul--mobile").hide(); // hide mobile search list }); }); @@ -113,8 +106,7 @@ function createMapbox() { }); tooltip.setLngLat(matched[0].coord.coordinates) .setHTML(tooltipHtml) - .addTo(map) - ; + .addTo(map); }); listingEl.append(listitem); }); @@ -299,6 +291,30 @@ function createMapbox() { .addTo(map); }); + // duplicate with "click" for mobile register + map.on('click', 'unclustered-point', function(e) { + // Change the cursor style as a UI indicator. + map.getCanvas().style.cursor = 'pointer'; + + let coordinates = e.features[0].geometry.coordinates.slice(); + let name = e.features[0].properties.Recipient; + let state = e.features[0].properties.State; + let fedInvest = formatCurrency(e.features[0].properties.Total_Federal_Investment); + let county = e.features[0].properties.COUNTY; + let numStudents = numberWithCommas(e.features[0].properties.Total); + + let tooltipHtml = `

    Institution

    ${name}

    State

    ${state}

    County

    ${county}

    Number of Students

    ${numStudents}

    Total $ Received

    ${fedInvest}

    `; + + while (Math.abs(e.lngLat.lng - coordinates[0]) > 180) { + coordinates[0] += e.lngLat.lng > coordinates[0] ? 360 : -360; + } + + tooltip.setLngLat(coordinates) + .setHTML(tooltipHtml) + .addTo(map); + }); + + map.on('mouseleave', 'unclustered-point', function() { map.getCanvas().style.cursor = ''; tooltip.remove(); @@ -336,12 +352,12 @@ function createInstTable() { let titles = ['Institution', 'Type', 'Contracts', 'Grants', 'Student Aid', 'Total $ Received']; let headers = table.append('thead').append('tr') - .selectAll('th') - .data(titles).enter() - .append('th') - .text(function (d) { - return d; - }) + .selectAll('th') + .data(titles).enter() + .append('th') + .text(function (d) { + return d; + }) ; // concat into a "type" property @@ -396,9 +412,9 @@ function filterSearchMobile() { for (let i = 0; i < li.length; i++) { const txtValue = li[i].innerHTML; if (txtValue.toUpperCase().indexOf(filter) > -1) { - li[i].style.display = ""; + li[i].style.display = ""; } else { - li[i].style.display = "none"; + li[i].style.display = "none"; } } }); From 69c25ed72e6dda2a94eb0d8dae06584558f43d0b Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 12:13:55 -0500 Subject: [PATCH 35/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 99fed33f..cc5e785e 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -71,7 +71,7 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { const { employeeCounts } = mem; - const agencyOccupationIds = []; + let agencyOccupationIds = []; for (let e of employeeCounts) { if (selectedAgencies.includes(e.agencyId)) { agencyOccupationIds.push(e.occupationCategoryId); From baba0c78dd9a6bf3dff58594894b848aae7e2891 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 12:15:04 -0500 Subject: [PATCH 36/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index cc5e785e..30a582e7 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -71,12 +71,12 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { const { employeeCounts } = mem; - let agencyOccupationIds = []; + const agencyOccupationIds = []; for (let e of employeeCounts) { if (selectedAgencies.includes(e.agencyId)) { agencyOccupationIds.push(e.occupationCategoryId); } - }); + }; occupationDropdownOptions = occupationDropdownMasterList .filter(o => agencyOccupationIds.includes(o.id)) .map(o => ``); From 88bf371989c6174ba3ceca10dfd85e9095c76ddf Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 12:47:11 -0500 Subject: [PATCH 37/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 30a582e7..244a739f 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -73,7 +73,7 @@ $(() => { const { employeeCounts } = mem; const agencyOccupationIds = []; for (let e of employeeCounts) { - if (selectedAgencies.includes(e.agencyId)) { + if (selectedAgencies.includes(e.agencyId.toString())) { agencyOccupationIds.push(e.occupationCategoryId); } }; From 6ebdb47693e15f022924909fb76737d97fff244b Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Mon, 22 Jul 2019 14:22:06 -0400 Subject: [PATCH 38/77] added condition for mobile --- .../investment-categories.js | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/assets/js/colleges-and-universities/investment-categories.js b/assets/js/colleges-and-universities/investment-categories.js index c7323af0..bc47894c 100755 --- a/assets/js/colleges-and-universities/investment-categories.js +++ b/assets/js/colleges-and-universities/investment-categories.js @@ -122,11 +122,17 @@ function downloadData() { } } -function calculateLineHeight(lineHeight) { - if (lineHeight < 1.2 && lineHeight > 0) { - return "1.2em"; - } - return lineHeight + "em"; +function isMobile() { + const maxThreshold = 768; + return window.innerWidth <= maxThreshold; +} + +function isTablet() { + const minThreshold = 769; + const maxThreshold = 1199; + + return (minThreshold <= window.innerWidth && window.innerWidth <= maxThreshold); + } const formatNumber = d3.format('$,.0f'); @@ -145,6 +151,9 @@ function updateCenter(d) { const largeText = 1.75; const exLargeText = 2; + let wordWrapMultiplier = isMobile() ? 5.5 : 2; + let smWordWrapMultiplier = isMobile() ? 3 : 1; + if (d.depth === 0) { centerGroup = svg.append('svg:text') @@ -192,7 +201,7 @@ function updateCenter(d) { .text(d.name) .attr('class', 'center-title') .style('font-size', labelFontSize * mediumText + "em") - .call(wordWrap, boundingBox) + .call(wordWrap, boundingBox * smWordWrapMultiplier) ; @@ -234,7 +243,7 @@ function updateCenter(d) { .text(d.parent.name) .attr('class', 'center-title') .style('font-size', labelFontSize * largeText + "em") - .call(wordWrap, boundingBox) + .call(wordWrap, boundingBox * smWordWrapMultiplier) ; @@ -255,7 +264,7 @@ function updateCenter(d) { .text(d.name) .attr('class', 'center-title') .style('font-size', labelFontSize * largeText + "em") - .call(wordWrap, innerRadius * 2.5) + .call(wordWrap, innerRadius * wordWrapMultiplier) ; centerGroup.append('tspan') From ee426805b1dd1e47d7da8f4675d6dd2986897fe8 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 13:29:16 -0500 Subject: [PATCH 39/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 244a739f..53196591 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -16,6 +16,7 @@ $(() => { } = dataModule; let occupationDropdownMasterList; + let agencyOccupationIds = []; let occupationDropdownOptions; loadStates(states => { @@ -50,6 +51,16 @@ $(() => { $("#mapAgencyDropdown").append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); + // create array or agency IDs, each an array of occupations within that agency + for (let e of mem.employeeCounts) { + if (!agencyOccupationIds[e.agencyId]) { + agencyOccupationIds[e.agencyId] = []; + } + if (!agencyOccupationIds[e.agencyId].includes(e.occupationCategoryId)) { + agencyOccupationIds[e.agencyId].push(e.occupationCategoryId); + } + } + occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); filterOccupationsList(); }); @@ -70,13 +81,6 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { - const { employeeCounts } = mem; - const agencyOccupationIds = []; - for (let e of employeeCounts) { - if (selectedAgencies.includes(e.agencyId.toString())) { - agencyOccupationIds.push(e.occupationCategoryId); - } - }; occupationDropdownOptions = occupationDropdownMasterList .filter(o => agencyOccupationIds.includes(o.id)) .map(o => ``); From 9eb2875ae7f4d1538b8be1f0466c732767241012 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 14:03:49 -0500 Subject: [PATCH 40/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 53196591..9bcca958 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -51,7 +51,7 @@ $(() => { $("#mapAgencyDropdown").append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); - // create array or agency IDs, each an array of occupations within that agency + // create array of agency IDs, each an array of occupation IDs within that agency for (let e of mem.employeeCounts) { if (!agencyOccupationIds[e.agencyId]) { agencyOccupationIds[e.agencyId] = []; @@ -72,7 +72,7 @@ $(() => { changes++; let local_change = changes; - setTimeout(function () { // wait 1 sec to see if they're done making changes + setTimeout(() => { // wait 1 sec to see if user is done making changes if (local_change === changes) { filterOccupationsList($("#mapAgencyDropdown").val()); } @@ -81,8 +81,18 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { + let currentOccupations = agencyOccupationIds[0].slice(); + if (selectedAgencies.length > 1) { + selectedAgencies.slice(1).forEach (agencyId => { + agencyOccupationIds[agencyId].forEach (occupationId => { + if (!currentOccupations.includes(occupationId)) { + currentOccupations.push(occupationId); + } + }) + }) + } occupationDropdownOptions = occupationDropdownMasterList - .filter(o => agencyOccupationIds.includes(o.id)) + .filter(o => currentOccupations.includes(o.id)) .map(o => ``); } else { occupationDropdownOptions = occupationDropdownMasterList From 5cecc52fcbf825571bc67a7cdb1475ee9e1d7c3e Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 14:17:36 -0500 Subject: [PATCH 41/77] DA-3327 wip --- assets/js/fedscope-tool/fedscope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 9bcca958..0f8abef8 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -81,7 +81,7 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { - let currentOccupations = agencyOccupationIds[0].slice(); + let currentOccupations = agencyOccupationIds[selectedAgencies[0]].slice(); if (selectedAgencies.length > 1) { selectedAgencies.slice(1).forEach (agencyId => { agencyOccupationIds[agencyId].forEach (occupationId => { From a4d3dd6be77d553279f673face3b49e127c492bc Mon Sep 17 00:00:00 2001 From: xjackk Date: Mon, 22 Jul 2019 15:25:32 -0400 Subject: [PATCH 42/77] re-sandbox --- _includes/colleges/colleges-share.html | 104 ++++++++++++------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/_includes/colleges/colleges-share.html b/_includes/colleges/colleges-share.html index a3311669..09dbc36f 100644 --- a/_includes/colleges/colleges-share.html +++ b/_includes/colleges/colleges-share.html @@ -1,59 +1,59 @@
    - - - - + + + +
    From a0c71e6047fc8dac60c5240faa0fb8a7c14abfbf Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Mon, 22 Jul 2019 14:43:52 -0500 Subject: [PATCH 43/77] DA-3227 init in callback fn after employee data actually loaded --- assets/js/fedscope-tool/fedscope.js | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index 0f8abef8..c0e55ee3 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -18,11 +18,11 @@ $(() => { let occupationDropdownMasterList; let agencyOccupationIds = []; let occupationDropdownOptions; - + loadStates(states => { loadAgencies(agencies => { loadOccupationCategories(occupationCategories => { - loadEmployeeCountData([mapModule.draw, barchartModule.draw], { + loadEmployeeCountData([mapModule.draw, barchartModule.draw, initAgencyOccupationIds], { states, agencies, occupationCategories @@ -41,32 +41,34 @@ $(() => { const stateDropdownOptions = Object.values(states) .sort(sorter) .map(s => ``) - ; + ; $("#barchartStateDropdown").append(...stateDropdownOptions); const agencyDropdownOptions = Object.values(agencies) .sort(sorter) .map(a => ``) - ; + ; $("#mapAgencyDropdown").append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); - // create array of agency IDs, each an array of occupation IDs within that agency - for (let e of mem.employeeCounts) { - if (!agencyOccupationIds[e.agencyId]) { - agencyOccupationIds[e.agencyId] = []; - } - if (!agencyOccupationIds[e.agencyId].includes(e.occupationCategoryId)) { - agencyOccupationIds[e.agencyId].push(e.occupationCategoryId); - } - } - occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); filterOccupationsList(); }); }); }); + // create array of agency IDs, each an array of occupation IDs within that agency + function initAgencyOccupationIds() { + for (let e of mem.employeeCounts) { + if (!agencyOccupationIds[e.agencyId]) { + agencyOccupationIds[e.agencyId] = []; + } + if (!agencyOccupationIds[e.agencyId].includes(e.occupationCategoryId)) { + agencyOccupationIds[e.agencyId].push(e.occupationCategoryId); + } + } + } + let changes = 0; $("#mapAgencyDropdown").change(() => { changes++; @@ -82,9 +84,9 @@ $(() => { function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { let currentOccupations = agencyOccupationIds[selectedAgencies[0]].slice(); - if (selectedAgencies.length > 1) { - selectedAgencies.slice(1).forEach (agencyId => { - agencyOccupationIds[agencyId].forEach (occupationId => { + if (selectedAgencies.length > 1) { // add to array of unique occupation IDs for the other selected agencies (besides above) + selectedAgencies.slice(1).forEach(agencyId => { + agencyOccupationIds[agencyId].forEach(occupationId => { if (!currentOccupations.includes(occupationId)) { currentOccupations.push(occupationId); } @@ -105,7 +107,7 @@ $(() => { .end() .append('') .append(...occupationDropdownOptions) - ; + ; } $("#mapFilter").click(() => { From c716eb65e799f5acf4118565922bda69da7b43f2 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 08:10:50 -0500 Subject: [PATCH 44/77] DA-3277 refactor for reuse & clarity --- assets/js/fedscope-tool/fedscope.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/assets/js/fedscope-tool/fedscope.js b/assets/js/fedscope-tool/fedscope.js index c0e55ee3..4360d55c 100644 --- a/assets/js/fedscope-tool/fedscope.js +++ b/assets/js/fedscope-tool/fedscope.js @@ -15,6 +15,8 @@ $(() => { mem } = dataModule; + const mapAgencyDropdown = $("#mapAgencyDropdown"); + const mapOccupationDropdown = $("#mapOccupationDropdown"); let occupationDropdownMasterList; let agencyOccupationIds = []; let occupationDropdownOptions; @@ -48,7 +50,7 @@ $(() => { .sort(sorter) .map(a => ``) ; - $("#mapAgencyDropdown").append(...agencyDropdownOptions); + mapAgencyDropdown.append(...agencyDropdownOptions); $("#barchartAgencyDropdown").append(...agencyDropdownOptions); occupationDropdownMasterList = Object.values(occupationCategories).sort(sorter); @@ -70,16 +72,16 @@ $(() => { } let changes = 0; - $("#mapAgencyDropdown").change(() => { + mapAgencyDropdown.change(() => { changes++; let local_change = changes; setTimeout(() => { // wait 1 sec to see if user is done making changes if (local_change === changes) { - filterOccupationsList($("#mapAgencyDropdown").val()); + filterOccupationsList(mapAgencyDropdown.val()); } }, 1000); - }) + }); function filterOccupationsList(selectedAgencies) { if (selectedAgencies) { @@ -93,26 +95,23 @@ $(() => { }) }) } - occupationDropdownOptions = occupationDropdownMasterList - .filter(o => currentOccupations.includes(o.id)) - .map(o => ``); + occupationDropdownOptions = occupationDropdownMasterList.filter(o => currentOccupations.includes(o.id)); } else { - occupationDropdownOptions = occupationDropdownMasterList - .map(o => ``); + occupationDropdownOptions = occupationDropdownMasterList; } - $("#mapOccupationDropdown") + mapOccupationDropdown .find("option") .remove() .end() .append('') - .append(...occupationDropdownOptions) + .append(...occupationDropdownOptions.map(o => ``)) ; } $("#mapFilter").click(() => { - const filterAgencies = $("#mapAgencyDropdown").val(); - const filterOccupations = $("#mapOccupationDropdown").val(); + const filterAgencies = mapAgencyDropdown.val(); + const filterOccupations = mapOccupationDropdown.val(); const { employeeCounts, states, occupationCategories } = mem; let newData = [...employeeCounts]; From dd26d352735c96567faca10382f4eea8d9915aed Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 09:46:56 -0500 Subject: [PATCH 45/77] DA-4170 check where bubble IDs created --- .../agenciesBubbleChart.js | 886 +++++++++--------- 1 file changed, 431 insertions(+), 455 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index 619ad0c7..80b6af71 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -1,16 +1,16 @@ --- ---- + --- /* * Local declarations */ const bubbleChartContainer = document.getElementById('agency-bubbleChart'); -const color = ['#c8ac7f','#C6919E','#C99E7F','#879BBA','#A3D1CC', '#88A6A0','#879BBA', - '#A3D1CC','#80AEC4','#C9BB7F','#C6919E', - '#879BBA','#C99E7F','#879BBA','#C6919E','#A3D1CC','#80AEC4','#C9BB7F', - '#88A6A0','#c8ac7f','#C99E7F','#879BBA','#A3D1CC','#88A6A0','#80AEC4','#C9BB7F', - '#80AEC4','#C99E7F','#C6919E','#879BBA','#A3D1CC','#88A6A0','#80AEC4','#C9BB7F', - '#C9BB7F','#c8ac7f','#C6919E','#879BBA','#A3D1CC','#88A6A0','#80AEC4','#C9BB7F', - '#c8ac7f','#c8ac7f','#C99E7F','#879BBA','#A3D1CC','#88A6A0','#80AEC4','#C9BB7F']; +const color = ['#c8ac7f', '#C6919E', '#C99E7F', '#879BBA', '#A3D1CC', '#88A6A0', '#879BBA', + '#A3D1CC', '#80AEC4', '#C9BB7F', '#C6919E', + '#879BBA', '#C99E7F', '#879BBA', '#C6919E', '#A3D1CC', '#80AEC4', '#C9BB7F', + '#88A6A0', '#c8ac7f', '#C99E7F', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F', + '#80AEC4', '#C99E7F', '#C6919E', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F', + '#C9BB7F', '#c8ac7f', '#C6919E', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F', + '#c8ac7f', '#c8ac7f', '#C99E7F', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F']; const bTableBtn = $('#bubble-table-trigger'); @@ -36,418 +36,406 @@ let tip; let resize = false; const pack = d3.layout.pack() - .padding(2) - .size([diameter - margin, diameter - margin]) - .value(function(d) { - if(d.size > 0) { - return d.size; - } - }) - .sort( function(a, b) { - var threshold = 100; - if ((a.value > threshold) && (b.value > threshold)) { - return b.value - a.value; - } else { - return -1; - } - }); + .padding(2) + .size([diameter - margin, diameter - margin]) + .value(function (d) { + if (d.size > 0) { + return d.size; + } + }) + .sort(function (a, b) { + var threshold = 100; + if ((a.value > threshold) && (b.value > threshold)) { + return b.value - a.value; + } else { + return -1; + } + }); // add legend d3.select('#agency-legend_scaleKey').append('circle') - .attr('r', 25) - .attr('class', 'legend_scaleKeyCircle') - .attr('cx', 60) - .attr('cy', 65); + .attr('r', 25) + .attr('class', 'legend_scaleKeyCircle') + .attr('cx', 60) + .attr('cy', 65); d3.select('#agency-legend_scaleKey').append('circle') - .attr('r', 35) - .attr('class', 'legend_scaleKeyCircle') - .attr('cx', 60) - .attr('cy', 65); + .attr('r', 35) + .attr('class', 'legend_scaleKeyCircle') + .attr('cx', 60) + .attr('cy', 65); d3.select('#agency-legend_scaleKey').append('circle') - .attr('r', 45) - .attr('class', 'legend_scaleKeyCircle') - .attr('cx', 60) - .attr('cy', 65); + .attr('r', 45) + .attr('class', 'legend_scaleKeyCircle') + .attr('cx', 60) + .attr('cy', 65); /* functions */ -function setChartState (d) { - _chartState = d; +function setChartState(d) { + _chartState = d; } -function getChartState () { - return _chartState; +function getChartState() { + return _chartState; } -function clearChartState () { - _chartState = null; +function clearChartState() { + _chartState = null; } /* Set color for sub-agency circles */ -function circleFill (d) { - if (d['color']) { - return d.color; - } +function circleFill(d) { + if (d['color']) { + return d.color; + } }; function isZoomedIn(d) { - if (d.depth === 2 && focus === d.parent || d.depth === 1 && focus === d) { - return true; - } - - return false; + if (d.depth === 2 && focus === d.parent || d.depth === 1 && focus === d) { + return true; + } + return false; } -function setLegendLeft (leftState) { - d3.select('#agency-legend_colorKey').classed("left", leftState); +function setLegendLeft(leftState) { + d3.select('#agency-legend_colorKey').classed("left", leftState); } function closeDetailPanel() { - if (d3.event) d3.event.stopPropagation(); - detailContainer.classed(detailContainerActiveClass, false); + if (d3.event) d3.event.stopPropagation(); + detailContainer.classed(detailContainerActiveClass, false); } /* Store the current state */ /* Calculate text font size for bubbles before and after zoom */ -function calculateTextFontSize (d) { - let radius = 0; - let labelWidth; - - if (!resize) { - if (d.fontsize) { - //if fontsize is already calculated use that. - return d.fontsize; - } - - if (!d.computed) { - //if computed not present get & store the getComputedTextLength() of the text field - d.computed = this.getComputedTextLength(); - } - } - - if (d.computed != 0) { - //if computed is not 0 then get the visual radius of DOM - //if radius present in DOM use that - radius = d.r ? d.r : 0; - - labelWidth = radius * 2 * diameter / (d.parent.r * 2 + margin) - margin; - - d.fontsize = labelWidth/d.computed > 0 ? labelWidth/d.computed + "em" : 0.01 + "em"; - - return d.fontsize; - - } +function calculateTextFontSize(d) { + let radius = 0; + let labelWidth; + + if (!resize) { + if (d.fontsize) { + //if fontsize is already calculated use that. + return d.fontsize; + } + if (!d.computed) { + //if computed not present get & store the getComputedTextLength() of the text field + d.computed = this.getComputedTextLength(); + } + } + + if (d.computed != 0) { + //if computed is not 0 then get the visual radius of DOM + //if radius present in DOM use that + radius = d.r ? d.r : 0; + labelWidth = radius * 2 * diameter / (d.parent.r * 2 + margin) - margin; + d.fontsize = labelWidth / d.computed > 0 ? labelWidth / d.computed + "em" : 0.01 + "em"; + return d.fontsize; + } }; function isTablet() { - const minThreshold = 949; - const maxThreshold = 1199; - - if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) - || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4))) { - return (minThreshold <= window.innerWidth && window.innerWidth <= maxThreshold); - } - - return false; + const minThreshold = 949; + const maxThreshold = 1199; + + if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) + || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0, 4))) { + return (minThreshold <= window.innerWidth && window.innerWidth <= maxThreshold); + } + return false; } function isDesktop() { - const threshold = 1200; - - return (threshold <= window.innerWidth); + const threshold = 1200; + return (threshold <= window.innerWidth); } function setAgencyTooltipHtml(d) { - const elName = "agency_tip_" + d.name.replace(/ /g,"_"); - let tooltipHtml = "
    "; - - if(!isDesktop()) { - tooltipHtml += ""; - } - - tooltipHtml += "Agency" + - "" + d.name + "" + - "

    Total Investment

    " + - "" + formatCurrency(popoverData[d.name].total_investment) + "" + - "
    "; - return tooltipHtml; + const elName = "agency_tip_" + d.name.replace(/ /g, "_"); + let tooltipHtml = "
    "; + + if (!isDesktop()) { + tooltipHtml += ""; + } + + tooltipHtml += "Agency" + + "" + d.name + "" + + "

    Total Investment

    " + + "" + formatCurrency(popoverData[d.name].total_investment) + "" + + "
    "; + return tooltipHtml; } function setSubagencyTooltipHtml(d) { - const elName = "subagency_tip_" + d.name.replace(/ /g,"_"); - - let tooltipHtml = "
    "; - - if(!isDesktop()) { - tooltipHtml += ""; - } - - tooltipHtml += "Agency" + - "" + d.parent.name + "" + - "Sub-Agency" + - "" + d.name + "" + - "

    Total $ of Awards

    " + - "" + formatCurrency(d.size) + "" + - "
    "; - return tooltipHtml; + const elName = "subagency_tip_" + d.name.replace(/ /g, "_"); + let tooltipHtml = "
    "; + + if (!isDesktop()) { + tooltipHtml += ""; + } + + tooltipHtml += "Agency" + + "" + d.parent.name + "" + + "Sub-Agency" + + "" + d.name + "" + + "

    Total $ of Awards

    " + + "" + formatCurrency(d.size) + "" + + "
    "; + return tooltipHtml; } function drawBubbleChart(root) { - const targetWidth = bubbleWidth; - - bubble.chartHeight = targetWidth; - - let tooltipHtml = '
    '; - - tip = d3.tip().attr('class', 'd3-tip').html(function(d) { - if (isZoomedIn(d)) { - if (d.depth === 2) { - tooltipHtml = setSubagencyTooltipHtml(d); - } else if (d.depth === 1) { - tooltipHtml = setAgencyTooltipHtml(d); - } - } else { - if (d.depth === 2) { - tooltipHtml = setAgencyTooltipHtml(d.parent); - } else if (d.depth === 1) { - tooltipHtml = setAgencyTooltipHtml(d); - } - } - - return tooltipHtml; - }); - - focus = root; - diameter = bubbleWidth = calculatedWidth < maxHeight ? calculatedWidth : maxHeight; - - d3.select(bubbleChartContainer) - .attr('style', "width: " + bubbleWidth + "px; height: " + bubbleWidth + "px;"); - - bubbleSvg = d3.select(bubbleChartContainer).append("svg") - .attr("id", "chart") - .attr("width", targetWidth) - .attr("height", bubble.chartHeight) - .append("g") - .attr("transform", "translate(" + diameter / 2 + "," + diameter / 2 + ")"); - - circle = bubbleSvg.selectAll("circle") - .data(nodes) - .enter().append("circle") - .attr("class", function(d) { - return d.parent ? d.children ? "node" : "node--leaf" : "node--root"; - }) - .style("fill", circleFill) - .attr("r", function(d) { - if (d.r > 0) { - return d.r; - } - }) - .attr("id", function(d) { - return d.name.replace(/ /g,"_"); - }) - .on("click", bubbleClick) - .on("mouseover", function(d) { - if (!isTablet()) { - tip.show(d); - } - }) - .on("mouseout", function(d) { - tip.hide(d); - }); - - bubbleSvg.selectAll("text") - .data(nodes) - .enter().append("text") - .attr("font-family", "Source Sans Pro") - .attr("class", "label") - .attr("id", function(d) { - return "text_" + d.name.replace(/ /g,"_"); - }) - .style("fill-opacity", function(d) { - return d.parent === root ? 1 : 0; - }) - .style("display", function(d) { - return d.parent === root ? null : "none"; - }) - .text(function(d) { - return d.name; - }) - .style("font-size", calculateTextFontSize) - .attr("text-anchor", "middle") - .on("click", bubbleClick) - .on("mouseover", function(d) { - // const elName = d.name.replace(/ /g,"_"); - if (!isTablet()) { - tip.show(d); - } - }) - .on("mouseout", tip.hide); - - node = bubbleSvg.selectAll("circle,text"); - - bubbleSvg.call(tip); - - + const targetWidth = bubbleWidth; + bubble.chartHeight = targetWidth; + + let tooltipHtml = '
    '; + tip = d3.tip().attr('class', 'd3-tip').html(function (d) { + if (isZoomedIn(d)) { + if (d.depth === 2) { + tooltipHtml = setSubagencyTooltipHtml(d); + } else if (d.depth === 1) { + tooltipHtml = setAgencyTooltipHtml(d); + } + } else { + if (d.depth === 2) { + tooltipHtml = setAgencyTooltipHtml(d.parent); + } else if (d.depth === 1) { + tooltipHtml = setAgencyTooltipHtml(d); + } + } + return tooltipHtml; + }); + + focus = root; + diameter = bubbleWidth = calculatedWidth < maxHeight ? calculatedWidth : maxHeight; + + d3.select(bubbleChartContainer) + .attr('style', "width: " + bubbleWidth + "px; height: " + bubbleWidth + "px;") + ; + + bubbleSvg = d3.select(bubbleChartContainer).append("svg") + .attr("id", "chart") + .attr("width", targetWidth) + .attr("height", bubble.chartHeight) + .append("g") + .attr("transform", "translate(" + diameter / 2 + "," + diameter / 2 + ")") + ; + + circle = bubbleSvg.selectAll("circle") + .data(nodes) + .enter().append("circle") + .attr("class", function (d) { + return d.parent ? d.children ? "node" : "node--leaf" : "node--root"; + }) + .style("fill", circleFill) + .attr("r", function (d) { + if (d.r > 0) { + return d.r; + } + }) + .attr("id", function (d) { + return d.name.replace(/ /g, "_!"); + }) + .on("click", bubbleClick) + .on("mouseover", function (d) { + if (!isTablet()) { + tip.show(d); + } + }) + .on("mouseout", function (d) { + tip.hide(d); + }) + ; + + bubbleSvg.selectAll("text") + .data(nodes) + .enter().append("text") + .attr("font-family", "Source Sans Pro") + .attr("class", "label") + .attr("id", function (d) { + return "text_" + d.name.replace(/ /g, "&_"); + }) + .style("fill-opacity", function (d) { + return d.parent === root ? 1 : 0; + }) + .style("display", function (d) { + return d.parent === root ? null : "none"; + }) + .text(function (d) { + return d.name; + }) + .style("font-size", calculateTextFontSize) + .attr("text-anchor", "middle") + .on("click", bubbleClick) + .on("mouseover", function (d) { + // const elName = d.name.replace(/ /g,"_"); + if (!isTablet()) { + tip.show(d); + } + }) + .on("mouseout", tip.hide) + ; + node = bubbleSvg.selectAll("circle,text"); + bubbleSvg.call(tip); } // close tooltip function closeTooltip() { - tip.hide(); + tip.hide(); } // Zoom into a specific circle function zoom(d) { - const focus0 = focus; - focus = d; - - closeDetailPanel(); - closeTooltip(); - - const transition = d3.transition() - .duration(d3.event && d3.event.altKey ? 7500 : 750) - .tween("zoom", function(d) { - var i = d3.interpolateZoom(view, [focus.x, focus.y, focus.r * 2 + margin]); - return function(t) { - zoomTo(i(t)); - }; - }); - - transition.selectAll(".node--root") - .style("fill-opacity", function() { - return focus.name === "flare" ? 1 : 0; - }); - - transition.selectAll("text.label") - .style("fill-opacity", function(d) { - return d.parent === focus ? 1 : 0; - }) - .each("start", function(d) { - if (d.parent === focus) { - this.style.display = "inline"; - } else { - this.style.display="none"; - } - }) - .each("end", function(d) { - if (d.parent !== focus) { - this.style.display = "none"; - } else { - this.style.display="inline"; - } - }); - - // hide the text - setTimeout(function() { - // show the text - d3.selectAll("text.label").filter(function(d) { - return d.parent === focus || this.style.display === "inline"; - }).style("font-size", calculateTextFontSize); - - }, 100); + const focus0 = focus; + focus = d; + + closeDetailPanel(); + closeTooltip(); + + const transition = d3.transition() + .duration(d3.event && d3.event.altKey ? 7500 : 750) + .tween("zoom", function (d) { + var i = d3.interpolateZoom(view, [focus.x, focus.y, focus.r * 2 + margin]); + return function (t) { + zoomTo(i(t)); + }; + }) + ; + + transition.selectAll(".node--root") + .style("fill-opacity", function () { + return focus.name === "flare" ? 1 : 0; + }) + ; + + transition.selectAll("text.label") + .style("fill-opacity", function (d) { + return d.parent === focus ? 1 : 0; + }) + .each("start", function (d) { + if (d.parent === focus) { + this.style.display = "inline"; + } else { + this.style.display = "none"; + } + }) + .each("end", function (d) { + if (d.parent !== focus) { + this.style.display = "none"; + } else { + this.style.display = "inline"; + } + }) + ; + + // hide the text + setTimeout(function () { + // show the text + d3.selectAll("text.label").filter(function (d) { + return d.parent === focus || this.style.display === "inline"; + }).style("font-size", calculateTextFontSize); + }, 100); } function zoomTo(v) { - var k = diameter / v[2]; - view = v; - node.attr("transform", function(d) { - return "translate(" + (d.x - v[0]) * k + "," + (d.y - v[1]) * k + ")"; - }); - - circle.attr("r", function(d) { - return d.r * k; - }); + var k = diameter / v[2]; + view = v; + node.attr("transform", function (d) { + return "translate(" + (d.x - v[0]) * k + "," + (d.y - v[1]) * k + ")"; + }); + circle.attr("r", function (d) { + return d.r * k; + }); } /** - Make a table, a bubble table ;;;; + Make a table, a bubble table ;;;; **/ function createBubbleTable(data) { - d3.csv("/data-lab-data/CU_bubble_chart_table.csv", function(err, data) { - if (err) { - return err; - } - let table = d3.select('#bubbleTableContainer').append('table') - .attr('id', 'bubbletable') - .attr('class', 'compact'); - - let titles = ['Recipient', 'Agency', 'SubAgency', 'Family', 'Type', 'Obligation']; - - let headers = table.append('thead').append('tr') - .selectAll('th') - .data(titles).enter() - .append('th') - .text(function (d) { - return d; - }); - - // datatable start - let dTable = $('#bubbletable').dataTable({ - data: data, - columns: [ - {"data": 'Recipient'}, - {"data": 'agency'}, - {"data": 'subagency'}, - {"data": 'family'}, - {"data": 'type'}, - {"data": 'obligation', 'render': $.fn.dataTable.render.number(',', '.', 0, '$')} - ], - deferRender: true, - scrollCollapse: true, - scroller: true - }); - }); + d3.csv("/data-lab-data/CU_bubble_chart_table.csv", function (err, data) { + if (err) { + return err; + } + let table = d3.select('#bubbleTableContainer').append('table') + .attr('id', 'bubbletable') + .attr('class', 'compact'); + + let titles = ['Recipient', 'Agency', 'SubAgency', 'Family', 'Type', 'Obligation']; + let headers = table.append('thead').append('tr') + .selectAll('th') + .data(titles).enter() + .append('th') + .text(function (d) { + return d; + }); + + // datatable start + let dTable = $('#bubbletable').dataTable({ + data: data, + columns: [ + { "data": 'Recipient' }, + { "data": 'agency' }, + { "data": 'subagency' }, + { "data": 'family' }, + { "data": 'type' }, + { "data": 'obligation', 'render': $.fn.dataTable.render.number(',', '.', 0, '$') } + ], + deferRender: true, + scrollCollapse: true, + scroller: true + }); + }); }; function selectSubAgency(d) { - const elSelector = "circle.node--leaf[id='" + d.name.replace(/ /g,"_") + "']"; - circle.classed('active', false); - d3.select(elSelector).classed("active", true); - if (focus !== d) zoom(d.parent), d3.event.stopPropagation(); - + const elSelector = "circle.node--leaf[id='" + d.name.replace(/ /g, "_") + "']"; + circle.classed('active', false); + d3.select(elSelector).classed("active", true); + if (focus !== d) { + zoom(d.parent), d3.event.stopPropagation(); + } } function bubbleClick(d) { - - circle.classed('active', false); - - // need to check if focus is d, maybe? - if (isZoomedIn(d)) { - if (d.depth === 2) { - d3.event.stopPropagation(); - setChartState(d.parent); - - const elName = "circle.node--leaf#" + d.name.replace(/ /g,"_"); - d3.select(elName).classed("active", true); - bubble.activateDetail(d); - - } else if (d.depth === 1) { - setLegendLeft(false); - - clearChartState(); - - if (focus !== d) zoom(d), d3.event.stopPropagation(); - - } - } else { - - if (d.depth === 2) { - setLegendLeft(true); - setChartState(d.parent); - - // check if a bubble is already selected - if (focus !== d.parent) zoom(d.parent), d3.event.stopPropagation(); - - } else if (d.depth === 1) { - setLegendLeft(true); - setChartState(d); - - if (focus !== d) zoom(d), d3.event.stopPropagation(); - - } - } + circle.classed('active', false); + + // need to check if focus is d, maybe? + if (isZoomedIn(d)) { + if (d.depth === 2) { + d3.event.stopPropagation(); + setChartState(d.parent); + + const elName = "circle.node--leaf#" + d.name.replace(/ /g, "_"); + d3.select(elName).classed("active", true); + bubble.activateDetail(d); + + } else if (d.depth === 1) { + setLegendLeft(false); + clearChartState(); + if (focus !== d) { + zoom(d), d3.event.stopPropagation(); + } + } + } else { + if (d.depth === 2) { + setLegendLeft(true); + setChartState(d.parent); + + // check if a bubble is already selected + if (focus !== d.parent) { + zoom(d.parent), d3.event.stopPropagation(); + } + } else if (d.depth === 1) { + setLegendLeft(true); + setChartState(d); + + if (focus !== d) { + zoom(d), d3.event.stopPropagation(); + } + } + } } @@ -455,86 +443,78 @@ function bubbleClick(d) { * Event Handlers */ -bChartBtn.click(function(){ - bTableContainer.hide(); // show - bChartContainer.show(); // hide bubble chart +bChartBtn.click(function () { + bTableContainer.hide(); // show + bChartContainer.show(); // hide bubble chart }); // table button toggle click -bTableBtn.click(function(){ - bTableContainer.show(); // show - bChartContainer.hide(); // hide bubble chart +bTableBtn.click(function () { + bTableContainer.show(); // show + bChartContainer.hide(); // hide bubble chart }); // Redraw based on the new size whenever the browser window is resized. -window.addEventListener("resize", function() { - closeDetailPanel(); - $("#agency-bubbleChart").empty(); - if (root) { - maxHeight = document.getElementById("agency-investments__content").clientHeight; - calculatedWidth = window.innerWidth * widthPercentage; - diameter = bubbleWidth = calculatedWidth < maxHeight ? calculatedWidth : maxHeight; - - resize = true; - drawBubbleChart(root); - resize = false; - - // check the state here and replay - const chartState = getChartState(); - - if(chartState) { - zoom(chartState); - - } else { - zoomTo([root.x, root.y, root.r * 2 + margin]); - } - - } +window.addEventListener("resize", function () { + closeDetailPanel(); + $("#agency-bubbleChart").empty(); + if (root) { + maxHeight = document.getElementById("agency-investments__content").clientHeight; + calculatedWidth = window.innerWidth * widthPercentage; + diameter = bubbleWidth = calculatedWidth < maxHeight ? calculatedWidth : maxHeight; + resize = true; + drawBubbleChart(root); + resize = false; + + // check the state here and replay + const chartState = getChartState(); + if (chartState) { + zoom(chartState); + } else { + zoomTo([root.x, root.y, root.r * 2 + margin]); + } + } }); -tooltipClose.click(function() { - tip.hide(); +tooltipClose.click(function () { + tip.hide(); }); - /* * Main Method */ -d3.csv("/data-lab-data/CU_bubble_chart.csv", function(err1, data) { - if (err1) { return err1; } - d3.csv("/data-lab-data/CU/Bubble_Chart_Agency_Hover_data.csv", function(err2, rawPopoverData) { - if (err2) { return err2; } - - popoverData = _.keyBy(rawPopoverData, 'agency'); - - root = transformData(data); - nodes = pack.nodes(root); - - drawBubbleChart(root); - - d3.select(bubbleChartContainer) - .on("click", function () { - const currentState = getChartState(); - if (!currentState || (currentState && currentState.depth !== 2)) { - setLegendLeft(false); - clearChartState(); - zoom(root); - } - }); - - zoomTo([root.x, root.y, root.r * 2 + margin]); - - createBubbleTable(data); // has to match csv columns! - - if (!bubble.setSearchData) { - console.warn('bubble method not available') - } else { - bubble.setSearchData(root); - bubble.selectSubAgency = selectSubAgency; - bubble.zoom = zoom; - } - }); +d3.csv("/data-lab-data/CU_bubble_chart.csv", function (err1, data) { + if (err1) { return err1; } + d3.csv("/data-lab-data/CU/Bubble_Chart_Agency_Hover_data.csv", function (err2, rawPopoverData) { + if (err2) { return err2; } + + popoverData = _.keyBy(rawPopoverData, 'agency'); + root = transformData(data); + nodes = pack.nodes(root); + drawBubbleChart(root); + + d3.select(bubbleChartContainer) + .on("click", function () { + const currentState = getChartState(); + if (!currentState || (currentState && currentState.depth !== 2)) { + setLegendLeft(false); + clearChartState(); + zoom(root); + } + }); + + zoomTo([root.x, root.y, root.r * 2 + margin]); + createBubbleTable(data); // has to match csv columns! + + if (!bubble.setSearchData) { + console.warn('bubble method not available') + } else { + bubble.setSearchData(root); + bubble.selectSubAgency = selectSubAgency; + bubble.zoom = zoom; + } + }); }); /* @@ -542,40 +522,36 @@ d3.csv("/data-lab-data/CU_bubble_chart.csv", function(err1, data) { */ function transformData(data) { - let result = _.groupBy(data, 'agency'); - var i = 0; - let tempRoot = { - "name": "flare", - "children": [] - }; - - // Re-structure data - for(let agency in result) { - result[agency] = _.groupBy(result[agency], 'subagency'); - - tempRoot.children.push({"name": agency, "children": []}); - - for(let subagency in result[agency]) { - if(result[agency][subagency] && result[agency][subagency].length > 0) { - result[agency][subagency] = result[agency][subagency][0].obligation; - } else { - result[agency][subagency] = 0; - } - - tempRoot.children[i].children.push({"name": subagency, "children": [], "color": null, "size": result[agency][subagency]}); - } - - i++; - } - - recipient = result; - - // add color - for (var i = 0; i < tempRoot.children.length; i++) { - for (var j = 0; j < tempRoot.children[i].children.length; j++) { - tempRoot.children[i].children[j].color = color[i]; - } - } - - return tempRoot; + let result = _.groupBy(data, 'agency'); + var i = 0; + let tempRoot = { + "name": "flare", + "children": [] + }; + + // Re-structure data + for (let agency in result) { + result[agency] = _.groupBy(result[agency], 'subagency'); + tempRoot.children.push({ "name": agency, "children": [] }); + + for (let subagency in result[agency]) { + if (result[agency][subagency] && result[agency][subagency].length > 0) { + result[agency][subagency] = result[agency][subagency][0].obligation; + } else { + result[agency][subagency] = 0; + } + tempRoot.children[i].children.push({ "name": subagency, "children": [], "color": null, "size": result[agency][subagency] }); + } + i++; + } + + recipient = result; + + // add color + for (var i = 0; i < tempRoot.children.length; i++) { + for (var j = 0; j < tempRoot.children[i].children.length; j++) { + tempRoot.children[i].children[j].color = color[i]; + } + } + return tempRoot; } From 2eb968a454f12da929bec4dc3fa93dd81364ae92 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 09:55:54 -0500 Subject: [PATCH 46/77] fix Jekyll tag? --- assets/js/colleges-and-universities/agenciesBubbleChart.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index 80b6af71..fa5df98e 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -1,5 +1,5 @@ --- - --- +--- /* * Local declarations */ @@ -12,7 +12,6 @@ const color = ['#c8ac7f', '#C6919E', '#C99E7F', '#879BBA', '#A3D1CC', '#88A6A0', '#C9BB7F', '#c8ac7f', '#C6919E', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F', '#c8ac7f', '#c8ac7f', '#C99E7F', '#879BBA', '#A3D1CC', '#88A6A0', '#80AEC4', '#C9BB7F']; - const bTableBtn = $('#bubble-table-trigger'); const bTableContainer = $('#bubbleTableContainer'); const bChartContainer = $('#bubbleChartContainer'); From 3e785cfe75400b70576f25e43f04de906cd0274c Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 11:13:35 -0500 Subject: [PATCH 47/77] DA-4170 wip test changing sub names for unique ID --- .../agenciesBubbleChart.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index fa5df98e..76051dd2 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -49,24 +49,28 @@ const pack = d3.layout.pack() } else { return -1; } - }); + }) + ; // add legend d3.select('#agency-legend_scaleKey').append('circle') .attr('r', 25) .attr('class', 'legend_scaleKeyCircle') .attr('cx', 60) - .attr('cy', 65); + .attr('cy', 65) + ; d3.select('#agency-legend_scaleKey').append('circle') .attr('r', 35) .attr('class', 'legend_scaleKeyCircle') .attr('cx', 60) - .attr('cy', 65); + .attr('cy', 65) + ; d3.select('#agency-legend_scaleKey').append('circle') .attr('r', 45) .attr('class', 'legend_scaleKeyCircle') .attr('cx', 60) - .attr('cy', 65); + .attr('cy', 65) + ; /* functions */ @@ -539,7 +543,7 @@ function transformData(data) { } else { result[agency][subagency] = 0; } - tempRoot.children[i].children.push({ "name": subagency, "children": [], "color": null, "size": result[agency][subagency] }); + tempRoot.children[i].children.push({ "name": `s${subagency}`, "children": [], "color": null, "size": result[agency][subagency] }); } i++; } From f53e9903a387ee994f6da412241550609afb6527 Mon Sep 17 00:00:00 2001 From: xjackk Date: Tue, 23 Jul 2019 12:47:35 -0400 Subject: [PATCH 48/77] radius check --- assets/js/colleges-and-universities/institutions.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/colleges-and-universities/institutions.js b/assets/js/colleges-and-universities/institutions.js index 9e1b5f31..ad6ae643 100644 --- a/assets/js/colleges-and-universities/institutions.js +++ b/assets/js/colleges-and-universities/institutions.js @@ -184,9 +184,9 @@ function createMapbox() { "circle-radius": [ "step", ["get", "point_count"], - 7, - 10, + 9, 15, + 20, 30, 15, 50, @@ -200,7 +200,7 @@ function createMapbox() { }); // set opactiy to 40% - map.setPaintProperty('clusters', 'circle-opacity', .4); + map.setPaintProperty('clusters', 'circle-opacity', .35); map.addLayer({ id: "cluster-count", @@ -221,7 +221,7 @@ function createMapbox() { filter: ["!", ["has", "point_count"]], paint: { "circle-color": "#881E3D", - "circle-radius": 5, + "circle-radius": 6, "circle-stroke-width": 1, "circle-stroke-color": "#ddd" } From 6f5ffe227e5bc90696be7c9d9aefb9e134e06054 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 11:48:52 -0500 Subject: [PATCH 49/77] DA-4170 change ID when creating bubbles --- .../agenciesBubbleChart.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index 76051dd2..b50b918c 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -238,7 +238,11 @@ function drawBubbleChart(root) { } }) .attr("id", function (d) { - return d.name.replace(/ /g, "_!"); + let name = d.name.replace(/ /g, "_"); + if (name === d.parent.name) { + name += '_sub' + } + return name; }) .on("click", bubbleClick) .on("mouseover", function (d) { @@ -257,7 +261,11 @@ function drawBubbleChart(root) { .attr("font-family", "Source Sans Pro") .attr("class", "label") .attr("id", function (d) { - return "text_" + d.name.replace(/ /g, "&_"); + let name = "text_" + d.name.replace(/ /g, "_"); + if (name === d.parent.name) { + name += '_sub' + } + return name; }) .style("fill-opacity", function (d) { return d.parent === root ? 1 : 0; @@ -543,7 +551,7 @@ function transformData(data) { } else { result[agency][subagency] = 0; } - tempRoot.children[i].children.push({ "name": `s${subagency}`, "children": [], "color": null, "size": result[agency][subagency] }); + tempRoot.children[i].children.push({ "name": subagency, "children": [], "color": null, "size": result[agency][subagency] }); } i++; } From 7dbd398cf88d85e7ced25760d2feefad0f281dc6 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 11:54:21 -0500 Subject: [PATCH 50/77] da-4170 tyr again... --- assets/js/colleges-and-universities/agenciesBubbleChart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index b50b918c..6399f3f9 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -239,7 +239,7 @@ function drawBubbleChart(root) { }) .attr("id", function (d) { let name = d.name.replace(/ /g, "_"); - if (name === d.parent.name) { + if (d.depth > 1 && name === d.parent.name) { name += '_sub' } return name; @@ -262,7 +262,7 @@ function drawBubbleChart(root) { .attr("class", "label") .attr("id", function (d) { let name = "text_" + d.name.replace(/ /g, "_"); - if (name === d.parent.name) { + if (d.depth > 1 && name === d.parent.name) { name += '_sub' } return name; From a6ce00681b950f4db921c653517945b0a709c903 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 12:03:23 -0500 Subject: [PATCH 51/77] da-4170 wip keep trying... --- assets/js/colleges-and-universities/agenciesBubbleChart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index 6399f3f9..4039f388 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -239,7 +239,7 @@ function drawBubbleChart(root) { }) .attr("id", function (d) { let name = d.name.replace(/ /g, "_"); - if (d.depth > 1 && name === d.parent.name) { + if (d.depth && name === d.parent.name) { name += '_sub' } return name; @@ -262,7 +262,7 @@ function drawBubbleChart(root) { .attr("class", "label") .attr("id", function (d) { let name = "text_" + d.name.replace(/ /g, "_"); - if (d.depth > 1 && name === d.parent.name) { + if (d.depth && name === d.parent.name) { name += '_sub' } return name; From 7d237c8255e0a0985fefec323080bf4fd9d6fe07 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Tue, 23 Jul 2019 12:19:24 -0500 Subject: [PATCH 52/77] da-4170 fix comparison --- assets/js/colleges-and-universities/agenciesBubbleChart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/colleges-and-universities/agenciesBubbleChart.js b/assets/js/colleges-and-universities/agenciesBubbleChart.js index 4039f388..049d996c 100644 --- a/assets/js/colleges-and-universities/agenciesBubbleChart.js +++ b/assets/js/colleges-and-universities/agenciesBubbleChart.js @@ -239,7 +239,7 @@ function drawBubbleChart(root) { }) .attr("id", function (d) { let name = d.name.replace(/ /g, "_"); - if (d.depth && name === d.parent.name) { + if (d.depth > 1 && d.name === d.parent.name) { name += '_sub' } return name; @@ -262,7 +262,7 @@ function drawBubbleChart(root) { .attr("class", "label") .attr("id", function (d) { let name = "text_" + d.name.replace(/ /g, "_"); - if (d.depth && name === d.parent.name) { + if (d.depth > 1 && d.name === d.parent.name) { name += '_sub' } return name; From 7332d6259f8ae810407addad36b71f0bdc1fc80a Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Tue, 23 Jul 2019 14:33:41 -0400 Subject: [PATCH 53/77] cu/sunburst-text-changes --- assets/js/colleges-and-universities/investment-categories.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/colleges-and-universities/investment-categories.js b/assets/js/colleges-and-universities/investment-categories.js index bc47894c..8dc47a79 100755 --- a/assets/js/colleges-and-universities/investment-categories.js +++ b/assets/js/colleges-and-universities/investment-categories.js @@ -151,8 +151,8 @@ function updateCenter(d) { const largeText = 1.75; const exLargeText = 2; - let wordWrapMultiplier = isMobile() ? 5.5 : 2; - let smWordWrapMultiplier = isMobile() ? 3 : 1; + let wordWrapMultiplier = isMobile() ? 5.5 : isTablet() ? 3 : 2; + let smWordWrapMultiplier = isMobile() ? 3 : isTablet() ? 2 : 1; if (d.depth === 0) { From f6e397cad0fffcc59795d10e8a939074d3cb558a Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:11:04 -0500 Subject: [PATCH 54/77] da4400 wip experiment with landing page widths --- css/landing.scss | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/css/landing.scss b/css/landing.scss index 20c0b25b..8e161287 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -7,10 +7,16 @@ $heading-color: #4A4A4A; +// device screen widths +$desktop-xl: 1200px; +$desktop: 992px; +$tablet: 768px; +$phone: 576px; + .dl-landing { display: block; box-sizing: border-box; - max-width: 1200px; + max-width: $desktop - 1; margin: 0 auto; padding-top: 1rem; color: #333; @@ -20,7 +26,6 @@ $heading-color: #4A4A4A; text-align: center; } - h2.primary__heading { font-size: 24px; } @@ -78,7 +83,6 @@ h2.primary__heading { &.primary__text--desktop { display: none; } - } .landing-chart { @@ -109,7 +113,6 @@ h2.primary__heading { h2:hover { text-decoration: underline; } - } .landing-feature { @@ -137,10 +140,8 @@ h2.primary__heading { letter-spacing: normal; color: $heading-color; } - } - .landing-feature__link { cursor: pointer; display: block; @@ -154,7 +155,6 @@ h2.primary__heading { } } - .landing-feature__text { font-weight: 300; font-style: normal; @@ -201,8 +201,7 @@ h2.primary__heading { } } -@media only screen and (min-width: 950px) { - +@media only screen and (min-width: $desktop) { .dl-landing { display: flex; justify-content: space-between; @@ -313,16 +312,14 @@ h2.primary__heading { letter-spacing: normal; color: $heading-color; } - } // tablet view -@media only screen and (min-width: 950px) and (max-width: 1200px) { - +@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) { .dl-landing { display: block; box-sizing: border-box; - max-width: 1200px; + max-width: $desktop - 1; margin: 0 auto; padding-top: 4rem; padding-left: 1rem; @@ -342,7 +339,6 @@ h2.primary__heading { height: 100%; } - .secondary { width: 100%; padding-top: 1rem; @@ -351,7 +347,6 @@ h2.primary__heading { .landing-feature { box-sizing: border-box; -// padding-right: 1rem; width: 50%; float: left; clear: none; @@ -365,7 +360,6 @@ h2.primary__heading { padding-left: 1rem; } - // was display: flex.. .landing-row .landing-row__tiles { display: block; @@ -405,15 +399,11 @@ h2.primary__heading { a.landing-row__tile:nth-child(odd) { padding-right: 1rem; } - - } -@media (min-width: 1200px) { - +@media (min-width: $desktop) { .landing-chart { text-align: left; } - } From b3351be8863379f97e6ecacd4674b76e4fee4651 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:26:01 -0500 Subject: [PATCH 55/77] da4400 wip move vars to main.scss --- css/landing.scss | 6 ------ main.scss | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/css/landing.scss b/css/landing.scss index 8e161287..286177e3 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -7,12 +7,6 @@ $heading-color: #4A4A4A; -// device screen widths -$desktop-xl: 1200px; -$desktop: 992px; -$tablet: 768px; -$phone: 576px; - .dl-landing { display: block; box-sizing: border-box; diff --git a/main.scss b/main.scss index 8068bd5e..f36853d7 100755 --- a/main.scss +++ b/main.scss @@ -19,6 +19,11 @@ // table styling (Material Design) @import url('css/materialTable.min.css'); +// device screen widths +$desktop-xl: 1200px; +$desktop: 992px; +$tablet: 768px; +$phone: 576px; $accent-blue: #007fae; $accent-grey: #323A45; From f6dc0d832a7804ca7637c6b9bf3a36a357746b6d Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:27:09 -0500 Subject: [PATCH 56/77] fix spelling --- main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.scss b/main.scss index f36853d7..4bb76156 100755 --- a/main.scss +++ b/main.scss @@ -417,7 +417,7 @@ header.major h2 { // font awesome icon .glossary-section > i { padding-left: 5px; - paddin-right: 5px; + padding-right: 5px; margin-left: 10px; margin-right: 10px; } From 6b2a5df6785a4ede960493dcea060ef2e10739dc Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:37:00 -0500 Subject: [PATCH 57/77] da4400 wip found more widths to adjust --- _sass/landing/landing-dts.scss | 2 +- _sass/landing/landing-row.scss | 6 +++--- css/landing.scss | 6 ++++++ main.scss | 6 ------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_sass/landing/landing-dts.scss b/_sass/landing/landing-dts.scss index 9f40e655..a2b7ed2a 100644 --- a/_sass/landing/landing-dts.scss +++ b/_sass/landing/landing-dts.scss @@ -85,7 +85,7 @@ hr.horizontal_dts{ margin-top: -5px; } -@media only screen and (max-width: 1200px) { +@media only screen and (max-width: $desktop - 1) { .dts-container { display: flex; justify-content: center; diff --git a/_sass/landing/landing-row.scss b/_sass/landing/landing-row.scss index f05cd615..25f03e89 100644 --- a/_sass/landing/landing-row.scss +++ b/_sass/landing/landing-row.scss @@ -14,7 +14,7 @@ $landing-title-color: #4A4A4A; .landing-row { clear: both; - max-width: 1200px; + max-width: $desktop - 1; margin: 0 auto; padding: 1rem; color: #666; @@ -175,7 +175,7 @@ $landing-title-color: #4A4A4A; .feature-row { clear: both; - max-width: 1200px; + max-width: $desktop - 1; padding: 0 1rem; .feature-row__border { @@ -426,7 +426,7 @@ $landing-title-color: #4A4A4A; } } -@media (min-width: 950px) and (max-width: 1200px) { +@media (min-width: $tablet) and (max-width: $desktop - 1) { .feature-row { box-sizing: border-box; display: flex; diff --git a/css/landing.scss b/css/landing.scss index 286177e3..8e161287 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -7,6 +7,12 @@ $heading-color: #4A4A4A; +// device screen widths +$desktop-xl: 1200px; +$desktop: 992px; +$tablet: 768px; +$phone: 576px; + .dl-landing { display: block; box-sizing: border-box; diff --git a/main.scss b/main.scss index 4bb76156..9fe5c620 100755 --- a/main.scss +++ b/main.scss @@ -19,12 +19,6 @@ // table styling (Material Design) @import url('css/materialTable.min.css'); -// device screen widths -$desktop-xl: 1200px; -$desktop: 992px; -$tablet: 768px; -$phone: 576px; - $accent-blue: #007fae; $accent-grey: #323A45; $shuttle-grey: #62666C; From 22c4f055064fe4e5bfcb0f19a02cb628870e3e9b Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:44:01 -0500 Subject: [PATCH 58/77] da4400 wip move sass variables bove imports --- css/landing.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/landing.scss b/css/landing.scss index 8e161287..9e69a04e 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -1,18 +1,18 @@ --- --- -// landing.scss -@import 'landing/landing-dts'; -@import 'landing/landing-row'; - -$heading-color: #4A4A4A; - // device screen widths $desktop-xl: 1200px; $desktop: 992px; $tablet: 768px; $phone: 576px; +// landing.scss +@import 'landing/landing-dts'; +@import 'landing/landing-row'; + +$heading-color: #4A4A4A; + .dl-landing { display: block; box-sizing: border-box; From 311cbb94e9651efcb2a9f1aa665c664206041ef4 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 10:54:27 -0500 Subject: [PATCH 59/77] da4400 wip still finding width defs --- _sass/landing/landing-row.scss | 41 ++++++++++------------------------ 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/_sass/landing/landing-row.scss b/_sass/landing/landing-row.scss index 25f03e89..6fa1a0dc 100644 --- a/_sass/landing/landing-row.scss +++ b/_sass/landing/landing-row.scss @@ -1,9 +1,9 @@ // landing-row.scss -$landing-title-color: #4A4A4A; +$landing-title-color: #4a4a4a; @mixin landing-header { font-size: 17px; - color: #2272CE; + color: #2272ce; font-weight: bold; } @@ -34,7 +34,6 @@ $landing-title-color: #4A4A4A; margin-bottom: 0; height: 100%; - &:hover { h2 { text-decoration: underline; @@ -54,7 +53,7 @@ $landing-title-color: #4A4A4A; clear: both; h2 { - color: #2272CE; + color: #2272ce; margin-bottom: 1rem; margin-top: 0; font-size: 17px; @@ -68,7 +67,7 @@ $landing-title-color: #4A4A4A; .landing-row__title { @include landing-subtext; - color: #4A4A4A; + color: #4a4a4a; margin-top: 0; font-size: 17px; font-weight: 600; @@ -121,7 +120,6 @@ $landing-title-color: #4A4A4A; -ms-flex-pack: justify; justify-content: space-between; - .svgImg { height: 62px; margin: 0 auto 1rem auto; @@ -130,7 +128,7 @@ $landing-title-color: #4A4A4A; } .landing-row__text { -// width: 50%; + // width: 50%; margin: auto; // center.. .landing-row__title { @@ -157,9 +155,9 @@ $landing-title-color: #4A4A4A; } &.landing-row--analyses { - .landing-row__featured__image { - width: 100%; - } + .landing-row__featured__image { + width: 100%; + } .landing-row__featured__mobile-heading { display: block; @@ -179,7 +177,6 @@ $landing-title-color: #4A4A4A; padding: 0 1rem; .feature-row__border { - .feature-row__image { img { width: 100%; @@ -231,9 +228,7 @@ $landing-title-color: #4A4A4A; display: table; } - -@media only screen and (min-width: 950px) { - +@media only screen and (min-width: $tablet) { .feature-row__border { padding: 0; } @@ -243,8 +238,6 @@ $landing-title-color: #4A4A4A; height: 100%; } - - .landing-row { padding: 1rem; @@ -331,7 +324,6 @@ $landing-title-color: #4A4A4A; .landing-row { &.landing-row--analyses { - .landing-row__tiles { flex-wrap: wrap; width: 49.5%; @@ -398,7 +390,6 @@ $landing-title-color: #4A4A4A; display: flex; border: 1px solid #ddd; border-radius: 0.25rem; -// padding: 2em; .feature-row__image { width: 57%; @@ -441,12 +432,12 @@ $landing-title-color: #4A4A4A; padding: 0; } -.feature-row .feature-row__border .feature-row__text { + .feature-row .feature-row__border .feature-row__text { width: 50%; padding-top: 0; padding-left: 1rem; padding-right: 2rem; -} + } .feature-row .feature-row__image { box-sizing: border-box; @@ -466,7 +457,7 @@ $landing-title-color: #4A4A4A; } .feature-row .feature-row__border .feature-row__image img { - width: 100% + width: 100%; } .feature-row .feature-row__border .feature-row__image { @@ -478,7 +469,6 @@ $landing-title-color: #4A4A4A; .landing-row { &.landing-row--analyses { - .landing-row__tiles { flex-wrap: wrap; width: 100%; @@ -520,14 +510,7 @@ $landing-title-color: #4A4A4A; margin: 1.6rem; text-align: center; } - } } } - } - - - - - From d59d6951b19a2ba6ecfba87aba560d589fd2ef6b Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 11:07:27 -0500 Subject: [PATCH 60/77] da4400 wip apply new widths to header --- _sass/website/header.scss | 49 +++++++++++---------------------------- css/landing.scss | 2 +- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/_sass/website/header.scss b/_sass/website/header.scss index f0d981c3..d72b1aaf 100644 --- a/_sass/website/header.scss +++ b/_sass/website/header.scss @@ -1,4 +1,9 @@ -// Jack Killilea (jrk) +// device screen min widths +$desktop-xl: 1200px; +$desktop: 992px; +$tablet: 768px; +$phone: 576px; + // For our *New* homepage Sticky Header & Banner (plus extras!) $lb-link: #2376d8; $db-link: #0a2644; @@ -440,53 +445,25 @@ ul.nav:first-child li:hover > ul:after { 100% { left: -3%; } } -@media screen and (max-width: 1043px) { - ul.nav { - flex-wrap: nowrap; -// padding-right: 0px; - } -} - -@media screen and (max-width: 898px) { - ul.nav { - flex-wrap: wrap; -// padding-right: 0px; - } -} - -@media screen and (max-width: 937px) { - ul.nav { - flex-wrap: nowrap; -/// padding-right: 0px; - } -} - -@media screen and (max-width: 768px) { +@media screen and (max-width: $desktop - 1) { ul.nav { flex-wrap: nowrap; -// padding-right: 0px; } } -@media (max-width: 1280px) { +@media (max-width: $desktop - 1) { .logo-div { position: static; } } -@media (max-width: 450px) { - .header-logo__img { - width: 200px; - } -} - -@media (max-width: 515px) { +@media (max-width: $phone - 1) { margin-top: 6px; font-size: 20px; -} -// "super mobile" - where logo shrinks -@media (max-width: 450px) { + .header-logo__img { + width: 200px; + } .official-banner { box-sizing: border-box; @@ -500,7 +477,7 @@ ul.nav:first-child li:hover > ul:after { } // mobile view toggle - hamburger -@media (max-width: 955px) { +@media (max-width: $tablet) { ul.nav { list-style-type: none; display: none; diff --git a/css/landing.scss b/css/landing.scss index 9e69a04e..30cfc718 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -1,7 +1,7 @@ --- --- -// device screen widths +// device screen min widths $desktop-xl: 1200px; $desktop: 992px; $tablet: 768px; From ccdeadbd86e49c5666f6c23a6dfdd0f07fde5a89 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 11:21:53 -0500 Subject: [PATCH 61/77] da4400 wip fix header widths in js --- js/homepage/header.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/homepage/header.js b/js/homepage/header.js index 492b83b7..abea4f12 100644 --- a/js/homepage/header.js +++ b/js/homepage/header.js @@ -7,8 +7,8 @@ let subNavHideTimeout; const headerContainers = {}; const mobileContainers = {}; - const desktopMin = 956; - const superMobile = 450; + const desktopMin = 992; + const superMobile = 576; const twolineCollision = 1350; let logoMarginOffset = 149; @@ -70,7 +70,7 @@ if (width >= superMobile) { let yOffset = max - y; if (y > 29) { - yOffset = 80; + yOffset = 80; } mobileContainers.mobileNav.css('top', yOffset + 'px'); } @@ -78,7 +78,7 @@ function fixSuperMobileNav(y, width) { const max = 110; - if (width <= superMobile) { + if (width < superMobile) { let yOffset = max - y; if (y > 29) { yOffset = 80; From 5907a79d8f6f7405a960df7fad66e080d37fbeda Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 11:42:05 -0500 Subject: [PATCH 62/77] da4400 wip use actual min width... --- js/homepage/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/homepage/header.js b/js/homepage/header.js index abea4f12..97f6f921 100644 --- a/js/homepage/header.js +++ b/js/homepage/header.js @@ -7,7 +7,7 @@ let subNavHideTimeout; const headerContainers = {}; const mobileContainers = {}; - const desktopMin = 992; + const desktopMin = 769; const superMobile = 576; const twolineCollision = 1350; let logoMarginOffset = 149; From 59352e42684458ed979353a76f5f271d80239a35 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 11:47:39 -0500 Subject: [PATCH 63/77] da4400 minor tweak to logic --- js/homepage/header.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/homepage/header.js b/js/homepage/header.js index 97f6f921..8dc7ca22 100644 --- a/js/homepage/header.js +++ b/js/homepage/header.js @@ -119,7 +119,7 @@ let leftMargin = 0 - (max - y) * mSteps; - if (width > desktopMin && width < twolineCollision) { + if (width >= desktopMin && width < twolineCollision) { forceLogoLeft(width); return; } @@ -336,7 +336,7 @@ function setInitialLogoPosition() { let width = window.innerWidth; const hasTight = headerContainers.header.hasClass('tight'); - if (width > desktopMin && width < twolineCollision) { + if (width >= desktopMin && width < twolineCollision) { forceLogoLeft(width); } else if (hasTight) { forceLogoLeft(width); From 6e3b925571c63426d0e3f867ac40d5e36676068d Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Wed, 24 Jul 2019 11:52:23 -0500 Subject: [PATCH 64/77] da4400 just guessing now --- js/homepage/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/homepage/header.js b/js/homepage/header.js index 8dc7ca22..b5ce2bb6 100644 --- a/js/homepage/header.js +++ b/js/homepage/header.js @@ -7,7 +7,7 @@ let subNavHideTimeout; const headerContainers = {}; const mobileContainers = {}; - const desktopMin = 769; + const desktopMin = 768; const superMobile = 576; const twolineCollision = 1350; let logoMarginOffset = 149; From c6961a622bdbd0e6df69949f8e47e15866ae0ace Mon Sep 17 00:00:00 2001 From: xjackk Date: Thu, 25 Jul 2019 15:10:26 -0400 Subject: [PATCH 65/77] css update and share update --- _includes/colleges/colleges-share.html | 6 +++--- css/C-a-U.scss | 1 + entries/colleges-and-universities.html | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/_includes/colleges/colleges-share.html b/_includes/colleges/colleges-share.html index 09dbc36f..e547c476 100644 --- a/_includes/colleges/colleges-share.html +++ b/_includes/colleges/colleges-share.html @@ -25,8 +25,8 @@
  • - {% if page.socialMediaText %} - {% assign twitterVariable = page.socialMediaText %} + {% if page.socialTwitterText %} + {% assign twitterVariable = page.socialTwitterText %} {% else %} {% assign twitterVariable = page.title %} {% endif %} @@ -36,7 +36,7 @@
  • - + {% include svgs/reddit.svg class="share-icon icon-reddit" %} diff --git a/css/C-a-U.scss b/css/C-a-U.scss index 64ad5042..7b5cdd9b 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -473,6 +473,7 @@ $cuRed: #881E3D; font-size: 15px; font-weight: 300; line-height: 18px; + // } } diff --git a/entries/colleges-and-universities.html b/entries/colleges-and-universities.html index 5ca229a9..61805668 100644 --- a/entries/colleges-and-universities.html +++ b/entries/colleges-and-universities.html @@ -6,7 +6,14 @@ colleges: true dlPageCss: C-a-U.css socialMediaImage: cu-share.jpg -socialMediaText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" +socialFacebookText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! +#DataLab #Treasury #DataTransparency #USAspending" + +socialTwitterText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" + +socialRedditText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis to discover more on federal funding in colleges and universities." + +socialLinkedinText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis to discover more on federal funding in colleges and universities!" ---
    From 2a0bbeaa0a7c3122a7e921aefb960605d4018937 Mon Sep 17 00:00:00 2001 From: xjackk Date: Thu, 25 Jul 2019 15:16:35 -0400 Subject: [PATCH 66/77] dot to hash --- css/C-a-U.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/C-a-U.scss b/css/C-a-U.scss index 36426c43..c705d85e 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -468,7 +468,7 @@ $cuRed: #881E3D; text-align: center; } - .aid-description { + #aid-description { color: #555555; font-size: 15px; font-weight: 300; From c798e2750212f76fd9cd594d19375e097198bf60 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Fri, 26 Jul 2019 14:19:29 -0500 Subject: [PATCH 67/77] revert 1 file --- _sass/landing/landing-dts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/landing/landing-dts.scss b/_sass/landing/landing-dts.scss index a2b7ed2a..9f40e655 100644 --- a/_sass/landing/landing-dts.scss +++ b/_sass/landing/landing-dts.scss @@ -85,7 +85,7 @@ hr.horizontal_dts{ margin-top: -5px; } -@media only screen and (max-width: $desktop - 1) { +@media only screen and (max-width: 1200px) { .dts-container { display: flex; justify-content: center; From 33673492a71a44645dd8a07ea70db3b41dc32a0c Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Fri, 26 Jul 2019 14:29:17 -0500 Subject: [PATCH 68/77] revert other da4400 files --- _sass/landing/landing-row.scss | 47 +++++++++++++++++++++++----------- css/landing.scss | 32 +++++++++++++++-------- js/homepage/header.js | 12 ++++----- 3 files changed, 59 insertions(+), 32 deletions(-) diff --git a/_sass/landing/landing-row.scss b/_sass/landing/landing-row.scss index 6fa1a0dc..f05cd615 100644 --- a/_sass/landing/landing-row.scss +++ b/_sass/landing/landing-row.scss @@ -1,9 +1,9 @@ // landing-row.scss -$landing-title-color: #4a4a4a; +$landing-title-color: #4A4A4A; @mixin landing-header { font-size: 17px; - color: #2272ce; + color: #2272CE; font-weight: bold; } @@ -14,7 +14,7 @@ $landing-title-color: #4a4a4a; .landing-row { clear: both; - max-width: $desktop - 1; + max-width: 1200px; margin: 0 auto; padding: 1rem; color: #666; @@ -34,6 +34,7 @@ $landing-title-color: #4a4a4a; margin-bottom: 0; height: 100%; + &:hover { h2 { text-decoration: underline; @@ -53,7 +54,7 @@ $landing-title-color: #4a4a4a; clear: both; h2 { - color: #2272ce; + color: #2272CE; margin-bottom: 1rem; margin-top: 0; font-size: 17px; @@ -67,7 +68,7 @@ $landing-title-color: #4a4a4a; .landing-row__title { @include landing-subtext; - color: #4a4a4a; + color: #4A4A4A; margin-top: 0; font-size: 17px; font-weight: 600; @@ -120,6 +121,7 @@ $landing-title-color: #4a4a4a; -ms-flex-pack: justify; justify-content: space-between; + .svgImg { height: 62px; margin: 0 auto 1rem auto; @@ -128,7 +130,7 @@ $landing-title-color: #4a4a4a; } .landing-row__text { - // width: 50%; +// width: 50%; margin: auto; // center.. .landing-row__title { @@ -155,9 +157,9 @@ $landing-title-color: #4a4a4a; } &.landing-row--analyses { - .landing-row__featured__image { - width: 100%; - } + .landing-row__featured__image { + width: 100%; + } .landing-row__featured__mobile-heading { display: block; @@ -173,10 +175,11 @@ $landing-title-color: #4a4a4a; .feature-row { clear: both; - max-width: $desktop - 1; + max-width: 1200px; padding: 0 1rem; .feature-row__border { + .feature-row__image { img { width: 100%; @@ -228,7 +231,9 @@ $landing-title-color: #4a4a4a; display: table; } -@media only screen and (min-width: $tablet) { + +@media only screen and (min-width: 950px) { + .feature-row__border { padding: 0; } @@ -238,6 +243,8 @@ $landing-title-color: #4a4a4a; height: 100%; } + + .landing-row { padding: 1rem; @@ -324,6 +331,7 @@ $landing-title-color: #4a4a4a; .landing-row { &.landing-row--analyses { + .landing-row__tiles { flex-wrap: wrap; width: 49.5%; @@ -390,6 +398,7 @@ $landing-title-color: #4a4a4a; display: flex; border: 1px solid #ddd; border-radius: 0.25rem; +// padding: 2em; .feature-row__image { width: 57%; @@ -417,7 +426,7 @@ $landing-title-color: #4a4a4a; } } -@media (min-width: $tablet) and (max-width: $desktop - 1) { +@media (min-width: 950px) and (max-width: 1200px) { .feature-row { box-sizing: border-box; display: flex; @@ -432,12 +441,12 @@ $landing-title-color: #4a4a4a; padding: 0; } - .feature-row .feature-row__border .feature-row__text { +.feature-row .feature-row__border .feature-row__text { width: 50%; padding-top: 0; padding-left: 1rem; padding-right: 2rem; - } +} .feature-row .feature-row__image { box-sizing: border-box; @@ -457,7 +466,7 @@ $landing-title-color: #4a4a4a; } .feature-row .feature-row__border .feature-row__image img { - width: 100%; + width: 100% } .feature-row .feature-row__border .feature-row__image { @@ -469,6 +478,7 @@ $landing-title-color: #4a4a4a; .landing-row { &.landing-row--analyses { + .landing-row__tiles { flex-wrap: wrap; width: 100%; @@ -510,7 +520,14 @@ $landing-title-color: #4a4a4a; margin: 1.6rem; text-align: center; } + } } } + } + + + + + diff --git a/css/landing.scss b/css/landing.scss index 30cfc718..20c0b25b 100644 --- a/css/landing.scss +++ b/css/landing.scss @@ -1,12 +1,6 @@ --- --- -// device screen min widths -$desktop-xl: 1200px; -$desktop: 992px; -$tablet: 768px; -$phone: 576px; - // landing.scss @import 'landing/landing-dts'; @import 'landing/landing-row'; @@ -16,7 +10,7 @@ $heading-color: #4A4A4A; .dl-landing { display: block; box-sizing: border-box; - max-width: $desktop - 1; + max-width: 1200px; margin: 0 auto; padding-top: 1rem; color: #333; @@ -26,6 +20,7 @@ $heading-color: #4A4A4A; text-align: center; } + h2.primary__heading { font-size: 24px; } @@ -83,6 +78,7 @@ h2.primary__heading { &.primary__text--desktop { display: none; } + } .landing-chart { @@ -113,6 +109,7 @@ h2.primary__heading { h2:hover { text-decoration: underline; } + } .landing-feature { @@ -140,8 +137,10 @@ h2.primary__heading { letter-spacing: normal; color: $heading-color; } + } + .landing-feature__link { cursor: pointer; display: block; @@ -155,6 +154,7 @@ h2.primary__heading { } } + .landing-feature__text { font-weight: 300; font-style: normal; @@ -201,7 +201,8 @@ h2.primary__heading { } } -@media only screen and (min-width: $desktop) { +@media only screen and (min-width: 950px) { + .dl-landing { display: flex; justify-content: space-between; @@ -312,14 +313,16 @@ h2.primary__heading { letter-spacing: normal; color: $heading-color; } + } // tablet view -@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) { +@media only screen and (min-width: 950px) and (max-width: 1200px) { + .dl-landing { display: block; box-sizing: border-box; - max-width: $desktop - 1; + max-width: 1200px; margin: 0 auto; padding-top: 4rem; padding-left: 1rem; @@ -339,6 +342,7 @@ h2.primary__heading { height: 100%; } + .secondary { width: 100%; padding-top: 1rem; @@ -347,6 +351,7 @@ h2.primary__heading { .landing-feature { box-sizing: border-box; +// padding-right: 1rem; width: 50%; float: left; clear: none; @@ -360,6 +365,7 @@ h2.primary__heading { padding-left: 1rem; } + // was display: flex.. .landing-row .landing-row__tiles { display: block; @@ -399,11 +405,15 @@ h2.primary__heading { a.landing-row__tile:nth-child(odd) { padding-right: 1rem; } + + } -@media (min-width: $desktop) { +@media (min-width: 1200px) { + .landing-chart { text-align: left; } + } diff --git a/js/homepage/header.js b/js/homepage/header.js index b5ce2bb6..492b83b7 100644 --- a/js/homepage/header.js +++ b/js/homepage/header.js @@ -7,8 +7,8 @@ let subNavHideTimeout; const headerContainers = {}; const mobileContainers = {}; - const desktopMin = 768; - const superMobile = 576; + const desktopMin = 956; + const superMobile = 450; const twolineCollision = 1350; let logoMarginOffset = 149; @@ -70,7 +70,7 @@ if (width >= superMobile) { let yOffset = max - y; if (y > 29) { - yOffset = 80; + yOffset = 80; } mobileContainers.mobileNav.css('top', yOffset + 'px'); } @@ -78,7 +78,7 @@ function fixSuperMobileNav(y, width) { const max = 110; - if (width < superMobile) { + if (width <= superMobile) { let yOffset = max - y; if (y > 29) { yOffset = 80; @@ -119,7 +119,7 @@ let leftMargin = 0 - (max - y) * mSteps; - if (width >= desktopMin && width < twolineCollision) { + if (width > desktopMin && width < twolineCollision) { forceLogoLeft(width); return; } @@ -336,7 +336,7 @@ function setInitialLogoPosition() { let width = window.innerWidth; const hasTight = headerContainers.header.hasClass('tight'); - if (width >= desktopMin && width < twolineCollision) { + if (width > desktopMin && width < twolineCollision) { forceLogoLeft(width); } else if (hasTight) { forceLogoLeft(width); From 1f2bcc858a37d3343db774447fa83a954fb208cd Mon Sep 17 00:00:00 2001 From: Andrea Blackwell Date: Mon, 29 Jul 2019 19:16:09 -0400 Subject: [PATCH 69/77] hiding overflow area on bubble chart when zoomed in --- css/C-a-U.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/css/C-a-U.scss b/css/C-a-U.scss index c705d85e..1f226fcf 100644 --- a/css/C-a-U.scss +++ b/css/C-a-U.scss @@ -742,6 +742,7 @@ $cuRed: #881E3D; position: absolute; top: 0; left: 0; + overflow: hidden; } #agency-legend_colorKey { From d18d662305f2a08a16ff0304a91f35defced40e1 Mon Sep 17 00:00:00 2001 From: xjackk Date: Wed, 31 Jul 2019 14:00:17 -0400 Subject: [PATCH 70/77] image fix --- _includes/head.html | 2 ++ entries/colleges-and-universities.html | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 727a88d5..a257312f 100755 --- a/_includes/head.html +++ b/_includes/head.html @@ -71,6 +71,8 @@ {% if page.permalink %}{% endif %} {% if page.socialMediaImage %} + {% elsif page.socialShare %} + {% else %} {% endif %} diff --git a/entries/colleges-and-universities.html b/entries/colleges-and-universities.html index e13bf60e..2033f9d4 100644 --- a/entries/colleges-and-universities.html +++ b/entries/colleges-and-universities.html @@ -2,13 +2,21 @@ layout: colleges menuname: Colleges & Universities menuorder: 3 +description: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" permalink: colleges-and-universities.html colleges: true dlPageCss: C-a-U.css -socialMediaImage: cu-share.jpg -socialMediaText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" ---- +socialShare: cu-share.jpg + +socialFacebookText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! +#DataLab #Treasury #DataTransparency #USAspending" + +socialTwitterText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds! #DataLab #Treasury #DataTransparency #USAspending" +socialRedditText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis to discover more on federal funding in colleges and universities." + +socialLinkedinText: "Did you know the federal government invested over $149 billion in higher education? Check out this analysis to discover more on federal funding in colleges and universities!" +---
    {% include colleges/sectionpre.html %} @@ -24,7 +32,6 @@ %}
    - From 833cbbfa689effc0397af526052858ea68589f52 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Thu, 1 Aug 2019 09:04:01 -0500 Subject: [PATCH 71/77] revert download icons for IE --- _includes/colleges/investment-categories.html | 2 +- _includes/colleges/sectionthree.html | 2 +- _includes/colleges/sectiontwo.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html index 09ed86d7..4c6ebb7e 100644 --- a/_includes/colleges/investment-categories.html +++ b/_includes/colleges/investment-categories.html @@ -104,7 +104,7 @@

    Instructions

    diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html index 91d43b6c..f43eabe3 100644 --- a/_includes/colleges/sectionthree.html +++ b/_includes/colleges/sectionthree.html @@ -78,7 +78,7 @@

    Instructions

    diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html index 393580d3..aae533ad 100644 --- a/_includes/colleges/sectiontwo.html +++ b/_includes/colleges/sectiontwo.html @@ -81,7 +81,7 @@

    Instructions

    From 85ed61d65f9bf682d2fad0fba09c0c3ee6a73e3d Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Thu, 1 Aug 2019 10:23:51 -0500 Subject: [PATCH 72/77] re-add icon file --- _includes/svgs/download_icon.svg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 _includes/svgs/download_icon.svg diff --git a/_includes/svgs/download_icon.svg b/_includes/svgs/download_icon.svg new file mode 100644 index 00000000..a0f188ba --- /dev/null +++ b/_includes/svgs/download_icon.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From 1594d20d26bf7674cdbfbe5f94b69cb4cc09136f Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Thu, 1 Aug 2019 10:59:48 -0500 Subject: [PATCH 73/77] missed SCSS file to revert --- _sass/website/header.scss | 49 ++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/_sass/website/header.scss b/_sass/website/header.scss index d72b1aaf..f0d981c3 100644 --- a/_sass/website/header.scss +++ b/_sass/website/header.scss @@ -1,9 +1,4 @@ -// device screen min widths -$desktop-xl: 1200px; -$desktop: 992px; -$tablet: 768px; -$phone: 576px; - +// Jack Killilea (jrk) // For our *New* homepage Sticky Header & Banner (plus extras!) $lb-link: #2376d8; $db-link: #0a2644; @@ -445,25 +440,53 @@ ul.nav:first-child li:hover > ul:after { 100% { left: -3%; } } -@media screen and (max-width: $desktop - 1) { +@media screen and (max-width: 1043px) { + ul.nav { + flex-wrap: nowrap; +// padding-right: 0px; + } +} + +@media screen and (max-width: 898px) { + ul.nav { + flex-wrap: wrap; +// padding-right: 0px; + } +} + +@media screen and (max-width: 937px) { + ul.nav { + flex-wrap: nowrap; +/// padding-right: 0px; + } +} + +@media screen and (max-width: 768px) { ul.nav { flex-wrap: nowrap; +// padding-right: 0px; } } -@media (max-width: $desktop - 1) { +@media (max-width: 1280px) { .logo-div { position: static; } } -@media (max-width: $phone - 1) { - margin-top: 6px; - font-size: 20px; - +@media (max-width: 450px) { .header-logo__img { width: 200px; } +} + +@media (max-width: 515px) { + margin-top: 6px; + font-size: 20px; +} + +// "super mobile" - where logo shrinks +@media (max-width: 450px) { .official-banner { box-sizing: border-box; @@ -477,7 +500,7 @@ ul.nav:first-child li:hover > ul:after { } // mobile view toggle - hamburger -@media (max-width: $tablet) { +@media (max-width: 955px) { ul.nav { list-style-type: none; display: none; From 41b3f9aeb4adfc2936a23f6f95d4d4da734cb0c6 Mon Sep 17 00:00:00 2001 From: Brett Varney Date: Thu, 1 Aug 2019 11:17:19 -0500 Subject: [PATCH 74/77] add tracking attributes to search buttons --- _includes/colleges/investment-categories.html | 9 +++++++-- _includes/colleges/sectionthree.html | 9 +++++++-- _includes/colleges/sectiontwo.html | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html index 09ed86d7..6b6f10b6 100644 --- a/_includes/colleges/investment-categories.html +++ b/_includes/colleges/investment-categories.html @@ -69,7 +69,12 @@

    Instructions

    @@ -104,7 +109,7 @@

    Instructions

    diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html index 91d43b6c..0394c5a5 100644 --- a/_includes/colleges/sectionthree.html +++ b/_includes/colleges/sectionthree.html @@ -48,7 +48,12 @@

    Instructions

    @@ -78,7 +83,7 @@

    Instructions

    diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html index 393580d3..bc49f89c 100644 --- a/_includes/colleges/sectiontwo.html +++ b/_includes/colleges/sectiontwo.html @@ -53,7 +53,12 @@

    Instructions

  • - {% if page.socialMediaText %} - {% assign twitterVariable = page.socialMediaText %} + {% if page.socialTwitterText %} + {% assign twitterVariable = page.socialTwitterText %} {% else %} {% assign twitterVariable = page.title %} {% endif %}