Products.urban 2.5.0.dev11__tar.gz → 2.5.0.dev13__tar.gz

{Products.urban-2.5.0.dev11/src/Products.urban.egg-info → Products.urban-2.5.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev11
+Version: 2.5.0.dev13
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -19,5 +19,5 @@ Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2.7
-Provides-Extra: templates
 Provides-Extra: test
+Provides-Extra: templates

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/docs/CHANGES.rst

@@ -8,6 +8,46 @@ Changelog
 
 .. towncrier release notes start
 
+2.5.0.dev13 (2025-02-07)
+------------------------
+
+New features:
+
+
+- Modify obsolete state display order
+  [jchandelle] (SUP-36697)
+
+
+Bug fixes:
+
+
+- Fix sending zem document by mail
+  [jchandelle] (SUP-40979)
+- Add missing translation in schedule config
+  [WBoudabous] (URB-3277)
+
+
+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)
 ------------------------
 

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/setup.py

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

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/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
 
@@ -946,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.dev11 → Products.urban-2.5.0.dev13}/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.dev11 → Products.urban-2.5.0.dev13}/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"
         )
 
 
@@ -199,11 +200,17 @@ class TransitionsPanelView(ActionsPanelView):
     def sortTransitions(self, lst):
         """Sort the list of transitions"""
         super(TransitionsPanelView, self).sortTransitions(lst)
-        end_transition_ids = ["abandon", "suspend"]
+        end_transition_ids = [
+            "abandon",
+            "suspend",
+            "make_obsolete_to_authorized",
+            "make_obsolete_to_accepct"
+        ]
         to_move = []
-        for transition in lst:
-            if transition["id"] in end_transition_ids:
-                to_move.append(lst.pop(lst.index(transition)))
+        lst_id = [trans["id"] for trans in lst]
+        for transition in end_transition_ids:
+            if transition in lst_id:
+                to_move.append(lst.pop(lst_id.index(transition)))
         lst.extend(to_move)
 
     def _transitionsToConfirm(self):

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/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.dev11 → Products.urban-2.5.0.dev13}/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"

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/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"

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/src/Products/urban/browser/urbaneventviews.py

@@ -13,6 +13,7 @@ from Products.urban.browser.table.urbantable import AttachmentsTable
 from Products.urban.browser.table.urbantable import ClaimantsTable
 from Products.urban.browser.table.urbantable import RecipientsCadastreTable
 from Products.urban.interfaces import IGenericLicence
+from Products.urban.send_mail_action.forms import MAIL_ACTION_KEY
 from Products.urban import services
 from StringIO import StringIO
 
@@ -244,6 +245,26 @@ class UrbanEventView(BrowserView):
         licence = self.context.aq_parent
         return licence.getFDAdviceDelay()
 
+    def mail_send(self):
+        annotations = interfaces.IAnnotations(self.context)
+        notif = annotations.get(MAIL_ACTION_KEY, None)
+        if notif is None or len(notif) == 0:
+            return False
+
+        notif.sort(key=lambda elem: elem["time"])
+        user = notif[-1].get("user")
+        username = notif[-1].get("username", None)
+        if username is None or username == "":
+            username = user
+        return _(
+            "Mail already send for ${title} by ${user}, ${date}",
+            mapping={
+                "title": notif[-1]['title'].lower(),
+                "user": username,
+                "date": notif[-1]["time"].strftime("%d/%m/%Y, %H:%M:%S")
+            }
+        )
+
 
 class IImportClaimantListingForm(Interface):
 

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/src/Products/urban/configure.zcml

@@ -62,6 +62,8 @@
   <include package=".workflows" />
   <include package=".widget" />
   <include package=".history" />
+  <include package=".contentrules" />
+  <include package=".send_mail_action" />
 
   <!-- needed to migrate UrbanDoc type, to remove in next release -->
   <adapter name="plone.app.blob.subtypes.file"

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/src/Products/urban/content/licence/CODT_BaseBuildLicence.py

@@ -18,6 +18,9 @@ from Products.Archetypes.atapi import *
 from plone import api
 from zope.component import getMultiAdapter
 from zope.interface import implements
+from Products.ATReferenceBrowserWidget.ATReferenceBrowserWidget import (
+    ReferenceBrowserWidget,
+)
 from Products.MasterSelectWidget.MasterBooleanWidget import MasterBooleanWidget
 from Products.urban import interfaces
 from Products.urban.content.licence.BaseBuildLicence import BaseBuildLicence
@@ -525,6 +528,32 @@ schema = Schema(
             ),
             schemata="urban_analysis",
         ),
+        ReferenceField(
+            name="bound_licences",
+            widget=ReferenceBrowserWidget(
+                allow_search=True,
+                allow_browse=False,
+                force_close_on_insert=True,
+                startup_directory="urban",
+                show_indexes=False,
+                wild_card_search=True,
+                restrict_browsing_to_startup_directory=True,
+                label=_("urban_label_bound_licences", default="Bound licences"),
+            ),
+            allowed_types=[
+                t
+                for t in URBAN_TYPES
+                if t
+                not in [
+                    "Inspection",
+                    "Ticket",
+                    "ProjectMeeting",
+                ]
+            ],
+            schemata="urban_description",
+            multiValued=True,
+            relationship="bound_licences",
+        ),
     ),
 )
 
@@ -737,6 +766,7 @@ def finalizeSchema(schema):
     schema.moveField("roadAdaptation", before="roadTechnicalAdvice")
     schema.moveField("architects", after="workLocations")
     schema.moveField("foldermanagers", after="architects")
+    schema.moveField("bound_licences", after="foldermanagers")
     schema.moveField("workType", after="folderCategory")
     schema.moveField("financial_caution", after="workType")
     schema.moveField("parcellings", after="isInSubdivision")

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/src/Products/urban/content/licence/Inspection.py

@@ -232,8 +232,20 @@ class Inspection(BaseFolder, GenericLicence, Inquiry, BrowserDefaultMixin):
         tenants = [
             app for app in self.objectValues("Applicant") if app.portal_type == "Tenant"
         ]
+        corporations = self.getCorporationTenants()
+        tenants.extend(corporations)
         return tenants
 
+    security.declarePublic("getCorporationTenants")
+
+    def getCorporationTenants(self):
+        corporations = [
+            corp
+            for corp in self.objectValues("Corporation")
+            if corp.portal_type == "CorporationTenant"
+        ]
+        return corporations
+
     security.declarePublic("getPlaintiffs")
 
     def getPlaintiffs(self):

{Products.urban-2.5.0.dev11 → Products.urban-2.5.0.dev13}/src/Products/urban/content/licence/base.py

@@ -30,16 +30,18 @@ from zope.schema.interfaces import IVocabularyFactory
 from zope.interface import implements
 from Products.urban import interfaces
 from urban.vocabulary.vocabularies.base import BaseVocabulary
+from OFS.interfaces import IOrderedContainer
+from Products.Archetypes.OrderedBaseFolder import OrderedContainer
 
 
-class UrbanBase(object):
+class UrbanBase(OrderedContainer):
     """
     This class manage every methods shared cross different licences
     """
 
     security = ClassSecurityInfo()
 
-    implements(interfaces.IUrbanBase)
+    implements(interfaces.IUrbanBase, IOrderedContainer)
 
     security.declarePublic("getLicenceConfig")
 

Products.urban-2.5.0.dev13/src/Products/urban/contentrules/configure.zcml

@@ -0,0 +1,132 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone">
+
+    <include package="plone.app.contentrules"/>
+
+
+    <!-- Email action definition -->
+
+     <adapter factory=".mail_with_attachment.MailWithAttachmentActionExecutor" />
+
+     <browser:page
+       for="plone.app.contentrules.browser.interfaces.IRuleActionAdding"
+       name="plone.actions.MailWithAttachement"
+       class=".mail_with_attachment.MailWithAttachmentAddForm"
+       permission="plone.app.contentrules.ManageContentRules"
+       />
+
+     <browser:page
+       for=".mail_with_attachment.IMailWithAttachmentAction"
+       name="edit"
+       class=".mail_with_attachment.MailWithAttachmentEditForm"
+       permission="plone.app.contentrules.ManageContentRules"
+       />
+
+     <plone:ruleAction
+         name="plone.actions.MailWithAttachement"
+         title="Send email with attachment"
+         description="Send an email with attachment on the triggering object"
+         for="*"
+         event="*"
+         addview="plone.actions.MailWithAttachement"
+         editview="edit"
+         schema=".mail_with_attachment.IMailWithAttachmentAction"
+         factory=".mail_with_attachment.MailWithAttachmentAction"
+         />
+
+    <adapter factory="Products.urban.contentrules.mail_with_attachment.GetDocumentToAttach"/>
+
+    <!-- eventType conditions -->
+
+    <adapter factory=".event_type.EventTypeConditionExecutor" />
+
+    <browser:page
+      for="plone.app.contentrules.browser.interfaces.IRuleConditionAdding"
+      name="urban.conditions.EventType"
+      class=".event_type.EventTypeAddForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <browser:page
+      for=".event_type.IEventTypeCondition"
+      name="edit"
+      class=".event_type.EventTypeEditForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <plone:ruleCondition
+        name="urban.conditions.EventType"
+        title="Event Type"
+        description="Apply only when the Event Type correspond to the one of the context"
+        for="*"
+        event="*"
+        addview="urban.conditions.EventType"
+        editview="edit"
+        schema=".event_type.IEventTypeCondition"
+        factory=".event_type.EventTypeCondition"
+        />
+
+
+    <!-- opinion conditions -->
+
+    <adapter factory=".opinions.OpinionsConditionExecutor" />
+
+    <browser:page
+      for="plone.app.contentrules.browser.interfaces.IRuleConditionAdding"
+      name="urban.conditions.Opinions"
+      class=".opinions.OpinionsAddForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <browser:page
+      for=".opinions.IOpinionsCondition"
+      name="edit"
+      class=".opinions.OpinionsEditForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <plone:ruleCondition
+        name="urban.conditions.Opinions"
+        title="Opinion to ask"
+        description="Apply only when one of the Opinion to ask slelected correspond to the one of the context"
+        for="*"
+        event="*"
+        addview="urban.conditions.Opinions"
+        editview="edit"
+        schema=".opinions.IOpinionsCondition"
+        factory=".opinions.OpinionsCondition"
+        />
+
+    <!-- event type conditions -->
+
+    <adapter factory=".licence_type.LicenceTypeConditionExecutor" />
+
+    <browser:page
+      for="plone.app.contentrules.browser.interfaces.IRuleConditionAdding"
+      name="urban.conditions.licence_type"
+      class=".licence_type.LicenceTypeAddForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <browser:page
+      for=".licence_type.LicenceTypeCondition"
+      name="edit"
+      class=".licence_type.LicenceTypeEditForm"
+      permission="cmf.ManagePortal"
+      />
+
+    <plone:ruleCondition
+        name="urban.conditions.licence_type"
+        title="Licence type"
+        description="Apply only when one of the licence type slelected correspond to the one of the context"
+        for="*"
+        event="*"
+        addview="urban.conditions.licence_type"
+        editview="edit"
+        schema=".licence_type.ILicenceTypeCondition"
+        factory=".licence_type.LicenceTypeCondition"
+        />
+
+</configure>

Products.urban-2.5.0.dev13/src/Products/urban/contentrules/event_type.py

@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+
+from OFS.SimpleItem import SimpleItem
+from plone import api
+from plone.app.contentrules import PloneMessageFactory as _
+from plone.app.contentrules.browser.formhelper import AddForm
+from plone.app.contentrules.browser.formhelper import EditForm
+from plone.contentrules.rule.interfaces import IExecutable
+from plone.contentrules.rule.interfaces import IRuleElementData
+from zope import schema
+from zope.component import adapts
+from zope.component import getUtility
+from zope.formlib import form
+from zope.interface import implements
+from zope.interface import Interface
+from zope.schema.interfaces import IVocabularyFactory
+
+
+class IEventTypeCondition(Interface):
+    """Interface for the configurable aspects of a Event type condition.
+
+    This is also used to create add and edit forms, below.
+    """
+
+    event_type = schema.Choice(
+        title=_(u"Event Type"),
+        vocabulary="urban.vocabularies.event_types",
+        required=True,
+    )
+
+
+class EventTypeCondition(SimpleItem):
+    """The actual persistent implementation of the Event type condition element."""
+
+    implements(IEventTypeCondition, IRuleElementData)
+
+    event_type = ""
+    element = "urban.conditions.EventType"
+
+    @property
+    def summary(self):
+        factory = getUtility(IVocabularyFactory, "urban.vocabularies.event_types")
+        vocabulary = factory(api.portal.get())
+        return u"Event Type : {}".format(vocabulary.by_value[self.event_type].title)
+
+
+class EventTypeConditionExecutor(object):
+    """The executor for this condition.
+
+    This is registered as an adapter in configure.zcml
+    """
+
+    implements(IExecutable)
+    adapts(Interface, IEventTypeCondition, Interface)
+
+    def __init__(self, context, element, event):
+        self.context = context
+        self.element = element
+        self.event = event
+
+    def __call__(self):
+        config_event_types = []
+        event_type_condition = self.element.event_type
+        if not event_type_condition:
+            return False
+        event_config = self.event.object.getUrbaneventtypes()
+        if event_config and hasattr(event_config, "eventTypeType"):
+            config_event_types = event_config.eventTypeType
+        if not self.check_if_iterrable(config_event_types):
+            return False
+        return event_type_condition in config_event_types
+
+    def check_if_iterrable(self, value):
+        if isinstance(value, list) or isinstance(value, tuple):
+            return True
+        try:
+            _ = iter(value)
+            return True
+        except TypeError:
+            return False
+
+
+class EventTypeAddForm(AddForm):
+    """An add form for event type condition."""
+
+    form_fields = form.FormFields(IEventTypeCondition)
+    label = _(u"Add Event type Condition")
+    description = _(
+        u"A Event type condition makes the rule apply "
+        "only if Event type correspond to the one from the context."
+    )
+    form_name = _(u"Configure element")
+
+    def create(self, data):
+        c = EventTypeCondition()
+        form.applyChanges(c, self.form_fields, data)
+        return c
+
+
+class EventTypeEditForm(EditForm):
+    """An edit form for Event type condition"""
+
+    form_fields = form.FormFields(IEventTypeCondition)
+    label = _(u"Edit Event type Condition")
+    description = _(
+        u"A Event type condition makes the rule apply "
+        "only if Event type correspond to the one from the context."
+    )
+    form_name = _(u"Configure element")

Products.urban-2.5.0.dev13/src/Products/urban/contentrules/interface.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from zope.interface import Interface
+
+
+class IGetDocumentToAttach(Interface):
+    """Interface to adapt get document to attach to mail"""