Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

Feature/data explinations #746

Merged
merged 8 commits into from
Sep 25, 2015
Merged

Feature/data explinations #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b488c6
Explaining additional date limitations on the schedule data.
LindsayYoung Sep 23, 2015
c01888c
Added Disbursement date, since we are working with two kind of dates
LindsayYoung Sep 23, 2015
f48c92c
Added date disclaimer, still need to change filtering options.
LindsayYoung Sep 23, 2015
de6b1e5
standardizing capitalizaton
LindsayYoung Sep 23, 2015
ab362c4
- added form info to receipts
LindsayYoung Sep 23, 2015
229bb11
Working on wording with Emileigh
LindsayYoung Sep 23, 2015
53f1292
Refining transaction disclaimer.
LindsayYoung Sep 23, 2015
e536663
file date is kind of confusing, adding that this is the first file date.
LindsayYoung Sep 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions static/templates/disbursements.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@
<td>{{{ currency disbursement_amount }}}</td>
</tr>
<tr>
<td class="panel__term">Receipt date</td>
<td class="panel__term">Disbursement date</td>
<td>{{{ datetime disbursement_date }}}</td>
</tr>
<tr>
<td class="panel__term">Description</td>
<td>{{ disbursement_description }}</td>
</tr>
<tr>
<td class="panel__term">Memo</td>
<td>{{ memo_text }}</td>
</tr>
<tr>
<td class="panel__term">Description</td>
<td>{{ disbursement_description }}</td>
<td class="panel__term">Memo code</td>
<td>{{ memoed_subtotal }}</td>
</tr>
{{#if election_type_full }}
<tr>
Expand All @@ -44,6 +48,20 @@
</table>
</div>

<div class="panel__row">
<h4 class="panel__title">Filing information</h4>
<table>
<tr>
<td class="panel__term">Filing date</td>
<td>{{{ datetime receipt_date }}}</td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be filing_date ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They use "receipt date" for the day the filing was received by the FEC. But that becomes confusing on the Receipts page, where there is "receipt date" and "contribution receipt date" I thought if we called "receipt date" "filing date" that makes the two dates more clear. I changed it on the disbursements since those tables are similar and if there is a section called receipts, receipt date might be confusing. If you have a better idea of how to make it less confusing we can change it.

</tr>
<tr>
<td class="panel__term">View report page</td>
<td><a href="{{{ pdf_url }}}" target="_blank">View on fec.gov</a></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This duplicates the "view original image" link at the top of the panel.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I am blind. Thanks for spotting that!

A thought on the language, what if it says-- "View report page" instead of "View original image" Does @emileighoutlaw or @noahmanger have strong feelings on this micro copy?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about "View original report" ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are showing the page that the record is on, which is handy because the reports can be thousands of pages.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like "View report page", but then in the filings panels we'd need it to be "View report". Right now we use "View original image" for both.

I was looking at this and think it might make sense for the link under filing date to link to the full report, just so people can have it. I think we should also identify the report it was filed on by name, so you can see, e.g. April Quarterly 2015.

</tr>
</table>
</div>

<div class="panel__row">
<h4 class="panel__title">Committee information</h4>
<table>
Expand Down
16 changes: 15 additions & 1 deletion static/templates/receipts.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<tr>
<td class="panel__term">Employer</td>
<td>{{ contributor_employer }}</td>
</tr>
</tr>
<tr>
<td class="panel__term">Year to date</td>
<td>{{{ currency contributor_aggregate_ytd }}}</td>
Expand Down Expand Up @@ -50,6 +50,20 @@
</table>
</div>

<div class="panel__row">
<h4 class="panel__title">Filing information</h4>
<table>
<tr>
<td class="panel__term">Filing date</td>
<td>{{{ datetime receipt_date }}}</td>
</tr>
<tr>
<td class="panel__term">View report page</td>
<td><a href="{{{ pdf_url }}}" target="_blank">View on fec.gov</a></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This duplicates the "view original image" link at the top of the panel.

</tr>
</table>
</div>

<div class="panel__row">
<h4 class="panel__title">Recipient information</h4>
<table>
Expand Down
2 changes: 1 addition & 1 deletion templates/partials/committees-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<th scope="col">Treasurer name</th>
<th scope="col">State</th>
<th scope="col">Party</th>
<th scope="col">File date</th>
<th scope="col">First file date</th>
<th scope="col">Type</th>
<th scope="col">Designation</th>
<th scope="col">Organization type</th>
Expand Down
8 changes: 5 additions & 3 deletions templates/partials/disbursements-filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{% endblock %}

{% block filters %}
<p>Due to the large number of transactions, records begin in 2011.</p>
{{ typeahead.field('committee_id', 'Committee') }}

<h4 class="filters__subheader">Recipient information</h4>
Expand All @@ -18,7 +19,8 @@ <h4 class="filters__subheader">Recipient information</h4>
{{ states.field('recipient_state')}}
<h4 class="filters__subheader">Transaction information</h4>
{{ text.field('disbursement_description', 'Purpose') }}
{{ text.field('min_amount', 'Minimum Expenditure') }}
{{ text.field('max_amount', 'Maximum Expenditure') }}
{{ date.field('date', 'Disbursement Date', dates ) }}
{{ text.field('min_amount', 'Minimum expenditure') }}
{{ text.field('max_amount', 'Maximum expenditure') }}
{{ date.field('date', 'Disbursement date', dates ) }}
<p>Disbursements are reported periodically, according to the filer's reporting schedule. Disbursements are updated as they’re processed— that time can vary.</p>
{% endblock %}
4 changes: 2 additions & 2 deletions templates/partials/disbursements-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<table id="results" class="data-table" data-type="expenditure">
<thead>
<tr>
<th scope="col">Recipient Name</th>
<th scope="col">Recipient name</th>
<th scope="col">State</th>
<th scope="col">Amount</th>
<th scope="col">Date</th>
<th scope="col">Disbursement date</th>
<th scope="col">Purpose</th>
<th scope="col">Committee</th>
<th scope="col"></th>
Expand Down
12 changes: 7 additions & 5 deletions templates/partials/receipts-filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

{% block filters %}
<div class="filter">
<p>Due to the large number of transactions, records begin in 2011.</p>
<fieldset>
<legend class="label">Show contributions from</legend>
<ul>
Expand Down Expand Up @@ -44,16 +45,17 @@
{{ typeahead.field('committee_id', 'Committee') }}

<h3 class="filters__subheader">Contributor information</h3>
{{ typeahead.field('contributor_id', 'Contributor Name (committee)') }}
{{ text.field('contributor_name', 'Contributor Name (non-committee)') }}
{{ typeahead.field('contributor_id', 'Contributor name (committee)') }}
{{ text.field('contributor_name', 'Contributor name (non-committee)') }}
{{ text.field('contributor_city', 'City') }}
{{ states.field('contributor_state') }}
{{ text.field('contributor_employer', 'Employer') }}
{{ text.field('contributor_occupation', 'Occupation') }}

<h3 class="filters__subheader">Transaction information</h3>
{{ text.field('min_amount', 'Minimum Contribution', {'data-inputmask': '"alias": "currency", "rightAlign": false, "clearMaskOnLostFocus": true' }) }}
{{ text.field('max_amount', 'Maximum Contribution', {'data-inputmask': '"alias": "currency", "rightAlign": false, "clearMaskOnLostFocus": true'}) }}
{{ date.field('date', 'Receipt Date', dates ) }}
{{ text.field('min_amount', 'Minimum contribution', {'data-inputmask': '"alias": "currency", "rightAlign": false, "clearMaskOnLostFocus": true' }) }}
{{ text.field('max_amount', 'Maximum contribution', {'data-inputmask': '"alias": "currency", "rightAlign": false, "clearMaskOnLostFocus": true'}) }}
{{ date.field('date', 'Receipt date', dates ) }}
<p>Receipts are reported periodically, according to the filer's reporting schedule. Receipts are updated as they’re processed— that time can vary.</p>

{% endblock %}
4 changes: 2 additions & 2 deletions templates/partials/receipts-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<table id="results" class="data-table" data-type="donation">
<thead>
<tr>
<th scope="col">Contributor Name</th>
<th scope="col">Contributor name</th>
<th scope="col">State</th>
<th scope="col">Employer</th>
<th scope="col">Amount</th>
<th scope="col">Date</th>
<th scope="col">Receipt date</th>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is Receipt date what we want and not filing date?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch-- thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, I checked and that column is correct, we are sorting on the day the receipt was made- "Receipt date"

Like I said, the column names are confusing and I am up to tweaking them. Because it is confusing, I think it is important to be explicit about which date we are showing, rather than just saying date

<th scope="col">Recipient</th>
<th scope="col"></th>
</tr>
Expand Down