I. Nüske · I. Nüske
--- a/src/caosadvancedtools/table_json_conversion/convert.py
+++ b/src/caosadvancedtools/table_json_conversion/convert.py
        self.definitions = definitions


-def _validate_jsonschema(instance, schema):
--- a/src/caosadvancedtools/table_json_conversion/validation_utils.py 0 → 100644
+++ b/src/caosadvancedtools/table_json_conversion/validation_utils.py 0 → 100644
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+"""
+Utilities for validation of conversion / import / export results.
+For internal use.
+"""
--- a/unittests/table_json_conversion/test_fill_xlsx.py
+++ b/unittests/table_json_conversion/test_fill_xlsx.py
    """
+    if schema is not None:
+        with open(schema, encoding="utf8", mode="r") as sch_f:
+            model_schema = json.load(sch_f)
+        data_schema = xlsx_utils.array_schema_from_model_schema(model_schema)
+    else:
+        data_schema = schema
+
    with tempfile.TemporaryDirectory() as tmpdir:
        outfile = os.path.join(tmpdir, 'test.xlsx')
        assert not os.path.exists(outfile)
        if custom_output is not None:
            outfile = custom_output
        fill_template(data=json_file, template=template_file, result=outfile,
-                      validation_schema=schema)
+                      validation_schema=data_schema)
--- a/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
+++ b/src/caosadvancedtools/table_json_conversion/fill_xlsx.py

    # Validation
    if validation_schema is not None:
+        # convert to array_schema is given schema is a model_schema
+        if 'properties' in validation_schema and validation_schema['properties'].values():
+            if list(validation_schema['properties'].values())[0]["type"] != "array":
                validation_schema = array_schema_from_model_schema(read_or_dict(validation_schema))
--- a/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
+++ b/src/caosadvancedtools/table_json_conversion/fill_xlsx.py

    # Validation
    if validation_schema is not None:
+        # convert to array_schema is given schema is a model_schema
+        if 'properties' in validation_schema and validation_schema['properties'].values():
+            if list(validation_schema['properties'].values())[0]["type"] != "array":
                validation_schema = array_schema_from_model_schema(read_or_dict(validation_schema))
        try:
-            # FIXME redefine checker for datetime
-            validate(data, validation_schema, format_checker=FormatChecker())
+            _validate_jsonschema(data, validation_schema)
--- a/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
+++ b/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
    # Validation
    if validation_schema is not None:
+        # convert to array_schema is given schema is a model_schema
+        if 'properties' in validation_schema and validation_schema['properties'].values():
+            if list(validation_schema['properties'].values())[0]["type"] != "array":
                validation_schema = array_schema_from_model_schema(read_or_dict(validation_schema))
        try:
-            # FIXME redefine checker for datetime
-            validate(data, validation_schema, format_checker=FormatChecker())
+            _validate_jsonschema(data, validation_schema)
        except ValidationError as verr:
            print(verr.message)
            raise verr
    else:
-        print("No validation schema given, continue at your own risk.")
+        warnings.warn("No validation schema given, continue at your own risk.")
--- a/src/caosadvancedtools/json_schema_exporter.py
+++ b/src/caosadvancedtools/json_schema_exporter.py
        name_property_for_new_records : bool, optional
            Whether objects shall generally have a `name` property in the generated schema.
            Optional, default is False.
+        use_id_for_identification: bool, optional
+            If set to true, an 'id' property is added to all records, and
+            foreign key references are assumed to be ids.
--- a/src/caosadvancedtools/json_schema_exporter.py
+++ b/src/caosadvancedtools/json_schema_exporter.py
            if inner_ui_schema:
                ui_schema["items"] = inner_ui_schema
        elif prop.is_reference():
-            if prop.datatype == db.REFERENCE:
+            if self._use_id_for_identification:
+                json_prop["type"] = "object"
+                json_prop["required"] = []
+                json_prop["additionalProperties"] = False
+                json_prop["title"] = prop.name
+                if prop.datatype == db.FILE:
+                    json_prop["description"] = "Path to file"
+                    json_prop["properties"] = {"path": {"type": "string"}}
+                else:
+                    json_prop["properties"] = {
+                        "id": {"oneOf": [{"type": "integer"}, {"type": "string"}]}}
--- a/src/caosadvancedtools/json_schema_exporter.py
+++ b/src/caosadvancedtools/json_schema_exporter.py
  If given, also merge the react-jsonschema-forms from this argument and return as the second return
  value.  If ``schemas`` is a dict, this parameter must also be a dict, if ``schemas`` is only an
  iterable, this paramater must support numerical indexing.
+return_data_schema : bool, default False
+  If set to True, a second schema with all top-level entries wrapped in an
+  array will be returned. This is necessary if the schema describes the
+  data layout of an XLSX file.
+  Cannot be used together with rjsf_uischemas.
--- a/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+++ b/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+    json_data : dict
+        The given records data in json form.
+    """
+    json_data = {}
+    for record in records:
+        # Convert records to high level api objects
+        record_obj = convert_to_python_object(record)
+        try:
+            record_obj.resolve_references(False, None)
+        except linkahead.LinkAheadException:
+            warnings.warn(f"Data for record with id {record_obj.id} might be "
+                          f"incomplete, unsuccessful retrieve.")
+        # Get json representation & adjust layout for compatibility
+        raw_data = record_obj.serialize()
+        raw_data.update(raw_data.get('properties', {}))
+        raw_data.pop('properties')
--- a/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+++ b/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+                            if isinstance(element, (int, str)):
+                                elem_id = element
+                            elif isinstance(element, linkahead.Entity):
+                                elem_id = element.id
+                            else:
+                                warnings.warn(f"Cannot handle referenced "
+                                              f"entity '{prop.value}'")
+                                continue
+                            entity_ids.add(elem_id)
+                    except linkahead.LinkAheadException as e:
+                        warnings.warn(f"Cannot handle referenced entity "
+                                      f"'{prop.value}' because of error '{e}'")
+    # Retrieve data
+    new_records = []
+    for entity_id in entity_ids:
+        entity_id = str(entity_id).split('@')[0]    # Queries cannot handle version
--- a/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+++ b/src/caosadvancedtools/table_json_conversion/export_import_xlsx.py 0 → 100644
+                   for rt_id in recordtype_ids]
+    recordtype_names = {recordtype.name for recordtype in recordtypes}
+    # Generate schema and data from the records
+    json_schema = _generate_jsonschema_from_recordtypes(recordtypes,
+                                                        jsonschema_filepath)
+    json_data = _generate_jsondata_from_records(records, jsondata_filepath)
+    # Generate xlsx template
+    # _generate_xlsx_template_file needs a file name, so use NamedTemporaryFile
+    # ToDo: This might not work on windows, if not, fix _generate file handling
+    if xlsx_template_filepath is None:
+        xlsx_template_file = tempfile.NamedTemporaryFile(suffix='.xlsx')
+        xlsx_template_filepath = xlsx_template_file.name
+    else:
+        xlsx_template_file = None
+    _generate_xlsx_template_file(json_schema, recordtype_names,
+                                 xlsx_template_filepath)