otlmow-template 1.9__py3-none-any.whl → 1.10__py3-none-any.whl

otlmow_template/SubsetTemplateCreator.py

@@ -20,8 +20,6 @@ from openpyxl.worksheet.worksheet import Worksheet
 from otlmow_converter.DotnotationHelper import DotnotationHelper
 from otlmow_converter.Exceptions.UnknownExcelError import UnknownExcelError
 from otlmow_converter.OtlmowConverter import OtlmowConverter
-from otlmow_model.OtlmowModel.BaseClasses.BooleanField import BooleanField
-from otlmow_model.OtlmowModel.BaseClasses.KeuzelijstField import KeuzelijstField
 from otlmow_model.OtlmowModel.BaseClasses.OTLObject import dynamic_create_instance_from_uri, OTLObject, \
     get_attribute_by_name, dynamic_create_type_from_uri
 from otlmow_model.OtlmowModel.Helpers.GenericHelper import get_ns_and_name_from_uri
@@ -503,18 +501,31 @@ class SubsetTemplateCreator:
         sheet.add_data_validation(boolean_validation)
         collected_attribute_info = []
         deprecated_attributes_row = []
+
         header_row = next(sheet.iter_rows(min_row=1, max_row=1))
+
+        first_data_row = 2 # first row is header, first data row is needed for later adjustments of formatting
+        if add_attribute_info:
+            first_data_row += 1
+        if add_deprecated and any(deprecated_attributes_row):
+            first_data_row += 1
+
+        max_row = 1000  # limit to 1000 as we only add validations up to row 1000
+        # Collect string columns to format after header processing
+        string_col_indices = []
+
         for header_cell in header_row:
             header = header_cell.value
-            if header is None or header == '':
+            if not header:
                 continue
 
             if header == 'typeURI':
                 data_validation = DataValidation(type="list", formula1=f'"{type_uri}"', allow_blank=True)
                 sheet.add_data_validation(data_validation)
-                data_validation.add(f'{header_cell.column_letter}2:{header_cell.column_letter}1000')
+                data_validation.add(f'{header_cell.column_letter}{first_data_row}:{header_cell.column_letter}{max_row}')
                 if add_attribute_info:
-                    collected_attribute_info.append('De URI van het object volgens https://www.w3.org/2001/XMLSchema#anyURI .')
+                    collected_attribute_info.append(
+                        'De URI van het object volgens https://www.w3.org/2001/XMLSchema#anyURI .')
                 if add_deprecated:
                     deprecated_attributes_row.append('')
                 continue
@@ -531,16 +542,23 @@ class SubsetTemplateCreator:
                 deprecated_attributes_row.append('DEPRECATED' if attribute.deprecated_version else '')
 
             if generate_choice_list:
-                if issubclass(attribute.field, BooleanField):
-                    boolean_validation.add(f'{header_cell.column_letter}2:{header_cell.column_letter}1000')
+                if attribute.field.native_type == bool:
+                    boolean_validation.add(f'{header_cell.column_letter}{first_data_row}:{header_cell.column_letter}{max_row}')
                     cls.color_choice_lists_green(sheet=sheet, header_cell_column=header_cell)
-
-                elif issubclass(attribute.field, KeuzelijstField):
+                elif hasattr(attribute.field, 'options') and attribute.field.options is not None:
                     cls.generate_choice_list_in_excel(
                         attribute=attribute, choice_list_dict=choice_list_dict, column=header_cell.column,
                         row_nr=1, sheet=sheet, workbook=workbook)
                     cls.color_choice_lists_green(sheet=sheet, header_cell_column=header_cell)
 
+            if attribute.field.native_type == str:
+                string_col_indices.append(header_cell.column)
+
+        # Efficiently format all string columns in one pass
+        for col_idx in string_col_indices:
+            for row_idx in range(first_data_row, max_row + 1):
+                sheet.cell(row=row_idx, column=col_idx).number_format = "@"
+
         if dummy_data_rows == 0:
             instance_count = len([x for x in instances if x.typeURI == type_uri])
             if instance_count > 0:

{otlmow_template-1.9.dist-info → otlmow_template-1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otlmow_template
-Version: 1.9
+Version: 1.10
 Author-email: David Vlaminck <david.vlaminck@mow.vlaanderen.be>, Jasper Berton <jasperberton1@telenet.be>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -684,6 +684,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

otlmow_template-1.10.dist-info/RECORD

@@ -0,0 +1,7 @@
+otlmow_template/SubsetTemplateCreator.py,sha256=t96Medun2k2zbTCCFSY4vKvIy43Hh4LnB1bYex5ONok,35500
+otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
+otlmow_template-1.10.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+otlmow_template-1.10.dist-info/METADATA,sha256=PiAyWmgjyGjipqsjg0UO4MDOISBGeznaM2GmsB3jQzg,44392
+otlmow_template-1.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+otlmow_template-1.10.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
+otlmow_template-1.10.dist-info/RECORD,,

{otlmow_template-1.9.dist-info → otlmow_template-1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

otlmow_template-1.9.dist-info/RECORD

@@ -1,7 +0,0 @@
-otlmow_template/SubsetTemplateCreator.py,sha256=dWzMZaBmJqK_k2J7ouyZyd_TovVRKPbpco47y6uc7Hk,34777
-otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
-otlmow_template-1.9.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-otlmow_template-1.9.dist-info/METADATA,sha256=YK9C8pnQbWaCUge2I_3pCtXVJLt4aW9d8e82wnurCxE,44340
-otlmow_template-1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-otlmow_template-1.9.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
-otlmow_template-1.9.dist-info/RECORD,,