From 0fb0b9deaba1e5d44048797063e847babe6abb91 Mon Sep 17 00:00:00 2001 From: acognet Date: Tue, 7 Sep 2021 09:42:45 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B03907=20-=20Polishing:=20Run=20query?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/backoffice/components/_field.scss | 3 +++ dictionaries/cs.dictionary.itop.ui.php | 1 + dictionaries/da.dictionary.itop.ui.php | 1 + dictionaries/de.dictionary.itop.ui.php | 1 + dictionaries/en.dictionary.itop.ui.php | 1 + dictionaries/es_cr.dictionary.itop.ui.php | 1 + dictionaries/fr.dictionary.itop.ui.php | 1 + dictionaries/hu.dictionary.itop.ui.php | 1 + dictionaries/it.dictionary.itop.ui.php | 1 + dictionaries/ja.dictionary.itop.ui.php | 1 + dictionaries/nl.dictionary.itop.ui.php | 1 + dictionaries/pl.dictionary.itop.ui.php | 1 + dictionaries/pt_br.dictionary.itop.ui.php | 1 + dictionaries/ru.dictionary.itop.ui.php | 1 + dictionaries/sk.dictionary.itop.ui.php | 1 + dictionaries/tr.dictionary.itop.ui.php | 1 + dictionaries/zh_cn.dictionary.itop.ui.php | 1 + pages/run_query.php | 25 ++++++++++++----------- 18 files changed, 32 insertions(+), 12 deletions(-) diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss index a7cd794e0..fdadcb01a 100644 --- a/css/backoffice/components/_field.scss +++ b/css/backoffice/components/_field.scss @@ -144,6 +144,9 @@ $ibo-field--value-decoration--spacing-x: 0.5rem !default; } } } +.ibo-field--label-small .ibo-field--label{ + width: 145px; +} .ibo-field--value { display: table; width: 100%; diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php index f63c863cd..7d9cec41d 100755 --- a/dictionaries/cs.dictionary.itop.ui.php +++ b/dictionaries/cs.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL dotaz', 'UI:RunQuery:HeaderOQLExpression+' => 'Dotaz v OQL syntaxi', 'UI:RunQuery:ExpressionToEvaluate' => 'Dotaz k vyhodnocení: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Více informací o dotazu: ', 'UI:RunQuery:DevelopedQuery' => 'Rekonstruovaný dotaz: ', 'UI:RunQuery:SerializedFilter' => 'Serializovaný filtr: ', diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php index 61c045298..92c4ffb9a 100644 --- a/dictionaries/da.dictionary.itop.ui.php +++ b/dictionaries/da.dictionary.itop.ui.php @@ -692,6 +692,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL Udtryk', 'UI:RunQuery:HeaderOQLExpression+' => 'Forespørgslen i OQL syntaks', 'UI:RunQuery:ExpressionToEvaluate' => 'Udtryk der skal evalueres: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Mere information om forespørgslen: ', 'UI:RunQuery:DevelopedQuery' => 'Videreudviklet forespørgselsudtryk: ', 'UI:RunQuery:SerializedFilter' => 'Serielt filter: ', diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 7c1bd075c..a76af6e18 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -692,6 +692,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL-Ausdruck', 'UI:RunQuery:HeaderOQLExpression+' => 'Die Abfrage in OQL-Syntax', 'UI:RunQuery:ExpressionToEvaluate' => 'Auszuwertender Ausdruck: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Mehr Informationen zur Abfrage: ', 'UI:RunQuery:DevelopedQuery' => 'Überarbeiteter Abfrageausdruck: ', 'UI:RunQuery:SerializedFilter' => 'Serieller Filter: ', diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 9f62c888d..bb860ecb9 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -720,6 +720,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating 'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression', 'UI:RunQuery:HeaderOQLExpression+' => 'The query in OQL syntax', 'UI:RunQuery:ExpressionToEvaluate' => 'Expression to evaluate: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments', 'UI:RunQuery:MoreInfo' => 'More information about the query: ', 'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ', 'UI:RunQuery:SerializedFilter' => 'Serialized filter: ', diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php index c012d836f..fd395be04 100644 --- a/dictionaries/es_cr.dictionary.itop.ui.php +++ b/dictionaries/es_cr.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'UI:RunQuery:HeaderOQLExpression' => 'Expresión OQL', 'UI:RunQuery:HeaderOQLExpression+' => 'La consulta en sintáxis OQL', 'UI:RunQuery:ExpressionToEvaluate' => 'Expresión a evaluar: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Más información acerca de la consulta: ', 'UI:RunQuery:DevelopedQuery' => 'Expresión de consulta rediseñada: ', 'UI:RunQuery:SerializedFilter' => 'Filtro de serialización: ', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index c120d5194..c37cb3fde 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi 'UI:RunQuery:HeaderOQLExpression' => 'Requête OQL', 'UI:RunQuery:HeaderOQLExpression+' => 'La requête en OQL', 'UI:RunQuery:ExpressionToEvaluate' => 'Requête à exécuter : ', + 'UI:RunQuery:QueryArguments' => 'Arguments de la requête', 'UI:RunQuery:MoreInfo' => 'Plus d\'information sur la requête : ', 'UI:RunQuery:DevelopedQuery' => 'Requête OQL décompilée : ', 'UI:RunQuery:SerializedFilter' => 'Version sérialisée : ', diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index c7495034d..01ceb05ed 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -692,6 +692,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL kifejezés', 'UI:RunQuery:HeaderOQLExpression+' => '', 'UI:RunQuery:ExpressionToEvaluate' => 'Értékelendő kifejezés: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Több információ a lekérdezésről: ', 'UI:RunQuery:DevelopedQuery' => 'Újraírt lekérdező értékelés: ', 'UI:RunQuery:SerializedFilter' => 'Szerializált szűrő: ', diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index cfca801cb..b84ba83a2 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'UI:RunQuery:HeaderOQLExpression' => 'Espressioni OQL', 'UI:RunQuery:HeaderOQLExpression+' => '', 'UI:RunQuery:ExpressionToEvaluate' => 'Espressione da valutare: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Maggiori informazioni sulla query: ', 'UI:RunQuery:DevelopedQuery' => 'Espressione della query riqualificata:', 'UI:RunQuery:SerializedFilter' => 'Filtro pubblicato: ', diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index 624046fa1..fdad48091 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -692,6 +692,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL式', 'UI:RunQuery:HeaderOQLExpression+' => 'OQL文法によるクエリ', 'UI:RunQuery:ExpressionToEvaluate' => '評価式', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'クエリに関する追加情報', 'UI:RunQuery:DevelopedQuery' => 'クエリ式の再開発', 'UI:RunQuery:SerializedFilter' => 'シリアライズされたフィルタ：', diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php index afabbcc86..4bc0b1409 100644 --- a/dictionaries/nl.dictionary.itop.ui.php +++ b/dictionaries/nl.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL-expressie', 'UI:RunQuery:HeaderOQLExpression+' => 'De query in OQL syntax', 'UI:RunQuery:ExpressionToEvaluate' => 'Expressie om te evalueren: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Meer informatie over de query: ', 'UI:RunQuery:DevelopedQuery' => 'Herschreven query-expressie: ', 'UI:RunQuery:SerializedFilter' => 'Geserialiseerde filter: ', diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php index 6369d1474..3d5f2be0c 100644 --- a/dictionaries/pl.dictionary.itop.ui.php +++ b/dictionaries/pl.dictionary.itop.ui.php @@ -705,6 +705,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array( 'UI:RunQuery:HeaderOQLExpression' => 'Wyrażenie OQL', 'UI:RunQuery:HeaderOQLExpression+' => 'Zapytanie w składni OQL', 'UI:RunQuery:ExpressionToEvaluate' => 'Wyrażenie do wykonania: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Więcej informacji o zapytaniu: ', 'UI:RunQuery:DevelopedQuery' => 'Rozwinięte wyrażenie zapytania: ', 'UI:RunQuery:SerializedFilter' => 'Filtr serializowany: ', diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index 147fb2c6a..35171d665 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'UI:RunQuery:HeaderOQLExpression' => 'A consulta na sintaxe OQL', 'UI:RunQuery:HeaderOQLExpression+' => 'A consulta na sintaxe OQL', 'UI:RunQuery:ExpressionToEvaluate' => 'Expressão para avaliar: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Mais informações sobre a consulta: ', 'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ', 'UI:RunQuery:SerializedFilter' => 'Filtro serializado: ', diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index 8d4178eb9..2dc362a12 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -704,6 +704,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'UI:RunQuery:HeaderOQLExpression' => 'Выражение OQL', 'UI:RunQuery:HeaderOQLExpression+' => 'Запрос в синтаксисе OQL', 'UI:RunQuery:ExpressionToEvaluate' => 'Оценка выражения: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Подробная информация о запросе: ', 'UI:RunQuery:DevelopedQuery' => 'Декомпилированный запрос OQL: ', 'UI:RunQuery:SerializedFilter' => 'Сериализованная версия: ', diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php index 00a966a10..39cde3827 100644 --- a/dictionaries/sk.dictionary.itop.ui.php +++ b/dictionaries/sk.dictionary.itop.ui.php @@ -693,6 +693,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL Výraz', 'UI:RunQuery:HeaderOQLExpression+' => '', 'UI:RunQuery:ExpressionToEvaluate' => 'Výraz k určeniu: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Viac informácií o dopyte: ', 'UI:RunQuery:DevelopedQuery' => 'Dopyt rozvinutého výrazu: ', 'UI:RunQuery:SerializedFilter' => 'Serializovaný filter: ', diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index b39ab6ea8..de523d28d 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL ifadesi', 'UI:RunQuery:HeaderOQLExpression+' => 'OQL yapısında sorgu', 'UI:RunQuery:ExpressionToEvaluate' => 'Değerlendirilecek ifade: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => 'Sorgu hakkında detaylı bilgi: ', 'UI:RunQuery:DevelopedQuery' => 'Yeniden düzenlenen sorgu: ', 'UI:RunQuery:SerializedFilter' => 'Özel filtre: ', diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php index 664f1bb76..229c739f9 100644 --- a/dictionaries/zh_cn.dictionary.itop.ui.php +++ b/dictionaries/zh_cn.dictionary.itop.ui.php @@ -703,6 +703,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:RunQuery:HeaderOQLExpression' => 'OQL 表达式', 'UI:RunQuery:HeaderOQLExpression+' => 'OQL 语法表示的查询', 'UI:RunQuery:ExpressionToEvaluate' => '请输入表达式: ', + 'UI:RunQuery:QueryArguments' => 'Query Arguments~~', 'UI:RunQuery:MoreInfo' => '该查询的更多信息: ', 'UI:RunQuery:DevelopedQuery' => '重新开发的查询表达式: ', 'UI:RunQuery:SerializedFilter' => '序列化的过滤器: ', diff --git a/pages/run_query.php b/pages/run_query.php index 0433a566f..4f34bcf73 100644 --- a/pages/run_query.php +++ b/pages/run_query.php @@ -8,6 +8,7 @@ use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSection; use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Field\Field; use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSet; use Combodo\iTop\Application\UI\Base\Component\Form\Form; use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory; @@ -163,14 +164,15 @@ try } } + $oPanelQuery = PanelUIBlockFactory::MakeWithBrandingPrimaryColor(Dict::S('UI:RunQuery:ExpressionToEvaluate')); + $oP->AddSubBlock($oPanelQuery); $oQueryForm = new Form(); - $oP->AddUiBlock($oQueryForm); + $oPanelQuery->AddSubBlock($oQueryForm); $oHiddenParams = new Html($oAppContext->GetForForm()); $oQueryForm->AddSubBlock($oHiddenParams); //--- Query textarea - $oQueryForm->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:ExpressionToEvaluate'), 2)); $oQueryTextArea = new TextArea('expression', utils::EscapeHtml($sExpression), 'expression', 120, 8); $oQueryTextArea->AddCSSClass('ibo-queryoql'); $oQueryForm->AddSubBlock($oQueryTextArea); @@ -186,15 +188,14 @@ EOF if (count($aArgs) > 0) { //--- Query arguments - $oQueryArgsContainer = PanelUIBlockFactory::MakeForInformation('Query arguments') - ->SetCSSClasses(['wizContainer']); + $oQueryForm->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:QueryArguments'),2)->AddCSSClass("ibo-collapsible-section--title")); + $oQueryArgsContainer = UIContentBlockUIBlockFactory::MakeStandard(null,['wizContainer']); $oQueryForm->AddSubBlock($oQueryArgsContainer); foreach ($aArgs as $sParam => $sValue) { - $oArgInput = InputUIBlockFactory::MakeForInputWithLabel( - $sParam, - 'arg_'.$sParam, - $sValue - ); + $oInput = InputUIBlockFactory::MakeStandard("text",'arg_'.$sParam, $sValue); + $oArgInput = \Combodo\iTop\Application\UI\Base\Component\Field\FieldUIBlockFactory::MakeFromObject($sParam,$oInput,Field::ENUM_FIELD_LAYOUT_SMALL); + $oArgInput->AddCSSClass("ibo-field--label-small"); + //$oArgInput = InputUIBlockFactory::MakeForInputWithLabel( $sParam, 'arg_'.$sParam, $sValue ); $oQueryArgsContainer->AddSubBlock($oArgInput); } } @@ -214,10 +215,10 @@ EOF if ($oFilter) { //--- Query filter - $oP->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:QueryResults'), 2)); - + $oPanelResult= PanelUIBlockFactory::MakeWithBrandingSecondaryColor(Dict::S('UI:RunQuery:QueryResults')); + $oP->AddSubBlock($oPanelResult); $oResultBlock = new DisplayBlock($oFilter, 'list', false); - $oP->AddSubBlock($oResultBlock->GetDisplay($oP, 'runquery')); + $oPanelResult->AddSubBlock($oResultBlock->GetDisplay($oP, 'runquery')); // Breadcrumb //$iCount = $oResultBlock->GetDisplayedCount();