From 6fabdcbd45583d726c4bf47363ca7d82c3feacda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Wed, 20 Jan 2021 14:59:16 +0100 Subject: [PATCH] in progress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Closes #1426. * Closes #1423. * Closes #1420. * Closes #1366. Co-Authored-by: Johnny MarieĢthoz --- .../jsonschemas/common/cantons-v0.0.1.json | 2 +- .../jsonschemas/common/countries-v0.0.1.json | 2 +- .../jsonschemas/common/languages-v0.0.1.json | 12 +-- .../acq_invoices/acq_invoice-v0.0.1.json | 9 --- .../collections/collection-v0.0.1.json | 22 ++++-- .../documents/document-v0.0.1.json | 8 +- .../documents/document_abstract-v0.0.1.json | 5 +- .../document_book_format-v0.0.1.json | 12 +-- .../document_color_content-v0.0.1.json | 8 +- .../document_contribution-v0.0.1.json | 3 - ...ment_contribution_identifiedby-v0.0.1.json | 6 +- ...ment_contribution_organisation-v0.0.1.json | 22 +++--- ...contribution_organisation_link-v0.0.1.json | 12 +-- .../document_contribution_person-v0.0.1.json | 22 +++--- ...ument_contribution_person_link-v0.0.1.json | 12 +-- .../document_contribution_role-v0.0.1.json | 2 +- .../document_copyright_date-v0.0.1.json | 12 +-- .../documents/document_dimensions-v0.0.1.json | 8 +- .../documents/document_duration-v0.0.1.json | 10 +-- .../document_edition_statement-v0.0.1.json | 3 - .../document_electronic_locator-v0.0.1.json | 21 +++--- .../documents/document_extent-v0.0.1.json | 2 +- .../document_identified_by-v0.0.1.json | 19 ++--- .../document_illustrative_content-v0.0.1.json | 5 +- .../documents/document_issuance-v0.0.1.json | 55 +++++++------- .../documents/document_language-v0.0.1.json | 15 ++-- .../documents/document_note-v0.0.1.json | 9 +-- .../documents/document_part_of-v0.0.1.json | 13 ++-- .../document_production_method-v0.0.1.json | 10 +-- .../document_provision_activity-v0.0.1.json | 41 +++++----- ...ument_responsibility_statement-v0.0.1.json | 3 - .../documents/document_series-v0.0.1.json | 7 +- .../documents/document_subjects-v0.0.1.json | 10 ++- .../documents/document_title-v0.0.1.json | 7 +- .../document_titles_proper-v0.0.1.json | 10 ++- .../document_translated_from-v0.0.1.json | 5 +- .../documents/document_types-v0.0.1.json | 2 +- .../jsonschemas/holdings/holding-v0.0.1.json | 26 +++++-- .../ill_requests/ill_request-v0.0.1.json | 74 ++++++------------- .../items/jsonschemas/items/item-v0.0.1.json | 36 +++++---- .../jsonschemas/libraries/library-v0.0.1.json | 43 ++--------- .../locations/location-v0.0.1.json | 7 +- .../patron_types/patron_type-v0.0.1.json | 32 ++++---- .../jsonschemas/patrons/patron-v0.0.1.json | 9 ++- .../templates/template-v0.0.1.json | 8 +- .../jsonschemas/vendors/vendor-v0.0.1.json | 10 ++- rero_ils/theme/views.py | 2 +- 47 files changed, 312 insertions(+), 361 deletions(-) diff --git a/rero_ils/jsonschemas/common/cantons-v0.0.1.json b/rero_ils/jsonschemas/common/cantons-v0.0.1.json index 69e32ac717..1fd3b35578 100644 --- a/rero_ils/jsonschemas/common/cantons-v0.0.1.json +++ b/rero_ils/jsonschemas/common/cantons-v0.0.1.json @@ -138,7 +138,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" }, "hideExpression": "field.parent.model.country !== 'sz'" } diff --git a/rero_ils/jsonschemas/common/countries-v0.0.1.json b/rero_ils/jsonschemas/common/countries-v0.0.1.json index 1c286e68bf..1e91bfcd51 100644 --- a/rero_ils/jsonschemas/common/countries-v0.0.1.json +++ b/rero_ils/jsonschemas/common/countries-v0.0.1.json @@ -1919,7 +1919,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } } diff --git a/rero_ils/jsonschemas/common/languages-v0.0.1.json b/rero_ils/jsonschemas/common/languages-v0.0.1.json index b59a6ee161..bfe5b0d8aa 100644 --- a/rero_ils/jsonschemas/common/languages-v0.0.1.json +++ b/rero_ils/jsonschemas/common/languages-v0.0.1.json @@ -2434,7 +2434,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -2537,7 +2537,7 @@ ], "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" }, "hide": true } @@ -2554,7 +2554,7 @@ ], "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } }, "properties": { @@ -2564,7 +2564,7 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -2578,7 +2578,7 @@ "type": "object", "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } }, "propertiesOrder": [ @@ -2595,7 +2595,7 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" }, "focus": true } diff --git a/rero_ils/modules/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json b/rero_ils/modules/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json index 766d638434..bcfb2cfbdd 100644 --- a/rero_ils/modules/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json +++ b/rero_ils/modules/acq_invoices/jsonschemas/acq_invoices/acq_invoice-v0.0.1.json @@ -133,9 +133,6 @@ "default": "in progress", "form": { "type": "selectWithSort", - "wrappers": [ - "form-field-horizontal" - ], "options": [ { "value": "in_progress", @@ -165,9 +162,6 @@ "form": { "type": "datepicker", "placeholder": "Select a date", - "wrappers": [ - "form-field" - ], "validation": { "messages": { "patternMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD)." @@ -202,9 +196,6 @@ ], "form": { "type": "selectWithSort", - "wrappers": [ - "form-field-horizontal" - ], "options": [ { "value": "shipping_and_handling", diff --git a/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json b/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json index 2217f07025..dc6dc1caaa 100644 --- a/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json +++ b/rero_ils/modules/collections/jsonschemas/collections/collection-v0.0.1.json @@ -61,9 +61,6 @@ ], "form": { "type": "selectWithSort", - "wrappers": [ - "form-field" - ], "options": [ { "label": "course", @@ -75,6 +72,9 @@ } ], "templateOptions": { + "wrappers": [ + "form-field" + ], "selectWithSortOptions": { "order": "label" } @@ -101,7 +101,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] }, "hideExpression": "field.parent.model.collection_type !== 'course'", "expressionProperties": { @@ -129,7 +131,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] } } }, @@ -212,7 +216,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] } } }, @@ -241,7 +247,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] } } }, diff --git a/rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json index 17488cab52..3a89ad8aff 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json @@ -138,9 +138,11 @@ "type": "boolean", "default": false, "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_abstract-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_abstract-v0.0.1.json index 307a357070..5d677d9a87 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_abstract-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_abstract-v0.0.1.json @@ -16,10 +16,7 @@ } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_book_format-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_book_format-v0.0.1.json index 17b65482fa..7b7e646251 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_book_format-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_book_format-v0.0.1.json @@ -23,13 +23,15 @@ "72\u00ba", "96\u00ba", "128\u00ba" - ] + ], + "form": { + "templateOptions": { + "cssClass": "w-md-50" + } + } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json index 4cf902f30e..bb7183aeb3 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_color_content-v0.0.1.json @@ -26,15 +26,13 @@ "templateOptions": { "selectWithSortOptions": { "order": "label" - } + }, + "cssClass": "w-md-50" } } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json index 9054bc27fd..e5613fa32b 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution-v0.0.1.json @@ -45,9 +45,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_identifiedby-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_identifiedby-v0.0.1.json index e614a142a5..6d2c56cd4e 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_identifiedby-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_identifiedby-v0.0.1.json @@ -24,7 +24,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } }, @@ -35,7 +35,7 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } }, @@ -48,7 +48,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json index 5f161b7f32..a69535413d 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation-v0.0.1.json @@ -23,9 +23,11 @@ "default": "bf:Organisation", "const": "bf:Organisation", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "preferred_name": { @@ -35,7 +37,7 @@ "form": { "placeholder": "Example: M\u00fcller, Hans", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -52,7 +54,7 @@ }, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } }, @@ -63,7 +65,7 @@ "default": false, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-6" } } }, @@ -74,7 +76,7 @@ "form": { "placeholder": "Example: Lausanne", "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } }, @@ -85,7 +87,7 @@ "form": { "placeholder": "Example: 4", "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } }, @@ -97,7 +99,7 @@ "form": { "placeholder": "Example: 1989", "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } }, @@ -107,7 +109,7 @@ }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation_link-v0.0.1.json index 90e8a4a11b..074d43c282 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation_link-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_organisation_link-v0.0.1.json @@ -18,9 +18,11 @@ "default": "bf:Organisation", "const": "bf:Organisation", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "$ref": { @@ -33,14 +35,14 @@ "enableGroupField": true }, "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person-v0.0.1.json index cf01e07b87..a1113cc05b 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person-v0.0.1.json @@ -23,9 +23,11 @@ "default": "bf:Person", "const": "bf:Person", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "preferred_name": { @@ -35,7 +37,7 @@ "form": { "placeholder": "Example: M\u00fcller, Hans", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -47,7 +49,7 @@ "form": { "placeholder": "Example: 1955", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -59,7 +61,7 @@ "form": { "placeholder": "Example: 2012", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -70,7 +72,7 @@ "form": { "placeholder": "Example: physicist", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -82,7 +84,7 @@ "form": { "placeholder": "Example: XXIII", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -93,7 +95,7 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -103,7 +105,7 @@ }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person_link-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person_link-v0.0.1.json index 47a8eeaabd..ef473c2f64 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person_link-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_person_link-v0.0.1.json @@ -18,9 +18,11 @@ "default": "bf:Person", "const": "bf:Person", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "$ref": { @@ -33,14 +35,14 @@ "enableGroupField": true }, "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json index 371272d63c..c682792fd8 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_contribution_role-v0.0.1.json @@ -757,7 +757,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_copyright_date-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_copyright_date-v0.0.1.json index 77b6efb6b2..449ce13b3e 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_copyright_date-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_copyright_date-v0.0.1.json @@ -9,14 +9,14 @@ "pattern": "^([\u00a9\u2117]\\s)?\\d{4}.*", "minLength": 4, "form": { - "placeholder": "Example: \u00a9 2010" + "placeholder": "Example: \u00a9 2010", + "templateOptions": { + "cssClass": "w-md-50" + } } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } -} \ No newline at end of file +} diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_dimensions-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_dimensions-v0.0.1.json index 3558cf7081..9eb9ffd67c 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_dimensions-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_dimensions-v0.0.1.json @@ -9,16 +9,16 @@ "type": "string", "minLength": 1, "form": { - "placeholder": "Example: 22 cm" + "placeholder": "Example: 22 cm", + "templateOptions": { + "cssClass": "w-md-50" + } } }, "form": { "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_duration-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_duration-v0.0.1.json index 8a6b264baf..e80287e906 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_duration-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_duration-v0.0.1.json @@ -9,14 +9,14 @@ "type": "string", "minLength": 2, "form": { - "placeholder": "Example: 1h50" + "placeholder": "Example: 1h50", + "templateOptions": { + "cssClass": "w-md-50" + } } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_edition_statement-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_edition_statement-v0.0.1.json index d5c8fbfddd..352301198a 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_edition_statement-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_edition_statement-v0.0.1.json @@ -38,9 +38,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json index aa58730e5d..d66556a09b 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_electronic_locator-v0.0.1.json @@ -24,10 +24,16 @@ "placeholder": "Example: https://www.rero.ch/", "type": "string", "format": "uri", + "pattern": "^(ftps?|https?)://([a-zA-Z.]*(:[0-9]*)?(?:/[a-zA-Z0-9]*)*)?$", "minLength": 7, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" + }, + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } } } }, @@ -67,7 +73,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -223,7 +229,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -242,22 +248,19 @@ }, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_extent-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_extent-v0.0.1.json index df715caec5..e4863a6444 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_extent-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_extent-v0.0.1.json @@ -11,7 +11,7 @@ }, "hide": true, "templateOptions": { - "cssClass": "editor-max-width editor-title" + "cssClass": "w-md-50" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json index 51d333f866..e412811a0c 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json @@ -137,7 +137,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -148,7 +148,7 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -160,7 +160,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -172,7 +172,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } }, @@ -184,7 +184,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -196,7 +196,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } }, @@ -212,14 +212,14 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-6" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, @@ -227,9 +227,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_illustrative_content-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_illustrative_content-v0.0.1.json index 0cb50b8936..c81f7ecdd3 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_illustrative_content-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_illustrative_content-v0.0.1.json @@ -13,10 +13,7 @@ } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_issuance-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_issuance-v0.0.1.json index 5040324892..190f64ba17 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_issuance-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_issuance-v0.0.1.json @@ -45,7 +45,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -56,15 +56,17 @@ "default": "rdami:1001", "const": "rdami:1001", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, @@ -105,7 +107,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -116,15 +118,17 @@ "default": "rdami:1002", "const": "rdami:1002", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, @@ -165,7 +169,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -176,15 +180,17 @@ "default": "rdami:1003", "const": "rdami:1003", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, @@ -220,7 +226,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -231,23 +237,20 @@ "default": "rdami:1004", "const": "rdami:1004", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } - ], - "form": { - "templateOptions": { - "cssClass": "editor-title" - } - } + ] } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_language-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_language-v0.0.1.json index e3ea994473..3eaf69076a 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_language-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_language-v0.0.1.json @@ -25,9 +25,11 @@ "bf:Language" ], "form": { - "wrappers": [ - "hide" - ], + "templateOptions": { + "wrappers": [ + "hide" + ] + }, "options": [ { "label": "Language", @@ -42,14 +44,9 @@ }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } - }, - "form": { - "templateOptions": { - "cssClass": "editor-title" - } } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json index ff448ac049..698205bfa4 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_note-v0.0.1.json @@ -41,7 +41,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } }, @@ -51,14 +51,14 @@ "minLength": 1, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, @@ -66,9 +66,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_part_of-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_part_of-v0.0.1.json index 4be5c8eb64..07fa38e651 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_part_of-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_part_of-v0.0.1.json @@ -68,7 +68,7 @@ } }, "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -78,7 +78,7 @@ "minimum": 1, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -88,7 +88,7 @@ "minimum": 1, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -104,14 +104,14 @@ } }, "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } } @@ -122,9 +122,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json index da60003434..cbbfa9a5ec 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_production_method-v0.0.1.json @@ -112,14 +112,14 @@ "label": "Thermoform", "value": "rdapm:1021" } - ] + ], + "templateOptions": { + "cssClass": "w-md-50" + } } }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json index 06badab7da..1bd3f33281 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_provision_activity-v0.0.1.json @@ -66,7 +66,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-4" + "itemcCssClass": "col-lg-4" } } }, @@ -94,9 +94,11 @@ "default": "bf:Place", "readOnly": true, "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "country": { @@ -108,14 +110,14 @@ }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } }, @@ -148,11 +150,11 @@ "type": "selectWithSort", "options": [ { - "label": "Place", + "label": "bf:Place", "value": "bf:Place" }, { - "label": "Agent", + "label": "bf:Agent", "value": "bf:Agent" }, { @@ -161,7 +163,7 @@ } ], "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } }, @@ -175,25 +177,25 @@ }, "form": { "templateOptions": { - "cssClass": "col-lg-8" + "itemCssClass": "col-lg-8" } } }, "form": { "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } }, "form": { "templateOptions": { - "cssClass": "col-lg-12" + "itemCssClass": "col-lg-12" } } }, @@ -204,7 +206,7 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, @@ -219,7 +221,7 @@ "templateOptions.required": "model.type === 'bf:Publication'" }, "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } }, @@ -232,21 +234,16 @@ "form": { "hide": true, "templateOptions": { - "cssClass": "col-lg-4" + "itemCssClass": "col-lg-4" } } } }, "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } } - }, - "form": { - "templateOptions": { - "cssClass": "editor-title" - } } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_responsibility_statement-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_responsibility_statement-v0.0.1.json index 71a3c97ce0..e5194e3c29 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_responsibility_statement-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_responsibility_statement-v0.0.1.json @@ -16,9 +16,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json index ede3f9f95c..eee6fb0ab5 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json @@ -87,9 +87,6 @@ "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } }, @@ -106,7 +103,7 @@ ], "form": { "templateOptions": { - "cssClass": "row" + "containerCssClass": "row" } }, "properties": { @@ -117,7 +114,7 @@ "form": { "placeholder": "Example: vol.3", "templateOptions": { - "cssClass": "col-lg-6" + "itemCssClass": "col-lg-6" } } }, diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json index 3478250d90..d9701e9bde 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_subjects-v0.0.1.json @@ -7,15 +7,17 @@ "items": { "title": "Subject", "type": "string", - "minLength": 1 + "minLength": 1, + "form": { + "templateOptions": { + "cssClass": "w-md-50" + } + } }, "form": { "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json index 30f99f6354..7188de244a 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_title-v0.0.1.json @@ -44,7 +44,7 @@ } ], "templateOptions": { - "cssClass": "editor-max-width" + "cssClass": "w-md-50" } } }, @@ -105,11 +105,6 @@ } } } - }, - "form": { - "templateOptions": { - "cssClass": "editor-title" - } } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_titles_proper-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_titles_proper-v0.0.1.json index 153c5affdc..2aa9c90e7f 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_titles_proper-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_titles_proper-v0.0.1.json @@ -7,15 +7,17 @@ "items": { "title": "Proper title", "type": "string", - "minLength": 2 + "minLength": 2, + "form": { + "templateOptions": { + "cssClass": "w-md-50" + } + } }, "form": { "hide": true, "navigation": { "essential": true - }, - "templateOptions": { - "cssClass": "editor-title" } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_translated_from-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_translated_from-v0.0.1.json index 22117b28d8..9f3087acd8 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_translated_from-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_translated_from-v0.0.1.json @@ -8,10 +8,7 @@ "$ref": "https://ils.rero.ch/schemas/common/languages-v0.0.1.json#/language" }, "form": { - "hide": true, - "templateOptions": { - "cssClass": "editor-title" - } + "hide": true } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json index fe728cb6e6..1daf1a85f4 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_types-v0.0.1.json @@ -51,7 +51,7 @@ } ], "templateOptions": { - "cssClass": "editor-max-width editor-title" + "cssClass": "w-md-50" } } } diff --git a/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json b/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json index a0a3b9e450..d98f595623 100644 --- a/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json +++ b/rero_ils/modules/holdings/jsonschemas/holdings/holding-v0.0.1.json @@ -116,7 +116,15 @@ "uri": { "title": "URI", "type": "string", - "format": "uri" + "format": "uri", + "pattern": "^(ftps?|https?)://([a-zA-Z.]*(:[0-9]*)?(?:/[a-zA-Z0-9]*)*)?$", + "form": { + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + } + } }, "source": { "title": "Source", @@ -135,9 +143,11 @@ "serial" ], "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "patterns": { @@ -433,6 +443,11 @@ } }, "form": { + "templateOptions": { + "wrappers": [ + "card" + ] + }, "expressionProperties": { "templateOptions.required": "true" } @@ -518,9 +533,6 @@ ], "form": { "type": "selectWithSort", - "wrappers": [ - "form-field-horizontal" - ], "options": [ { "label": "general_note", diff --git a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json index a27e10fcc6..f353355f67 100644 --- a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json +++ b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json @@ -174,32 +174,17 @@ "title": { "type": "string", "title": "Title", - "minLength": 3, - "form": { - "wrappers": [ - "form-field-horizontal" - ] - } + "minLength": 3 }, "authors": { "type": "string", "title": "Authors", - "minLength": 3, - "form": { - "wrappers": [ - "form-field-horizontal" - ] - } + "minLength": 3 }, "publisher": { "type": "string", "title": "Publisher", - "minLength": 3, - "form": { - "wrappers": [ - "form-field-horizontal" - ] - } + "minLength": 3 }, "year": { "type": "string", @@ -210,20 +195,12 @@ "messages": { "patternMessage": "Should be in the following format: YYYY (2020)." } - }, - "wrappers": [ - "form-field-horizontal" - ] + } } }, "identifier": { "type": "string", - "title": "Identifier", - "form": { - "wrappers": [ - "form-field-horizontal" - ] - } + "title": "Identifier" }, "source": { "type": "object", @@ -244,42 +221,30 @@ "form": { "expressionProperties": { "templateOptions.required": "false" - }, - "wrappers": [ - "form-field-horizontal" - ] + } } }, "volume": { "type": "string", "title": "Volume", "form": { - "wrappers": [ - "form-field-horizontal" - ], "templateOptions": { - "cssClass": "col-md-3 p-0" + "itemCssClass": "col-md-3 p-0" } } }, "number": { "type": "string", - "title": "Number", - "form": { - "wrappers": [ - "form-field-horizontal" - ], - "templateOptions": { - "cssClass": "col-md-3 p-0" - } - } + "title": "Number" } } } }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] } } }, @@ -290,10 +255,7 @@ "hideExpression": "model.copy === false", "expressionProperties": { "templateOptions.required": "model.copy === true" - }, - "wrappers": [ - "form-field-horizontal" - ] + } } }, "found_in": { @@ -322,11 +284,17 @@ "type": "string", "title": "URL", "placeholder": "Example: https://www.rero.ch/", - "format": "uri", + "format": "uri",, + "pattern": "^(ftps?|https?)://([a-zA-Z.]*(:[0-9]*)?(?:/[a-zA-Z0-9]*)*)?$", "minLength": 7, "form": { "expressionProperties": { "templateOptions.required": "field.parent.model.source !== undefined && field.parent.model.source !== ''" + }, + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } } } } @@ -386,7 +354,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] }, "validation": { "validators": { diff --git a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json index 41bec61e0b..0b98cf892d 100644 --- a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json +++ b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json @@ -141,9 +141,11 @@ ], "default": "standard", "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "issue": { @@ -208,9 +210,11 @@ "validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).", "form": { "type": "datepicker", - "wrappers": [ - "form-field" - ], + "templateOptions": { + "wrappers": [ + "form-field" + ] + }, "validation": { "messages": { "pattern": "Should be in the ISO 8601, YYYY-MM-DD." @@ -239,9 +243,11 @@ "type": "boolean", "default": true, "form": { - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "claims_count": { @@ -296,9 +302,11 @@ "value": "excluded" } ], - "wrappers": [ - "hide" - ] + "templateOptions": { + "wrappers": [ + "hide" + ] + } } }, "holding": { @@ -432,10 +440,6 @@ "validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).", "form": { "type": "datepicker", - "wrappers": [ - "toggle-switch", - "form-field" - ], "templateOptions": { "label": "", "wrappers": [ diff --git a/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json b/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json index aab2d14d5d..35135f9873 100644 --- a/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json +++ b/rero_ils/modules/libraries/jsonschemas/libraries/library-v0.0.1.json @@ -240,42 +240,13 @@ "weekly", "monthly", "yearly" - ], - "form": { - "type": "selectWithSort", - "wrappers": [ - "form-field-horizontal" - ], - "templateOptions": { - "selectWithSortOptions": { - "order": "label" - } - }, - "options": [ - { - "label": "daily", - "value": "daily" - }, - { - "label": "weekly", - "value": "weekly" - }, - { - "label": "monthly", - "value": "monthly" - }, - { - "label": "yearly", - "value": "yearly" - } - ] - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + ] + } + }, + "data": { + "type": "array", + "items": { + "type": "integer" } } } diff --git a/rero_ils/modules/locations/jsonschemas/locations/location-v0.0.1.json b/rero_ils/modules/locations/jsonschemas/locations/location-v0.0.1.json index 9a807304f0..9c6f7bd761 100644 --- a/rero_ils/modules/locations/jsonschemas/locations/location-v0.0.1.json +++ b/rero_ils/modules/locations/jsonschemas/locations/location-v0.0.1.json @@ -200,11 +200,12 @@ } }, "form": { - "wrappers": [ - "toggle-switch" - ], + "hideExpression": "field.parent.model.allow_request === false", "templateOptions": { "label": "", + "wrappers": [ + "toggle-switch" + ], "toggle-switch": { "label": "Restrict pickup to", "description": "If enabled, restrict pickup to specific pickup locations." diff --git a/rero_ils/modules/patron_types/jsonschemas/patron_types/patron_type-v0.0.1.json b/rero_ils/modules/patron_types/jsonschemas/patron_types/patron_type-v0.0.1.json index 504b63da76..2096ba5c79 100644 --- a/rero_ils/modules/patron_types/jsonschemas/patron_types/patron_type-v0.0.1.json +++ b/rero_ils/modules/patron_types/jsonschemas/patron_types/patron_type-v0.0.1.json @@ -70,11 +70,11 @@ "type": "number", "minimum": 0, "form": { - "wrappers": [ - "toggle-switch", - "form-field" - ], "templateOptions": { + "wrappers": [ + "toggle-switch", + "form-field" + ], "toggle-switch": { "label": "Yearly subscription", "description": "Activation of subscription fees for patrons linked to this type." @@ -162,11 +162,11 @@ } }, "form": { - "wrappers": [ - "toggle-switch", - "form-field" - ], "templateOptions": { + "wrappers": [ + "toggle-switch", + "form-field" + ], "toggle-switch": { "label": "Limit by checkouts" } @@ -188,11 +188,11 @@ } }, "form": { - "wrappers": [ - "toggle-switch", - "form-field" - ], "templateOptions": { + "wrappers": [ + "toggle-switch", + "form-field" + ], "toggle-switch": { "label": "Limit by overdue fee amount" } @@ -214,11 +214,11 @@ } }, "form": { - "wrappers": [ - "toggle-switch", - "form-field" - ], "templateOptions": { + "wrappers": [ + "toggle-switch", + "form-field" + ], "toggle-switch": { "label": "Limit by overdue items" } diff --git a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json index c7bbc7ac9f..d62a91caa2 100644 --- a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json +++ b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json @@ -8,6 +8,7 @@ "first_name", "last_name", "birth_date", + "user_id", "email", "username", "street", @@ -396,7 +397,9 @@ "form": { "hideExpression": "!field.parent.model.roles.some(v => v === 'patron')", "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] } } }, @@ -528,7 +531,9 @@ }, "form": { "templateOptions": { - "cssClass": "editor-title" + "wrappers": [ + "card" + ] }, "validation": { "validators": { diff --git a/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json b/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json index 76d5871e33..1b295af920 100644 --- a/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json +++ b/rero_ils/modules/templates/jsonschemas/templates/template-v0.0.1.json @@ -110,9 +110,11 @@ "patrons" ], "form": { - "wrappers": [ - "hide" - ], + "templateOptions": { + "wrappers": [ + "hide" + ] + }, "options": [ { "label": "documents", diff --git a/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json b/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json index aa657a1a0e..b5def9c296 100644 --- a/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json +++ b/rero_ils/modules/vendors/jsonschemas/vendors/vendor-v0.0.1.json @@ -56,7 +56,15 @@ "title": "Website", "type": "string", "format": "uri", - "minLength": 4 + "pattern": "^(ftps?|https?)://([a-zA-Z.]*(:[0-9]*)?(?:/[a-zA-Z0-9]*)*)?$", + "minLength": 4, + "form": { + "validation": { + "messages": { + "patternMessage": "Should be a valid URL format." + } + } + } }, "note": { "title": "Note", diff --git a/rero_ils/theme/views.py b/rero_ils/theme/views.py index 6bfe30e07b..2f08f4a3ba 100644 --- a/rero_ils/theme/views.py +++ b/rero_ils/theme/views.py @@ -426,7 +426,7 @@ def prepare_jsonschema(schema): return schema -@blueprint.route('/schemaform/') +@blueprint.route('/schemas/') def schemaform(document_type): """Return schema and form options for the editor.""" doc_type = document_type