composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-07-18 20:56:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add factory for MultiColumn and Column

Browse Source
This commit is contained in:
acognet
2021-03-24 11:17:47 +01:00
parent 64d5f52eae
commit b63f720e5d
11 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/csvbulkexport.class.inc.php
View File

@@ -10,7 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
/**
* Bulk export: CSV export
@@ -114,14 +115,12 @@ class CSVBulkExport extends TabularBulkExport
case 'csv_options':
$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:CSVOptions'));
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oPanel->AddSubBlock($oMulticolumn);
//SeparatorCharacter
$oFieldSetSeparator = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:SeparatorCharacter'));
$oFieldSetSeparator->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetSeparator);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSeparator));
$sRawSeparator = utils::ReadParam('separator', ',', true, 'raw_data');
$sCustomDateTimeFormat = utils::ReadParam('', ',', true, 'raw_data');
@@ -149,8 +148,7 @@ class CSVBulkExport extends TabularBulkExport
//TextQualifierCharacter
$oFieldSetTextQualifier = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:TextQualifierCharacter'));
$oFieldSetTextQualifier->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetTextQualifier);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetTextQualifier));
$sRawQualifier = utils::ReadParam('text-qualifier', '"', true, 'raw_data');
$aQualifiers = array(
@@ -176,8 +174,7 @@ class CSVBulkExport extends TabularBulkExport
//Localization
$oFieldSetLocalization = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:CSVLocalization'));
$oFieldSetLocalization->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetLocalization);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetLocalization));
$oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionNoLocalize'), "no_localize", "1", "csv_no_localize", "checkbox");
$oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('no_localize', 0) == 1));
@@ -198,8 +195,7 @@ class CSVBulkExport extends TabularBulkExport
}
//markup
$oFieldSetMarkup = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat'));
$oFieldSetMarkup->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetMarkup);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetMarkup));
$oCheckBoxMarkup = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "csv_formatted_text", "checkbox");
$oCheckBoxMarkup->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1));
@@ -209,8 +205,7 @@ class CSVBulkExport extends TabularBulkExport
//date format
$oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat'));
$oFieldSetDate->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetDate);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate));
$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');

12
core/excelbulkexport.class.inc.php
View File

@@ -8,7 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Html\Html;
use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
require_once(APPROOT.'application/xlsxwriter.class.php');
@@ -82,13 +83,11 @@ class ExcelBulkExport extends TabularBulkExport
case 'xlsx_options':
$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XLSXOptions'));
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oPanel->AddSubBlock($oMulticolumn);
$oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat'));
$oFieldSetFormat->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetFormat);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat));
$oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "xlsx_formatted_text", "checkbox");
$oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1));
@@ -97,8 +96,7 @@ class ExcelBulkExport extends TabularBulkExport
$oFieldSetFormat->AddSubBlock($oCheckBox);
$oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat'));
$oFieldSetDate->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetDate);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate));
$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');

12
core/pdfbulkexport.class.inc.php
View File

@@ -10,7 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
/**
* Bulk export: PDF export, based on the HTML export converted to PDF
@@ -46,13 +47,11 @@ class PDFBulkExport extends HTMLBulkExport
case 'pdf_options':
$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:PDFOptions'));
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oPanel->AddSubBlock($oMulticolumn);
$oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:PDFPageFormat'));
$oFieldSetFormat->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetFormat);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat));
//page format
$oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize'));
@@ -81,8 +80,7 @@ class PDFBulkExport extends HTMLBulkExport
//date format
$oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat'));
$oFieldSetDate->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetDate);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate));
$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');

12
core/spreadsheetbulkexport.class.inc.php
View File

@@ -8,7 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Html\Html;
use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
/**
* Bulk export: "spreadsheet" export: a simplified HTML export in which the date/time columns are split in two column: date AND time
@@ -48,13 +49,11 @@ class SpreadsheetBulkExport extends TabularBulkExport
case 'spreadsheet_options':
$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:SpreadsheetOptions'));
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oPanel->AddSubBlock($oMulticolumn);
$oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat'));
$oFieldSetFormat->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetFormat);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat));
$oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "spreadsheet_formatted_text", "checkbox");
$oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1));
@@ -70,8 +69,7 @@ class SpreadsheetBulkExport extends TabularBulkExport
$oFieldSetFormat->AddSubBlock($oCheckBox);
$oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat'));
$oFieldSetDate->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetDate);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate));
$sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data');

10
core/xmlbulkexport.class.inc.php
View File

@@ -6,7 +6,8 @@
use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
/**
* Bulk export: XML export
@@ -41,21 +42,20 @@ class XMLBulkExport extends BulkExport
$oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XMLOptions'));
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oPanel->AddSubBlock($oMulticolumn);
$oCheckBoxLocalize = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionNoLocalize'), "no_localize", "1", "xml_no_localize", "checkbox");
$oCheckBoxLocalize->GetInput()->SetIsChecked((utils::ReadParam('no_localize', 0) == 1));
$oCheckBoxLocalize->SetBeforeInput(false);
$oCheckBoxLocalize->GetInput()->AddCSSClass('ibo-input-checkbox');
$oPanel->AddSubBlock($oCheckBoxLocalize);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxLocalize));
$oCheckBoxLink = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionLinkSets'), "linksets", "1", "xml_linksets", "checkbox");
$oCheckBoxLink->GetInput()->SetIsChecked((utils::ReadParam('linksets', 0) == 1));
$oCheckBoxLink->SetBeforeInput(false);
$oCheckBoxLink->GetInput()->AddCSSClass('ibo-input-checkbox');
$oPanel->AddSubBlock($oCheckBoxLink);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxLink));
return $oPanel;
break;

2
lib/composer/autoload_classmap.php
View File

@@ -254,7 +254,9 @@ return array(
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\UIDashboardLayoutBlock' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/UIDashboardLayoutBlock.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumnUIBlockFactory' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => $baseDir . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php',

2
lib/composer/autoload_static.php
View File

@@ -484,7 +484,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\UIDashboardLayoutBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/UIDashboardLayoutBlock.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumnUIBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php',

2
pages/ajax.render.php
View File

@@ -1163,6 +1163,8 @@ EOF
if ($oDashlet->IsRedrawNeeded()) {
$oBlock = $oDashlet->DoRender($oPage, true, false, $aExtraParams);
$sHtml = ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock);
$sHtml = str_replace("\n", '', $sHtml);
$sHtml = str_replace("\r", '', $sHtml);
$oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');");
}
if ($oDashlet->IsFormRedrawNeeded()) {

58
pages/csvimport.php
View File

@@ -21,6 +21,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab;
use Combodo\iTop\Application\UI\Base\Layout\TabContainer\TabContainer;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
@@ -544,49 +546,36 @@ try {
$aDisplayFilters['added'] = Dict::S('UI:CSVImport:ObjectsWereAdded');
$aDisplayFilters['errors'] = Dict::S('UI:CSVImport:ObjectsHadErrors');
}
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClasses(['ibo-multi-column', 'ml-1']);
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ml-1');
$oForm->AddSubBlock($oMulticolumn);
$oColumn = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn);
$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<img src="../images/unchanged.png">&nbsp;'.sprintf($aDisplayFilters['unchanged'], $iUnchanged), '', "1", "show_unchanged", "checkbox");
$oCheckBoxUnchanged->GetInput()->SetIsChecked(true);
$oCheckBoxUnchanged->SetBeforeInput(false);
$oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox');
$oColumn->AddSubBlock($oCheckBoxUnchanged);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged));
$oPage->add_ready_script("$('#show_unchanged').on('click', function(){ToggleRows('row_unchanged')})");
$oColumn = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn);
$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<img src="../images/modified.png">&nbsp;'.sprintf($aDisplayFilters['modified'], $iModified), '', "1", "show_modified", "checkbox");
$oCheckBoxUnchanged->GetInput()->SetIsChecked(true);
$oCheckBoxUnchanged->SetBeforeInput(false);
$oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox');
$oColumn->AddSubBlock($oCheckBoxUnchanged);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged));
$oPage->add_ready_script("$('#show_modified').on('click', function(){ToggleRows('row_modified')})");
$oColumn = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn);
$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<img src="../images/added.png">&nbsp;'.sprintf($aDisplayFilters['added'], $iCreated), '', "1", "show_created", "checkbox");
$oCheckBoxUnchanged->GetInput()->SetIsChecked(true);
$oCheckBoxUnchanged->SetBeforeInput(false);
$oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox');
$oColumn->AddSubBlock($oCheckBoxUnchanged);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged));
$oPage->add_ready_script("$('#show_created').on('click', function(){ToggleRows('row_added')})");
$oColumn = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn);
$oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel('<img src="../images/error.png">&nbsp;'.sprintf($aDisplayFilters['errors'], $iErrors), '', "1", "show_errors", "checkbox");
$oCheckBoxUnchanged->GetInput()->SetIsChecked(true);
$oCheckBoxUnchanged->SetBeforeInput(false);
$oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox');
$oColumn->AddSubBlock($oCheckBoxUnchanged);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged));
$oPage->add_ready_script("$('#show_errors').on('click', function(){ToggleRows('row_error')})");
$oPanel = PanelUIBlockFactory::MakeNeutral('');
@@ -838,27 +827,18 @@ EOF
$oForm->SetOnSubmitJsCode("return CheckValues()");
$oContainer->AddSubBlock($oForm);
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('ibo-multi-column');
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oForm->AddSubBlock($oMulticolumn);
$oColumn1 = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn1->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn1);
$oFieldSelectClass = FieldUIBlockFactory::MakeFromObject(Dict::S('UI:CSVImport:SelectClass'), $oClassesSelect);
$oFieldSelectClass->AddCSSClass('ibo-field-large');
$oColumn1->AddSubBlock($oFieldSelectClass);
$oColumn2 = UIContentBlockUIBlockFactory::MakeStandard();
$oColumn2->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oColumn2);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSelectClass));
$oAdvancedMode = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('UI:CSVImport:AdvancedMode'), "advanced", 1, '', 'checkbox');
$oAdvancedMode->GetInput()->SetIsChecked(($bAdvanced == 1));
$oAdvancedMode->SetBeforeInput(false);
$oAdvancedMode->GetInput()->AddCSSClass('ibo-input-checkbox');
$oColumn2->AddSubBlock($oAdvancedMode);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oAdvancedMode));
$oDivAdvancedHelp = UIContentBlockUIBlockFactory::MakeStandard("advanced_help")->AddCSSClass('ibo-is-hidden');
$oForm->AddSubBlock($oDivAdvancedHelp);
@@ -1222,14 +1202,13 @@ EOF
$oContainer = PanelUIBlockFactory::MakeNeutral('');
$oForm->AddSubBlock($oContainer);
$oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClasses(['ibo-multi-column', 'wizContainer']);
$oMulticolumn = MultiColumnUIBlockFactory::MakeStandard();
$oMulticolumn->AddCSSClass('wizContainer');
$oContainer->AddSubBlock($oMulticolumn);
//SeparatorCharacter
$oFieldSetSeparator = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:SeparatorCharacter'));
$oFieldSetSeparator->AddCSSClass('ibo - column');
$oMulticolumn->AddSubBlock($oFieldSetSeparator);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSeparator));
$aSep = array(
';' => Dict::S('UI:CSVImport:SeparatorSemicolon+'),
@@ -1260,8 +1239,7 @@ EOF
//TextQualifierCharacter
$oFieldSetTextQualifier = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:TextQualifierCharacter'));
$oFieldSetTextQualifier->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetTextQualifier);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetTextQualifier));
$aQualifiers = array(
'"' => Dict::S('UI:CSVImport:QualifierDoubleQuote+'),
@@ -1281,8 +1259,7 @@ EOF
//CommentsAndHeader
$oFieldSetCommentsAndHeader = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:CommentsAndHeader'));
$oFieldSetCommentsAndHeader->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetCommentsAndHeader);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetCommentsAndHeader));
$oCheckBoxHeader = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('UI:CSVImport:TreatFirstLineAsHeader'), "header_line", "1", "box_header", "checkbox");
$oCheckBoxHeader->GetInput()->SetIsChecked(($bHeaderLine == 1));
@@ -1303,8 +1280,7 @@ EOF
//date format
$oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:DateAndTimeFormats'));
$oFieldSetDate->AddCSSClass('ibo-column');
$oMulticolumn->AddSubBlock($oFieldSetDate);
$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate));
$sDateTimeFormat = utils::ReadParam('date_time_format', 'default');
$sCustomDateTimeFormat = utils::ReadParam('custom_date_time_format', (string)AttributeDateTime::GetFormat(), false, 'raw_data');

33
sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
use Combodo\iTop\Application\UI\Base\UIBlock;
class ColumnUIBlockFactory extends AbstractUIBlockFactory
{
public const TWIG_TAG_NAME = 'UIColumn';
public const UI_BLOCK_CLASS_NAME = Column::class;
public static function MakeStandard(?string $sId = null): Column
{
$oInput = new Column($sId);
return $oInput;
}
public static function MakeForBlock(UIBlock $oBlock, ?string $sId = null): Column
{
$oInput = new Column($sId);
$oInput->AddSubBlock($oBlock);
return $oInput;
}
}

23
sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Base\Layout\MultiColumn;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
class MultiColumnUIBlockFactory extends AbstractUIBlockFactory
{
public const TWIG_TAG_NAME = 'UIMultiColumn';
public const UI_BLOCK_CLASS_NAME = MultiColumn::class;
public static function MakeStandard(?string $sId = null): MultiColumn
{
$oInput = new MultiColumn($sId);
return $oInput;
}
}