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

Rearranged visits list to display multiple #58

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Rearranged visits list to display multiple #58

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
90 changes: 85 additions & 5 deletions apps/reporting/templates/reporting/encampment_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ <h2>{{ encampment.name }}</h2>

<div class="main-panel">
<div class="visit-panel">
{% if not visits %}
This encampment has never been visited
{% else %}
{% with visits|first as most_recent %}
{% if most_recent %}
<div class="most-recent visits">
<div class="visits-header">
Most Recent Visit
</div>
<div class="visits-container">
<div class="visits-content">
<div class="date-bar">
<div>{{ most_recent.date }}</div>
Expand Down Expand Up @@ -120,30 +124,106 @@ <h3>Notes / next steps</h3>
</div>
{% endif %}
</div>
</div>
</div>
{% else %}
This encampment has never been visited
{% endif %}
{% endif %}
{% endwith %}
<br/>
<div class="previous visits">
{% for visit in visits|slice:"1:" %}
{% if forloop.first %}
<div class="visits-header">
Previous Visits
</div>
{% endif %}
<div class="visits-container">
{% for visit in visits|slice:"1:" %}
<div class="visits-content">
<details>
<summary>
<div class="previous-visit">
<div class="date">{{ visit.date }}</div>
<div class="spacer"></div>
<div class="date-ago">{{ visit.date | ago }}</div>
<div class="spacer"></div>
<div class="performed-by">{{ visit.performed_by }}</div>
</div>
</summary>
<div>
<div class="visit-info">
<h2>Status</h2>
<div class="spacer"></div>
<div class="visit-detail">
<h3>Type of setup</h3>
<p>{{ visit.type_of_setup }}</p>
</div>
<div class="visit-detail">
<h3>Living here</h3>
<p>{{ visit.get_occupancy_display }}</p>
</div>
<div class="visit-detail">
<h3>Talked to</h3>
<p>{{ visit.talked_to }}</p>
</div>
</div>
{% if visit.supplies_delivered or visit.food_delivered %}
<div class="visit-info">
<h2>Deliveries</h2>
<div class="spacer"></div>
{% if visit.supplies_delivered %}
<div class="visit-detail">
<h3>Supplies Delivered</h3>
<p>{{ visit.supplies_delivered }}</p>
</div>
{% endif %}
{% if visit.food_delivered %}
<div class="visit-detail">
<h3>Food Delivered</h3>
<p>{{ visit.food_delivered }}</p>
</div>
{% endif %}
</div>
{% endif %}
<div class="visit-info">
<h2>Covid</h2>
<div class="spacer"></div>
<div class="visit-detail">
<h3>Education</h3>
<p>{{ visit.education_provided }}</p>
</div>
<div class="visit-detail">
<h3>Assessed</h3>
<p>{{ visit.assessed }}</p>
</div>
<div class="visit-detail">
<h3>Asymptomatic</h3>
<p>{{ visit.assessed_asymptomatic }}</p>
</div>
</div>
{% if visit.needs or visit.notes %}
<div class="visit-info">
<h2>Actions</h2>
<div class="spacer"></div>
{% if visit.needs %}
<div class="visit-detail">
<h3>Outstanding Needs</h3>
<p>{{ visit.needs }}</p>
</div>
{% endif %}
{% if visit.notes %}
<div class="visit-detail">
<h3>Notes / next steps</h3>
<p>{{ visit.notes }}</p>
</div>
{% endif %}
</div>
{% endif %}

</div>
</div>
</details>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<!-- end visits panel -->

Expand Down
8 changes: 7 additions & 1 deletion templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,9 +695,15 @@
}

.previous-visit {
display: flex;
display: inline-flex;
}

summary:focus {
outline: none;
color: #063;
}


.visits-content {
width: 100%;
}
Expand Down