Products.urban 2.5.0.dev4__tar.gz → 2.5.0.dev12__tar.gz

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/MANIFEST.in

@@ -51,3 +51,4 @@
   recursive-include docs *.pickle
   recursive-include docs *.png
   recursive-include docs Makefile
+  include *.toml

{Products.urban-2.5.0.dev4/src/Products.urban.egg-info → Products.urban-2.5.0.dev12}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev4
+Version: 2.5.0.dev12
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
 Author-email: simon.delcourt@imio.be
 License: GPL
+Description: Introduction
+        ============
+        
+        
+        
+        This product may contain traces of nuts.
+        
+        
 Keywords: Urban IMIO
+Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2.7
 Provides-Extra: test
 Provides-Extra: templates
-
-Introduction
-============
-
-
-
-This product may contain traces of nuts.
-

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/docs/CHANGES.rst

@@ -8,13 +8,140 @@ Changelog
 
 .. towncrier release notes start
 
+2.5.0.dev12 (2025-01-16)
+------------------------
+
+New features:
+
+
+- Add interval commit to update_licences_open_tasks cron
+  [jchandelle] (SUP-41904)
+- Add action for sending mail from event context with document in attachement
+  [jchandelle] (URB-3020)
+- Add a link field on CODT build licences
+  [mpeeters, daggelpop] (URB-3063)
+
+
+Bug fixes:
+
+
+- Allow corporate tenant in inspections
+  [daggelpop] (SUP-33621)
+
+
+2.5.0.dev11 (2024-10-16)
+------------------------
+
+New features:
+
+
+- Use imio.pm.wsclient 2.x version (REST).
+  [aduchene]
+  Add `get_last_plonemeeting_date`, `get_last_college_date` and `get_last_college_date` to CODT_BaseBuildLicence.
+  [aduchene] (URB-3148)
+
+
+2.5.0.dev10 (2024-10-01)
+------------------------
+
+New features:
+
+
+- Add validity date filter and index
+  [jchandelle] (URB-3090)
+- Add field `D.67 CoPat` to patrimony fieldset
+  daggelpop (URB-3167)
+
+
+2.5.0.dev9 (2024-06-27)
+-----------------------
+
+New features:
+
+
+- Add recipient import to inquiries
+  [daggelpop] (SUP-36417)
+
+
+Internal:
+
+
+- Test checking opnion FD delay
+  [jchandelle]
+  Test completion due dates after amending plans
+  [daggelpop] (URB-3005)
+
+
+2.5.0.dev8 (2024-04-21)
+-----------------------
+
+Bug fixes:
+
+
+- Avoid to display disabled vocabulary entries with no start or end validity date
+  [mpeeters] (SUP-36742)
+- Fix logic on some methods to exclude invalid vocabulary entries
+  [mpeeters] (URB-3002)
+
+
+2.5.0.dev7 (2024-04-07)
+-----------------------
+
+Bug fixes:
+
+
+- Avoid an error if an advice was not defined
+  [mpeeters] (SUP-36385)
+
+
+2.5.0.dev6 (2024-04-01)
+-----------------------
+
+Bug fixes:
+
+
+- Move method methods to be available for every events.
+  Change `is_CODT2024` to be true if there is no deposit but current date is greater than 2024-03-31.
+  [mpeeters] (URB-3008)
+
+
+Internal:
+
+
+- Update setup for tests
+  [mpeeters]
+  Test checking completion task
+  [daggelpop] (URB-3005)
+
+
+2.5.0.dev5 (2024-03-20)
+-----------------------
+
+New features:
+
+
+- Make caduc and abandoned workflow state grey
+  [jchandelle] (URB-3007)
+- Add `is_not_CODT2024` method that can be used in templates
+  [mpeeters] (URB-3008)
+
+
+Bug fixes:
+
+
+- Fix update of vocabularies
+  [mpeeters] (URB-3002)
+- Invert Refer FD delay 30 <-> 40 days
+  [mpeeters] (URB-3008)
+
+
 2.5.0.dev4 (2024-03-18)
 -----------------------
 
 New features:
 
 
-- Add `getCompletenessDelay`, `getCompletenessDelay` and `getFDAdviceDelay` methods that can be used in templates
+- Add `getCompletenessDelay`, `getReferFDDelay` and `getFDAdviceDelay` methods that can be used in templates
   [mpeeters] (URB-3008)
 
 

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '2.5.0.dev4'
+version = '2.5.0.dev12'
 
 setup(
     name="Products.urban",

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/UrbanEvent.py

@@ -13,6 +13,7 @@ __author__ = """Gauthier BASTIEN <gbastien@commune.sambreville.be>, Stephan GEUL
 <stephan.geulette@uvcw.be>, Jean-Michel Abe <jm.abe@la-bruyere.be>"""
 __docformat__ = "plaintext"
 
+from Acquisition import aq_parent
 from AccessControl import ClassSecurityInfo
 from Products.Archetypes.atapi import *
 from zope.interface import implements
@@ -38,6 +39,10 @@ from Products.urban.UrbanVocabularyTerm import UrbanVocabulary
 from Products.urban.utils import is_attachment
 from Products.urban.utils import setOptionalAttributes
 from Products.urban import UrbanMessage as _
+from plone.contentrules.engine.interfaces import IRuleAssignmentManager
+from zope.component import getUtility, getMultiAdapter
+from plone.contentrules.rule.interfaces import IExecutable
+from plone.contentrules.engine.interfaces import IRuleStorage
 
 from plone import api
 
@@ -901,6 +906,8 @@ class UrbanEvent(BaseFolder, BrowserDefaultMixin):
         Returns the external decision value or the UrbanVocabularyTerm if theObject=True
         """
         res = self.getField("externalDecision").get(self)
+        if res == [""]:
+            res = ""
         if res and theObject:
             tool = getToolByName(self, "portal_urban")
             res = getattr(tool.externaldecisions, res)
@@ -944,6 +951,31 @@ class UrbanEvent(BaseFolder, BrowserDefaultMixin):
         show = "other" in selection
         return show
 
+    def get_all_rules_for_this_event(self):
+        portal = api.portal.get()
+        assignable = IRuleAssignmentManager(portal)
+        storage = getUtility(IRuleStorage)
+
+        rules = []
+        for key in [key for key in assignable]:
+            conditions = []
+            rule = storage.get(key, None)
+            if rule is None:
+                continue
+            if not rule.enabled:
+                continue
+            for condition in rule.conditions:
+                class EventTemp():
+                    object = self
+                executable = getMultiAdapter((self, condition, EventTemp), IExecutable)
+                conditions.append(executable())
+            if all(conditions):
+                rules.append(rule)
+        return rules
+
+    def get_parent_licence(self):
+        return aq_parent(self)
+
 
 registerType(UrbanEvent, PROJECTNAME)
 # end of class UrbanEvent

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/UrbanTool.py

@@ -32,6 +32,7 @@ from Products.urban.config import VOCABULARY_TYPES
 from Products.urban.config import *
 from Products.urban.interfaces import IUrbanEventType
 from Products.urban.interfaces import IGenericLicence
+from Products.urban.interfaces import IUrbanEvent
 from Products.urban import UrbanMessage as _
 
 from zope.annotation import IAnnotations
@@ -39,7 +40,8 @@ from zope.interface import implements
 
 from AccessControl import getSecurityManager
 from plone import api
-from plone.memoize.request import cache
+from plone.memoize import ram
+from plone.memoize.request  import cache
 from zope.i18n import translate
 from Products.CMFCore import permissions
 from Products.CMFCore.utils import getToolByName
@@ -51,8 +53,13 @@ from Products.DataGridField.FixedColumn import FixedColumn
 from Products.urban.utils import getCurrentFolderManager
 from Products.urban.config import GENERATED_DOCUMENT_FORMATS
 from Products.urban.interfaces import IUrbanVocabularyTerm, IContactFolder
+from Products.urban.utils import cache_key_30min
 from Products.urban import services
+from plone.contentrules.engine.interfaces import IRuleAssignmentManager
+from plone.contentrules.engine.interfaces import IRuleStorage
+from plone.contentrules.rule.interfaces import IExecutable
 from datetime import date as _date
+from zope.component import getUtility, getMultiAdapter
 
 import interfaces
 import logging
@@ -1023,4 +1030,14 @@ class UrbanTool(UniqueObject, OrderedBaseFolder, BrowserDefaultMixin):
                 )
 
 
+    @ram.cache(cache_key_30min)
+    def check_if_mail_content_rule_applied(self, context):
+
+        if not IUrbanEvent.providedBy(context):
+            return False
+
+        rules = context.get_all_rules_for_this_event()
+
+        return len(rules) > 0
+
 registerType(UrbanTool, PROJECTNAME)

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/UrbanVocabularyTerm.py

@@ -178,7 +178,7 @@ class UrbanVocabulary(object):
         value_to_use="title",
         sort_on="getObjPositionInParent",
         inUrbanConfig=True,
-        allowedStates=["enabled"],
+        allowedStates=["enabled", "disabled"],
         with_empty_value=False,
         datagridfield_key="street",
         _filter=None,
@@ -195,10 +195,14 @@ class UrbanVocabulary(object):
         self._filter = _filter
 
     def _validate_term(self, term, deposit_date):
-        if "startValidity" not in term or "endValidity" not in term:
-            return True
+        if isinstance(term, dict):
+            if "startValidity" not in term or "endValidity" not in term:
+                return term.get("enabled", True)
+        else:
+            if not hasattr(term, "startValidity") or not hasattr(term, "endValidity"):
+                return term.get("enabled", True)
         if term["startValidity"] is None and term["endValidity"] is None:
-            return True
+            return term.get("enabled", True)
         if term["startValidity"] and term["endValidity"]:
             return (
                 deposit_date >= term["startValidity"]
@@ -209,6 +213,17 @@ class UrbanVocabulary(object):
         if term["endValidity"]:
             return deposit_date <= term["endValidity"]
 
+    def _get_deposit_date(self, context):
+        deposit_date = None
+        if hasattr(context, "get_first_deposit_date"):
+            deposit_date = context.get_first_deposit_date()
+        if hasattr(context, "get_first_deposit_date") and not deposit_date:
+            deposit_date = context.creation_date
+        if not deposit_date:
+            # by default we use the current date
+            deposit_date = DateTime(*datetime.now().date().timetuple()[0:3])
+        return deposit_date
+
     def get_raw_voc(self, context, licence_type="", _filter=None):
         portal_urban = api.portal.get_tool("portal_urban")
         raw_voc = portal_urban.get_vocabulary(
@@ -218,12 +233,7 @@ class UrbanVocabulary(object):
             name=self.path,
         )
 
-        deposit_date = None
-        if hasattr(context, "get_first_deposit_date"):
-            deposit_date = context.get_first_deposit_date()
-        if not deposit_date:
-            # by default we use the current date
-            deposit_date = DateTime(*datetime.now().date().timetuple()[0:3])
+        deposit_date = self._get_deposit_date(context)
         voc = [
             v
             for v in raw_voc
@@ -261,21 +271,19 @@ class UrbanVocabulary(object):
 
     def getDisplayListForTemplate(self, content_instance):
         portal_urban = api.portal.get_tool("portal_urban")
-        result = DisplayList(
-            portal_urban.listVocabulary(
-                self.path,
-                content_instance,
-                vocType=self.vocType,
-                id_to_use=self.id_to_use,
-                value_to_use=self.value_to_use,
-                sort_on=self.sort_on,
-                inUrbanConfig=self.inUrbanConfig,
-                allowedStates=self.allowedStates,
-                with_empty_value=self.with_empty_value,
-                with_numbering=False,
-            )
+        voc_terms = portal_urban.listVocabulary(
+            self.path,
+            content_instance,
+            vocType=self.vocType,
+            id_to_use=self.id_to_use,
+            value_to_use=self.value_to_use,
+            sort_on=self.sort_on,
+            inUrbanConfig=self.inUrbanConfig,
+            allowedStates=self.allowedStates,
+            with_empty_value=self.with_empty_value,
+            with_numbering=False,
         )
-        return result
+        return DisplayList(voc_terms)
 
     def getObjectsSet(self, content_instance, values):
         if isinstance(values, str):
@@ -302,7 +310,12 @@ class UrbanVocabulary(object):
             allowedStates=self.allowedStates,
             with_empty_value=self.with_empty_value,
         )
-        return voc_terms
+        deposit_date = self._get_deposit_date(content_instance)
+        filtered_terms = {
+            k: v for k, v in voc_terms.items()
+            if self._validate_term(v, deposit_date)
+        }
+        return filtered_terms
 
     def listAllVocTerms(self, content_instance):
         portal_urban = api.portal.get_tool("portal_urban")
@@ -315,7 +328,12 @@ class UrbanVocabulary(object):
             allowedStates=self.allowedStates,
         )
         voc_terms = [brain.getObject() for brain in voc_brains]
-        return voc_terms
+        deposit_date = self._get_deposit_date(content_instance)
+        filtered_terms = [
+            v for v in voc_terms
+            if self._validate_term(v, deposit_date)
+        ]
+        return filtered_terms
 
 
 ##/code-section module-footer

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/browser/actionspanel/actionspanel.py

@@ -47,6 +47,7 @@ class EventActionsPanelView(ActionsPanelView):
         self.ACCEPTABLE_ACTIONS = (
             "plonemeeting_wsclient_action_1",
             "plonemeeting_wsclient_action_2",
+            "send_mail_action"
         )
 
 

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/browser/cron/tasks.py

@@ -15,6 +15,9 @@ from zope.component import getUtilitiesFor
 from zope.event import notify
 from zope.lifecycleevent import ObjectModifiedEvent
 
+import transaction
+
+COMMIT_INTERVAL = 100
 
 class TaskCronView(BrowserView):
     def __call__(self):
@@ -81,7 +84,7 @@ class UpdateOpenTasksLicences(BrowserView):
         from Products.urban import logger
 
         # from imio.schedule.utils import get_task_configs
-        for licence in filtered_licences:
+        for count, licence in enumerate(filtered_licences):
             logger.info("UpdateOpenTasksLicences: %s" % str(licence.absolute_url()))
             logger.info(
                 "getHasModifiedBlueprints: %s"
@@ -103,6 +106,8 @@ class UpdateOpenTasksLicences(BrowserView):
             )
             notify(ObjectModifiedEvent(licence))
             licence.reindexObject()
+            if count % COMMIT_INTERVAL == 0:
+                transaction.commit()
             # task_configs = licence.portal_type != 'CODT_BuildLicence' and get_task_configs(licence) or []
             # for config in task_configs:
             # task = config.get_open_task(licence)

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/browser/templates/urbaneventinquiryview.pt

@@ -17,7 +17,12 @@
                                                                   recipients context/getRecipients;
                                                                   linkedUrbanEventType context/getUrbaneventtypes;
                                                                   global parcels view/getParcels;">
-
+                    <div id="messageWrapper" style="position: relative" tal:condition="view/mail_send" tal:define="mail_send view/mail_send">
+                        <dl class="portalMessage info">
+                        <dt i18n:domain="plone" i18n:translate="">Info</dt>
+                        <dd tal:content="mail_send"></dd>
+                        </dl>
+                    </div>
                     <div class="action-bar">
                     <metal:listing use-macro="here/@@globalmacros/goBackToMacro" />
                         <div class="action-bar-text" i18n:domain="plone"
@@ -205,6 +210,13 @@
                                 </form>
                                 <p>&nbsp;</p>
                             </tal:block>
+
+                            <tal:import_recipients_form define="form python: view.import_recipients_listing_form">
+                                <tal:with-form-as-view define="view nocall:form">
+                                    <metal:block use-macro="form/@@ploneform-macros/titlelessform"/>
+                                </tal:with-form-as-view>
+                            </tal:import_recipients_form>
+
                             <tal:block condition="python: context.REQUEST.get('template_uid') != None">
                                 <tal:block define="docObj python:context.uid_catalog(UID=context.REQUEST.get('template_uid'))[0]">
                                     <Script tal:content="python:'document.location = \''+docObj.getObject().absolute_url()+'/external_edit\';'" />

{Products.urban-2.5.0.dev4 → Products.urban-2.5.0.dev12}/src/Products/urban/browser/templates/urbaneventview.pt

@@ -15,7 +15,12 @@
             <metal:main_macro define-macro="main">
                 <metal:body define-macro="body_macro" tal:define="linkedUrbanEventType view/getUrbaneventtypes;
                                                                   member context/@@plone_portal_state/member;">
-
+                    <div id="messageWrapper" style="position: relative" tal:condition="view/mail_send" tal:define="mail_send view/mail_send">
+                        <dl class="portalMessage info">
+                        <dt i18n:domain="plone" i18n:translate="">Info</dt>
+                        <dd tal:content="mail_send"></dd>
+                        </dl>
+                    </div>
                     <div class="action-bar">
                     <metal:listing use-macro="here/@@globalmacros/goBackToMacro" />
                         <div class="action-bar-text" i18n:domain="plone"