docassemble.AssemblyLine 4.6.2__tar.gz → 4.6.3__tar.gz

{docassemble_assemblyline-4.6.2/docassemble.AssemblyLine.egg-info → docassemble_assemblyline-4.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docassemble.AssemblyLine
-Version: 4.6.2
+Version: 4.6.3
 Summary: Quickly go from a paper court form to a runnable, guided, step-by-step web application powered by Docassemble. Swap out branding and pre-built questions to meet your needs.
 Author-email: Suffolk Legal Innovation and Technology Lab <litlab@suffolk.edu>
 License-Expression: MIT

docassemble_assemblyline-4.6.3/docassemble/AssemblyLine/__init__.py

@@ -0,0 +1 @@
+__version__ = '4.6.3'

{docassemble_assemblyline-4.6.2 → docassemble_assemblyline-4.6.3}/docassemble/AssemblyLine/al_general.py

@@ -275,12 +275,18 @@ class ALAddress(Address):
                 }
             )
 
+        # All 'field' entries start with the full name of the object (i.e. 'users[1].address...'),
+        # so make sure the keys in maxlengths and required have that prefix
+        prefix = self.attr_name("")
+        rename_key = lambda key: key if key.startswith(prefix) else prefix + key
         if maxlengths:
+            maxlengths = {rename_key(k): v for k, v in maxlengths.items()}
             for field in fields:
                 if field["field"] in maxlengths:
                     field["maxlength"] = maxlengths[field["field"]]
 
         if required:
+            required = {rename_key(k): v for k, v in required.items()}
             for field in fields:
                 if field["field"] in required:
                     field["required"] = required[field["field"]]
@@ -1223,17 +1229,6 @@ class ALIndividual(Individual):
                 for field in fields:
                     field["show if"] = show_if
 
-            if maxlengths:
-                for field in fields:
-                    if field["field"] in maxlengths:
-                        field["maxlength"] = maxlengths[field["field"]]
-
-            if required:
-                for field in fields:
-                    if field["field"] in required:
-                        field["required"] = required[field["field"]]
-
-            return fields
         elif person_or_business == "business":
             fields = [
                 {
@@ -1244,17 +1239,6 @@ class ALIndividual(Individual):
             if show_if:
                 fields[0]["show if"] = show_if
 
-            if maxlengths:
-                for field in fields:
-                    if field["field"] in maxlengths:
-                        field["maxlength"] = maxlengths[field["field"]]
-
-            if required:
-                for field in fields:
-                    if field["field"] in required:
-                        field["required"] = required[field["field"]]
-
-            return fields
         else:
             # Note: the labels are template block objects: if they are keys,
             # they should be converted to strings first
@@ -1317,17 +1301,23 @@ class ALIndividual(Individual):
                 }
             )
 
-            if maxlengths:
-                for field in fields:
-                    if field["field"] in maxlengths:
-                        field["maxlength"] = maxlengths[field["field"]]
+        # All 'field' entries start with the full name of the object (i.e. 'users[1].address...'),
+        # so make sure the keys in maxlengths and required have that prefix
+        prefix = self.attr_name("name.")
+        rename_key = lambda key: key if key.startswith(prefix) else prefix + key
+        if maxlengths:
+            maxlengths = {rename_key(k): v for k, v in maxlengths.items()}
+            for field in fields:
+                if field["field"] in maxlengths:
+                    field["maxlength"] = maxlengths[field["field"]]
 
-            if required:
-                for field in fields:
-                    if field["field"] in required:
-                        field["required"] = required[field["field"]]
+        if required:
+            required = {rename_key(k): v for k, v in required.items()}
+            for field in fields:
+                if field["field"] in required:
+                    field["required"] = required[field["field"]]
 
-            return fields
+        return fields
 
     def address_fields(
         self,
@@ -1428,12 +1418,18 @@ class ALIndividual(Individual):
         if show_if:
             fields[0]["show if"] = show_if
 
+        # All 'field' entries start with the full name of the object (i.e. 'users[1].address...'),
+        # so make sure the keys in maxlengths and required have that prefix
+        prefix = self.attr_name("")
+        rename_key = lambda key: key if key.startswith(prefix) else prefix + key
         if maxlengths:
+            maxlengths = {rename_key(k): v for k, v in maxlengths.items()}
             for field in fields:
                 if field["field"] in maxlengths:
                     field["maxlength"] = maxlengths[field["field"]]
 
         if required:
+            required = {rename_key(k): v for k, v in required.items()}
             for field in fields:
                 if field["field"] in required:
                     field["required"] = required[field["field"]]
@@ -1590,12 +1586,18 @@ class ALIndividual(Individual):
         if show_if:
             fields[0]["show if"] = show_if
 
+        # All 'field' entries start with the full name of the object (i.e. 'users[1].address...'),
+        # so make sure the keys in maxlengths and required have that prefix
+        prefix = self.attr_name("")
+        rename_key = lambda key: key if key.startswith(prefix) else prefix + key
         if maxlengths:
+            maxlengths = {rename_key(k): v for k, v in maxlengths.items()}
             for field in fields:
                 if field["field"] in maxlengths:
                     field["maxlength"] = maxlengths[field["field"]]
 
         if required:
+            required = {rename_key(k): v for k, v in required.items()}
             for field in fields:
                 if field["field"] in required:
                     field["required"] = required[field["field"]]

{docassemble_assemblyline-4.6.2 → docassemble_assemblyline-4.6.3}/docassemble/AssemblyLine/test_al_general.py

@@ -25,6 +25,10 @@ class test_aladdress(unittest.TestCase):
         )
         addr.instanceName = "addr"
         fields = addr.address_fields(required={"addr.zip": True})
+        for field in fields:
+            if "zip" in field["field"]:
+                self.assertTrue(field["required"])
+        fields = addr.address_fields(required={"zip": True})
         for field in fields:
             if "zip" in field["field"]:
                 self.assertTrue(field["required"])
@@ -586,7 +590,7 @@ class TestALIndividual(unittest.TestCase):
         # Test business case with required parameter
         fields = self.individual.name_fields(
             person_or_business="business",
-            required={"test_individual.name.first": True},
+            required={"first": True},
             title_choices=["a title"],
             suffix_choices=["Jr.", "Sr."],
         )
@@ -613,9 +617,7 @@ class TestALIndividual(unittest.TestCase):
         )  # Should not have required by default
 
         # Test with required parameter
-        fields = self.individual.gender_fields(
-            required={"test_individual.gender": True}
-        )
+        fields = self.individual.gender_fields(required={"gender": True})
         gender_field = fields[0]
         self.assertEqual(gender_field["required"], True)
 

{docassemble_assemblyline-4.6.2 → docassemble_assemblyline-4.6.3/docassemble.AssemblyLine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docassemble.AssemblyLine
-Version: 4.6.2
+Version: 4.6.3
 Summary: Quickly go from a paper court form to a runnable, guided, step-by-step web application powered by Docassemble. Swap out branding and pre-built questions to meet your needs.
 Author-email: Suffolk Legal Innovation and Technology Lab <litlab@suffolk.edu>
 License-Expression: MIT

{docassemble_assemblyline-4.6.2 → docassemble_assemblyline-4.6.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "docassemble.AssemblyLine"
-version = "4.6.2"
+version = "4.6.3"
 description = "Quickly go from a paper court form to a runnable, guided, step-by-step web application powered by Docassemble. Swap out branding and pre-built questions to meet your needs."
 readme = "README.md"
 authors = [

docassemble_assemblyline-4.6.2/docassemble/AssemblyLine/__init__.py

@@ -1 +0,0 @@
-__version__ = '4.6.2'