diff --git a/unittests/table_json_conversion/example.xlsx b/unittests/table_json_conversion/example.xlsx deleted file mode 100644 index 23530ad18c2a1442160d0c1a478a25dc887ac900..0000000000000000000000000000000000000000 Binary files a/unittests/table_json_conversion/example.xlsx and /dev/null differ diff --git a/unittests/table_json_conversion/model.yml b/unittests/table_json_conversion/model.yml index 9c6f5e6781077119f5b1538abe4ae93b0471bc78..3ee3b20e92e7d4cabddb668db66540169cfad27e 100644 --- a/unittests/table_json_conversion/model.yml +++ b/unittests/table_json_conversion/model.yml @@ -25,6 +25,8 @@ Training: datatype: INTEGER remote: datatype: BOOLEAN + slides: + datatype: FILE ProgrammingCourse: inherit_from_suggested: - Training diff --git a/unittests/table_json_conversion/model_schema.json b/unittests/table_json_conversion/model_schema.json index 6b27c8b6604fbd3a7eb5ea1b6182fce60047d14b..f7d9738a17f07f6779f2253e60f6da434f926e30 100644 --- a/unittests/table_json_conversion/model_schema.json +++ b/unittests/table_json_conversion/model_schema.json @@ -53,28 +53,8 @@ "type": "string" }, "Organisation": { - "oneOf": [ - { - "title": "Existing entries", - "enum": [ - "Federal Reserve" - ] - }, - { - "type": "object", - "required": [], - "additionalProperties": false, - "title": "Create new", - "properties": { - "name": { - "type": "string", - "description": "The name of the Record to be created" - }, - "Country": { - "type": "string" - } - } - } + "enum": [ + "Federal Reserve" ] } } @@ -97,28 +77,8 @@ "type": "string" }, "Organisation": { - "oneOf": [ - { - "title": "Existing entries", - "enum": [ - "Federal Reserve" - ] - }, - { - "type": "object", - "required": [], - "additionalProperties": false, - "title": "Create new", - "properties": { - "name": { - "type": "string", - "description": "The name of the Record to be created" - }, - "Country": { - "type": "string" - } - } - } + "enum": [ + "Federal Reserve" ] } } @@ -152,28 +112,8 @@ "type": "string" }, "Organisation": { - "oneOf": [ - { - "title": "Existing entries", - "enum": [ - "Federal Reserve" - ] - }, - { - "type": "object", - "required": [], - "additionalProperties": false, - "title": "Create new", - "properties": { - "name": { - "type": "string", - "description": "The name of the Record to be created" - }, - "Country": { - "type": "string" - } - } - } + "enum": [ + "Federal Reserve" ] } }, diff --git a/unittests/table_json_conversion/test_table_template_generator.py b/unittests/table_json_conversion/test_table_template_generator.py index 40f9d0b1db511ee7fdcfca4c3e2c58ff0edf3630..75310253ffa6ac7d73ec8bb31c3e68ed7c22ac98 100644 --- a/unittests/table_json_conversion/test_table_template_generator.py +++ b/unittests/table_json_conversion/test_table_template_generator.py @@ -189,14 +189,15 @@ def test_template_generator(): assert ws.row_dimensions[1].hidden is True assert ws.column_dimensions['A'].hidden is True - -# rp = '/home/henrik/CaosDB/management/external/dimr/eingabemaske/django/laforms/settings/DevelSchema.json' -# with open(rp) as sfi: -# schema = json.load(sfi) -# generator.generate(schema=schema, -# foreign_keys={}, -# filepath=path) -# os.system(f'libreoffice {path}') + di = '/home/professional/CaosDB/management/external/dimr/eingabemaske/crawler/schemas' + for fi in os.listdir(di): + rp = os.path.join(di, fi) + with open(rp) as sfi: + schema = json.load(sfi) + generator.generate(schema=schema, + foreign_keys={}, + filepath=path) + os.system(f'libreoffice {path}') # TODO test colisions of sheet or colnames # TODO test escaping of values