Add UIBlocks to twig (Changed classes name)

sources/application/UI/Base/Component/Input/Select/Select.php

@@ -8,28 +8,81 @@
 namespace Combodo\iTop\Application\UI\Base\Component\Input\Select;
 
 
-use Combodo\iTop\Application\UI\Base\Component\Input\Input;
+use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
 
-class Select extends Input
+class Select extends UIContentBlock
 {
 	public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/select/select';
 
-	/** @var array */
-	protected $aOptions;
+	/** @var string */
+	protected $sName;
+	/** @var string */
+	protected $sValue;
+	/** @var bool  */
+	protected $bSubmitOnChange = false;
+
 
 	public function __construct(?string $sId = null)
 	{
 		parent::__construct($sId);
-		$this->aOptions = [];
 	}
 
 	public function AddOption(SelectOption $oOption)
 	{
-		$this->aOptions[$oOption->GetId()] = $oOption;
+		$this->AddSubBlock($oOption);
 	}
 
-	public function GetSubBlocks()
+	public function GetName(): string
 	{
-		return $this->aOptions;
+		return $this->sName;
 	}
+
+	/**
+	 * @param string $sName
+	 *
+	 * @return $this
+	 */
+	public function SetName(string $sName)
+	{
+		$this->sName = $sName;
+
+		return $this;
+	}
+
+	public function GetValue(): ?string
+	{
+		return $this->sValue;
+	}
+
+	/**
+	 * @param string|null $sValue
+	 *
+	 * @return $this
+	 */
+	public function SetValue(?string $sValue)
+	{
+		$this->sValue = $sValue;
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function GetSubmitOnChange(): bool
+	{
+		return $this->bSubmitOnChange;
+	}
+
+	/**
+	 * @param bool $bSubmitOnChange
+	 *
+	 * @return $this
+	 */
+	public function SetSubmitOnChange(bool $bSubmitOnChange)
+	{
+		$this->bSubmitOnChange = $bSubmitOnChange;
+		return $this;
+	}
+
 }

sources/application/UI/Base/Component/Input/Select/SelectOptionUIBlockFactory.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+namespace Combodo\iTop\Application\UI\Base\Component\Input\Select;
+
+
+use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
+
+class SelectOptionUIBlockFactory extends AbstractUIBlockFactory
+{
+	public const TWIG_TAG_NAME = 'UISelectOption';
+	public const UI_BLOCK_CLASS_NAME = SelectOption::class;
+
+	public static function MakeForSelectOption(string $sValue, string $sLabel, bool $bSelected, ?string $sId = null): SelectOption
+	{
+		$oInput = new SelectOption($sId);
+
+		$oInput->SetValue($sValue)
+			->SetLabel($sLabel)
+			->SetSelected($bSelected);
+
+		return $oInput;
+	}
+}

sources/application/UI/Base/Component/Input/Select/SelectUIBlockFactory.php

@@ -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\Component\Input;
+
+
+use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Input\Select\Select;
+
+class SelectUIBlockFactory extends AbstractUIBlockFactory
+{
+	public const TWIG_TAG_NAME = 'UISelect';
+	public const UI_BLOCK_CLASS_NAME = Select::class;
+
+	/**
+	 * @param string $sName
+	 * @param string|null $sId
+	 *
+	 * @return \Combodo\iTop\Application\UI\Base\Component\Input\Select\Select
+	 */
+	public static function MakeForSelect(string $sName, ?string $sId = null): Select
+	{
+		$oInput = new Select($sId);
+		$oInput->SetName($sName);
+
+		return $oInput;
+	}
+
+}