Fix async bug + Add extra validation in Forms

Author: jcheron

Ajax/common/traits/JsUtilsAjaxTrait.php

@@ -40,9 +40,9 @@ protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
 		}
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
-		if(!$async){
-			$ajaxParameters["async"]="false";
-		}
+		
+		$ajaxParameters["async"]=($async?"true":"false");
+		
 		if(isset($params)){
 			$ajaxParameters["data"]=self::_correctParams($params);
 		}

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

@@ -13,6 +13,7 @@
 use Ajax\semantic\components\Form;
 use Ajax\common\html\BaseHtml;
 use Ajax\common\html\HtmlDoubleElement;
+use Ajax\semantic\components\validation\FieldValidation;
 
 /**
  * Semantic Form component
@@ -32,6 +33,8 @@ class HtmlForm extends HtmlSemCollection {
 	 * @var array
 	 */
 	protected $_validationParams;
+	
+	protected $_extraFieldRules;
 
 	public function __construct($identifier, $elements=array()) {
 		parent::__construct($identifier, "form", "ui form");
@@ -40,6 +43,7 @@ public function __construct($identifier, $elements=array()) {
 		$this->_fields=array ();
 		$this->addItems($elements);
 		$this->_validationParams=[];
+		$this->_extraFieldRules=[];
 	}
 
 	protected function getForm(){
@@ -186,9 +190,19 @@ public function run(JsUtils $js) {
 				}
 			}
 		}
+		foreach ($this->_extraFieldRules as $field=>$fieldValidation){
+			$compo=$this->addExtraCompoValidation($compo, $fieldValidation);
+		}
 		$this->_runValidationParams($compo,$js);
 		return $this->_bsComponent;
 	}
+	
+	public function getExtraFieldValidation($fieldname){
+		if(!isset($this->_extraFieldRules[$fieldname])){
+			$this->_extraFieldRules[$fieldname]=new FieldValidation($fieldname);
+		}
+		return $this->_extraFieldRules[$fieldname];
+	}
 
 	public function addValidationParam($paramName,$paramValue,$before="",$after=""){
 		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);

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

@@ -8,6 +8,7 @@
 use Ajax\common\html\BaseHtml;
 use Ajax\semantic\components\Form;
 use Ajax\semantic\html\collections\form\HtmlFormField;
+use Ajax\semantic\components\validation\FieldValidation;
 
 /**
  * trait used in Widget and HtmlForm
@@ -29,6 +30,11 @@ protected function addCompoValidation(Form $compo,HtmlFormField $field){
 		}
 		return $compo;
 	}
+	
+	protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
+		$compo->addFieldValidation($validation);
+		return $compo;
+	}
 
 	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
 		$form=$this->getForm();
@@ -155,4 +161,18 @@ public function onSuccess($jsCode){
 		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
 		return $form;
 	}
+	
+	public function addExtraFieldRules($fieldname,$rules){
+		$form=$this->getForm();
+		$fv=$form->getExtraFieldValidation($fieldname);
+		foreach ($rules as $rule){
+			$fv->addRule($rule);
+		}
+	}
+	
+	public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){
+		$form=$this->getForm();
+		$fv=$form->getExtraFieldValidation($fieldname);
+		$fv->addRule($type,$prompt,$value);
+	}
 }