imio.smartweb.core 1.2.66__py3-none-any.whl → 1.2.67__py3-none-any.whl

imio/smartweb/core/browser/controlpanel.py

@@ -3,6 +3,7 @@
 from collective.z3cform.datagridfield.datagridfield import DataGridFieldFactory
 from collective.z3cform.datagridfield.registry import DictRow
 from imio.smartweb.locales import SmartwebMessageFactory as _
+from plone import api
 from plone.app.registry.browser.controlpanel import ControlPanelFormWrapper
 from plone.app.registry.browser.controlpanel import RegistryEditForm
 from plone.autoform import directives
@@ -165,12 +166,52 @@ class ISmartwebControlPanel(Interface):
         required=False,
     )
 
+    iadeliberations_url = schema.TextLine(
+        title=_("I.A. Deliberations' url"),
+        description=_(
+            "For staging : https://conseil.staging.imio.be | for production : https://www.deliberations.be"
+        ),
+        required=False,
+    )
+
+    iadeliberations_api_username = schema.TextLine(
+        title=_("Username to consume I.A. Deliberations API"),
+        required=False,
+    )
+
+    iadeliberation_api_password = schema.Password(
+        title=_("Password to consume I.A. Deliberations API"),
+        required=False,
+    )
+
+    iadeliberations_institution = schema.Choice(
+        title=_("I.A. Deliberations : Institutions"),
+        source="imio.smartweb.vocabulary.IADeliberationsInstitutions",
+        required=False,
+    )
+
 
 class SmartwebControlPanelForm(RegistryEditForm):
     schema = ISmartwebControlPanel
     schema_prefix = "smartweb"
     label = _("Smartweb Settings")
 
+    def applyChanges(self, data):
+        # Get current registry value for (controlpanel) passwords
+        iadeliberation_pwd = api.portal.get_registry_record(
+            "smartweb.iadeliberation_api_password"
+        )
+        secret_key_api = api.portal.get_registry_record("smartweb.secret_key_api")
+
+        # if data is None when we apply changes for password fields we keep password from registry
+        if not data.get("iadeliberation_api_password"):
+            data["iadeliberation_api_password"] = iadeliberation_pwd
+
+        if not data.get("secret_key_api"):
+            data["secret_key_api"] = secret_key_api
+
+        return super().applyChanges(data)
+
 
 SmartwebControlPanelView = layout.wrap_form(
     SmartwebControlPanelForm, ControlPanelFormWrapper

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/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/sections/common_templates/table.pt

@@ -56,10 +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;"
-                        tal:attributes="class string:table_display ${item/container_id | nothing};"
+                        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"
@@ -85,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"
@@ -97,6 +97,9 @@
                               <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"
@@ -115,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/files/content.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from imio.smartweb.core.contents import IPublication
 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 _
@@ -30,3 +30,9 @@ class SectionFiles(Section):
     """SectionText class"""
 
     manage_content = True
+
+    def has_publications(self):
+        for item in self.items():
+            if IPublication.providedBy(item[1]):
+                return True
+        return False

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

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-
+from imio.smartweb.core.contents import IPublication
 from imio.smartweb.core.contents.sections.views import CarouselOrTableSectionView
 from imio.smartweb.core.utils import batch_results
 from imio.smartweb.core.utils import get_scale_url
+from plone import api
 from zope.component import queryMultiAdapter
 
 
@@ -12,7 +13,7 @@ class FilesView(CarouselOrTableSectionView):
     def items(self):
         orientation = self.context.orientation
         image_scale = self.image_scale
-        items = self.context.listFolderContents()
+        items = super(FilesView, self).items()
         results = []
         for item in items:
             url = item.absolute_url()
@@ -21,14 +22,40 @@ class FilesView(CarouselOrTableSectionView):
             scale_url = get_scale_url(
                 item, self.request, "image", image_scale, orientation
             )
-            results.append(
-                {
-                    "title": item.title,
-                    "description": item.description,
-                    "url": url,
-                    "image": scale_url,
-                    "has_image": has_image,
-                    "item_infos": file_view.human_readable_size(),
-                }
+            dict_item = {
+                "title": item.title,
+                "description": item.description,
+                "smartweb_type": item.smartweb_type,
+                "url": url,
+                "image": scale_url,
+                "has_image": has_image,
+            }
+            dict_item["item_infos"] = (
+                None if file_view is None else file_view.human_readable_size()
             )
+            if IPublication.providedBy(item):
+                extra_properties = [
+                    "linked_publication",
+                    "publication_datetime",
+                    "publication_url",
+                    "publication_document_type",
+                    "publication_attached_file",
+                ]
+                dict_item = self.get_publication_extra_properties(
+                    item, dict_item, extra_properties
+                )
+
+            results.append(dict_item)
         return batch_results(results, self.context.nb_results_by_batch)
+
+    def retrieve_item_url(self, item):
+        if item.get("publication_url", None) is not None and api.user.is_anonymous():
+            # return "real" publication url in iadeliberation
+            return item.get("publication_url")
+        # return smartweb item url
+        return item.get("url")
+
+    def get_publication_extra_properties(self, item, dict_item, extra_properties):
+        for prop in extra_properties:
+            dict_item[prop] = getattr(item, prop, None)
+        return dict_item

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

@@ -103,6 +103,16 @@ class SectionView(BrowserView):
 class CarouselOrTableSectionView(SectionView):
     """Section view that can display a carousel"""
 
+    def items(self):
+        items = self.context.listFolderContents()
+        for item in items:
+            item.smartweb_type = "Item"
+            item.container_id = ""
+            portal_type = getattr(item, "portal_type", None)
+            if portal_type:
+                item.smartweb_type = portal_type.split(".")[-1]
+        return items
+
     @property
     def image_scale(self):
         layout = self.context.getLayout()
@@ -114,25 +124,28 @@ class CarouselOrTableSectionView(SectionView):
         else:
             return getattr(self.context, "image_scale", "")
 
-    def datetime_format(self, item):
+    def datetime_format(self, item, datetime_field="effective"):
         """
         item.get("effective", None)
         => DateTime('YYYY/MM/DD HH:mm:ss.000000 GMT+1')
         convert to more conventional datetime format
         and return its string representation
         """
-        effective = item.get("effective", None)
-        if effective is None:
+        datetime_field = item.get(datetime_field, None)
+        if datetime_field is None:
             return ""
         target_timezone = pytz.timezone("Europe/Paris")
-        if isinstance(effective, str):
-            return effective
-        dt = effective.asdatetime()
+        if isinstance(datetime_field, str):
+            return datetime_field
+        dt = datetime_field.asdatetime()
         target_datetime = dt.astimezone(target_timezone)
         output_format = "%Y-%m-%dT%H:%M:%S%z"
         formatted_datetime_str = target_datetime.strftime(output_format)
         return formatted_datetime_str
 
+    def retrieve_item_url(self, item):
+        return item.get("url")
+
 
 class HashableJsonSectionView(SectionView):
     json_data = None

imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1059</version>
+  <version>1061</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

imio/smartweb/core/profiles/default/types/imio.smartweb.Publication.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.Publication"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <!-- Basic properties -->
+  <property
+      i18n:translate=""
+      name="title">Publication</property>
+  <property
+      i18n:translate=""
+      name="description">IA.Deliberations : Publication</property>
+
+  <property name="icon_expr">string:bounding-box-circles</property>
+
+  <!-- Hierarchy control -->
+  <property name="global_allow">False</property>
+
+  <!-- Schema, class and security -->
+  <!-- if we can add a page, we can add a page section -->
+  <property name="add_permission">imio.smartweb.core.AddPage</property>
+  <property name="klass">imio.smartweb.core.contents.Publication</property>
+  <property name="schema">imio.smartweb.core.contents.IPublication</property>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="plone.shortname"/>
+    <element value="plone.leadimage"/>
+    <element value="solr.fields" />
+  </property>
+
+  <!-- View information -->
+  <property name="default_view">view</property>
+  <property name="default_view_fallback">False</property>
+  <property name="immediate_view">view</property>
+
+</object>

imio/smartweb/core/profiles/default/types/imio.smartweb.SectionFiles.xml

@@ -19,6 +19,7 @@
   <property name="filter_content_types">True</property>
   <property name="allowed_content_types">
     <element value="File" />
+    <element value="imio.smartweb.Publication" />
   </property>
   <!-- Schema, class and security -->
   <!-- if we can add a page, we can add a page section -->

imio/smartweb/core/profiles/default/types.xml

@@ -11,6 +11,7 @@
   <object meta_type="Dexterity FTI" name="imio.smartweb.Page"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.PortalPage"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.Procedure"/>
+  <object meta_type="Dexterity FTI" name="imio.smartweb.Publication"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionCollection"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionContact"/>
   <object meta_type="Dexterity FTI" name="imio.smartweb.SectionEvents"/>

imio/smartweb/core/subscribers.py

@@ -4,6 +4,8 @@ from imio.smartweb.common.faceted.utils import configure_faceted
 from imio.smartweb.common.utils import is_log_active
 from imio.smartweb.common.utils import remove_cropping
 from imio.smartweb.core.behaviors.minisite import IImioSmartwebMinisite
+from imio.smartweb.core.utils import get_iadeliberation_institution_from_registry
+from imio.smartweb.core.utils import get_iadeliberation_json
 from imio.smartweb.core.utils import safe_html
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
@@ -106,3 +108,25 @@ def modified_content(obj, event):
         class_name = d.interface.__identifier__.split(".")[-1]
         for field_name in d.attributes:
             check_image_field(obj, d.interface, class_name, field_name)
+
+
+def added_publication(obj, event):
+    """save json attributes on object attributes"""
+    # query the deliberation API with the
+    # selected publication UID to retrieve all informations
+    iadeliberation_institution = get_iadeliberation_institution_from_registry()
+    url = f"{iadeliberation_institution}/publications/{obj.linked_publication}?fullobjects=y"
+    try:
+        json_publication = get_iadeliberation_json(url)
+        obj.title = json_publication.get("title")
+        obj.description = json_publication.get("description")
+        obj.publication_uid = json_publication.get("UID")
+        obj.publication_url = json_publication.get("@id")
+        obj.publication_datetime = json_publication.get("effective")
+        obj.publication_document_type = json_publication.get("document_type").get(
+            "title"
+        )
+        obj.publication_category = json_publication.get("category").get("title")
+        obj.publication_attached_file = json_publication.get("file")
+    except Exception:
+        logger.error(f"Error while trying to get publication data from {url}")

imio/smartweb/core/subscribers.zcml

@@ -21,4 +21,8 @@
                    zope.lifecycleevent.interfaces.IObjectModifiedEvent"
               handler=".subscribers.modified_content" />
 
+  <subscriber for="imio.smartweb.core.contents.IPublication
+                   zope.lifecycleevent.interfaces.IObjectAddedEvent"
+              handler=".subscribers.added_publication" />
+
 </configure>

imio/smartweb/core/tests/resources/json_iadeliberations_institutions.json

@@ -0,0 +1,60 @@
+{
+    "@id": "https://conseil.staging.imio.be/@search?portal_type=Institution&metadata_fields=UID",
+    "batching": {
+        "@id": "https://conseil.staging.imio.be/@search?portal_type=Institution&metadata_fields=UID",
+        "first": "https://conseil.staging.imio.be/@search?b_start=0&portal_type=Institution&metadata_fields=UID",
+        "last": "https://conseil.staging.imio.be/@search?b_start=150&portal_type=Institution&metadata_fields=UID",
+        "next": "https://conseil.staging.imio.be/@search?b_start=25&portal_type=Institution&metadata_fields=UID"
+    },
+    "items": [
+        {
+            "@id": "https://conseil.staging.imio.be/quaregnon",
+            "@type": "Institution",
+            "UID": "8b7ee28aee6a4d17a796c198139bb477",
+            "description": "",
+            "review_state": "published",
+            "title": "Quaregnon"
+        },
+        {
+            "@id": "https://conseil.staging.imio.be/waremme",
+            "@type": "Institution",
+            "UID": "7a125baa06d844b4aaea97c73b9efddd",
+            "description": "",
+            "review_state": "published",
+            "title": "Waremme"
+        },
+        {
+            "@id": "https://conseil.staging.imio.be/jalhay",
+            "@type": "Institution",
+            "UID": "d04e1e724694450da535f57f0c0b0450",
+            "description": "",
+            "review_state": "published",
+            "title": "Jalhay"
+        },
+        {
+            "@id": "https://conseil.staging.imio.be/la-hulpe",
+            "@type": "Institution",
+            "UID": "970bb179557940d28a3751aa76e123c2",
+            "description": "",
+            "review_state": "published",
+            "title": "La Hulpe"
+        },
+        {
+            "@id": "https://conseil.staging.imio.be/ramillies",
+            "@type": "Institution",
+            "UID": "c85014aaec2d4b2a861911b8b6085b15",
+            "description": "",
+            "review_state": "published",
+            "title": "Ramillies"
+        },
+        {
+            "@id": "https://conseil.staging.imio.be/liege",
+            "@type": "Institution",
+            "UID": "970bb179557940d28a3751aa76edddd",
+            "description": "",
+            "review_state": "published",
+            "title": "Liège"
+        }
+    ],
+    "items_total": 5
+}

imio/smartweb/core/tests/resources/json_iadeliberations_publication.json

@@ -0,0 +1,105 @@
+{
+    "@components": {
+        "actions": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@actions"
+        },
+        "aliases": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@aliases"
+        },
+        "breadcrumbs": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@breadcrumbs"
+        },
+        "contextnavigation": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@contextnavigation"
+        },
+        "navigation": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@navigation"
+        },
+        "navroot": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@navroot"
+        },
+        "types": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@types"
+        },
+        "workflow": {
+            "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@workflow"
+        }
+    },
+    "@id": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid",
+    "@type": "Publication",
+    "UID": "33befb1ecea143e4a4e8b2dd548e294f",
+    "allow_discussion": false,
+    "authority_date": null,
+    "category": {
+        "title": "Sécurité & Prévention",
+        "token": "securit\\xe9"
+    },
+    "consultation_text": {
+        "content-type": "text/html",
+        "data": "<p>Hôtel de Ville - Secrétariat du Collège et du Conseil</p>\n<p>place du Marché, 2</p>\n<p>4000 Liège</p>\n<p>du lundi au vendredi  (sauf jours fériés)</p>\n<p>de 9 à 12 heure et de 13.30 à 16.30 heures</p>",
+        "encoding": "utf-8"
+    },
+    "created": "2024-08-14T07:13:42+00:00",
+    "decision_date": "2022-12-12",
+    "description": "Adopté par M. le Bourgmestre en date 12 décembre 2022",
+    "document_type": {
+        "title": "Ordonnance de police administrative",
+        "token": "ordonnance-police-administrative"
+    },
+    "effective": "2024-08-14T09:14:31",
+    "entry_date": "2022-12-12",
+    "expires": null,
+    "file": {
+        "content-type": "application/pdf",
+        "download": "https://conseil.staging.imio.be/liege/publications/ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid/@@download/file",
+        "filename": "013400000123949.PDF",
+        "size": 120014
+    },
+    "id": "ordonnance-concernant-des-mesures-specifiques-en-cas-de-grand-froid",
+    "is_folderish": true,
+    "items": [],
+    "items_total": 0,
+    "layout": "view",
+    "legislative_authority": {
+        "title": "Bourgmestre",
+        "token": "bourgmestre"
+    },
+    "lock": {
+        "locked": false,
+        "stealable": true
+    },
+    "modified": "2024-08-14T07:14:31+00:00",
+    "next_item": {
+        "@id": "https://conseil.staging.imio.be/liege/publications/reglement-relatif-a-la-redevance-sur-le-stationnement",
+        "@type": "Publication",
+        "description": "Adopté par le Conseil communal en date du 19 décembre 2023",
+        "title": "Règlement relatif à la redevance sur le stationnement.",
+        "type_title": "Publication"
+    },
+    "parent": {
+        "@id": "https://conseil.staging.imio.be/liege/publications",
+        "@type": "Folder",
+        "description": "",
+        "image_field": null,
+        "image_scales": {},
+        "review_state": "published",
+        "title": "Publications",
+        "type_title": "Dossier"
+    },
+    "previous_item": {
+        "@id": "https://conseil.staging.imio.be/liege/publications/reglement-relatif-a-loctroi-dune-intervention-financiere-subvention-directe-operateur-pour-lannee-2024-en-faveur-des-commerces-de-detail-et-des-etablissements-horeca-situes-sur-le-territoire-de-la-ville-de-liege-dont-lactivite-economique-est-affectee-par",
+        "@type": "Publication",
+        "description": "Adopté par le Conseil communal en date du 24 juin 2024",
+        "title": "Règlement relatif à l'octroi d’une intervention financière (subvention directe opérateur), pour l'année 2024, en faveur des commerces de détail et des établissements HORECA, situés sur le territoire de la Ville de Liège, dont l’activité économique est affectée par les retards d’exécution du chantier du Tramway de Liège.",
+        "type_title": "Publication"
+    },
+    "relatedItems": [],
+    "review_state": "published",
+    "table_of_contents": false,
+    "text": null,
+    "title": "Ordonnance concernant des mesures spécifiques en cas de grand froid.",
+    "type_title": "Publication",
+    "version": "current",
+    "working_copy": null,
+    "working_copy_of": null
+}