pretty calendar

shifts/views.py

@@ -120,14 +120,17 @@ def get_list_shift_calendar(request, partner_id):
                 smax = int(value['seats_available']) + int(value['seats_reserved'])
  
                 value['address_id'] = getattr(settings, 'COMPANY_CODE', '')
-                title_prefix = ' - '
+                title_prefix = ''
                 if len(value['address_id']) == 2 and ',' in value['address_id'][1]:
                     title_prefix = str(value['address_id'][1]).split(",")[1] + " --"
 
                 event["title"] = title_prefix + str(value['seats_reserved']) + "/" + str(smax)
 
+
                 event["start"] = dateIsoUTC(value['date_begin_tz'])
-                event["end"] = dateIsoUTC(value['date_end_tz'])
+
+                datetime_object = datetime.datetime.strptime(value['date_end_tz'], "%Y-%m-%d %H:%M:%S") - datetime.timedelta(minutes=15)
+                event["end"] = dateIsoUTC(datetime_object.strftime("%Y-%m-%d %H:%M:%S"))
 
                 if len(l) > 0:
                     if use_new_members_space is True:

templates/members_space/index.html

@@ -56,9 +56,9 @@
 
     <div id="calendar_explaination_template"> 
       <h4>Légende du calendrier</h4>
-      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">06:00</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky"> - 9/12</div></div></div></div></a>
+      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">06:00</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky"> 9/12</div></div></div></div></a>
       <p>Un service colorié en noir : je suis déjà inscrit.e à ce service.</p>
-      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_less_alf"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">10:45</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky"> - 3/12</div></div></div></div></a>
+      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_less_alf"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">10:45</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky"> 3/12</div></div></div></div></a>
       <p>Un service colorié en bleu : je peux m'inscrire à ce service.</p>
       <p>3/12 <i class="arrow_explanation_numbers fas fa-arrow-right"></i> il y a déjà 3 places réservées à ce service sur 12 disponibles.
           <b>Plus le chiffre de gauche est petit, plus on a besoin de coopérateurs.rices à ce service !</b></p>

[François C.]

https://redmine.cooperatic.fr/issues/1680