FieldAs, Form light refactoring

Author: jcheron

Ajax/common/Widget.php

@@ -122,6 +122,16 @@ public function addField($field){
 		return $this;
 	}
 
+	public function addMessage($attributes=NULL,$fieldName="message"){
+		$this->_instanceViewer->addField($fieldName);
+		$count=$this->_instanceViewer->visiblePropertiesCount();
+		return $this->fieldAsMessage($count-1,$attributes);
+	}
+
+	public function addErrorMessage(){
+		return $this->addMessage(["error"=>true],"message");
+	}
+
 	public function insertField($index,$field){
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
@@ -331,15 +341,15 @@ public function run(JsUtils $js=NULL){
 		return $result;
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js=NULL){
 		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field){
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(JsUtils $js=NULL,&$view=NULL){
+	protected function _compileForm(){
 		if(isset($this->_form)){
 			$noValidate="";
 			if(\sizeof($this->_form->getValidationParams())>0)

Ajax/common/html/html5/HtmlInput.php

@@ -4,9 +4,10 @@
 
 use Ajax\common\html\HtmlSingleElement;
 use Ajax\service\JString;
+use Ajax\JsUtils;
 
 class HtmlInput extends HtmlSingleElement {
-
+	protected $_placeholder;
 	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
 		parent::__construct($identifier, "input");
 		$this->setProperty("name", $identifier);
@@ -26,12 +27,18 @@ public function setInputType($value) {
 	}
 
 	public function setPlaceholder($value){
-		if(JString::isNull($value)){
-			if(JString::isNotNull($this->identifier))
-				$value=\ucfirst($this->identifier);
-		}
 		if(JString::isNotNull($value))
-			$this->setProperty("placeholder", $value);
+			$this->_placeholder=$value;
 		return $this;
 	}
+
+	public function compile(JsUtils $js=NULL,&$view=NULL){
+		$value=$this->_placeholder;
+		if(JString::isNull($value)){
+			if(JString::isNotNull($this->getProperty("name")))
+				$value=\ucfirst($this->getProperty("name"));
+		}
+		$this->setProperty("placeholder", $value);
+		return parent::compile($js,$view);
+	}
 }

Ajax/semantic/html/collections/form/HtmlForm.php

@@ -10,6 +10,7 @@
 use Ajax\semantic\html\elements\HtmlDivider;
 use Ajax\JsUtils;
 use Ajax\semantic\html\collections\form\traits\FormTrait;
+use Ajax\semantic\components\Form;
 
 /**
  * Semantic Form component
@@ -151,24 +152,26 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 	}
 
 	public function run(JsUtils $js) {
-		$compo=NULL;
+		if(isset($js)){
+			$compo=$js->semantic()->form("#".$this->identifier);
+		}else{
+			$compo=new Form();
+			$compo->attach("#".$this->identifier);
+		}
 		foreach ($this->_fields as $field){
 			if($field instanceof HtmlFormField){
-				$compo=$this->addCompoValidation($js, $compo, $field);
+				$compo=$this->addCompoValidation($compo, $field);
 			}
 		}
 		foreach ($this->content as $field){
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
 					if($_field instanceof HtmlFormField)
-						$compo=$this->addCompoValidation($js, $compo, $_field);
+						$compo=$this->addCompoValidation($compo, $_field);
 				}
 			}
 		}
-		if(isset($compo)===false){
-			return parent::run($js);
-		}
 		$this->_runValidationParams($compo,$js);
 		return $this->_bsComponent;
 	}

Ajax/semantic/html/collections/form/HtmlFormField.php

@@ -141,6 +141,11 @@ public function addRules(array $rules){
 		return $this;
 	}
 
+	public function setRules(array $rules){
+		$this->_validation=null;
+		return $this->addRules($rules);
+	}
+
 	public function addIcon($icon,$direction=Direction::LEFT){
 		$field=$this->getField();
 		return $field->addIcon($icon,$direction);

Ajax/semantic/html/collections/form/traits/FormTrait.php

@@ -13,13 +13,9 @@ trait FormTrait{
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($js,$compo,$field){
-		$form=$this->getForm();
+	protected function addCompoValidation($compo,$field){
 		$validation=$field->getValidation();
 		if(isset($validation)){
-			if(isset($compo)===false){
-				$compo=$js->semantic()->form("#".$form->getIdentifier());
-			}
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -209,7 +209,10 @@ public function fieldsAs(array $types){
 		$i=0;
 		if(JArray::isAssociative($types)){
 			foreach ($types as $type=>$attributes){
-				$this->fieldAs($i++,$type,$attributes);
+				if(\is_int($type))
+					$this->fieldAs($i++,$attributes,[]);
+				else
+					$this->fieldAs($i++,$type,$attributes);
 			}
 		}else{
 			foreach ($types as $type){
@@ -220,7 +223,6 @@ public function fieldsAs(array $types){
 
 	public function fieldAs($index,$type,$attributes=NULL){
 		$method="fieldAs".\ucfirst($type);
-
 		if(\method_exists($this, $method)){
 			if(!\is_array($attributes)){
 				$attributes=[$index];

Ajax/semantic/widgets/dataelement/DataElement.php

@@ -34,7 +34,7 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 			$this->_setToolbarPosition($table);
 		}
 		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		$this->_compileForm($js,$view);
+		$this->_compileForm();
 		return parent::compile($js,$view);
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

@@ -85,7 +85,7 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 			$this->_setToolbarPosition($table, $captions);
 		}
 		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		$this->_compileForm($js,$view);
+		$this->_compileForm();
 		return parent::compile($js,$view);
 	}