Skip to content
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

[Fixes #1648] Actual end date is now correct on report page #1649

Merged
merged 1 commit into from
Jul 10, 2015
Merged

[Fixes #1648] Actual end date is now correct on report page #1649

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
16 changes: 8 additions & 8 deletions akvo/templates/project_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h4>{% trans "Activity Dates" %}</h4>
</tr>
<tr>
<th scope="row">{% trans "Actual End Date" %}</th>
<td>{{project.date_end_planned|default_if_none:""}}</td>
<td>{{project.date_end_actual|default_if_none:""}}</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -308,7 +308,7 @@ <h4>{% trans "Product Budget Items" %}</h4>
</tbody>
</table>
{% endif %}

{% if project.planned_disbursements.all %}
<h4>{% trans "Planned Disbursements" %}</h4>
<table class="table table-striped table-bordered table-responsive">
Expand Down Expand Up @@ -336,7 +336,7 @@ <h4>{% trans "Planned Disbursements" %}</h4>
</tbody>
</table>
{% endif %}

{% if project.transactions.all %}
<h4>{% trans "Transactions" %}</h4>
<table class="table table-striped table-bordered table-responsive">
Expand Down Expand Up @@ -403,7 +403,7 @@ <h4>{% trans "Activity Documents" %}</h4>
</tbody>
</table>
{% endif %}

{% if project.conditions.all %}
<h4>{% trans "Conditions" %}</h4>
<table class="table table-striped table-bordered table-responsive">
Expand Down Expand Up @@ -448,7 +448,7 @@ <h4>{% trans "Results" %}</h4>
</tbody>
</table>
{% endif%}

{% if project.has_indicators %}
<h4>{% trans "Indicators" %}</h4>
<table class="table table-striped table-bordered table-responsive">
Expand Down Expand Up @@ -516,7 +516,7 @@ <h4>{% trans "Reporting Organisation" %}</h4>
</tbody>
</table>
{% endwith %}

<h4>{% trans "Participating Organisations" %}</h4>
{% for partner, info in project.partners_info.items %}
<table class="table table-striped table-bordered table-responsive participatingOrganisations">
Expand Down Expand Up @@ -550,7 +550,7 @@ <h4>{% trans "Participating Organisations" %}</h4>
</tbody>
</table>
{% endfor %}

{% if project.contacts.all %}
<h4>{% trans "Contact Details" %}</h4>
{% for contact in project.contacts.all %}
Expand Down Expand Up @@ -592,7 +592,7 @@ <h4>{% trans "Contact Details" %}</h4>
</table>
{% endfor %}
{% endif %}

{% if project.project_scope or project.collaboration_type or project.default_flow_type or project.default_finance_type or project.default_tied_status or project.default_aid_type %}
<h4>{% trans "Additional Details" %}</h4>
<table class="table table-striped table-bordered table-responsive">
Expand Down