Products.urban 2.7.10__tar.gz → 2.7.12__tar.gz

{Products.urban-2.7.10 → Products.urban-2.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.10
+Version: 2.7.12
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -52,6 +52,40 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.12 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Fix wrong files export
+  [jchandelle] (MURBMONA-48)
+
+
+2.7.11 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Add event sub file in export content
+  Add missing portal_type to export sub content
+  [jchandelle] (MURBMONA-48)
+
+
+Internal:
+
+
+- Add `withtitle` parameter to the getApplicantsSignaletic method
+  [fngaha] (SUP-33759)
+- Improve merge fields
+  Provide a merge field that only returns streets
+  Adapt the getStreetAndNumber method field to be able to receive a separation parameter between the street and the number
+  [fngaha] (SUP-34184)
+- Update the translation of empty fields
+  [fngaha] (URB-3079)
+
+
 2.7.10 (2024-04-10)
 -------------------
 

{Products.urban-2.7.10 → Products.urban-2.7.12}/docs/CHANGES.rst

@@ -8,6 +8,40 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.12 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Fix wrong files export
+  [jchandelle] (MURBMONA-48)
+
+
+2.7.11 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Add event sub file in export content
+  Add missing portal_type to export sub content
+  [jchandelle] (MURBMONA-48)
+
+
+Internal:
+
+
+- Add `withtitle` parameter to the getApplicantsSignaletic method
+  [fngaha] (SUP-33759)
+- Improve merge fields
+  Provide a merge field that only returns streets
+  Adapt the getStreetAndNumber method field to be able to receive a separation parameter between the street and the number
+  [fngaha] (SUP-34184)
+- Update the translation of empty fields
+  [fngaha] (URB-3079)
+
+
 2.7.10 (2024-04-10)
 -------------------
 

{Products.urban-2.7.10 → Products.urban-2.7.12}/setup.py

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

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/Applicant.py

@@ -304,7 +304,9 @@ class Applicant(BaseContent, Contact, BrowserDefaultMixin):
         ]
         return DisplayList(tuple(vocabulary))
 
-    def _getNameSignaletic(self, short, linebyline, reverse=False, invertnames=False):
+    def _getNameSignaletic(
+        self, short, linebyline, reverse=False, invertnames=False, withtitle=True
+    ):
         title = self.getPersonTitleValue(short, linebyline, reverse)
         name1 = self.getName1().decode("utf-8")
         name2 = self.getName2().decode("utf-8")
@@ -314,7 +316,10 @@ class Applicant(BaseContent, Contact, BrowserDefaultMixin):
             names = u"%s %s" % (name2, name1)
         names = names.strip()
         namepart = namedefined and names or self.getSociety().decode("utf-8")
-        nameSignaletic = u"%s %s" % (title, namepart)
+        if withtitle:
+            nameSignaletic = u"%s %s" % (title, namepart)
+        else:
+            nameSignaletic = u"%s" % (namepart)
         if len(self.getRepresentedBy()) > 0 or self.getRepresentedBySociety():
             person_title = self.getPersonTitle(theObject=True)
             representatives = (
@@ -335,12 +340,19 @@ class Applicant(BaseContent, Contact, BrowserDefaultMixin):
                     represented = u"représentée"
                 elif gender == "female" and multiplicity == "plural":
                     represented = u"représentées"
-            nameSignaletic = u"%s %s %s par %s" % (
-                title,
-                namepart,
-                represented,
-                representatives.decode("utf-8"),
-            )
+            if withtitle:
+                nameSignaletic = u"%s %s %s par %s" % (
+                    title,
+                    namepart,
+                    represented,
+                    representatives.decode("utf-8"),
+                )
+            else:
+                nameSignaletic = u"%s %s par %s" % (
+                    namepart,
+                    represented,
+                    representatives.decode("utf-8"),
+                )
         if linebyline:
             # escape HTML special characters like HTML entities
             return cgi.escape(nameSignaletic)

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/Contact.py

@@ -296,6 +296,7 @@ class Contact(BaseContent, BrowserDefaultMixin):
         reverse=False,
         remove_comma=False,
         inverted_address=False,
+        withtitle=True,
     ):
         """
         Returns the contact base signaletic : title and names
@@ -303,7 +304,7 @@ class Contact(BaseContent, BrowserDefaultMixin):
         urban_tool = api.portal.get_tool("portal_urban")
         invertnames = urban_tool.getInvertAddressNames()
         nameSignaletic = self._getNameSignaletic(
-            short, linebyline, reverse, invertnames
+            short, linebyline, reverse, invertnames, withtitle=withtitle
         )
         if not withaddress:
             if not linebyline:
@@ -364,7 +365,9 @@ class Contact(BaseContent, BrowserDefaultMixin):
                 address = u"<p>%s<br />%s</p>" % (nameSignaletic, addressSignaletic)
                 return address
 
-    def _getNameSignaletic(self, short, linebyline, reverse=False, invertnames=False):
+    def _getNameSignaletic(
+        self, short, linebyline, reverse=False, invertnames=False, withtitle=True
+    ):
         title = self.getPersonTitleValue(short, False, reverse)
         name1 = self.getName1().decode("utf-8")
         name2 = self.getName2().decode("utf-8")
@@ -375,7 +378,10 @@ class Contact(BaseContent, BrowserDefaultMixin):
             names = u"%s %s" % (name2, name1)
         names = names.strip()
         namepart = namedefined and names or society
-        nameSignaletic = u"%s %s" % (title, namepart)
+        if withtitle:
+            nameSignaletic = u"%s %s" % (title, namepart)
+        else:
+            nameSignaletic = u"%s" % (namepart)
         nameSignaletic = nameSignaletic.strip()
         if linebyline:
             # escape HTML special characters like HTML entities

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/Corporation.py

@@ -216,7 +216,9 @@ class Corporation(BaseContent, Applicant, BrowserDefaultMixin):
         )
         return title
 
-    def _getNameSignaletic(self, short, linebyline, reverse=False, invertnames=False):
+    def _getNameSignaletic(
+        self, short, linebyline, reverse=False, invertnames=False, withtitle=True
+    ):
         title = self.getPersonTitleValue(short, False, reverse).decode("utf8")
         legalForm = self.getLegalForm().decode("utf8")
         denomination = self.getDenomination().decode("utf8")
@@ -226,19 +228,27 @@ class Corporation(BaseContent, Applicant, BrowserDefaultMixin):
         nameSignaletic = u"{} {}".format(legalForm, denomination)
         if linebyline:
             # escape HTML special characters like HTML entities
-            title = cgi.escape(title)
             legalForm = cgi.escape(legalForm)
             denomination = cgi.escape(denomination)
             firstName = cgi.escape(firstName)
             lastName = cgi.escape(lastName)
             personRole = cgi.escape(personRole)
-            nameSignaletic = u"%s %s<br />%s %s %s" % (
-                legalForm,
-                denomination,
-                title,
-                firstName,
-                lastName,
-            )
+            if withtitle:
+                title = cgi.escape(title)
+                nameSignaletic = u"%s %s<br />%s %s %s" % (
+                    legalForm,
+                    denomination,
+                    title,
+                    firstName,
+                    lastName,
+                )
+            else:
+                nameSignaletic = u"%s %s<br />%s %s %s" % (
+                    legalForm,
+                    denomination,
+                    firstName,
+                    lastName,
+                )
         return nameSignaletic
 
 

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/Couple.py

@@ -134,7 +134,9 @@ class Couple(BaseContent, Applicant, BrowserDefaultMixin):
             self.getCouplePerson2Firstname(),
         )
 
-    def _getNameSignaletic(self, short, linebyline, reverse=False, invertnames=False):
+    def _getNameSignaletic(
+        self, short, linebyline, reverse=False, invertnames=False, withtitle=True
+    ):
         title = self.getPersonTitleValue(short, False, reverse).decode("utf8")
         lastNamePerson1 = self.getCouplePerson1Name().decode("utf-8")
         firstNamePerson1 = self.getCouplePerson1Firstname().decode("utf-8")
@@ -159,7 +161,10 @@ class Couple(BaseContent, Applicant, BrowserDefaultMixin):
         names = names.strip()
         if namedefined:
             namepart = names
-        nameSignaletic = u"%s %s" % (title, namepart)
+        if withtitle:
+            nameSignaletic = u"%s %s" % (title, namepart)
+        else:
+            nameSignaletic = u"%s" % (namepart)
         nameSignaletic = nameSignaletic.strip()
         if len(self.getRepresentedBy()) > 0:
             person_title = self.getPersonTitle(theObject=True)
@@ -177,12 +182,19 @@ class Couple(BaseContent, Applicant, BrowserDefaultMixin):
                     represented = u"représentée"
                 elif gender == "female" and multiplicity == "plural":
                     represented = u"représentées"
-            nameSignaletic = u"%s %s %s par %s" % (
-                title,
-                namepart,
-                represented,
-                representatives.decode("utf-8"),
-            )
+            if withtitle:
+                nameSignaletic = u"%s %s %s par %s" % (
+                    title,
+                    namepart,
+                    represented,
+                    representatives.decode("utf-8"),
+                )
+            else:
+                nameSignaletic = u"%s %s par %s" % (
+                    namepart,
+                    represented,
+                    representatives.decode("utf-8"),
+                )
         if linebyline:
             # escape HTML special characters like HTML entities
             return cgi.escape(nameSignaletic)

Products.urban-2.7.12/src/Products/urban/browser/exportimport/export_content.py

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+from collective.exportimport.export_content import ExportContent
+from plone.restapi.interfaces import ISerializeToJson
+from Products.urban.config import URBAN_TYPES
+from zope.component import getMultiAdapter
+
+
+class UrbanExportContent(ExportContent):
+    def _serializer(self, obj, with_files=False):
+        serializer = getMultiAdapter((obj, self.request), ISerializeToJson)
+        item = serializer()
+        if with_files:
+            sub_files = obj.listFolderContents(
+                contentFilter={"portal_type": "File"}
+            )
+            for file in sub_files:
+                file_serializer = getMultiAdapter((file, self.request), ISerializeToJson)
+                if "documents" not in item:
+                    item["documents"] = []
+                item["documents"].append(self.update_data_for_migration(file_serializer(), obj))
+        item["@id"] = obj.absolute_url()
+        return self.update_data_for_migration(item, obj)
+
+    def global_dict_hook(self, item, obj):
+        item = super(UrbanExportContent, self).global_dict_hook(item, obj)
+        if item["@type"] in URBAN_TYPES:
+            item["events"] = [
+                self._serializer(event, with_files=True)
+                for event in obj.listFolderContents(
+                    contentFilter={"portal_type": [
+                        "UrbanEvent",
+                        "UrbanEventAnnouncement",
+                        "UrbanEventCollege",
+                        "UrbanEventNotificationCollege",
+                        "UrbanEventOpinionRequest",
+                        "UrbanEventInquiry",
+                        "UrbanEventMayor",
+                        "CODT_Inquiry",
+                        "Inquiry",
+                        "CODT_UniqueLicenceInquiry",
+                        "UrbanEventInspectionReport",
+                        "UrbanEventFollowUp",
+                    ]}
+                )
+            ]
+            item["parcels"] = [
+                self._serializer(event)
+                for event in obj.listFolderContents(
+                    contentFilter={"portal_type": "Parcel"}
+                )
+            ]
+            item["notary_worklocation"] = [
+                self._serializer(event)
+                for event in obj.listFolderContents(
+                    contentFilter={"portal_type": "WorkLocation"}
+                )
+            ]
+            item["applicants"] = [
+                self._serializer(event)
+                for event in obj.listFolderContents(
+                    contentFilter={"portal_type": [
+                        "Applicant",
+                        "Couple",
+                        "Corporation",
+                        "Proprietary",
+                        "CorporationProprietary",
+                        "ProprietaryCouple",
+                        "Tenant",
+                        "Plaintiff",
+                        "CorporationPlaintiff",
+                    ]}
+                )
+            ]
+        return item
+
+    def update_data_for_migration(self, item, obj):
+        item.pop("@components", None)
+        item.pop("next_item", None)
+        item.pop("batching", None)
+        item.pop("items", None)
+        item.pop("previous_item", None)
+        item.pop("immediatelyAddableTypes", None)
+        item.pop("locallyAllowedTypes", None)
+        return item

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/content/licence/EnvironmentLicence.py

@@ -280,7 +280,7 @@ class EnvironmentLicence(BaseFolder, EnvironmentBase, BrowserDefaultMixin):
 
     security.declarePublic("getApplicantsSignaletic")
 
-    def getApplicantsSignaletic(self, withaddress=False):
+    def getApplicantsSignaletic(self, withaddress=False, withtitle=True):
         """
         Returns a string representing the signaletic of every applicants
         """
@@ -292,7 +292,9 @@ class EnvironmentLicence(BaseFolder, EnvironmentBase, BrowserDefaultMixin):
                 signaletic += " %s " % translate(
                     "and", "urban", context=self.REQUEST
                 ).encode("utf8")
-            signaletic += applicant.getSignaletic(withaddress=withaddress)
+            signaletic += applicant.getSignaletic(
+                withaddress=withaddress, withtitle=withtitle
+            )
         return signaletic
 
     security.declarePublic("updateTitle")

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/content/licence/ExplosivesPossession.py

@@ -77,7 +77,7 @@ class ExplosivesPossession(BaseFolder, EnvironmentLicence, BrowserDefaultMixin):
 
     security.declarePublic("getApplicantsSignaletic")
 
-    def getApplicantsSignaletic(self, withaddress=False):
+    def getApplicantsSignaletic(self, withaddress=False, withtitle=True):
         """
         Returns a string representing the signaletic of every applicants
         """
@@ -89,7 +89,9 @@ class ExplosivesPossession(BaseFolder, EnvironmentLicence, BrowserDefaultMixin):
                 signaletic += " %s " % translate(
                     "and", "urban", context=self.REQUEST
                 ).encode("utf8")
-            signaletic += applicant.getSignaletic(withaddress=withaddress)
+            signaletic += applicant.getSignaletic(
+                withaddress=withaddress, withtitle=withtitle
+            )
         return signaletic
 
     security.declarePublic("updateTitle")

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/content/licence/base.py

@@ -213,7 +213,7 @@ class UrbanBase(object):
     security.declarePublic("getApplicantsSignaletic")
 
     def getApplicantsSignaletic(
-        self, withaddress=False, linebyline=False, remove_comma=False
+        self, withaddress=False, linebyline=False, remove_comma=False, withtitle=True
     ):
         """
         Returns a string representing the signaletic of every applicants
@@ -227,7 +227,10 @@ class UrbanBase(object):
                     "and", "urban", context=self.REQUEST
                 ).encode("utf8")
             signaletic += applicant.getSignaletic(
-                withaddress=withaddress, linebyline=linebyline, remove_comma=False
+                withaddress=withaddress,
+                linebyline=linebyline,
+                remove_comma=False,
+                withtitle=withtitle,
             )
         return signaletic
 
@@ -504,7 +507,7 @@ class UrbanBase(object):
 
     security.declarePublic("getStreetAndNumber")
 
-    def getStreetAndNumber(self):
+    def getStreetAndNumber(self, separator=None):
         """
         Returns a string reprensenting the different streets and numbers
         """
@@ -513,11 +516,11 @@ class UrbanBase(object):
         if adress_signaletic_adapter:
             return adress_signaletic_adapter.get_street_and_number()
 
-        return self.getDefaultStreetAndNumber()
+        return self.getDefaultStreetAndNumber(separator=separator)
 
     security.declarePublic("getDefaultStreetAndNumber")
 
-    def getDefaultStreetAndNumber(self):
+    def getDefaultStreetAndNumber(self, separator=""):
         """
         Returns a string reprensenting the different streets and numbers
         """
@@ -532,14 +535,33 @@ class UrbanBase(object):
             streetName = street.getStreetName()
             number = wl["number"]
             if number:
-                signaletic = "{} {} {}".format(
-                    signaletic, streetName, convert_to_utf8(number)
+                signaletic = "{} {}{} {}".format(
+                    signaletic, streetName, separator, convert_to_utf8(number)
                 )
             else:
                 signaletic = "{} {}".format(signaletic, streetName)
 
         return signaletic
 
+    security.declarePublic("getStreets")
+    
+    def getStreets(self):
+        """
+        Returns a string representing the different streets
+        """
+        catalog = api.portal.get_tool("uid_catalog")
+        signaletic = ""
+
+        for wl in self.getWorkLocations():
+            street_brains = catalog(UID=wl["street"])
+            if not street_brains:
+                continue
+            street = street_brains[0].getObject()
+            streetName = unicode(street.getStreetName(), "utf-8")
+            signaletic = "{} {}".format(signaletic, streetName)
+
+        return signaletic
+
     security.declarePublic("hasSingleApplicant")
 
     def hasSingleApplicant(self):

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products/urban/locales/fr/LC_MESSAGES/urban.po

@@ -1190,7 +1190,7 @@ msgstr "Attention, aucune adresse de travaux définie"
 #: ../browser/licence/templates/licencemacros.pt:5
 #: ../browser/licence/templates/licencetabsmacros.pt:92
 msgid "content_none"
-msgstr "N.C."
+msgstr "-"
 
 #. Default: "Contact person address / headoffice"
 #: ../browser/templates/contactmacros.pt:135

{Products.urban-2.7.10 → Products.urban-2.7.12}/src/Products.urban.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.10
+Version: 2.7.12
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -52,6 +52,40 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.12 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Fix wrong files export
+  [jchandelle] (MURBMONA-48)
+
+
+2.7.11 (2024-04-25)
+-------------------
+
+Bug fixes:
+
+
+- Add event sub file in export content
+  Add missing portal_type to export sub content
+  [jchandelle] (MURBMONA-48)
+
+
+Internal:
+
+
+- Add `withtitle` parameter to the getApplicantsSignaletic method
+  [fngaha] (SUP-33759)
+- Improve merge fields
+  Provide a merge field that only returns streets
+  Adapt the getStreetAndNumber method field to be able to receive a separation parameter between the street and the number
+  [fngaha] (SUP-34184)
+- Update the translation of empty fields
+  [fngaha] (URB-3079)
+
+
 2.7.10 (2024-04-10)
 -------------------
 

Products.urban-2.7.10/src/Products/urban/browser/exportimport/export_content.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from collective.exportimport.export_content import ExportContent
-from plone.restapi.interfaces import ISerializeToJson
-from Products.urban.config import URBAN_TYPES
-from zope.component import getMultiAdapter
-
-
-class UrbanExportContent(ExportContent):
-    def _serializer(self, obj):
-        serializer = getMultiAdapter((obj, self.request), ISerializeToJson)
-        item = serializer()
-        item["@id"] = obj.absolute_url()
-        return self.update_data_for_migration(item, obj)
-
-    def global_dict_hook(self, item, obj):
-        item = super(UrbanExportContent, self).global_dict_hook(item, obj)
-        if item["@type"] in URBAN_TYPES:
-            item["events"] = [
-                self._serializer(event)
-                for event in obj.listFolderContents(
-                    contentFilter={"portal_type": "UrbanEvent"}
-                )
-            ]
-            item["parcels"] = [
-                self._serializer(event)
-                for event in obj.listFolderContents(
-                    contentFilter={"portal_type": "Parcel"}
-                )
-            ]
-            item["applicants"] = [
-                self._serializer(event)
-                for event in obj.listFolderContents(
-                    contentFilter={"portal_type": "Applicant"}
-                )
-            ]
-        return item
-
-    def update_data_for_migration(self, item, obj):
-        item.pop("@components", None)
-        item.pop("next_item", None)
-        item.pop("batching", None)
-        item.pop("items", None)
-        item.pop("previous_item", None)
-        item.pop("immediatelyAddableTypes", None)
-        item.pop("locallyAllowedTypes", None)
-        return item