DataForm + Form light refactoring

Author: jcheron

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

@@ -9,7 +9,6 @@
 use Ajax\semantic\html\collections\form\traits\FieldsTrait;
 use Ajax\semantic\html\elements\HtmlDivider;
 use Ajax\JsUtils;
-use Ajax\service\AjaxCall;
 use Ajax\semantic\html\collections\form\traits\FormTrait;
 
 /**
@@ -36,7 +35,6 @@ public function __construct($identifier, $elements=array()) {
 		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
 		$this->setProperty("name", $this->identifier);
 		$this->_fields=array ();
-		$this->_validationParams=[];
 		$this->addItems($elements);
 	}
 
@@ -143,17 +141,7 @@ public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $typ
 		return $this->addItem($message);
 	}
 
-	private function addCompoValidation($js,$compo,$field){
-		$validation=$field->getValidation();
-		if(isset($validation)){
-			if(isset($compo)===false){
-				$compo=$js->semantic()->form("#".$this->identifier);
-			}
-			$validation->setIdentifier($field->getDataField()->getIdentifier());
-			$compo->addFieldValidation($validation);
-		}
-		return $compo;
-	}
+
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
 		if(\sizeof($this->_validationParams)>0)
@@ -183,18 +171,6 @@ public function run(JsUtils $js) {
 		return $this->_bsComponent;
 	}
 
-	private function _runValidationParams(&$compo,JsUtils $js=NULL){
-		if(isset($this->_validationParams["_ajaxSubmit"]) && $this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){
-			$compilation=$this->_validationParams["_ajaxSubmit"]->compile($js);
-			$compilation=str_ireplace("\"","%quote%", $compilation);
-			$this->onSuccess($compilation);
-			unset($this->_validationParams["_ajaxSubmit"]);
-		}
-		$compo->addParams($this->_validationParams);
-		$this->_bsComponent=$compo;
-		$this->addEventsOnRun($js);
-	}
-
 	public function addValidationParam($paramName,$paramValue){
 		$this->_validationParams[$paramName]=$paramValue;
 		return $this;
@@ -204,4 +180,9 @@ public function setValidationParams(array $_validationParams) {
 		$this->_validationParams=$_validationParams;
 		return $this;
 	}
+
+	public function getValidationParams() {
+		return $this->_validationParams;
+	}
+
 }

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

@@ -4,13 +4,42 @@
 use Ajax\semantic\html\collections\form\HtmlForm;
 use Ajax\semantic\html\collections\HtmlMessage;
 use Ajax\service\AjaxCall;
+use Ajax\JsUtils;
 
 trait FormTrait{
+
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
+	protected function addCompoValidation($js,$compo,$field){
+		$form=$this->getForm();
+		$validation=$field->getValidation();
+		if(isset($validation)){
+			if(isset($compo)===false){
+				$compo=$js->semantic()->form("#".$form->getIdentifier());
+			}
+			$validation->setIdentifier($field->getDataField()->getIdentifier());
+			$compo->addFieldValidation($validation);
+		}
+		return $compo;
+	}
+
+	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+		$form=$this->getForm();
+		$params=$form->getValidationParams();
+		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
+			$compilation=$params["_ajaxSubmit"]->compile($js);
+			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$this->onSuccess($compilation);
+			unset($params["_ajaxSubmit"]);
+		}
+		$compo->addParams($params);
+		$form->setBsComponent($compo);
+		$form->addEventsOnRun($js);
+	}
+
 	public function setLoading() {
 		return $this->getForm()->addToProperty("class", "loading");
 	}

Ajax/semantic/widgets/dataform/DataForm.php

@@ -55,10 +55,13 @@ protected function _generateContent($form){
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
+				//TODO check why $fields is empty
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
-				}else
-					$form->addFields($fields);
+				}elseif(\sizeof($fields)>1){
+					$form->addFields($fields,"grouped");
+					$i+=\sizeof($fields)-1;
+				}
 			}
 		}
 	}