From ef9c473db34d91576dd8177efc5328de55b8e610 Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Sun, 8 Nov 2020 01:55:15 +0100
Subject: [PATCH] Show AK duration in time-like format, not decimal format
---
AKModel/models.py | 9 +++++++++
AKSubmission/templates/AKSubmission/ak_detail.html | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/AKModel/models.py b/AKModel/models.py
index ff005a7a..a6254aaa 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -336,6 +336,15 @@ class AKSlot(models.Model):
return f"{self.ak} @ {self.start_simplified} in {self.room}"
return f"{self.ak} @ {self.start_simplified}"
+ @property
+ def duration_simplified(self):
+ """
+ Display duration of slot in format hours:minutes, e.g. 1.5 -> "1:30"
+ """
+ hours = int(self.duration)
+ minutes = (self.duration * 60) % 60
+ return '%d:%02d' % (hours, minutes)
+
@property
def start_simplified(self):
"""
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index bb8886fc..6224ee8c 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -185,7 +185,7 @@
<tbody>
{% for slot in ak.akslot_set.all %}
<tr>
- <td>{{ slot.duration }}</td>
+ <td>{{ slot.duration_simplified }}</td>
{% if not ak.event.plan_hidden or user.is_staff %}
<td>{{ slot.time_simplified }}</td>
<td>
--
GitLab