imio.smartweb.core 1.2.38__py3-none-any.whl → 1.2.80__py3-none-any.whl

imio/smartweb/core/browser/vocabulary.py

@@ -1,15 +1,20 @@
 # -*- coding: utf-8 -*-
-from plone.app.content.browser.vocabulary import VocabularyView
+
+from imio.smartweb.common.browser.vocabulary import TranslatedVocabularyView
 from plone.app.content.browser.vocabulary import VocabLookupException
 from plone.app.content.utils import json_dumps
 
 
-class SmartwebVocabularyView(VocabularyView):
+class SmartwebVocabularyView(TranslatedVocabularyView):
 
     def __call__(self):
         form = self.request.form
         name = form.get("name")
-        if name != "imio.smartweb.vocabulary.RemoteContacts":
+        if name not in [
+            "imio.smartweb.vocabulary.RemoteContacts",
+            "imio.smartweb.vocabulary.NewsItemsFromEntity",
+            "imio.smartweb.vocabulary.EventsFromEntity",
+        ]:
             return super(SmartwebVocabularyView, self).__call__()
 
         self.request.response.setHeader(

imio/smartweb/core/contents/__init__.py

@@ -17,6 +17,8 @@ from .pages.portal_page.content import IPortalPage  # NOQA
 from .pages.portal_page.content import PortalPage  # NOQA
 from .pages.procedure.content import IProcedure  # NOQA
 from .pages.procedure.content import Procedure  # NOQA
+from .publication.content import Publication  # NOQA
+from .publication.content import IPublication  # NOQA
 from .rest.base import RestView  # NOQA
 from .rest.base import IRestView  # NOQA
 from .rest.directory.content import DirectoryView  # NOQA

imio/smartweb/core/contents/configure.zcml

@@ -4,6 +4,7 @@
   <include package=".blocks" />
   <include package=".folder" />
   <include package=".pages" />
+  <include package=".publication" />
   <include package=".rest" />
   <include package=".sections" />
 

imio/smartweb/core/contents/folder/block_view.pt

@@ -15,18 +15,18 @@
                          orientation_class python:images_orientation and f'display-{images_orientation}' or '';
                          thumb_scale view/get_thumb_scale_summary">
 
-        <div class="" id="block-menu"
+        <ul class="" id="block-menu"
              tal:attributes="class string:row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-xl-4 g-4 ${orientation_class}">
-            <div class="block-menu-element col" tal:repeat="item res/results">
+            <li class="block-menu-element col" tal:repeat="item res/results">
                 <metal:macro use-macro="context/@@folder_macros/block" />
-            </div>
-        </div>
-        <div class="" id="block-quickaccess"
+            </li>
+        </ul>
+        <ul class="" id="block-quickaccess"
              tal:attributes="class string:row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-xl-4 g-4 ${orientation_class}">
-            <div class="block-menu-element col" tal:repeat="item res/quick_access">
+            <li class="block-menu-element col" tal:repeat="item res/quick_access">
                 <metal:macro use-macro="context/@@folder_macros/block" />
-            </div>
-        </div>
+            </li>
+        </ul>
     </tal:def>
 </metal:content-core>
 </metal:main>

imio/smartweb/core/contents/folder/summary_view.pt

@@ -17,12 +17,12 @@
                          images_orientation context/orientation | nothing;
                          orientation_class python:images_orientation and f'display-{images_orientation}' or ''">
 
-        <div class="" id="block-menu"
+        <ul class="" id="block-menu"
              tal:attributes="class string:row ${orientation_class}">
-            <div class="list-menu-element col-12" tal:repeat="item batch">
+            <li class="list-menu-element col-12" tal:repeat="item batch">
                 <metal:macro use-macro="context/@@folder_macros/summary" />
-            </div>
-        </div>
+            </li>
+        </ul>
 
     </tal:def>
 

imio/smartweb/core/contents/pages/cirkwi/content.py

@@ -18,6 +18,11 @@ class ICirkwiView(IPages):
         required=True,
     )
 
+    cirkwi_widget_mb_key = schema.TextLine(
+        title=_("Cirkwi widget mb_key"),
+        required=True,
+    )
+
 
 @implementer(ICirkwiView)
 class CirkwiView(Pages):

imio/smartweb/core/contents/pages/cirkwi/view.py

@@ -10,7 +10,8 @@ class CirkwiViewView(BrowserView):
 
     def get_cirkwi_html(self):
         cirkwi_widget_id = self.context.cirkwi_widget_id
-        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}"
+        cirkwi_widget_mb_key = self.context.cirkwi_widget_mb_key
+        url = f"{self.cirwki_api_uri}{cirkwi_widget_id}?mb_key={cirkwi_widget_mb_key}&{self.request.get('QUERY_STRING')}"
         response = requests.get(url)
         if response.status_code != 200:
             return response.status_code

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

@@ -15,6 +15,7 @@
       template="view.pt"
       class=".views.PagesView"
       permission="zope2.View"
+      allowed_attributes="get_page_contacts"
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 

imio/smartweb/core/contents/pages/portal_page/view.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.interfaces import IHtmxViewUtils
 from Products.Five.browser import BrowserView
+from zope.interface import implementer
 
 
+@implementer(IHtmxViewUtils)
 class NoTitleView(BrowserView):
     def __call__(self):
         return ""

imio/smartweb/core/contents/pages/views.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_inner
+from imio.smartweb.core.config import DIRECTORY_URL
 from imio.smartweb.core.utils import get_scale_url
+from imio.smartweb.core.interfaces import IHtmxViewUtils
 from imio.smartweb.core.interfaces import IViewWithoutLeadImage
+from imio.smartweb.core.utils import get_json
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from Products.CMFPlone.resources import add_bundle_on_request
 from plone import api
@@ -10,17 +13,21 @@ from plone.app.content.browser.contents.rearrange import OrderContentsBaseAction
 from plone.app.content.utils import json_loads
 from plone.app.contenttypes.browser.folder import FolderView
 from plone.app.contenttypes.browser.full_view import FullViewItem as BaseFullViewItem
+from plone.memoize.view import memoize
 from Products.CMFPlone import utils
 from Products.CMFPlone.browser.navigation import PhysicalNavigationBreadcrumbs
 from zope.component import getMultiAdapter
 from zope.interface import implementer
 
+import itertools
+
 
 @implementer(IViewWithoutLeadImage)
+@implementer(IHtmxViewUtils)
 class PagesView(FolderView):
     """Pages view"""
 
-    b_size = 40
+    b_size = 70
 
     def __call__(self):
         # get gallery sections and sections with gallery
@@ -44,6 +51,45 @@ class PagesView(FolderView):
             add_bundle_on_request(self.request, "flexbin")
         return self.index()
 
+    @memoize
+    def get_page_contacts(self):
+        # TODO We need to check every tests to be sure to avoid caching that
+        # creates false positive assertions
+        sections_contacts = self.context.listFolderContents(
+            contentFilter={
+                "portal_type": [
+                    "imio.smartweb.SectionContact",
+                ]
+            }
+        )
+        if len(sections_contacts) == 0:
+            return None
+        nested_contact_list = [
+            section_contacts.related_contacts
+            for section_contacts in sections_contacts
+            if section_contacts.related_contacts is not None
+        ]
+        if nested_contact_list == []:
+            return None
+        # Make a "set" to simplifying request in url (avoid duplicate uid)
+        # Sometimes we have duplicate uid because some pages were build with contact attributes
+        # in a section and for layout issues,for the same contact, others attributes are in another section.
+        page_contacts = list(
+            set(list(itertools.chain.from_iterable(nested_contact_list)))
+        )
+        uids = "&UID=".join(page_contacts)
+        bsize = len(page_contacts)
+        url = "{}/@search?UID={}&fullobjects=1&b_size={}".format(
+            DIRECTORY_URL, uids, bsize
+        )
+        current_lang = api.portal.get_current_language()[:2]
+        if current_lang != "fr":
+            url = f"{url}&translated_in_{current_lang}=1"
+        json_data = get_json(url)
+        if json_data is None or len(json_data.get("items", [])) == 0:
+            return
+        return json_data
+
     def results(self, **kwargs):
         """
         Gets results for folder listings without taking care of friendly_types

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

@@ -0,0 +1,5 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
+
+</configure>

imio/smartweb/core/contents/publication/content.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.locales import SmartwebMessageFactory as _
+from plone.dexterity.content import Item
+from zope import schema
+from zope.interface import implementer
+from zope.interface import Interface
+
+
+class IPublication(Interface):
+    """ """
+
+    linked_publication = schema.Choice(
+        vocabulary="imio.smartweb.vocabulary.IADeliberationsPublications",
+        title=_("I.A. Deliberation publication"),
+        required=True,
+        default=None,
+    )
+
+
+@implementer(IPublication)
+class Publication(Item):
+    """Publication class"""

imio/smartweb/core/contents/rest/base.py

@@ -4,6 +4,7 @@ from imio.smartweb.core.utils import get_json
 from plone import api
 from plone.dexterity.content import Container
 from plone.rest import Service
+from urllib.parse import urlencode
 from zope.interface import implementer
 from zope.interface import Interface
 
@@ -19,7 +20,7 @@ class BaseEndpoint(object):
         self.request = request
 
     def __call__(self):
-        results = get_json(self.query_url)
+        results = get_json(self.query_url, timeout=20)
         return results
 
     @property
@@ -47,21 +48,22 @@ class BaseEndpoint(object):
         )
         del item[field]
 
-    def get_extra_params(self, params):
+    def construct_query_string(self, params):
+        params = "&".join(params)
         form = self.request.form
         extra_params = []
         for k, v in form.items():
             if isinstance(v, list):
                 # handles multiple metadata_fields
                 for value in v:
-                    extra_params.append("{}={}".format(k, value))
+                    extra_params.append((k, value))
             else:
-                extra_params.append("{}={}".format(k, v))
+                extra_params.append((k, v))
         current_lang = api.portal.get_current_language()[:2]
         if current_lang != "fr":
-            extra_params.append("translated_in_{}=1".format(current_lang))
-        params = params + extra_params
-        return params
+            extra_params.append(("translated_in_{}".format(current_lang), 1))
+        extra_params = urlencode(extra_params)
+        return "&".join(filter(None, [params, extra_params]))
 
 
 class BaseService(Service):

imio/smartweb/core/contents/rest/directory/endpoint.py

@@ -53,8 +53,8 @@ class BaseDirectoryEndpoint(BaseEndpoint):
             for category in self.context.selected_categories:
                 params.append(f"taxonomy_contact_category.query={category}")
             params.append("taxonomy_contact_category.operator=or")
-        params = self.get_extra_params(params)
-        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{DIRECTORY_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

imio/smartweb/core/contents/rest/directory/view.pt

@@ -11,7 +11,8 @@
                                        orientation view/orientation;
                                        current-language view/current_language;
                                        display-map view/display_map;
-                                       view-path view/view_path;"></smartweb-annuaire>
+                                       view-path view/view_path;
+                                       context-authenticated-user view/context_authenticated_user;"></smartweb-annuaire>
   </div>
 </metal:main>
 </body>

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

@@ -37,6 +37,19 @@ class IEventsView(model.Schema):
         default=True,
     )
 
+    display_agendas_titles = schema.Bool(
+        title=_("Display agendas titles"),
+        description=_("If checked, display agendas titles"),
+        required=False,
+    )
+
+    only_past_events = schema.Bool(
+        title=_("Display only past events"),
+        description=_("If selected, only past events will be displayed"),
+        required=False,
+        default=False,
+    )
+
 
 @implementer(IEventsView)
 class EventsView(RestView):

imio/smartweb/core/contents/rest/events/endpoint.py

@@ -13,7 +13,7 @@ from zope.interface import Interface
 class BaseEventsEndpoint(BaseEndpoint):
     def __call__(self):
         results = super(BaseEventsEndpoint, self).__call__()
-        if not results.get("items"):
+        if not results or not results.get("items"):
             return results
         orientation = self.context.orientation
         for result in results["items"]:
@@ -35,6 +35,8 @@ class BaseEventsEndpoint(BaseEndpoint):
         params = [
             "selected_agendas={}".format(self.context.selected_agenda),
             "metadata_fields=category",
+            "metadata_fields=local_category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",
@@ -47,8 +49,8 @@ class BaseEventsEndpoint(BaseEndpoint):
         if self.context.selected_event_types is not None:
             for event_type in self.context.selected_event_types:
                 params.append(f"event_type={event_type}")
-        params = self.get_extra_params(params)
-        url = f"{EVENTS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{EVENTS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

imio/smartweb/core/contents/rest/events/view.pt

@@ -12,7 +12,11 @@
                                        orientation view/orientation;
                                        current-language view/current_language;
                                        display-map view/display_map;
-                                       view-path view/view_path;"></smartweb-events>
+                                       only-past-events view/only_past_events;
+                                       view-path view/view_path;
+                                       display_agendas_titles view/display_agendas_titles;
+                                       show-categories-or-topics view/show_categories_or_topics;
+                                       context-authenticated-user view/context_authenticated_user;"></smartweb-events>
     </div>
     </metal:main>
   </body>

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

@@ -17,3 +17,15 @@ class EventsViewView(BaseRestView):
     @property
     def display_map(self):
         return self.context.display_map
+
+    @property
+    def only_past_events(self):
+        return self.context.only_past_events
+
+    @property
+    def display_agendas_titles(self):
+        return self.context.display_agendas_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

imio/smartweb/core/contents/rest/news/content.py

@@ -21,6 +21,12 @@ class INewsView(model.Schema):
         title=_("Number of items to display"), default=20, required=True
     )
 
+    display_newsfolders_titles = schema.Bool(
+        title=_("Display news folders titles"),
+        description=_("If checked, display news folders titles"),
+        required=False,
+    )
+
 
 @implementer(INewsView)
 class NewsView(RestView):

imio/smartweb/core/contents/rest/news/endpoint.py

@@ -39,6 +39,8 @@ class BaseNewsEndpoint(BaseEndpoint):
             "selected_news_folders={}".format(self.context.selected_news_folder),
             "portal_type=imio.news.NewsItem",
             "metadata_fields=category",
+            "metadata_fields=local_category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=UID",
@@ -47,8 +49,8 @@ class BaseNewsEndpoint(BaseEndpoint):
             "b_size={}".format(self.context.nb_results),
             "fullobjects=1",
         ]
-        params = self.get_extra_params(params)
-        url = f"{NEWS_URL}/{self.remote_endpoint}?{'&'.join(params)}"
+        params = self.construct_query_string(params)
+        url = f"{NEWS_URL}/{self.remote_endpoint}?{params}"
         return url
 
 

imio/smartweb/core/contents/rest/news/view.pt

@@ -11,7 +11,10 @@
                                          propose-url view/propose_url;
                                          orientation view/orientation;
                                          current-language view/current_language;
-                                         view-path view/view_path;"></smartweb-news>
+                                         view-path view/view_path;
+                                         display_newsfolders_titles view/display_newsfolders_titles;
+                                         show-categories-or-topics view/show_categories_or_topics;
+                                         context-authenticated-user view/context_authenticated_user;"></smartweb-news>
       </div>
     </metal:main>
   </body>

imio/smartweb/core/contents/rest/news/view.py

@@ -13,3 +13,11 @@ class NewsViewView(BaseRestView):
     @property
     def propose_url(self):
         return api.portal.get_registry_record("smartweb.propose_news_url")
+
+    @property
+    def display_newsfolders_titles(self):
+        return self.context.display_newsfolders_titles
+
+    @property
+    def show_categories_or_topics(self):
+        return self.context.show_categories_or_topics

imio/smartweb/core/contents/rest/utils.py

@@ -5,7 +5,6 @@ from imio.smartweb.core.config import EVENTS_URL
 from imio.smartweb.core.config import NEWS_URL
 from imio.smartweb.core.utils import get_wca_token
 from plone.memoize import ram
-from plone.memoize.view import memoize
 from time import time
 from zope.component import getUtility
 from zope.schema.interfaces import IVocabularyFactory

imio/smartweb/core/contents/rest/view.py

@@ -31,6 +31,10 @@ class BaseRestView(BrowserView):
     def current_language(self):
         return api.portal.get_current_language()[:2]
 
+    @property
+    def context_authenticated_user(self):
+        return api.user.is_anonymous()
+
     @property
     def view_path(self):
         url = self.context.absolute_url()

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,6 +65,9 @@
                          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">

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

@@ -56,9 +56,10 @@
                                    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 is-icon w-100"
@@ -84,7 +85,7 @@
                         </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"
@@ -96,8 +97,14 @@
                               <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 AjaxSelectFieldWidget
 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",
-        AjaxSelectFieldWidget,
+        TranslatedAjaxSelectWidget,
         vocabulary="imio.smartweb.vocabulary.RemoteContacts",
         pattern_options={"multiple": True},
     )