Merge sessions and notes
Django CI/CD / build-and-push (push) Successful in 1m9s
Details
Django CI/CD / build-and-push (push) Successful in 1m9s
Details
This commit is contained in:
parent
bbe5e072b2
commit
c35b539c42
|
@ -808,6 +808,10 @@ select {
|
|||
margin-bottom: 2.5rem;
|
||||
}
|
||||
|
||||
.mb-2 {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.mb-4 {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
@ -1405,6 +1409,11 @@ th label {
|
|||
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
|
||||
}
|
||||
|
||||
:is(.dark .dark\:text-slate-400) {
|
||||
--tw-text-opacity: 1;
|
||||
color: rgb(148 163 184 / var(--tw-text-opacity));
|
||||
}
|
||||
|
||||
:is(.dark .dark\:text-slate-500) {
|
||||
--tw-text-opacity: 1;
|
||||
color: rgb(100 116 139 / var(--tw-text-opacity));
|
||||
|
|
|
@ -60,34 +60,18 @@
|
|||
<span class="dark:text-slate-500">({{ sessions.count }})</span>
|
||||
{% url 'start_game_session' game.id as add_session_link %}
|
||||
{% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
|
||||
and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
|
||||
|
||||
</h1>
|
||||
<ul>
|
||||
{% for session in sessions %}
|
||||
<li class="sm:pl-2 flex items-center">
|
||||
{{ session.timestamp_start | date:"d/m/Y" }}
|
||||
<li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center">
|
||||
{{ session.timestamp_start | date:"d/m/Y H:m" }}
|
||||
({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
|
||||
{% url 'edit_session' session.id as edit_url %}
|
||||
{% include 'components/edit_button.html' with edit_url=edit_url %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<h1 class="text-3xl mt-4 mb-1">
|
||||
Notes <span class="dark:text-slate-500">({{ sessions_with_notes.count }})</span>
|
||||
</h1>
|
||||
<ul>
|
||||
{% for session in sessions_with_notes %}
|
||||
<li class="sm:pl-2">
|
||||
<ul>
|
||||
<li class="block dark:text-slate-500">
|
||||
<span class="flex items-center">
|
||||
{{ session.timestamp_start | date:"d/m/Y H:m" }}
|
||||
{% url 'edit_session' session.id as edit_session_url %}
|
||||
{% include 'components/edit_button.html' with edit_url=edit_session_url %}
|
||||
</span>
|
||||
</li>
|
||||
<li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -179,7 +179,7 @@ def view_game(request, game_id=None):
|
|||
"purchase_count": Purchase.objects.filter(edition__game=game).count(),
|
||||
"session_average": round(total_hours / int(session_count), 1),
|
||||
"session_count": session_count,
|
||||
"sessions_with_notes": sessions.exclude(note=""),
|
||||
"sessions_with_notes_count": sessions.exclude(note="").count(),
|
||||
"sessions": sessions.order_by("-timestamp_start"),
|
||||
"title": f"Game Overview - {game.name}",
|
||||
"hours_sum": total_hours,
|
||||
|
|
Loading…
Reference in New Issue