From e7166f55a74ff12d4c3653c19afca957748eae4a Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 19 Aug 2020 17:09:13 +0200 Subject: [PATCH] Added example rules and values --- webapp/src/main/webapp/themes/iph/css/iph.css | 2 +- .../themes/iph/js/query-builder-config.js | 79 +++++++++--------- .../webapp/themes/iph/js/query-builder.ru.js | 4 +- .../themes/iph/templates/.page-home.ftl.swp | Bin 16384 -> 0 bytes 4 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index f7170c99..981ce15a 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -764,7 +764,7 @@ p.external-auth a.blue:hover { /* HOME SEARCH ------> */ #search-home { float: left; - /* width: 533px; */ + width: 100%; margin: 30px 0 0 0; } #search-home h3 { diff --git a/webapp/src/main/webapp/themes/iph/js/query-builder-config.js b/webapp/src/main/webapp/themes/iph/js/query-builder-config.js index f723d7e8..0cf8b218 100644 --- a/webapp/src/main/webapp/themes/iph/js/query-builder-config.js +++ b/webapp/src/main/webapp/themes/iph/js/query-builder-config.js @@ -2,12 +2,12 @@ var rules_basic = { condition: 'AND', rules: [{ - id: 'category', - operator: 'equal', + id: 'text', + operator: 'contains', value: 2 }, { - id: 'category', - operator: 'equal', + id: 'keywords', + operator: 'contains', value: 1 }] @@ -15,51 +15,50 @@ var rules_basic = { $('#builder').queryBuilder({ filters: [{ - id: 'name', - label: 'Name', - type: 'string' + id: 'text', + label: 'Текст', + type: 'string', + operators: ['contains', 'not_contains'] }, { - id: 'category', - label: 'Category', + id: 'keywords', + label: 'Ключевые слова', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'title', + label: 'Название', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'bibliography', + label: 'Библиография', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'classgroup', + label: 'Тип документа', type: 'integer', input: 'select', values: { - 1: 'Books', - 2: 'Movies', - 3: 'Music', - 4: 'Tools', - 5: 'Goodies', - 6: 'Clothes' + 1: 'Статья', + 2: 'Отрывок' }, - operators: ['equal', 'not_equal'] + operators: ['contains'] }, { - id: 'in_stock', - label: 'In stock', + id: 'rubrics', + label: 'Рубрикация', type: 'integer', - input: 'radio', + input: 'select', values: { - 1: 'Yes', - 0: 'No' + 1: 'История философии', + 2: 'Логика', + 3: 'Философия языка', + 4: 'Этика', + 5: 'Эстетика', + 6: 'Философия техники' }, - operators: ['equal'] - }, { - id: 'price', - label: 'Price', - type: 'double', - validation: { - min: 0, - step: 0.01 - } - }, { - id: 'id', - label: 'Identifier', - type: 'string', - placeholder: '____-____-____', - operators: ['equal', 'not_equal'], - validation: { - format: /^.{4}-.{4}-.{4}$/ - } - }], + operators: ['contains', 'not_contains'] + } ], lang_code: 'ru', rules: rules_basic }); diff --git a/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js b/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js index e09665cd..c53708b7 100644 --- a/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js +++ b/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js @@ -18,7 +18,7 @@ var QueryBuilder = $.fn.queryBuilder; QueryBuilder.regional['ru'] = { "__locale": "Russian (ru)", - "add_rule": "Добавить", + "add_rule": "Добавить условие", "add_group": "Добавить группу", "delete_rule": "Удалить", "delete_group": "Удалить", @@ -74,4 +74,4 @@ QueryBuilder.regional['ru'] = { }; QueryBuilder.defaults({ lang_code: 'ru' }); -})); \ No newline at end of file +})); diff --git a/webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp b/webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp deleted file mode 100644 index d098ceb70067b78f63de00473a86eed181ffb26a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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