composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-22 06:08:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3907 - Polishing: Run query

Browse Source
This commit is contained in:
acognet
2021-09-07 09:42:45 +02:00
parent ecb1acf5af
commit 0fb0b9deab
18 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
css/backoffice/components/_field.scss
View File

@@ -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%;

1
dictionaries/cs.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/da.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/de.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/es_cr.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -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 : ',

1
dictionaries/hu.dictionary.itop.ui.php
View File

@@ -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ő: ',

1
dictionaries/it.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/ja.dictionary.itop.ui.php
View File

@@ -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' => 'シリアライズされたフィルタ：',

1
dictionaries/nl.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/pl.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/pt_br.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/ru.dictionary.itop.ui.php
View File

@@ -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' => 'Сериализованная версия: ',

1
dictionaries/sk.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/tr.dictionary.itop.ui.php
View File

@@ -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: ',

1
dictionaries/zh_cn.dictionary.itop.ui.php
View File

@@ -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' => '序列化的过滤器: ',

25
pages/run_query.php
View File

@@ -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();