diff --git a/AKModel/models.py b/AKModel/models.py index ff005a7ac2c738dd6276f18395ba50529e509025..a6254aaa1a190cbfed9d420734a7fa43bcf90107 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 bb8886fc114ad380b1fe0aa67baca1239211fad3..6224ee8cea10e59e21feeb6d2d70003f1ac32dd1 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>