Products.urban 2.5.0.dev8__tar.gz → 2.5.0.dev10__tar.gz

{Products.urban-2.5.0.dev8/src/Products.urban.egg-info → Products.urban-2.5.0.dev10}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev8
+Version: 2.5.0.dev10
 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.dev8 → Products.urban-2.5.0.dev10}/docs/CHANGES.rst

@@ -8,6 +8,37 @@ Changelog
 
 .. towncrier release notes start
 
+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)
 -----------------------
 

{Products.urban-2.5.0.dev8 → Products.urban-2.5.0.dev10}/setup.py

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

{Products.urban-2.5.0.dev8 → Products.urban-2.5.0.dev10}/src/Products/urban/browser/templates/urbaneventinquiryview.pt

@@ -205,6 +205,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.dev8 → Products.urban-2.5.0.dev10}/src/Products/urban/browser/urbaneventviews.py

@@ -2,6 +2,7 @@
 
 from Acquisition import aq_inner
 from DateTime import DateTime
+from Products.statusmessages.interfaces import IStatusMessage
 from Products.urban import utils
 from Products.Five import BrowserView
 from Products.urban import UrbanMessage as _
@@ -25,6 +26,7 @@ from zope.annotation import interfaces
 from zope.interface import Interface
 
 import csv
+import collections
 
 claimants_csv_fieldnames = [
     "numerotation",
@@ -245,7 +247,7 @@ class UrbanEventView(BrowserView):
 
 class IImportClaimantListingForm(Interface):
 
-    listing_file = NamedFile(title=_(u"Listing file"))
+    listing_file_claimants = NamedFile(title=_(u'Listing file (claimants)'))
 
 
 class ImportClaimantListingForm(form.Form):
@@ -254,7 +256,7 @@ class ImportClaimantListingForm(form.Form):
     fields = field.Fields(IImportClaimantListingForm)
     ignoreContext = True
 
-    @button.buttonAndHandler(_("Import"), name="import")
+    @button.buttonAndHandler(_('Import'), name='import-claimants')
     def handleImport(self, action):
         inquiry_UID = self.context.UID()
         planned_claimants_import = (
@@ -269,7 +271,7 @@ class ImportClaimantListingForm(form.Form):
             if inquiry_UID in planned_claimants_import:
                 planned_claimants_import.remove(inquiry_UID)
         else:
-            csv_file = data["listing_file"]
+            csv_file = data['listing_file_claimants']
             csv_integrity_error = self.validate_csv_integrity(csv_file)
             if csv_integrity_error:
                 api.portal.show_message(csv_integrity_error, self.request, "error")
@@ -312,6 +314,107 @@ class ImportClaimantListingForm(form.Form):
         return None
 
 
+class IImportRecipientListingForm(Interface):
+
+    listing_file_recipients = NamedFile(title=_(u"Listing file (recipients)"))
+
+
+class ImportRecipientListingForm(form.Form):
+
+    method = "post"
+    fields = field.Fields(IImportRecipientListingForm)
+    ignoreContext = True
+
+    @button.buttonAndHandler(_("Import"), name="import-recipients")
+    def handleImport(self, action):
+        self.import_recipients_from_csv()
+        self.request.response.redirect(
+            self.context.absolute_url()
+            + "/#fieldsetlegend-urbaneventinquiry_recipients"
+        )
+
+    def import_recipients_from_csv(self):
+        data, errors = self.extractData()
+        if errors:
+            return False
+
+        fieldnames = [
+            "name",
+            "firstname",
+            "street",
+            "number",
+            "number_index",
+            "zipcode",
+            "city",
+            "country",
+            "status",
+            "id",  # extra, is read as an empty column
+        ]
+
+        csv_file = data["listing_file_recipients"]
+        data = csv_file.data
+        if data:
+            reader = csv.DictReader(
+                StringIO(data), fieldnames, delimiter=",", quotechar='"'
+            )
+        else:
+            reader = []
+
+        try:
+            recipient_args = [row for row in reader if row["name"]][1:]
+        except csv.Error, error:
+            IStatusMessage(self.request).addStatusMessage(
+                _(
+                    u"The CSV file couldn't be read properly. Please verify its structure and try again."
+                ),
+                type="error",
+            )
+            return
+
+        portal_urban = api.portal.get_tool("portal_urban")
+        plone_utils = api.portal.get_tool("plone_utils")
+
+        country_mapping = {"": ""}
+        country_folder = portal_urban.country
+        for country_obj in country_folder.objectValues():
+            country_mapping[country_obj.Title()] = country_obj.id
+
+        for recipient_arg in recipient_args:
+
+            if not recipient_arg["id"]:
+                recipient_arg["id"] = plone_utils.normalizeString(
+                    " ".join([recipient_arg["name"], recipient_arg["firstname"]])
+                )
+                if recipient_arg["id"] in self.context.objectIds():
+                    count = 1
+                    new_id = "{0}-{1}".format(recipient_arg["id"], count)
+                    while new_id in self.context.objectIds():
+                        count += 1
+                        new_id = "{0}-{1}".format(recipient_arg["id"], count)
+                    recipient_arg["id"] = new_id
+
+            recipient_arg["country"] = country_mapping.get(
+                recipient_arg["country"], None
+            )  # ignore country if it's missing in the country vocabulary
+            recipient_arg["adr1"] = "{} {}".format(
+                recipient_arg["zipcode"], recipient_arg["city"]
+            )
+            adr2 = "{} {}".format(
+                recipient_arg["street"], recipient_arg["number"]
+            )
+            if recipient_arg["number_index"]:
+                adr2 = "{} ({})".format(adr2, recipient_arg["number_index"])
+            recipient_arg["adr2"] = adr2
+            # create recipient
+            with api.env.adopt_roles(["Manager"]):
+                recipient_id = self.context.invokeFactory(
+                    "RecipientCadastre", **recipient_arg
+                )
+                recipient_obj = getattr(self.context, recipient_id)
+
+        plone_utils.addPortalMessage(_("urban_imported_recipients"), type="info")
+
+
 class UrbanEventInquiryBaseView(UrbanEventView, MapView, LicenceView):
     """
     This manage the base view of UrbanEventInquiry
@@ -325,6 +428,8 @@ class UrbanEventInquiryBaseView(UrbanEventView, MapView, LicenceView):
         self.request.set("disable_plone.leftcolumn", 1)
         self.import_claimants_listing_form = ImportClaimantListingForm(context, request)
         self.import_claimants_listing_form.update()
+        self.import_recipients_listing_form = ImportRecipientListingForm(context, request)
+        self.import_recipients_listing_form.update()
 
     @property
     def has_planned_claimant_import(self):

{Products.urban-2.5.0.dev8 → Products.urban-2.5.0.dev10}/src/Products/urban/content/licence/CODT_BaseBuildLicence.py

@@ -455,6 +455,14 @@ schema = Schema(
                 "general_disposition", inUrbanConfig=False, with_empty_value=True
             ),
         ),
+        BooleanField(
+            name="d67copat",
+            default=False,
+            widget=BooleanField._properties["widget"](
+                label=_("urban_label_d67copat", default="D.67 CoPat"),
+            ),
+            schemata="urban_patrimony",
+        ),
         BooleanField(
             name="financial_caution",
             default=False,

{Products.urban-2.5.0.dev8 → Products.urban-2.5.0.dev10}/src/Products/urban/content/licence/GenericLicence.py

@@ -1563,6 +1563,16 @@ class GenericLicence(BaseFolder, UrbanBase, BrowserDefaultMixin):
         if events:
             return events[0]
 
+    def getLastEventWithValidityDate(self):
+        events = [
+            event
+            for event in self.getAllEvents()
+            if getattr(event, "validityEndDate", None) is not None
+        ]
+        if len(events) == 0:
+            return None
+        return events[-1]
+
     def get_bound_roaddecrees(self):
         roaddecrees = []
         annotations = IAnnotations(self)

{Products.urban-2.5.0.dev8 → Products.urban-2.5.0.dev10}/src/Products/urban/dashboard/config/all.xml

@@ -135,5 +135,15 @@
    <property name="step">10</property>
    <property name="default">20</property>
   </criterion>
+  <criterion name="validity-date">
+   <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>
  </criteria>
 </object>

Products.urban-2.5.0.dev8/src/Products/urban/dashboard/config/buildlicences.xml → Products.urban-2.5.0.dev10/src/Products/urban/dashboard/config/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">1</property>
    <property name="maxitems"></property>
    <property name="sortreversed"></property>
-   <property name="default">b0efd11e10b041d4b4f5141322a8a488</property>
+   <property name="default">b7b6f14a4a7c48a7aeb039e4c5185da9</property>
   </criterion>
   <criterion name="c11">
    <property name="widget">daterange</property>
@@ -94,17 +94,6 @@
       name="autocomplete_view">cadastral-autocomplete-suggest</property>
    <property name="onlyallelements">1</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">0</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="c5">
    <property name="widget">text</property>
    <property name="title">Titre, référence</property>
@@ -160,5 +149,15 @@
    <property name="step">10</property>
    <property name="default">20</property>
   </criterion>
+  <criterion name="validity-date">
+   <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>
  </criteria>
 </object>

Products.urban-2.5.0.dev10/src/Products/urban/dashboard/config/buildlicences.xml

@@ -0,0 +1,174 @@
+<?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">1</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">1</property>
+   <property name="count"></property>
+   <property name="sortcountable"></property>
+   <property name="hidezerocount"></property>
+   <property
+      name="vocabulary">imio.dashboard.conditionawarecollectionvocabulary</property>
+   <property name="hidealloption">1</property>
+   <property name="maxitems"></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">0</property>
+   <property name="index">getDecisionDate</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">0</property>
+   <property name="index">applicantInfosIndex</property>
+   <property name="default"></property>
+   <property name="onlyallelements">1</property>
+   <property name="wildcard">1</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">0</property>
+   <property name="index">representatives</property>
+   <property name="default"></property>
+   <property
+      name="autocomplete_view">architects-autocomplete-suggest</property>
+   <property name="onlyallelements">1</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">0</property>
+   <property name="index">StreetsUID</property>
+   <property name="default"></property>
+   <property name="autocomplete_view">sreets-autocomplete-suggest</property>
+   <property name="onlyallelements">1</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">0</property>
+   <property name="index">StreetNumber</property>
+   <property name="default"></property>
+   <property name="onlyallelements">1</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">0</property>
+   <property name="index">parcelInfosIndex</property>
+   <property name="default"></property>
+   <property
+      name="autocomplete_view">cadastral-autocomplete-suggest</property>
+   <property name="onlyallelements">1</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">0</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="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">0</property>
+   <property name="index">Title</property>
+   <property name="default"></property>
+   <property name="onlyallelements">1</property>
+   <property name="wildcard">1</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">0</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">0</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="maxitems"></property>
+   <property name="sortreversed">0</property>
+   <property name="default"/>
+  </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">0</property>
+   <property name="start"></property>
+   <property name="end">50</property>
+   <property name="step">10</property>
+   <property name="default">20</property>
+  </criterion>
+  <criterion name="validity-date">
+   <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>
+ </criteria>
+</object>

Products.urban-2.5.0.dev8/src/Products/urban/dashboard/config/codt_buildlicences.xml → Products.urban-2.5.0.dev10/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">1</property>
    <property name="maxitems"></property>
    <property name="sortreversed"></property>
-   <property name="default">b0efd11e10b041d4b4f5141322a8a488</property>
+   <property name="default">b7b6f14a4a7c48a7aeb039e4c5185da9</property>
   </criterion>
   <criterion name="c11">
    <property name="widget">daterange</property>
@@ -94,17 +94,6 @@
       name="autocomplete_view">cadastral-autocomplete-suggest</property>
    <property name="onlyallelements">1</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">0</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="c5">
    <property name="widget">text</property>
    <property name="title">Titre, référence</property>
@@ -160,5 +149,15 @@
    <property name="step">10</property>
    <property name="default">20</property>
   </criterion>
+  <criterion name="validity-date">
+   <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>
  </criteria>
 </object>