Skip to content

Handle null issue_date for final opinion document and legal search results #6609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patphongs wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Handle null issue_date for final opinion document and legal search results #6609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions fec/data/api_caller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,15 @@ def _get_sorted_documents(ao):
)
sorted_documents = sorted(sorted_documents, key=itemgetter("date"), reverse=True)

# # Sort by document date unless it's a final opinion. Final opinion uses issue date.
# sorted_documents = sorted(
# sorted_documents,
# key=lambda doc: doc.get("date") if doc.get("ao_doc_category_id") != 'F' else ao.get("issue_date"),
# reverse=True
# )
# Sort by document date unless it's a final opinion. Final opinion uses issue date.
sorted_documents = sorted(
sorted_documents,
key=lambda doc: (
# Make it blank for null issue_date when ao_doc_category_id is 'F'
doc.get("issue_date") or "" if doc.get("ao_doc_category_id") == 'F' else doc.get("date")
),
reverse=True
)

return sorted_documents

Expand Down
2 changes: 1 addition & 1 deletion fec/data/templatetags/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def date_filter(value, fmt='%m/%d/%Y'):
@library.filter
def ao_document_date(value):
date = date_filter(value)
return 'Not dated' if date == '01/01/1900' else date
return '' if date is None else date


@library.filter
Expand Down
9 changes: 7 additions & 2 deletions fec/legal/templates/legal-advisory-opinion.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<h2>Documents</h2>
{% if final_opinion %}
<div class="content__section">
<a class="button button--cta button--document button--lg" href="{{ final_opinion.url }}">Final opinion</a> <span class="t-sans u-padding--left">{{ final_opinion.date | date(fmt='%B %d, %Y') }}</span>
<a class="button button--cta button--document button--lg" href="{{ final_opinion.url }}">Final opinion</a>{% if advisory_opinion.issue_date %}<span class="t-sans u-padding--left">{{ advisory_opinion.issue_date | date(fmt='%B %d, %Y') }}</span>{% endif %}
</div>
{% endif %}
<table class="data-table simple-table" style="table-layout: auto;">
Expand All @@ -57,7 +57,12 @@
<tbody>
{% for document in advisory_opinion.sorted_documents %}
<tr>
<td>{{ document.date | ao_document_date }}</td>
<td>
{% if document.ao_doc_category_id == 'F' %}
{{ advisory_opinion.issue_date | ao_document_date }}
{% else %}
{{ document.date | ao_document_date }}
{% endif %}</td>
<td><a href="{{ document.url }}">{{ document.description }}</a></td>
<td>{{ document.category }}</td>
</tr>
Expand Down
3 changes: 2 additions & 1 deletion fec/legal/templates/partials/legal-search-results-advisory-opinion.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
Pending
{% elif advisory_opinion.status == "Withdrawn"%}
Withdrawn
{% elif advisory_opinion.issue_date != undefined %}
{% elif advisory_opinion.issue_date is not none %}
{# When issue date is null, leave it blank #}
{{ advisory_opinion.issue_date | date(fmt='%m/%d/%Y') }}
{% endif %}
</div>
Expand Down