From ea2fbc38741678291de9eb50073ac08b5f4a54d8 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Wed, 5 Aug 2020 10:28:16 +0200
Subject: [PATCH 1/2] agendas: add str method to Booking (#45742)

---
 chrono/agendas/models.py                           | 14 +++++++++++++-
 .../templates/chrono/manager_agenda_day_view.html  |  5 +----
 .../chrono/manager_event_detail_fragment.html      |  6 ++----
 .../chrono/manager_meetings_agenda_month_view.html |  5 +----
 .../chrono/manager_resource_day_view.html          |  5 +----
 .../chrono/manager_resource_month_view.html        |  5 +----
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/chrono/agendas/models.py b/chrono/agendas/models.py
index 841c324..665d8de 100644
--- a/chrono/agendas/models.py
+++ b/chrono/agendas/models.py
@@ -41,7 +41,7 @@ from django.utils.encoding import force_text
 from django.utils.formats import date_format
 from django.utils.text import slugify
 from django.utils.timezone import localtime, now, make_aware, make_naive, is_aware
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ugettext
 
 from jsonfield import JSONField
 
@@ -1015,6 +1015,18 @@ class Booking(models.Model):
             new_booking.save()
         return new_booking
 
+    def events_display(self):
+        name = self.user_name or _('Unknown')
+        return '%s, %s' % (name, date_format(localtime(self.creation_datetime), 'DATETIME_FORMAT'))
+
+    def meetings_display(self):
+        if self.label and self.user_name:
+            return '%s - %s' % (self.label, self.user_name)
+        elif self.label or self.user_name:
+            return self.label or self.user_name
+        else:
+            return ugettext('booked')
+
 
 OpeningHour = collections.namedtuple('OpeningHour', ['begin', 'end'])
 
diff --git a/chrono/manager/templates/chrono/manager_agenda_day_view.html b/chrono/manager/templates/chrono/manager_agenda_day_view.html
index 4246f17..2b812be 100644
--- a/chrono/manager/templates/chrono/manager_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_day_view.html
@@ -71,10 +71,7 @@
           <div class="booking"
               style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
             ><span class="start-time">{{booking.event.start_datetime|date:"TIME_FORMAT"}}</span>
-            <a {% if booking.backoffice_url %}href="{{booking.backoffice_url}}"{% endif %}
-             >{% if booking.label or booking.user_name %}
-                {{booking.label}}{% if booking.label and booking.user_name %} - {% endif %} {{booking.user_name}}
-              {% else %}{% trans "booked" %}{% endif %}</a>
+            <a {% if booking.backoffice_url %}href="{{booking.backoffice_url}}"{% endif %}>{{ booking.meetings_display }}</a>
             <a rel="popup" class="cancel" href="{% url 'chrono-manager-booking-cancel' pk=agenda.id booking_pk=booking.id %}?next={{ request.path }}">{% trans "Cancel" %}</a>
           </div>
         {% endfor %}
diff --git a/chrono/manager/templates/chrono/manager_event_detail_fragment.html b/chrono/manager/templates/chrono/manager_event_detail_fragment.html
index d52fdc3..5d2ef5c 100644
--- a/chrono/manager/templates/chrono/manager_event_detail_fragment.html
+++ b/chrono/manager/templates/chrono/manager_event_detail_fragment.html
@@ -28,8 +28,7 @@
 
   <ul class="objects-list single-links">
     {% for booking in booked %}
-    <li><a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}>{% if booking.user_name %}{{ booking.user_name }}{% else %}{% trans "Unknown" %}{% endif %},
-    {{ booking.creation_datetime|date:"DATETIME_FORMAT" }}</a>
+    <li><a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}>{{ booking }}</a>
     <a rel="popup" class="delete" href="{% url 'chrono-manager-booking-cancel' pk=agenda.id booking_pk=booking.id %}?next={{ request.path }}">{% trans "Cancel" %}</a>
     </li>
     {% endfor %}
@@ -49,8 +48,7 @@
 <div>
   <ul class="objects-list single-links">
     {% for booking in waiting %}
-    <li><a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}>{% if booking.user_name %}{{ booking.user_name }}{% else %}{% trans "Unknown" %}{% endif %},
-    {{ booking.creation_datetime|date:"DATETIME_FORMAT" }}</a></li>
+    <li><a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}>{{ booking.events_display }}</a></li>
     {% endfor %}
   </ul>
 </div>
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
index 15ce6c1..691154a 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
@@ -35,10 +35,7 @@
       {% for slot in day.infos.booked_slots %}
       <div class="booking" style="left:{{ slot.css_left|stringformat:".1f" }}%;height:{{ slot.css_height|stringformat:".1f" }}%;min-height:{{ slot.css_height|stringformat:".1f" }}%;top:{{ slot.css_top|stringformat:".1f" }}%;width:{{ slot.css_width|stringformat:".1f" }}%">
         <span class="start-time">{{slot.booking.event.start_datetime|date:"TIME_FORMAT"}}</span>
-        <a {% if slot.booking.backoffice_url %}href="{{slot.booking.backoffice_url}}"{% endif %}
-           >{% if slot.booking.label or slot.booking.user_name %}
-          {{slot.booking.label}}{% if slot.booking.label and slot.booking.user_name %} - {% endif %} {{slot.booking.user_name}}
-          {% else %}{% trans "booked" %}{% endif %}</a>
+        <a {% if slot.booking.backoffice_url %}href="{{slot.booking.backoffice_url}}"{% endif %}>{{ booking.meetings_display }}</a>
           <a rel="popup" class="cancel" href="{% url 'chrono-manager-booking-cancel' pk=agenda.id booking_pk=slot.booking.id %}?next={{ request.path }}">{% trans "Cancel" %}</a>
         {% if not single_desk %}<span class="desk">{{ slot.desk }}</span>{% endif %}
         </div>
diff --git a/chrono/manager/templates/chrono/manager_resource_day_view.html b/chrono/manager/templates/chrono/manager_resource_day_view.html
index 18814e9..4e026bc 100644
--- a/chrono/manager/templates/chrono/manager_resource_day_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_day_view.html
@@ -40,10 +40,7 @@
                       <div class="booking"
                           style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
                         ><span class="start-time">{{ booking.event.start_datetime|date:"TIME_FORMAT" }}</span>
-                        <a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}
-                         >{% if booking.label or booking.user_name %}
-                            {{ booking.label }}{% if booking.label and booking.user_name %} - {% endif %} {{ booking.user_name }}
-                          {% else %}{% trans "booked" %}{% endif %}</a>
+                        <a {% if booking.backoffice_url %}href="{{ booking.backoffice_url }}"{% endif %}>{{ booking.meetings_display }}</a>
                       </div>
                     {% endfor %}
                 </td>
diff --git a/chrono/manager/templates/chrono/manager_resource_month_view.html b/chrono/manager/templates/chrono/manager_resource_month_view.html
index b5d2c33..01b2203 100644
--- a/chrono/manager/templates/chrono/manager_resource_month_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_month_view.html
@@ -49,10 +49,7 @@
                 {% for slot in day.infos.booked_slots %}
                 <div class="booking" style="height:{{ slot.css_height|stringformat:".1f" }}%;min-height:{{ slot.css_height|stringformat:".1f" }}%;top:{{ slot.css_top|stringformat:".1f" }}%">
                     <span class="start-time">{{ slot.booking.event.start_datetime|date:"TIME_FORMAT" }}</span>
-                    <a {% if slot.booking.backoffice_url %}href="{{ slot.booking.backoffice_url }}"{% endif %}
-                       >{% if slot.booking.label or slot.booking.user_name %}
-                      {{ slot.booking.label }}{% if slot.booking.label and slot.booking.user_name %} - {% endif %} {{ slot.booking.user_name }}
-                      {% else %}{% trans "booked" %}{% endif %}</a>
+                    <a {% if slot.booking.backoffice_url %}href="{{ slot.booking.backoffice_url }}"{% endif %}>{{ booking.meetings_display }}</a>
                 </div>
                 {% endfor %}
                 {% endif %}
-- 
2.20.1