Products.urban 2.7.17__tar.gz → 2.7.18__tar.gz

{Products.urban-2.7.17/src/Products.urban.egg-info → Products.urban-2.7.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.17
+Version: 2.7.18
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -46,6 +46,32 @@ Description: *********
         
         .. towncrier release notes start
         
+        2.7.18 (2024-10-04)
+        -------------------
+        
+        New features:
+        
+        
+        - Add translation and add contextual title to the form from send email action
+          [jchandelle] (URB-3020)
+        
+        
+        Bug fixes:
+        
+        
+        - Fix missing extending validity date
+          [jchandelle] (URB-3153)
+        
+        
+        Internal:
+        
+        
+        - Add a new field "additional reference" and configure faceteed navigation
+          [fngaha] (URB-2595)
+        - improve the functionality of searching for owners within a defined radius.
+          [fngaha] (URB-2983)
+        
+        
         2.7.17 (2024-10-01)
         -------------------
         
@@ -1323,5 +1349,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: test
 Provides-Extra: templates
+Provides-Extra: test

{Products.urban-2.7.17 → Products.urban-2.7.18}/docs/CHANGES.rst

@@ -8,6 +8,32 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.18 (2024-10-04)
+-------------------
+
+New features:
+
+
+- Add translation and add contextual title to the form from send email action
+  [jchandelle] (URB-3020)
+
+
+Bug fixes:
+
+
+- Fix missing extending validity date
+  [jchandelle] (URB-3153)
+
+
+Internal:
+
+
+- Add a new field "additional reference" and configure faceteed navigation
+  [fngaha] (URB-2595)
+- improve the functionality of searching for owners within a defined radius.
+  [fngaha] (URB-2983)
+
+
 2.7.17 (2024-10-01)
 -------------------
 

{Products.urban-2.7.17 → Products.urban-2.7.18}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "2.7.17"
+version = "2.7.18"
 
 setup(
     name="Products.urban",

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/UrbanEvent.py

@@ -41,6 +41,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
 
@@ -524,6 +528,7 @@ schema = Schema(
                 show_hm=False,
                 format="%d/%m/%Y",
                 starting_year=1960,
+                ending_year=WIDGET_DATE_END_YEAR,
                 label=_("urban_label_videoConferenceDate", default="videoConferencedate"),
             ),
             optional=True,
@@ -534,6 +539,7 @@ schema = Schema(
                 show_hm=False,
                 format="%d/%m/%Y",
                 starting_year=1960,
+                ending_year=WIDGET_DATE_END_YEAR,
                 label=_("urban_label_validityEndDate", default="validityEndDate"),
             ),
             optional=True,
@@ -941,6 +947,28 @@ class UrbanEvent(BaseFolder, BrowserDefaultMixin):
         # !!! Fix to handle file exporting on Event with c.exportimport
         return 0
 
+    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
+
 
 registerType(UrbanEvent, PROJECTNAME)
 # end of class UrbanEvent

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/UrbanTool.py

@@ -1080,25 +1080,8 @@ class UrbanTool(UniqueObject, OrderedBaseFolder, BrowserDefaultMixin):
         if not IUrbanEvent.providedBy(context):
             return False
 
-        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:
-                rules.append(False)
-                continue
-            for condition in rule.conditions:
-                class EventTemp():
-                    object = context
-                executable = getMultiAdapter((context, condition, EventTemp), IExecutable)
-                conditions.append(executable())
-            rules.append(all(conditions))
-        return any(rules)
+        rules = context.get_all_rules_for_this_event()
+
+        return len(rules) > 0
 
 registerType(UrbanTool, PROJECTNAME)

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/browser/urbaneventviews.py

@@ -905,13 +905,4 @@ class UrbanEventInquiryView(UrbanEventInquiryBaseView):
 
     def getInquiryRadius(self):
         licence = self.context.aq_parent
-        if hasattr(licence, "hasEnvironmentImpactStudy"):
-            if licence.getHasEnvironmentImpactStudy():
-                return 200
-        if hasattr(licence, "impactStudy"):
-            if licence.getImpactStudy():
-                return 200
-        if hasattr(licence, "inquiry_category"):
-            if licence.getInquiry_category() == "B":
-                return 200
-        return 50
+        return int(licence.investigation_radius.split("m")[0])

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/content/CODT_UniqueLicenceInquiry.py

@@ -15,6 +15,7 @@ __docformat__ = "plaintext"
 
 from AccessControl import ClassSecurityInfo
 from Products.Archetypes.atapi import *
+from Products.MasterSelectWidget.MasterSelectWidget import MasterSelectWidget
 from zope.interface import implements
 from Products.urban import interfaces
 from Products.urban import utils
@@ -25,6 +26,14 @@ from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
 from Products.urban.config import *
 from Products.urban.content.CODT_Inquiry import CODT_Inquiry
 
+slave_fields_inquiry_category = (
+    {
+        "name": "investigation_radius",
+        "action": "value",
+        "vocab_method": "get_inquiry_category_radius",
+        "control_param": "enquiry_type",
+    },
+)
 ##code-section module-header #fill in your manual code here
 ##/code-section module-header
 
@@ -32,7 +41,8 @@ schema = Schema(
     (
         StringField(
             name="inquiry_category",
-            widget=SelectionWidget(
+            widget=MasterSelectWidget(
+                slave_fields=slave_fields_inquiry_category,
                 label=_("urban_label_inquiry_category", default="Inquiry_category"),
             ),
             vocabulary="list_inquiry_category",
@@ -94,6 +104,12 @@ class CODT_UniqueLicenceInquiry(BaseContent, CODT_Inquiry, BrowserDefaultMixin):
         )
         return all_inquiries
 
+    def get_inquiry_category_radius(self, enquiry_type):
+        """ """
+        if enquiry_type == "B":
+            return "200m"
+        return "50m"
+
 
 registerType(CODT_UniqueLicenceInquiry, PROJECTNAME)
 # end of class Inquiry

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/content/Inquiry.py

@@ -51,6 +51,15 @@ optional_fields = [
 
 schema = Schema(
     (
+        StringField(
+            name="investigation_radius",
+            widget=SelectionWidget(
+                label=_("urban_label_investigation_radius", default="Investigation_radius"),
+            ),
+            vocabulary=UrbanVocabulary("investigations_radius", inUrbanConfig=False),
+            default_method="getDefaultValue",
+            schemata="urban_inquiry"
+        ),
         LinesField(
             name="derogation",
             widget=MultiSelect2Widget(
@@ -548,6 +557,13 @@ class Inquiry(BaseContent, BrowserDefaultMixin):
         return inqs
 
 
+    def get_impact_study_radius(self, has_impact_study):
+        """ """
+        if has_impact_study:
+            return "200m"
+        return "50m"
+
+
 registerType(Inquiry, PROJECTNAME)
 # end of class Inquiry
 

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/content/licence/BaseBuildLicence.py

@@ -159,6 +159,15 @@ slave_fields_composition = (
         "control_param": "composition",
     },
 )
+
+slave_fields_impact_study = (
+    {
+        "name": "investigation_radius",
+        "action": "value",
+        "vocab_method": "get_impact_study_radius",
+        "control_param": "has_impact_study",
+    },
+)
 ##/code-section module-header
 
 schema = Schema(
@@ -222,7 +231,8 @@ schema = Schema(
         BooleanField(
             name="impactStudy",
             default=False,
-            widget=BooleanField._properties["widget"](
+            widget=MasterBooleanWidget(
+                slave_fields=slave_fields_impact_study,
                 label=_("urban_label_impactStudy", default="Impactstudy"),
             ),
             schemata="urban_description",

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/content/licence/EnvironmentLicence.py

@@ -67,6 +67,14 @@ slave_fields_procedurechoice = [
     },
 ]
 
+slave_fields_has_environment_impact_study = (
+    {
+        "name": "investigation_radius",
+        "action": "value",
+        "vocab_method": "get_impact_study_radius",
+        "control_param": "has_impact_study",
+    },
+)
 ##/code-section module-header
 
 schema = Schema(
@@ -123,7 +131,8 @@ schema = Schema(
         BooleanField(
             name="hasEnvironmentImpactStudy",
             default=True,
-            widget=BooleanField._properties["widget"](
+            widget=MasterBooleanWidget(
+                slave_fields=slave_fields_has_environment_impact_study,
                 label=_(
                     "urban_label_hasEnvironmentImpactStudy",
                     default="Hasenvironmentimpactstudy",

{Products.urban-2.7.17 → Products.urban-2.7.18}/src/Products/urban/content/licence/GenericLicence.py

@@ -241,6 +241,16 @@ schema = Schema(
             ),
             schemata="urban_description",
         ),
+        StringField(
+            name="additionalReference",
+            widget=StringField._properties["widget"](
+                size=60,
+                label=_(
+                    "urban_label_additionalReference", default="Additionalreference"
+                ),
+            ),
+            schemata="urban_description",
+        ),
         DataGridField(
             name="workLocations",
             schemata="urban_description",
@@ -1876,6 +1886,7 @@ class GenericLicence(OrderedBaseFolder, UrbanBase, BrowserDefaultMixin):
             return translate(_("${nbr} days", mapping={"nbr": delay}), context=request)
         return delay
 
+
 registerType(GenericLicence, PROJECTNAME)
 # end of class GenericLicence
 

Products.urban-2.7.17/src/Products/urban/dashboard/config/codt_buildlicences.xml → Products.urban-2.7.18/src/Products/urban/dashboard/config/codt_article127s.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="codt_buildlicences" meta_type="ATFolder">
+<object name="codt_article127s" meta_type="ATFolder">
  <criteria>
   <criterion name="c1">
    <property name="widget">sorting</property>
@@ -25,7 +25,7 @@
    <property name="hidealloption">True</property>
    <property name="hide_category">True</property>
    <property name="sortreversed"></property>
-   <property name="default">b0efd11e10b041d4b4f5141322a8a488</property>
+   <property name="default">b7b6f14a4a7c48a7aeb039e4c5185da9</property>
   </criterion>
   <criterion name="c11">
    <property name="widget">daterange</property>
@@ -104,16 +104,16 @@
       name="autocomplete_view">cadastral-autocomplete-suggest</property>
    <property name="onlyallelements">True</property>
   </criterion>
-  <criterion name="c12">
-   <property name="widget">daterangecustom</property>
-   <property name="title">Date d'enquête</property>
+  <criterion name="c98">
+   <property name="widget">text</property>
+   <property name="title">Référence supplémentaire</property>
    <property name="position">top</property>
    <property name="section">advanced</property>
    <property name="hidden">False</property>
-   <property name="index">investigationStart</property>
+   <property name="index">getAdditionalReference</property>
    <property name="default"></property>
-   <property name="calYearRange">c-10:c+10</property>
-   <property name="index_end">investigationEnd</property>
+   <property name="onlyallelements">True</property>
+   <property name="wildcard">True</property>
   </criterion>
   <criterion name="c5">
    <property name="widget">text</property>
@@ -156,6 +156,7 @@
    <property name="vocabulary">urban.rootfolder_licence_state</property>
    <property name="catalog"></property>
    <property name="sortreversed">0</property>
+   
   </criterion>
   <criterion name="c0">
    <property name="widget">resultsperpage</property>

Products.urban-2.7.18/src/Products/urban/dashboard/config/codt_buildlicences.xml

@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<object name="codt_buildlicences" meta_type="ATFolder">
+ <criteria>
+  <criterion name="c1">
+   <property name="widget">sorting</property>
+   <property name="title">Tri</property>
+   <property name="position">top</property>
+   <property name="section">default</property>
+   <property name="hidden">True</property>
+   <property
+      name="vocabulary">eea.faceted.vocabularies.SortingCatalogIndexes</property>
+   <property name="default">created(reverse)</property>
+  </criterion>
+  <criterion name="c2">
+   <property name="widget">collection-link</property>
+   <property name="title">Procédures</property>
+   <property name="position">top</property>
+   <property name="section">default</property>
+   <property name="hidden">True</property>
+   <property name="count"></property>
+   <property name="sortcountable"></property>
+   <property name="hidezerocount"></property>
+   <property
+      name="vocabulary">collective.eeafaceted.collectionwidget.cachedcollectionvocabulary</property>
+   <property name="hidealloption">True</property>
+   <property name="hide_category">True</property>
+   <property name="sortreversed"></property>
+   <property name="default">b0efd11e10b041d4b4f5141322a8a488</property>
+  </criterion>
+  <criterion name="c11">
+   <property name="widget">daterange</property>
+   <property name="title">Date de la décision</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">getDecisionDate</property>
+   <property name="default"></property>
+   <property name="calYearRange">c-10:c+10</property>
+  </criterion>
+  <criterion name="c99">
+   <property name="widget">daterange</property>
+   <property name="title">Date de validité</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">getValidityDate</property>
+   <property name="default"></property>
+   <property name="calYearRange">c-10:c+10</property>
+  </criterion>
+  <criterion name="c10">
+   <property name="widget">text</property>
+   <property name="title">Demandeur</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">applicantInfosIndex</property>
+   <property name="default"></property>
+   <property name="onlyallelements">True</property>
+   <property name="wildcard">True</property>
+  </criterion>
+  <criterion name="c9">
+   <property name="widget">autocomplete</property>
+   <property name="title">Architecte</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">representatives</property>
+   <property name="default"></property>
+   <property
+      name="autocomplete_view">architects-autocomplete-suggest</property>
+   <property name="onlyallelements">True</property>
+  </criterion>
+  <criterion name="c4">
+   <property name="widget">autocomplete</property>
+   <property name="title">Rue</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">StreetsUID</property>
+   <property name="default"></property>
+   <property name="autocomplete_view">sreets-autocomplete-suggest</property>
+   <property name="onlyallelements">True</property>
+  </criterion>
+  <criterion name="c7">
+   <property name="widget">text</property>
+   <property name="title">N° de police</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">StreetNumber</property>
+   <property name="default"></property>
+   <property name="onlyallelements">True</property>
+   <property name="wildcard"></property>
+  </criterion>
+  <criterion name="c8">
+   <property name="widget">autocomplete</property>
+   <property name="title">Référence cadastrale</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">parcelInfosIndex</property>
+   <property name="default"></property>
+   <property
+      name="autocomplete_view">cadastral-autocomplete-suggest</property>
+   <property name="onlyallelements">True</property>
+  </criterion>
+  <criterion name="c12">
+   <property name="widget">daterangecustom</property>
+   <property name="title">Date d'enquête</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">investigationStart</property>
+   <property name="default"></property>
+   <property name="calYearRange">c-10:c+10</property>
+   <property name="index_end">investigationEnd</property>
+  </criterion>
+  <criterion name="c98">
+   <property name="widget">text</property>
+   <property name="title">Référence supplémentaire</property>
+   <property name="position">top</property>
+   <property name="section">advanced</property>
+   <property name="hidden">False</property>
+   <property name="index">getAdditionalReference</property>
+   <property name="default"></property>
+   <property name="onlyallelements">True</property>
+   <property name="wildcard">True</property>
+  </criterion>
+  <criterion name="c5">
+   <property name="widget">text</property>
+   <property name="title">Titre, référence</property>
+   <property name="position">center</property>
+   <property name="section">default</property>
+   <property name="hidden">False</property>
+   <property name="index">Title</property>
+   <property name="default"></property>
+   <property name="onlyallelements">True</property>
+   <property name="wildcard">True</property>
+  </criterion>
+  <criterion name="c6">
+   <property name="widget">select</property>
+   <property name="title">Agent traitant</property>
+   <property name="position">center</property>
+   <property name="section">default</property>
+   <property name="hidden">False</property>
+   <property name="count"></property>
+   <property name="sortcountable"></property>
+   <property name="hidezerocount"></property>
+   <property name="index">folder_manager</property>
+   <property name="vocabulary">urban.folder_managers</property>
+   <property name="catalog"></property>
+   <property name="sortreversed"></property>
+   <property name="default"></property>
+  </criterion>
+  <criterion name="c3">
+   <property name="widget">checkbox</property>
+   <property name="title">État</property>
+   <property name="position">center</property>
+   <property name="section">default</property>
+   <property name="hidden">False</property>
+   <property name="count">0</property>
+   <property name="sortcountable">0</property>
+   <property name="hidezerocount">0</property>
+   <property name="index">review_state</property>
+   <property name="operator">or</property>
+   <property name="operator_visible">0</property>
+   <property name="vocabulary">urban.rootfolder_licence_state</property>
+   <property name="catalog"></property>
+   <property name="sortreversed">0</property>
+  </criterion>
+  <criterion name="c0">
+   <property name="widget">resultsperpage</property>
+   <property name="title">Results per page</property>
+   <property name="position">center</property>
+   <property name="section">default</property>
+   <property name="hidden">False</property>
+   <property name="start">0</property>
+   <property name="end">50</property>
+   <property name="step">10</property>
+   <property name="default">20</property>
+  </criterion>
+ </criteria>
+</object>