From 4df5667f888baa4cf581556974c008147a24e98c Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 9 Mar 2025 16:18:30 +0100 Subject: [PATCH] =?UTF-8?q?On=20affiche=20les=20p=C3=A9riodes=20de=20la=20?= =?UTF-8?q?journ=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #350 --- src/agenda_culturel/static/style.scss | 12 + .../templates/agenda_culturel/page-week.html | 207 +++++++++--------- 2 files changed, 117 insertions(+), 102 deletions(-) diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index dec8002..862e452 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -2070,3 +2070,15 @@ dialog { padding: 0; } } + +#calendar.week { + h3 { + font-size: 100%; + margin: 0 0.2em; + padding-left: 0.1em; + border-bottom: 1px solid var(--secondary); + } + .day header { + margin-bottom: 0.5em; + } +} diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index 9c5d062..c0f9878 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -88,7 +88,7 @@ {% endif %} -
+
{% if calendar.firstdate|shift_day:-1|not_before_first %} {% if calendar.lastdate|not_after_last %} @@ -126,10 +126,103 @@ href="{{ day.date | url_day:category }}?{{ filter.get_url }}">{{ day.date | date:"l j" }} - {% if day.events %} -
    - {% for event in day.events %} - {% if event.is_first_after_now %} + {% for ti in day.get_time_intervals %} + {% if ti.events|length > 0 %} + {% if not forloop.first %}

    {{ ti.short_name }}

    {% endif %} +
      + {% for event in ti.events %} + {% if event.is_first_after_now %} +
    • +
      +
      {% now "H:i" %}
      +
      +
      +
      • + {% endif %} +
    • + {{ event.category | circle_cat:event.has_recurrences }} + {% if event.start_day == day.date and event.start_time %}{{ event.start_time }}{% endif %} + {{ event|picto_status }} {{ event.title|no_emoji }} + {{ event|tw_badge }} + +
      +
      +
      + +

      + {{ event.category|small_cat_recurrent:event.has_recurrences }} {{ event|picto_status }} {{ event.title }} {{ event|picto_visibility:user.is_authenticated }} +

      +

      + {% picto_from_name "map-pin" %} + {% if event.exact_location %} + {{ event.exact_location.name }}, {{ event.exact_location.city }} + {% else %} + {% if perms.agenda_culturel.change_event and perms.agenda_culturel.change_place %} + {{ event.location }} + {% else %} + {{ event.location }} + {% endif %} + {% endif %} +

      +

      + {% picto_from_name "calendar" %} + {% if event.end_day and event.end_day != event.start_day %} + du + {% else %} + le + {% endif %} + {{ event.start_day|date|frdate }} + {% if event.start_time %} + {% if not event.end_day or event.end_day == event.start_day %} + {% if event.end_time %} + de + {% else %} + à + {% endif %} + {% endif %} + {{ event.start_time }} + {% endif %} + {% if event.end_day and event.end_day != event.start_day %} + au + {% if event.end_day and event.end_day != event.start_day %}{{ event.end_day|date|frdate }}{% endif %} + {% endif %} + {% if event.end_time %} + {% if not event.end_day|date|frdate or event.end_day == event.start_day %}jusqu'à{% endif %} + {{ event.end_time }} + {% endif %} +

      +
      +
      +
      {{ event.description |linebreaks }}
      +

      + {% for tag in event.sorted_tags %}{{ tag | tag_button }}{% endfor %} +

      + +
      +       +
      • + {% endfor %} + {% if day.is_today_after_events %}
    • {% now "H:i" %}
      @@ -137,103 +230,13 @@
      • {% endif %} -
    • - {{ event.category | circle_cat:event.has_recurrences }} - {% if event.start_day == day.date and event.start_time %}{{ event.start_time }}{% endif %} - {{ event|picto_status }} {{ event.title|no_emoji }} - {{ event|tw_badge }} - -
      -
      -
      - -

      - {{ event.category|small_cat_recurrent:event.has_recurrences }} {{ event|picto_status }} {{ event.title }} {{ event|picto_visibility:user.is_authenticated }} -

      -

      - {% picto_from_name "map-pin" %} - {% if event.exact_location %} - {{ event.exact_location.name }}, {{ event.exact_location.city }} - {% else %} - {% if perms.agenda_culturel.change_event and perms.agenda_culturel.change_place %} - {{ event.location }} - {% else %} - {{ event.location }} - {% endif %} - {% endif %} -

      -

      - {% picto_from_name "calendar" %} - {% if event.end_day and event.end_day != event.start_day %} - du - {% else %} - le - {% endif %} - {{ event.start_day|date|frdate }} - {% if event.start_time %} - {% if not event.end_day or event.end_day == event.start_day %} - {% if event.end_time %} - de - {% else %} - à - {% endif %} - {% endif %} - {{ event.start_time }} - {% endif %} - {% if event.end_day and event.end_day != event.start_day %} - au - {% if event.end_day and event.end_day != event.start_day %}{{ event.end_day|date|frdate }}{% endif %} - {% endif %} - {% if event.end_time %} - {% if not event.end_day|date|frdate or event.end_day == event.start_day %}jusqu'à{% endif %} - {{ event.end_time }} - {% endif %} -

      -
      -
      -
      {{ event.description |linebreaks }}
      -

      - {% for tag in event.sorted_tags %}{{ tag | tag_button }}{% endfor %} -

      - -
      -       -
      • - {% endfor %} - {% if day.is_today_after_events %} -
    • -
      -
      {% now "H:i" %}
      -
      -
      -
      • - {% endif %} -
    • - voir en détail {% picto_from_name "chevrons-right" %} -
      • -
    - {% endif %} +
+ {% endif %} + {% endfor %} +

+ voir en détail {% picto_from_name "chevrons-right" %} +

{% endwith %} {% endwith %}