Skip to content

Commit

Permalink
Merge branch 'release/public-20210105' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@patphongs
patphongs committed Jan 5, 2021
2 parents 9138406 + 97e7611 commit 56b57f5
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 10 deletions.
10 changes: 10 additions & 0 deletions fec/data/templates/partials/browse-data/bulk-data.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/weball22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/weball20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/weball18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/weball16.zip">2015–2016</a></li>
Expand Down Expand Up @@ -40,6 +41,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/cn22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/cn20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/cn18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/cn16.zip">2015–2016</a></li>
Expand Down Expand Up @@ -72,6 +74,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/ccl22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/ccl20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/ccl18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/ccl16.zip">2015–2016</a></li>
Expand All @@ -94,6 +97,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/webl22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/webl20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/webl18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/webl16.zip">2015–2016</a></li>
Expand All @@ -117,6 +121,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/cm22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/cm20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/cm18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/cm16.zip">2015–2016</a></li>
Expand Down Expand Up @@ -149,6 +154,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/webk22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/webk20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/webk18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/webk16.zip">2015–2016</a></li>
Expand All @@ -172,6 +178,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/indiv22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/indiv20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/indiv18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/indiv16.zip">2015–2016</a></li>
Expand Down Expand Up @@ -204,6 +211,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/pas222.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/pas220.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/pas218.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/pas216.zip">2015–2016</a></li>
Expand Down Expand Up @@ -235,6 +243,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-margin--bottom">
<li><a href="/files/bulk-downloads/2022/oth22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/oth20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/oth18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/oth16.zip">2015–2016</a></li>
Expand Down Expand Up @@ -267,6 +276,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered">
<li><a href="/files/bulk-downloads/2022/oppexp22.zip">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/oppexp20.zip">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/oppexp18.zip">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/oppexp16.zip">2015–2016</a></li>
Expand Down
6 changes: 4 additions & 2 deletions fec/data/templates/partials/browse-data/candidates.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/candidate_summary_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/candidate_summary_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/candidate_summary_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/candidate_summary_2016.csv">2015–2016</a></li>
Expand Down Expand Up @@ -64,10 +65,10 @@
<a href="/data/elections/president/2020/">
<div class="card card--horizontal card--alternating-bg">
<div class="card__image__container card__image__container--primary">
<img src="/static/img/i-elections--primary-contrast.svg" alt="Icon of a person and location marker" class="card__image">
<img src="/static/img/i-elections--primary-contrast.svg" alt="Icon of a person and location marker" class="card__image">
</div>
<div class="card__content">
<span class="label">
<span class="label">
<span class="label heading__pre-title">Presidential candidates</span>
</span>
Compare candidates in the 2020 election
Expand Down Expand Up @@ -141,6 +142,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/Form2Filer_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/Form2Filer_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/Form2Filer_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/Form2Filer_2016.csv">2015–2016</a></li>
Expand Down
5 changes: 4 additions & 1 deletion fec/data/templates/partials/browse-data/committees.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/committee_summary_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/committee_summary_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/committee_summary_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/committee_summary_2016.csv">2015–2016</a></li>
Expand All @@ -41,6 +42,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/leadership2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/leadership2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/leadership2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/leadership2016.csv">2015–2016</a></li>
Expand All @@ -65,7 +67,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/data.fec.gov/lobbyist.csv">2007–2020</a></li>
<li><a href="/files/bulk-downloads/data.fec.gov/lobbyist.csv">2007–2022</a></li>
</ul>
<p class="u-margin--top"><a href="/campaign-finance-data/lobbyistregistrant-committees-file-description">Data description for this file</a><i class="icon icon--small i-arrow-right icon--inline--right"></i></p>
</div>
Expand All @@ -86,6 +88,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/Form1Filer_2022.csv">2021-2022</a></li>
<li><a href="/files/bulk-downloads/2020/Form1Filer_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/Form1Filer_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/Form1Filer_2016.csv">2015–2016</a></li>
Expand Down
2 changes: 1 addition & 1 deletion fec/data/templates/partials/browse-data/filings-reports.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/data.fec.gov/UnverifiedCommittees.csv">2007–2020</a></li>
<li><a href="/files/bulk-downloads/data.fec.gov/UnverifiedCommittees.csv">2016–2022</a></li>
</ul>
<p class="u-margin--top"><a href="/campaign-finance-data/unverified-filers-file-description">Data description for this file</a><i class="icon icon--small i-arrow-right icon--inline--right"></i></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion fec/data/templates/partials/browse-data/raising.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/data.fec.gov/lobbyist_bundle.csv">2009–2020</a></li>
<li><a href="/files/bulk-downloads/data.fec.gov/lobbyist_bundle.csv">2009–2022</a></li>
</ul>
<p class="u-margin--top"><a href="/campaign-finance-data/lobbyist-bundled-contributions-file-description/">Data description for this file</a><i class="icon icon--small i-arrow-right icon--inline--right"></i></p>
</div>
Expand Down
9 changes: 6 additions & 3 deletions fec/data/templates/partials/browse-data/spending.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/independent_expenditure_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/independent_expenditure_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/independent_expenditure_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/independent_expenditure_2016.csv">2015–2016</a></li>
Expand Down Expand Up @@ -58,12 +59,13 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/ElectioneeringComm_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/ElectioneeringComm_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/ElectioneeringComm_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/ElectioneeringComm_2016.csv">2015–2016</a></li>
<li><a href="/files/bulk-downloads/2014/ElectioneeringComm_2014.csv">2013–2014</a></li>
<li><a href="/files/bulk-downloads/2012/ElectioneeringComm_2012.csv"">2011–2012</a></li>
<li><a href="/files/bulk-downloads/2010/ElectioneeringComm_2010.csv"">2009–2010</a></li>
<li><a href="/files/bulk-downloads/2012/ElectioneeringComm_2012.csv">2011–2012</a></li>
<li><a href="/files/bulk-downloads/2010/ElectioneeringComm_2010.csv">2009–2010</a></li>
</ul>
<p class="u-margin--top"><a href="/campaign-finance-data/electioneering-communications-file-description">Data description for this file</a><i class="icon icon--small i-arrow-right icon--inline--right"></i></p>
</div>
Expand All @@ -75,7 +77,7 @@
<li>
<i class="icon i-magnifying-glass icon--absolute--left"></i>
<div class="content__section--indent-left">
<h4><a href="/data/communication-costs"">Communication costs</a></h4>
<h4><a href="/data/communication-costs">Communication costs</a></h4>
<p class ="u-margin--bottom">Search communication costs for communications that support or oppose specific candidates. Search by date and amount spent.</p>
<div class="js-accordion accordion--neutral" data-content-prefix="communication-costs">
<button type="button" class="js-accordion-trigger accordion__button">Download this data as .CSV to use on your own</button>
Expand All @@ -84,6 +86,7 @@
<i class="icon i-download icon--absolute--left"></i>
<div class="content__section--indent-left">
<ul class="list--flat-bordered u-no-margin">
<li><a href="/files/bulk-downloads/2022/CommunicationCosts_2022.csv">2021–2022</a></li>
<li><a href="/files/bulk-downloads/2020/CommunicationCosts_2020.csv">2019–2020</a></li>
<li><a href="/files/bulk-downloads/2018/CommunicationCosts_2018.csv">2017–2018</a></li>
<li><a href="/files/bulk-downloads/2016/CommunicationCosts_2016.csv">2015–2016</a></li>
Expand Down
4 changes: 2 additions & 2 deletions fec/fec/static/js/pages/statistical-summary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ StatisticalSummary.prototype.showTable = function() {
'message--inline',
'message--alert'
);
const today = new Date();
const thisYear = today.getFullYear();

const thisYear = this.chooseYear.options[0].value;

//Fire handleLatestAvailableOption() if user selects this year's select option or a URL has this year in querysting year parameter

Expand Down

0 comments on commit 56b57f5

Please sign in to comment.