imio.smartweb.core 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

imio/smartweb/core/browser/configure.zcml

@@ -56,6 +56,14 @@
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 
+  <browser:page
+      name="siteadmin-smartweb-controlpanel"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      class=".controlpanel_siteadmin.SmartwebSiteAdminControlPanelView"
+      permission="cmf.ManagePortal"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
+
   <browser:page
       name="utils"
       for="*"

imio/smartweb/core/browser/controlpanel_siteadmin.py

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+
+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.directives import omitted
+from plone.autoform.directives import mode
+from plone.autoform.directives import widget
+from plone.registry.interfaces import IRegistry
+from plone.z3cform import layout
+from Products.statusmessages.interfaces import IStatusMessage
+
+from z3c.form.interfaces import ActionExecutionError
+from zope import schema
+from zope.component import getUtility
+from zope.interface import Interface
+from zope.interface import Invalid
+from zope.schema import ValidationError
+from zope import schema
+
+import json
+import logging
+
+logger = logging.getLogger("imio.smartweb.core.browser.controlpanel_siteadmin")
+
+MAX_LENGTH = 33
+
+
+class LabelTooLong(ValidationError):
+    __doc__ = f"Le texte ne peut pas dépasser {MAX_LENGTH} caractères."
+
+
+def max_length_constraint(value):
+    if len(value) > MAX_LENGTH:
+        raise LabelTooLong(value)
+    return True
+
+
+class IProcedureTextRowSchema(Interface):
+
+    omitted("label_id")
+    mode(label_id="hidden")
+    label_id = schema.TextLine(
+        title=_("ID"),
+        description=_("Unique identifier for the procedure button text"),
+        required=False,
+    )
+    label_fr = schema.TextLine(
+        title=_("Label (fr)"),
+        description=_("Your button title (french)"),
+        constraint=max_length_constraint,
+        required=True,
+    )
+    label_nl = schema.TextLine(
+        title=_("Label (nl)"),
+        description=_("Your button title (dutch)"),
+        constraint=max_length_constraint,
+        required=False,
+    )
+    label_de = schema.TextLine(
+        title=_("Label (de)"),
+        description=_("Your button title (german)"),
+        constraint=max_length_constraint,
+        required=False,
+    )
+    label_en = schema.TextLine(
+        title=_("Label (en)"),
+        description=_("Your button title (english)"),
+        constraint=max_length_constraint,
+        required=False,
+    )
+
+
+class ISmartwebSiteAdminControlPanel(Interface):
+
+    widget(procedure_button_text=DataGridFieldFactory)
+    procedure_button_text = schema.List(
+        title=_("Procedure : Define button text"),
+        description=_("Choose procedure submission button text"),
+        value_type=DictRow(
+            title="Labels",
+            schema=IProcedureTextRowSchema,
+        ),
+        default=[],
+        required=False,
+    )
+
+
+class SmartwebSiteAdminControlPanelForm(RegistryEditForm):
+    schema = ISmartwebSiteAdminControlPanel
+    schema_prefix = "smartweb"
+    label = _("Smartweb Site admin Settings")
+    # fields = field.Fields(ISmartwebSiteAdminControlPanel)
+
+
+class SmartwebSiteAdminControlPanelForm(RegistryEditForm):
+    schema = ISmartwebSiteAdminControlPanel
+    schema_prefix = "smartweb"
+    label = _("Smartweb Site admin Settings")
+
+    def applyChanges(self, data):
+        rows = data.get("procedure_button_text") or []
+        for row in rows:
+            all_label_ids = [row.get("label_id") for row in rows if row.get("label_id")]
+            numbers = [
+                int(label.split("-")[1])
+                for label in all_label_ids
+                if isinstance(label, str)
+                and label.startswith("label-")
+                and label.split("-")[1].isdigit()
+            ]
+            max_number = max(numbers, default=0)
+            if row.get("label_id") is None:
+                max_number += 1
+                row["label_id"] = f"label-{max_number}"
+        new_ids = {row.get("label_id") for row in rows if row.get("label_id")}
+
+        registry = getUtility(IRegistry)
+        old_rows = registry.get("smartweb.procedure_button_text") or []
+        old_ids = {row.get("label_id") for row in old_rows if row.get("label_id")}
+
+        removed_ids = old_ids - new_ids
+        if removed_ids:
+            brains = api.content.find(portal_type="imio.smartweb.Procedure")
+            for removed_id in removed_ids:
+                for brain in brains:
+                    obj = brain.getObject()
+                    if obj.button_ts_label == removed_id:
+                        IStatusMessage(self.request).addStatusMessage(
+                            f"Label ID '{removed_id}' is still used in Procedure '{obj.absolute_url()}' and will not be removed.",
+                            type="error",
+                        )
+                        return False
+        return super().applyChanges(data)
+
+
+SmartwebSiteAdminControlPanelView = layout.wrap_form(
+    SmartwebSiteAdminControlPanelForm, ControlPanelFormWrapper
+)

imio/smartweb/core/browser/sitemap.py

@@ -74,7 +74,7 @@ def format_sitemap_items(items, base_url):
     formatted_items = []
     for item in items:
         item_id = normalizeString(item.get("title"))
-        item_uid = item.get("id")
+        item_uid = item.get("UID")
         lastmod = item.get("modified") or "1970-01-01T00:00:00Z"
         formatted_items.append(
             {

imio/smartweb/core/browser/static/src/view.js

@@ -1,6 +1,5 @@
-import './view.less'
-jQuery(document).ready(function ($) {
 
+jQuery(document).ready(function ($) {
   // Show full schedule table when clicking on today's schedule
   $(".opening_informations").click(function (e) {
     $(this).siblings(".table_schedule").toggleClass("table_schedule--active");
@@ -16,11 +15,19 @@ jQuery(document).ready(function ($) {
       }
     }
   });
+
+ if (window.location.href.indexOf('@@siteadmin-smartweb-controlpanel') !== -1) {
+        // On est bien sur la page @@siteadmin-smartweb-controlpanel
+        if ($('div.container div.statusmessage-error').length > 0) {
+            $('div.container div.statusmessage-info').remove();
+        }
+    }
   
 });
 // New navigation
 
 $(document).ready(function () {
+    
   const menu = $('#portal-globalnav');
   const submenu = $('#subsite-navigation');
 

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

@@ -25,6 +25,14 @@ class IProcedure(IPages):
 
     procedure_url = schema.URI(title=_("Procedure url"), required=False)
 
+    button_ts_label = schema.Choice(
+        vocabulary="imio.smartweb.vocabulary.ProcedureButtonLabels",
+        title=_("Button label"),
+        description=_("Set button label to redirect to e-guichet"),
+        required=False,
+        default=None,
+    )
+
     @invariant
     def required_procedure(data):
         # if data.procedure_ts is None and data.procedure_url is None:

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

@@ -52,7 +52,7 @@ class BaseDirectoryEndpoint(BaseEndpoint):
             params.append("b_size={}".format(self.context.nb_results))
         else:
             params.append("b_size={}".format(self.batch_size))
-        if self.context.selected_categories is not None:
+        if self.context.selected_categories:
             for category in self.context.selected_categories:
                 params.append(f"taxonomy_contact_category.query={category}")
             params.append("taxonomy_contact_category.operator=or")

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

@@ -52,7 +52,7 @@ class EventsView(CarouselOrTableSectionView, HashableJsonSectionView):
                 "sort_on=event_dates",
             ]
         url = "{}/@events?{}".format(EVENTS_URL, "&".join(params))
-        self.json_data = get_json(url)
+        self.json_data = get_json(url, timeout=15)
         self.json_data = remove_cache_key(self.json_data)
         self.refresh_modification_date()
         if self.json_data is None or len(self.json_data.get("items", [])) == 0:

imio/smartweb/core/permissions.zcml

@@ -74,4 +74,10 @@
     description=""
     />
 
+  <permission
+    id="imio.smartweb.core.ManageSiteAdminControlPanel"
+    title="imio.smartweb.core: Manage site admin control panel"
+    description=""
+    />
+
 </configure>

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

@@ -11,4 +11,16 @@
       visible="True">
     <permission>Manage portal</permission>
   </configlet>
+
+  <configlet
+      title="Site admin smartweb Settings"
+      action_id="siteadmin-smartweb-controlpanel"
+      appId="siteadmin-smartweb-controlpanel"
+      category="Products"
+      condition_expr=""
+      icon_expr=""
+      url_expr="string:${portal_url}/@@siteadmin-smartweb-controlpanel"
+      visible="True">
+    <permission>Manage portal</permission>
+  </configlet>  
 </object>

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

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

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

@@ -6,4 +6,7 @@
     <records interface="imio.smartweb.core.browser.controlpanel.ISmartwebControlPanel"
              prefix="smartweb" />
 
+    <records interface="imio.smartweb.core.browser.controlpanel_siteadmin.ISmartwebSiteAdminControlPanel"
+             prefix="smartweb" />
+
 </registry>

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

@@ -83,6 +83,11 @@
       <role name="Site Administrator"/>
     </permission>
 
+    <permission name="imio.smartweb.core: Manage site admin control panel" acquire="True">
+      <role name="Manager"/>
+      <role name="Site Administrator"/>
+    </permission>
+
   </permissions>
 
 </rolemap>

imio/smartweb/core/profiles/default/taxonomies/procedure_category.xml

@@ -88,6 +88,15 @@
       <langstring language="de">Anmeldung</langstring>
     </caption>
   </term>
+  <term>
+    <termIdentifier>offre_d_emploi</termIdentifier>
+    <caption>
+      <langstring language="fr">Offre d'emploi</langstring>
+      <langstring language="en">Job offer</langstring>
+      <langstring language="nl">Job aanbod</langstring>
+      <langstring language="de">Stellenangebot</langstring>
+    </caption>
+  </term>    
   <term>
     <termIdentifier>permis</termIdentifier>
     <caption>

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

@@ -19,7 +19,7 @@
   <property name="filter_content_types">True</property>
   <property name="allowed_content_types">
     <element value="imio.smartweb.SectionContact" />
-    <element value="imio.smartweb.SectionExternalContent" />
+    <element value="imio.smartweb.SectionExternalContent" />    
     <element value="imio.smartweb.SectionFiles" />
     <element value="imio.smartweb.SectionGallery" />
     <element value="imio.smartweb.SectionHTML" />
@@ -28,6 +28,7 @@
     <element value="imio.smartweb.SectionPostit" />
     <element value="imio.smartweb.SectionSelections" />
     <element value="imio.smartweb.SectionText" />
+    <element value="imio.smartweb.SectionTimestampedPublications" />
     <element value="imio.smartweb.SectionVideo" />
   </property>
   <!-- Schema, class and security -->

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

@@ -32,6 +32,7 @@
     <element value="imio.smartweb.SectionSelections" />
     <element value="imio.smartweb.SectionSendinblue" />
     <element value="imio.smartweb.SectionText" />
+    <element value="imio.smartweb.SectionTimestampedPublications" />
     <element value="imio.smartweb.SectionVideo" />
   </property>
   <!-- Schema, class and security -->

imio/smartweb/core/setuphandlers.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.core.utils import populate_procedure_button_text
 from Products.CMFPlone.interfaces import INonInstallable
 from zope.interface import implementer
 
@@ -25,6 +26,7 @@ class HiddenProfiles(object):
 
 def post_install(context):
     """Post install script"""
+    populate_procedure_button_text()
 
 
 def uninstall(context):

imio/smartweb/core/upgrades/configure.zcml

@@ -305,7 +305,23 @@
       directory="profiles/1067_to_1068"
       description="Don't display cropping action on react views"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      />      
+      />
+
+  <genericsetup:registerProfile
+      name="upgrade_1068_to_1069"
+      title="Upgrade core from 1068 to 1069"
+      directory="profiles/1068_to_1069"
+      description="Add new control panel for site admin"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <genericsetup:registerProfile
+      name="upgrade_1069_to_1070"
+      title="Upgrade core from 1069 to 1070"
+      directory="profiles/1069_to_1070"
+      description="Add term offre_d_emploi to procedure_taxonomy"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
 
   <genericsetup:upgradeStep
       title="Configure first official release"
@@ -997,6 +1013,30 @@
     />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1068"
+      destination="1069"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Add new control panel for site admin"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1068_to_1069"
+    />
+    <genericsetup:upgradeStep
+        title="Set some default texts for procedure button"
+        handler=".upgrades.populate_procedure_button_text"
+    />    
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="1069"
+      destination="1070"      
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Add term offre_d_emploi to procedure_taxonomy"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1069_to_1070"
+    />
+  </genericsetup:upgradeSteps>
+
   <!--genericsetup:upgradeStep
       title="Check contact itinerary if address was checked in visible blocks"
       description=""

imio/smartweb/core/upgrades/profiles/1068_to_1069/controlpanel.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<object name="portal_controlpanel">
+  <configlet
+      title="Smartweb Settings"
+      action_id="smartweb-controlpanel"
+      appId="smartweb-controlpanel"
+      category="Products"
+      condition_expr=""
+      icon_expr=""
+      url_expr="string:${portal_url}/@@smartweb-controlpanel"
+      visible="True">
+    <permission>Manage portal</permission>
+  </configlet>
+
+  <configlet
+      title="Site admin smartweb Settings"
+      action_id="siteadmin-smartweb-controlpanel"
+      appId="siteadmin-smartweb-controlpanel"
+      category="Products"
+      condition_expr=""
+      icon_expr=""
+      url_expr="string:${portal_url}/@@siteadmin-smartweb-controlpanel"
+      visible="True">
+    <permission>Manage portal</permission>
+  </configlet>  
+</object>

imio/smartweb/core/upgrades/profiles/1068_to_1069/registry.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<registry
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="imio.smartweb">
+
+    <records interface="imio.smartweb.core.browser.controlpanel_siteadmin.ISmartwebSiteAdminControlPanel"
+             prefix="smartweb" />
+
+</registry>

imio/smartweb/core/upgrades/profiles/1068_to_1069/rolemap.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<rolemap>
+
+  <permissions>
+    <permission name="imio.smartweb.core: Manage site admin control panel" acquire="True">
+      <role name="Manager"/>
+      <role name="Site Administrator"/>
+    </permission>
+ </permissions>
+
+</rolemap>

imio/smartweb/core/upgrades/profiles/1069_to_1070/taxonomies/procedure_category.cfg

@@ -0,0 +1,9 @@
+[taxonomy]
+name = procedure_category
+title = Catégorie d'une démarche
+default_language = fr
+field_title = Catégorie
+field_description = Important!  Ces catégories sont utilisées pour créer des listes accessibles via le menu navigation
+taxonomy_fieldset = categorization
+is_single_select = true
+is_required = false

imio/smartweb/core/upgrades/profiles/1069_to_1070/taxonomies/procedure_category.xml

@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='utf-8'?>
+<vdex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.imsglobal.org/xsd/imsvdex_v1p0" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsvdex_v1p0 imsvdex_v1p0.xsd http://www.imsglobal.org/xsd/imsmd_rootv1p2p1 imsmd_rootv1p2p1.xsd" profileType="hierarchicalTokenTerms" orderSignificant="false" language="fr">
+  <vocabIdentifier>procedure_category</vocabIdentifier>
+  <term>
+    <termIdentifier>actes</termIdentifier>
+    <caption>
+      <langstring language="fr">Acte (naissance, mariage, décès, etc.)</langstring>
+      <langstring language="en">Act (birth, marriage, death, etc.)</langstring>
+      <langstring language="nl">Akte (geboorte, huwelijk, overlijden, enz.)</langstring>
+      <langstring language="de">Urkunde (Geburt, Ehe, Tod, usw.)</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>autorisation_carte</termIdentifier>
+    <caption>
+      <langstring language="fr">Autorisation et carte</langstring>
+      <langstring language="en">Authorization and card</langstring>
+      <langstring language="nl">Vergunning en kaart</langstring>
+      <langstring language="de">Genehmigung und Karte</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>certificat</termIdentifier>
+    <caption>
+      <langstring language="fr">Certificat (de vie, d'hérédité, etc.)</langstring>
+      <langstring language="en">Certificate (of life, inheritance, etc.)</langstring>
+      <langstring language="nl">Certificaat (van leven, van erfenis, enz.)</langstring>
+      <langstring language="de">Bescheinigung (des Lebens, des Erbes, usw.)</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>declaration</termIdentifier>
+    <caption>
+      <langstring language="fr">Déclaration</langstring>
+      <langstring language="en">Statement</langstring>
+      <langstring language="nl">Verklaring</langstring>
+      <langstring language="de">Erklärung</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>demande</termIdentifier>
+    <caption>
+      <langstring language="fr">Demande (concession funéraire, changement de prénom, etc.)</langstring>
+      <langstring language="en">Request (funeral concession, change of first name, etc.)</langstring>
+      <langstring language="nl">Aanvraag (begrafenisconcessie, naamsverandering, enz.)</langstring>
+      <langstring language="de">Antrag (Begräbnis Konzession, Namensänderung, usw.)</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>document_d_identite</termIdentifier>
+    <caption>
+      <langstring language="fr">Document d'identité</langstring>
+      <langstring language="en">Identity document</langstring>
+      <langstring language="nl">Identiteitsdocument</langstring>
+      <langstring language="de">Ausweisdokument</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>extrait_de_registre</termIdentifier>
+    <caption>
+      <langstring language="fr">Extrait de registre</langstring>
+      <langstring language="en">Register extract</langstring>
+      <langstring language="nl">Uittreksel uit het register</langstring>
+      <langstring language="de">Registerauszug</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>information_pratique</termIdentifier>
+    <caption>
+      <langstring language="fr">Information pratique</langstring>
+      <langstring language="en">Practical information</langstring>
+      <langstring language="nl">Praktische informatie</langstring>
+      <langstring language="de">Praktische Information</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>inscription</termIdentifier>
+    <caption>
+      <langstring language="fr">Inscription</langstring>
+      <langstring language="en">Registration</langstring>
+      <langstring language="nl">Inschrijving</langstring>
+      <langstring language="de">Anmeldung</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>offre_d_emploi</termIdentifier>
+    <caption>
+      <langstring language="fr">Offre d'emploi</langstring>
+      <langstring language="en">Job offer</langstring>
+      <langstring language="nl">Job aanbod</langstring>
+      <langstring language="de">Stellenangebot</langstring>
+    </caption>
+  </term>    
+  <term>
+    <termIdentifier>permis</termIdentifier>
+    <caption>
+      <langstring language="fr">Permis</langstring>
+      <langstring language="en">License</langstring>
+      <langstring language="nl">Vergunning</langstring>
+      <langstring language="de">Erlaubnis</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>plainte_et_reclamation</termIdentifier>
+    <caption>
+      <langstring language="fr">Plainte et réclamation</langstring>
+      <langstring language="en">Complaint</langstring>
+      <langstring language="nl">Klacht</langstring>
+      <langstring language="de">Beschwerde</langstring>
+    </caption>
+  </term>
+  <term>
+    <termIdentifier>prime_et_aide</termIdentifier>
+    <caption>
+      <langstring language="fr">Prime et aide</langstring>
+      <langstring language="en">Bonus and aid</langstring>
+      <langstring language="nl">Premie en hulp</langstring>
+      <langstring language="de">Prämie und Hilfe</langstring>
+    </caption>
+  </term>
+</vdex>

imio/smartweb/core/upgrades/upgrades.py

@@ -2,6 +2,9 @@
 
 from imio.smartweb.core.browser.controlpanel import ISmartwebControlPanel
 from imio.smartweb.core.contents import IPages
+from imio.smartweb.core.utils import (
+    populate_procedure_button_text as utils_populate_procedure_button_text,
+)
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from eea.facetednavigation.interfaces import ICriteria
 from eea.facetednavigation.subtypes.interfaces import IFacetedNavigable
@@ -13,7 +16,6 @@ from plone.registry.interfaces import IRegistry
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getUtility
 from zope.schema import getFieldNames
-from zope.schema import TextLine
 
 import logging
 
@@ -291,3 +293,7 @@ def update_control_panel_combo_api_fieldname(context):
         logger.info("La clé 'smartweb.url_formdefs_api' a été supprimée.")
     except KeyError:
         logger.info("La clé 'smartweb.url_formdefs_api' n'existe pas dans le registre.")
+
+
+def populate_procedure_button_text(context):
+    utils_populate_procedure_button_text()