imio.smartweb.core 1.2.12__py3-none-any.whl → 1.2.68__py3-none-any.whl

imio/smartweb/core/contents/sections/common_templates/carousel.pt

@@ -48,7 +48,8 @@
                                open_in_new_tab item/open_in_new_tab | nothing;">
                   <a  tal:omit-tag="not: item/url"
                       tal:attributes="href item/url;
-                                     target python:'_blank' if (open_in_new_tab and not can_edit_sections) else ''">
+                                      class item/container_id | nothing;
+                                      target python:'_blank' if (open_in_new_tab and not can_edit_sections) else ''">
                     <div class="swiper-image"
                          tal:condition="python: item_has_image and show_lead_image"
                          tal:attributes="style string:background-image:url(${item/image});
@@ -64,13 +65,16 @@
                          tal:condition="item/category | nothing">
                       <span tal:content="item/category" />
                     </div>
+                    <div tal:condition="view/display_container_title"
+                         class="auth_source_container_title"
+                         tal:content="item/container_title | nothing"></div>
                     <div class="swiper_date"
                          tal:condition="context/show_items_date | nothing">
                       <tal:if tal:condition="item/effective | nothing">
                         <span i18n:translate="">Published</span>
                         <span class="pat-display-time"
                               data-pat-display-time="from-now: true"
-                              tal:attributes="datetime item/effective"/>
+                              tal:attributes="datetime python:view.datetime_format(item)"/>
                       </tal:if>
                       <tal:if tal:condition="item/event_date | nothing">
                         <tal:def tal:define="event_date item/event_date">

imio/smartweb/core/contents/sections/common_templates/table.pt

@@ -56,19 +56,20 @@
                                    show_lead_image python:getattr(context, 'show_items_lead_image', True);
                                    portal context/@@plone_portal_state/portal;
                                    open_in_new_tab item/open_in_new_tab | nothing;"
-                       class="table_display">
+                        tal:attributes="class string:table_display ${item/container_id | nothing} ${item/smartweb_type | nothing};"
+                      >
                       <a tal:attributes="class python:'table_image no-image' if no_icon_no_image else 'table_image';
-                                         href item/url;
+                                         href python:view.retrieve_item_url(item);
                                          target python:'_blank' if (open_in_new_tab and not can_edit_sections) else '';">
                         <tal:if tal:condition="show_lead_image">
-                            <div class="image d-block w-100"
+                            <div class="image d-block is-icon w-100"
                                  tal:condition="item_has_icon">
                               <tal:icon tal:replace="structure python:smartweb_icons.tag(item['icon'])" />
                             </div>
-                            <div class="image d-block w-100"
+                            <div class="image d-block is-image w-100"
                                  tal:condition="python: item_has_image and not item_has_icon"
                                  tal:attributes="style string:background-image:url(${item/image});
-                                                 class python:'image d-block w-100 {}'.format('bad_scale' if item.get('bad_scale') else '')">
+                                                 class python:'image d-block is-image w-100 {}'.format('bad_scale' if item.get('bad_scale') else '')">
                               <span tal:condition="python:not view.is_anonymous and item.get('bad_scale')"
                                     i18n:translate="">Bad scale</span>
                             </div>
@@ -84,20 +85,26 @@
                         </div>
 
                         <div class="table_date"
-                             tal:condition="context/show_items_date | nothing">
+                             tal:condition="context/show_items_date | context/has_publications | nothing">
                           <tal:if tal:condition="item/effective | nothing">
                             <span i18n:translate="">Published</span>
                             <span class="pat-display-time"
                                   data-pat-display-time="from-now: true"
-                                  tal:attributes="datetime item/effective"/>
+                                  tal:attributes="datetime python:view.datetime_format(item)"/>
                           </tal:if>
                           <tal:if tal:condition="item/event_date | nothing">
                             <tal:def tal:define="event_date item/event_date">
                               <metal:macro use-macro="context/@@macros/event_date" />
                             </tal:def>
                           </tal:if>
+                          <tal:if tal:condition="item/publication_datetime | nothing">
+                            <span class="publication_datetime" tal:content="python:view.datetime_format(item,'publication_datetime')"/>
+                          </tal:if>
+                        </div>
+                        <div tal:condition="view/display_container_title"
+                             class="auth_source_container_title"
+                             tal:content="item/container_title | nothing">
                         </div>
-
                         <div class="table_title">
                           <span tal:content="item/title" />
                         </div>
@@ -111,6 +118,13 @@
                              tal:condition="item/item_infos | nothing"
                              tal:content="item/item_infos"/>
                       </a>
+                  <!-- publication : attached file-->
+                    <a
+                    tal:condition="item/publication_attached_file | nothing"
+                    tal:attributes="href item/publication_attached_file/download"
+                        tal:content="item/publication_attached_file/filename"
+                        target="_blank" ></a>
+
                   </div>
               </li>
 

imio/smartweb/core/contents/sections/configure.zcml

@@ -54,6 +54,24 @@
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 
+  <browser:page
+      for="*"
+      name="getsizes"
+      attribute="get_sizes"
+      class="imio.smartweb.core.contents.sections.views.SectionView"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+  <browser:page
+      for="*"
+      name="savesize"
+      attribute="save_size"
+      class="imio.smartweb.core.contents.sections.views.SectionView"
+      permission="cmf.ModifyPortalContent"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
   <subscriber
       for="imio.smartweb.core.contents.ISection
            zope.lifecycleevent.interfaces.IObjectAddedEvent"

imio/smartweb/core/contents/sections/contact/content.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
@@ -16,7 +16,7 @@ class ISectionContact(ISection):
 
     directives.widget(
         "related_contacts",
-        SelectFieldWidget,
+        TranslatedAjaxSelectWidget,
         vocabulary="imio.smartweb.vocabulary.RemoteContacts",
         pattern_options={"multiple": True},
     )

imio/smartweb/core/contents/sections/contact/utils.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from datetime import date, datetime
-from datetime import timedelta
-from decimal import Decimal
+from imio.smartweb.common.contact_utils import ContactProperties as ContactSchedule
 from imio.smartweb.common.utils import rich_description
 from imio.smartweb.core.utils import batch_results
 from imio.smartweb.core.utils import get_json
@@ -10,12 +8,11 @@ from imio.smartweb.core.utils import hash_md5
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from zope.i18n import translate
-from zope.i18nmessageid import MessageFactory
 
 import json
 
 
-class ContactProperties:
+class ContactProperties(ContactSchedule):
     def __init__(self, json_dict, section):
         self.contact = json_dict
         self.context = section
@@ -94,18 +91,6 @@ class ContactProperties:
             results.append(dict_item)
         return batch_results(results, nb_results_by_batch)
 
-    @property
-    def days(self):
-        return (
-            ("monday", _("Monday")),
-            ("tuesday", _("Tuesday")),
-            ("wednesday", _("Wednesday")),
-            ("thursday", _("Thursday")),
-            ("friday", _("Friday")),
-            ("saturday", _("Saturday")),
-            ("sunday", _("Sunday")),
-        )
-
     def get_itinerary_link(self):
         address_parts = [
             self.contact.get("street"),
@@ -126,79 +111,6 @@ class ContactProperties:
         url_type_label = url_type_id[0].upper() + url_type_id[1:]
         return translate(_(url_type_label), target_language=current_lang)
 
-    def get_opening_informations(self, a_date=None):
-        current_date = a_date or date.today()
-        schedule = self.contact.get("schedule")
-        multi_schedule = self.contact.get("multi_schedule")
-        exceptional_closure = self.contact.get("exceptional_closure")
-        week_day = self.days[current_date.weekday()][0]
-        day_schedule = schedule[week_day]
-        for schedule_info in multi_schedule:
-            if schedule_info.get("dates") == []:
-                continue
-            for daterange in schedule_info.get("dates"):
-                min_date = datetime.strptime(
-                    daterange.get("start_date"), "%Y-%m-%d"
-                ).date()
-                max_date = datetime.strptime(
-                    daterange.get("end_date"), "%Y-%m-%d"
-                ).date()
-                if not (min_date < current_date < max_date):
-                    week_day = week_day  # Fix coverage issue with continue.
-                    continue
-                day_schedule = schedule_info.get("schedule")[week_day]
-
-        for exceptional_closure_info in exceptional_closure:
-            exceptional_closure_date = datetime.strptime(
-                exceptional_closure_info.get("date"), "%Y-%m-%d"
-            ).date()
-            if not current_date == exceptional_closure_date:
-                continue
-            for k, v in day_schedule.items():
-                day_schedule[k] = ""
-                if k == "comment":
-                    day_schedule[k] = exceptional_closure_info.get("title")
-        # sample : {'afternoonend': '16:00', 'afternoonstart': '14:00', 'comment': '', 'morningend': '14:00', 'morningstart': '09:00'}
-        return day_schedule
-
-    def get_week_days(self):
-        """Returns a list of Messages for the weekday names."""
-        PLMF = MessageFactory("plonelocales")
-        ts = api.portal.get_tool("translation_service")
-        weekdays = []
-        now = date.today()
-        for i in range(0, 7):
-            ref_date = now + timedelta(days=i)
-            # weekday 0 == monday in python
-            # ts.day_msgid 0 = sunday in plone
-            ref_date_tsweekday = (ref_date.weekday() + 1) % 7
-            weekdays.append(
-                {
-                    PLMF(
-                        ts.day_msgid(ref_date_tsweekday, format="s"),
-                        default=ts.weekday_english(ref_date_tsweekday, format="a"),
-                    ): self.get_schedule_for_date(ref_date)
-                }
-            )
-        return weekdays
-
-    def get_schedule_for_date(self, a_date):
-        return self.get_opening_informations(a_date)
-
-    def get_schedule_for_today(self, schedule):
-        return get_schedule_for_today(schedule)
-
-    def formatted_schedule(self, schedule):
-        return formatted_schedule(schedule)
-
-    def is_empty_schedule(self):
-        schedule = self.contact.get("schedule") or {}
-        for day in schedule.values():
-            for value in day.values():
-                if value:
-                    return False
-        return True
-
     def formatted_address(self):
         street_parts = [
             self.contact.get("street"),
@@ -219,67 +131,3 @@ class ContactProperties:
         if not (street or entity or country):
             return None
         return {"street": street, "entity": entity, "country": country}
-
-
-def formatted_schedule(schedule):
-    # opening = {'afternoonend': '', 'afternoonstart': '', 'comment': '', 'morningend': '12:00', 'morningstart': '08:30'}
-    current_lang = api.portal.get_current_language()[:2]
-    morningstart = schedule.get("morningstart")
-    morningend = schedule.get("morningend")
-    afternoonstart = schedule.get("afternoonstart")
-    afternoonend = schedule.get("afternoonend")
-    comment = schedule.get("comment")
-    str_opening = ""
-    morning = False
-    if morningend:
-        morning = True
-        str_opening = "{} - {}".format(morningstart, morningend)
-    if morning is True and afternoonstart:
-        str_opening += " | {} - {}".format(afternoonstart, afternoonend)
-    elif morning is False and afternoonstart:
-        str_opening = "{} - {}".format(afternoonstart, afternoonend)
-    elif not morningend and not afternoonstart:
-        str_opening = "{} - {}".format(morningstart, afternoonend)
-    if not morningstart and not morningend and not afternoonstart and not afternoonend:
-        str_opening = translate(_("Closed"), target_language=current_lang)
-    return "{} ({})".format(str_opening, comment) if comment else str_opening
-
-
-# {'afternoonend': '', 'afternoonstart': '', 'comment': 'vendredi : apéro à midi', 'morningend': '11:00', 'morningstart': '08:30'}
-def get_schedule_for_today(schedule):
-    current_lang = api.portal.get_current_language()[:2]
-    message = translate(_("Open"), target_language=current_lang)
-    comment = schedule.get("comment") or ""
-    morningstart = Decimal(schedule.get("morningstart").replace(":", ".") or "0.00")
-    morningend = Decimal(schedule.get("morningend").replace(":", ".") or "0.00")
-    afternoonstart = Decimal(schedule.get("afternoonstart").replace(":", ".") or "0.00")
-    afternoonend = Decimal(schedule.get("afternoonend").replace(":", ".") or "0.00")
-
-    now_str = Decimal(datetime.now().strftime("%H.%M"))
-    if not morningstart and not morningend and not afternoonstart and not afternoonend:
-        translated_closed = translate(_("Closed"), target_language=current_lang)
-        return (
-            "{} ({})".format(translated_closed, comment)
-            if comment
-            else translated_closed
-        )
-    before_opened = now_str < (morningstart or afternoonstart)
-    if before_opened:
-        translated_open_at = translate(_("Open at "), target_language=current_lang)
-        hour, minute = str(morningstart or afternoonstart).split(".")
-        message = "{} {:02d}:{:02d}".format(translated_open_at, int(hour), int(minute))
-
-    lunch_time = is_now_between(now_str, morningend, afternoonstart)
-    if lunch_time:
-        message = translate(_("Lunch time"), target_language=current_lang)
-
-    after_closed = now_str >= (afternoonend or morningend)
-    if after_closed:
-        message = translate(_("Closed"), target_language=current_lang)
-    return "{} ({})".format(message, comment) if comment else message
-
-
-def is_now_between(now, start, end):
-    if not start or not end:
-        return False
-    return now >= start and now < end

imio/smartweb/core/contents/sections/events/content.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
@@ -13,8 +13,8 @@ from zope import schema
 from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.interface import implementer
-from zope.schema.interfaces import IContextAwareDefaultFactory
 from zope.interface import provider
+from zope.schema.interfaces import IContextAwareDefaultFactory
 
 
 @provider(IContextAwareDefaultFactory)
@@ -40,8 +40,9 @@ class ISectionEvents(ISection):
     )
     directives.widget(
         "specific_related_events",
-        AjaxSelectFieldWidget,
-        source="imio.smartweb.vocabulary.EventsFromEntity",
+        TranslatedAjaxSelectWidget,
+        vocabulary="imio.smartweb.vocabulary.EventsFromEntity",
+        pattern_options={"multiple": True},
     )
 
     directives.widget(
@@ -85,6 +86,13 @@ class ISectionEvents(ISection):
         title=_("Show items description"), required=False
     )
 
+    model.fieldset("layout", fields=["display_agendas_titles"])
+    display_agendas_titles = schema.Bool(
+        title=_("Display agendas titles"),
+        description=_("If checked, display agendas titles in the carousel view."),
+        required=False,
+    )
+
 
 @implementer(ISectionEvents)
 class SectionEvents(Section):

imio/smartweb/core/contents/sections/events/view.py

@@ -2,6 +2,7 @@
 
 from datetime import date
 from dateutil.parser import parse
+from imio.smartweb.common.utils import translate_vocabulary_term
 from imio.smartweb.core.config import EVENTS_URL
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.contents.sections.views import HashableJsonSectionView
@@ -27,7 +28,10 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             )
         params = [
             selected_item,
+            "metadata_fields=container_uid",
             "metadata_fields=category_title",
+            "metadata_fields=local_category",
+            "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
             "metadata_fields=has_leadimage",
@@ -62,13 +66,23 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
             end = item["end"] and parse(item["end"]) or None
             date_dict = {"start": start, "end": end}
             modified_hash = hash_md5(item["modified"])
+            category = ""
+            if self.context.show_categories_or_topics == "category":
+                category = item.get("local_category") or item.get("category_title", "")
+            elif self.context.show_categories_or_topics == "topic":
+                topic = item.get("topics") and item["topics"][0] or None
+                category = translate_vocabulary_term(
+                    "imio.smartweb.vocabulary.Topics", topic
+                )
             dict_item = {
                 "uid": item_uid,
                 "title": item["title"],
                 "description": item["description"],
-                "category": item["category_title"],
+                "category": category,
                 "event_date": date_dict,
-                "url": f"{linking_view_url}#/{item_id}?u={item_uid}",
+                "url": f"{linking_view_url}/{item_id}?u={item_uid}",
+                "container_id": item.get("usefull_container_id", None),
+                "container_title": item.get("usefull_container_title", None),
                 "has_image": item["has_leadimage"],
                 "image": f"{item_url}/@@images/image/{orientation}_{image_scale}?cache_key={modified_hash}",
             }
@@ -85,3 +99,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
 
     def is_multi_dates(self, start, end):
         return start and end and start.date() != end.date()
+
+    @property
+    def display_container_title(self):
+        return self.context.display_agendas_titles

imio/smartweb/core/contents/sections/external_content/configure.zcml

@@ -19,4 +19,33 @@
       permission="zope2.View"
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
+
+  <browser:page
+      name="view_idelux_waste"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.IdeluxWasteView"
+      template="view_idelux_waste.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+  <browser:page
+      name="view_inbw_container_affluence"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.InbwContainersAffluenceView"
+      template="view_inbw_containers_affluence.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
+
+  <browser:page
+      name="view_odwb_widget"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.OdwbWidgetView"
+      template="view_odwb_widget.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
 </configure>

imio/smartweb/core/contents/sections/external_content/view.pt

@@ -12,21 +12,39 @@
 <metal:macro use-macro="context/@@sections_macros/section_edition" />
 <div class="container section-container section-external-content"
      id=""
+     define="datas view/get_datas"
      tal:attributes="id string:container-section-${context/id}">
 
 
-    <tal:check tal:condition="view/has_leadimage">
-        <img tal:attributes="src view/image" />
-    </tal:check>
+  <tal:check tal:condition="view/has_leadimage">
+      <img tal:attributes="src view/image" />
+  </tal:check>
 
   <metal:macro use-macro="context/@@sections_macros/section_title" />
 
   <p tal:replace="structure context/@@description" />
+  <div tal:define="which_plugin view/which_plugin">
+
+    <div tal:condition="not:which_plugin"
+         tal:define="collapse_klass python: 'collapse' if context.collapsible_section else ''"
+         tal:attributes="class string:body-section ${collapse_klass};
+                         id string:body-section-${context/id}"
+         tal:content="structure view/contents" />
+
+    <div tal:condition="python:which_plugin == 'ideluxwasteplugin'">
+        <metal:block use-macro="context/@@view_idelux_waste/embeded_datas" tal:define="datas view/contents"></metal:block>
+    </div>
+
+    <div tal:condition="python:which_plugin == 'inbwcontainersaffluenceplugin'">
+        <metal:block use-macro="context/@@view_inbw_container_affluence/embeded_datas" tal:define="datas view/contents"></metal:block>
+    </div>
+
+    <div tal:condition="python:which_plugin == 'odwbwidgetplugin'">
+        <metal:block use-macro="context/@@view_odwb_widget/embeded_datas" tal:define="datas view/contents"></metal:block>
+    </div>
+
+  </div>
 
-  <div tal:define="collapse_klass python: 'collapse' if context.collapsible_section else ''"
-       tal:attributes="class string:body-section ratio ${collapse_klass};
-                       id string:body-section-${context/id}"
-       tal:content="structure view/get_embed_external_content" />
 
 </div>
 </metal:content-core>

imio/smartweb/core/contents/sections/external_content/view_idelux_waste.pt

@@ -0,0 +1,50 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="imio.smartweb">
+
+  <metal:macro define-macro="embeded_datas">
+    <script>
+          $(document).ready(function() {
+        $('#searchInput').on('input', function() {
+            var searchTerm = $(this).val().toLowerCase();
+
+            // Loop through each item in the results
+            $('.result-item').each(function() {
+                var searchable = $(this).data('searchable').toLowerCase();
+
+                // If the keyword is found in the consignes_de_tri, show the item, otherwise hide it
+                if (searchable.includes(searchTerm)) {
+                    $(this).show(); // Show the matching item
+                } else {
+                    $(this).hide(); // Hide the non-matching item
+                }
+            });
+        });
+    });
+    </script>
+    <input type="text" id="searchInput" class="form-control" placeholder="Search Consignes de Tri">
+    <div id="results">
+        <!-- Results will be populated here -->
+    </div>
+
+    <div tal:define="results datas/results">
+      <ul tal:repeat="res results">
+        <tal:def define="filiere res/filiere;
+                            dechet res/dechet;
+                            infoparc res/infoparc;
+                            consignes_de_tri res/consignes_de_tri;
+                            searchable string:${filiere} ${dechet} ${infoparc} ${consignes_de_tri}">
+          <li class="result-item" data-searchable="${searchable}" >
+            <h3 tal:content="string:${filiere} - ${dechet}" />
+            <p tal:content="infoparc"></p>
+            <p tal:content="consignes_de_tri"></p>
+          </li>
+
+        </tal:def>
+      </ul>
+    </div>
+  </metal:macro>
+</html>

imio/smartweb/core/contents/sections/external_content/view_inbw_containers_affluence.pt

@@ -0,0 +1,91 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="imio.smartweb">
+
+  <metal:macro define-macro="embeded_datas">
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+    <script>
+$(document).ready(function () {
+    var today = new Date().getDay();
+    var hours = new Date().getHours(); // Get current hour
+    var daysOfWeek = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+    var currentDay = daysOfWeek[today];
+    var jsonDataString = $('#json-data').attr("data");
+
+    var jsonData = JSON.parse(jsonDataString);
+    var todayData = JSON.parse(jsonData.results[0][currentDay]);
+    var current_affluence = jsonData.results[0].current_affluence;
+
+    var keys = [];
+    var dataset1 = [];
+    var dataset2 = [];
+
+    Object.entries(todayData).forEach(function([key, value]) {
+        keys.push(key + "h00");
+        console.log('key' + key + 'hours' + hours);
+        if (key == hours) {
+            dataset2.push(current_affluence);
+        }
+        else {dataset2.push(0);}
+        dataset1.push(value);
+    });
+
+
+    // Define the Chart.js data and options
+    var chartData = {
+        labels: keys,  // Hours
+        datasets: [{
+            label: currentDay + ' average affluence',
+            data: dataset1,
+            backgroundColor: 'rgba(54, 162, 235, 0.2)',
+            borderColor: 'rgba(54, 162, 235, 1)',
+            borderWidth: 1
+        },
+        {
+            label: 'Current affluence',
+            data: dataset2,
+            backgroundColor: 'rgba(255, 99, 132, 0.2)', // Specify the desired color
+            borderColor: 'rgba(255, 99, 132, 1)', // Specify the desired color
+            borderWidth: 1
+        }]
+    };
+
+    var chartOptions = {
+        scales: {
+            x: {
+                title: {
+                    display: true,
+                    text: 'Hours'
+                }
+            },
+            y: {
+                title: {
+                    display: true,
+                    text: 'Values'
+                },
+                ticks: {
+                    stepSize: 1
+                }
+            }
+        }
+    };
+
+    // Get the canvas element
+    var ctx = document.getElementById('myChart').getContext('2d');
+    // Create the Chart.js chart
+    var myChart = new Chart(ctx, {
+        type: 'bar',
+        data: chartData,
+        options: chartOptions
+    });
+});
+
+    </script>
+    <div id="json-data" tal:attributes="data datas"></div>
+    <canvas id="myChart" width="60%" height="" ></canvas>
+
+  </metal:macro>
+</html>