Widgets asModal

jcheron · jcheron · commit e534306fca8c · 2017-02-26T14:37:35.000+01:00
diff --git a/Ajax/common/Widget.php b/Ajax/common/Widget.php
@@ -17,6 +17,7 @@
 use Ajax\semantic\html\collections\form\HtmlFormField;
 use Ajax\semantic\html\collections\form\traits\FormTrait;
 use Ajax\common\html\BaseWidget;
+use Ajax\semantic\html\modules\HtmlModal;
 
 abstract class Widget extends HtmlDoubleElement {
 	use FieldAsTrait,FormTrait;
@@ -425,4 +426,13 @@ public function removeField($index){
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
+
+	public function asModal($header){
+		$modal=new HtmlModal("modal-".$this->identifier,$header);
+		$modal->setContent($this);
+		if(isset($this->_form)){
+			$this->_form->onSuccess($modal->jsHide());
+		}
+		return $modal;
+	}
 }
diff --git a/Ajax/common/traits/JqueryAjaxTrait.php b/Ajax/common/traits/JqueryAjaxTrait.php
@@ -50,7 +50,7 @@ protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCal
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
-			return $retour;
+		return $retour;
 	}
 
 	protected function setAjaxDataCall($params){
diff --git a/Ajax/semantic/html/base/traits/BaseTrait.php b/Ajax/semantic/html/base/traits/BaseTrait.php
@@ -6,6 +6,7 @@
 use Ajax\semantic\html\base\constants\Color;
 use Ajax\semantic\html\base\constants\Direction;
 use Ajax\semantic\html\elements\HtmlIcon;
+use Ajax\service\JString;
 
 /**
  * @author jc
@@ -183,4 +184,16 @@ public function floatLeft() {
 	public function getBaseClass() {
 		return $this->_baseClass;
 	}
+
+	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
+		if(\is_string($value)){
+			if(isset($array[$key])){
+				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
+				$array[$key]=$before.$p.$value.$after;
+			}else
+				$array[$key]=$before.$value.$after;
+		}else
+			$array[$key]=$value;
+		return $this;
+	}
 }
diff --git a/Ajax/semantic/html/collections/HtmlMessage.php b/Ajax/semantic/html/collections/HtmlMessage.php
@@ -40,6 +40,10 @@ public function addHeader($header){
 		return $this->addContent($headerO,true);
 	}
 
+	public function setHeader($header){
+		return $this->addHeader($header);
+	}
+
 	public function addList($elements,$ordered=false){
 		$list=new HtmlList("list-".$this->identifier,$elements);
 		$list->setOrdered($ordered);
@@ -96,6 +100,10 @@ public function setError(){
 		return $this->setStyle("error");
 	}
 
+	public function setWarning(){
+		return $this->setStyle("warning");
+	}
+
 	public function setMessage($message){
 		if(\is_array($this->content)){
 			$this->content[\sizeof($this->content)-1]=$message;
diff --git a/Ajax/semantic/html/collections/form/HtmlForm.php b/Ajax/semantic/html/collections/form/HtmlForm.php
@@ -11,6 +11,7 @@
 use Ajax\JsUtils;
 use Ajax\semantic\html\collections\form\traits\FormTrait;
 use Ajax\semantic\components\Form;
+use Ajax\service\JString;
 
 /**
  * Semantic Form component
@@ -176,8 +177,8 @@ public function run(JsUtils $js) {
 		return $this->_bsComponent;
 	}
 
-	public function addValidationParam($paramName,$paramValue){
-		$this->_validationParams[$paramName]=$paramValue;
+	public function addValidationParam($paramName,$paramValue,$before="",$after=""){
+		$this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after);
 		return $this;
 	}
 
diff --git a/Ajax/semantic/html/collections/form/HtmlFormField.php b/Ajax/semantic/html/collections/form/HtmlFormField.php
@@ -18,7 +18,7 @@ public function __construct($identifier, $field,$label=NULL) {
 		parent::__construct($identifier, "div","field");
 		$this->content=array();
 		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
+		if(isset($label) && $label!=="")
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
diff --git a/Ajax/semantic/html/collections/form/traits/FormTrait.php b/Ajax/semantic/html/collections/form/traits/FormTrait.php
@@ -46,6 +46,11 @@ public function setLoading() {
 		return $this->getForm()->addToProperty("class", "loading");
 	}
 
+	public function setState($state) {
+		$this->getForm()->addToProperty("class", $state);
+		return $this;
+	}
+
 	public function setAttached($value=true){
 		$form=$this->getForm();
 		if($value)
@@ -122,7 +127,7 @@ public function onValid($jsCode){
 	 */
 	public function onSuccess($jsCode){
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");
+		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
 		return $form;
 	}
 }
diff --git a/Ajax/semantic/html/modules/HtmlModal.php b/Ajax/semantic/html/modules/HtmlModal.php
@@ -14,7 +14,7 @@ class HtmlModal extends HtmlSemDoubleElement {
 	protected $_params=array();
 	protected $_paramParts=array();
 
-	public function __construct($identifier, $header="", $content="", $actions=array()) {
+	public function __construct($identifier, $header="", $content="", $actions=null) {
 		parent::__construct($identifier, "div","ui modal");
 		if(isset($header)){
 			$this->setHeader($header);
@@ -171,4 +171,12 @@ public function run(JsUtils $js) {
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
+
+	public function jsDo($behavior) {
+		return "$('#".$this->identifier."').modal('".$behavior."');";
+	}
+
+	public function jsHide() {
+		return $this->jsDo("hide");
+	}
 }
diff --git a/Ajax/semantic/html/modules/HtmlProgress.php b/Ajax/semantic/html/modules/HtmlProgress.php
@@ -103,7 +103,8 @@ public function setTextValues($active=false, $error=false, $success=false, $warn
 	}
 
 	public function onChange($jsCode) {
-		return $this->_params["onChange"]="%function(percent, value, total){" . $jsCode . "}%";
+		$this->addBehavior($this->_params, "onChange", $jsCode,"%function(percent, value, total){","}%");
+		return $this;
 	}
 
 	/*
diff --git a/Ajax/semantic/traits/SemanticWidgetsTrait.php b/Ajax/semantic/traits/SemanticWidgetsTrait.php
@@ -38,7 +38,11 @@ public function dataForm($identifier, $instance){
 		return $this->addHtmlComponent(new DataForm($identifier,$instance));
 	}
 
-	public function formLogin($identifier){
-		return $this->addHtmlComponent(new FormLogin($identifier));
+	public function defaultLogin($identifier,$instance=null){
+		return $this->addHtmlComponent(FormLogin::default($identifier,$instance));
+	}
+
+	public function smallLogin($identifier,$instance=null){
+		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
 	}
 }
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
@@ -249,7 +249,7 @@ public function fieldAs($index,$type,$attributes=NULL){
 
 	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
+			$button=new HtmlButton($id,$caption,$cssStyle);
 			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
 			return $button;
 		}, $index,$attributes,"submit");
diff --git a/Ajax/semantic/widgets/business/BusinessForm.php b/Ajax/semantic/widgets/business/BusinessForm.php
@@ -10,18 +10,27 @@
  */
 abstract class BusinessForm extends DataForm {
 	protected $_fieldsOrder;
-	protected $_fieldsDefinition;
 	/**
 	 *
 	 * {@inheritdoc}
 	 *
 	 * @see \Ajax\semantic\widgets\dataform\DataForm::__construct()
 	 */
-	public function __construct($identifier,$modelInstance=null,$fields=[],$captions=[],$separators=[]) {
+	public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) {
+		if(!isset($modelInstance)){
+			$modelInstance=$this->getDefaultModelInstance();
+		}
 		parent::__construct($identifier,$modelInstance);
+		$this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators);
+	}
+
+	abstract protected function getDefaultModelInstance();
+
+	protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){
+		$this->_fieldsOrder=$fieldsOrder;
 		$this->setFields($fields);
 		$this->setSeparators($separators);
-		$this->fieldsAs($this->_fieldsDefinition);
+		$this->fieldsAs($fieldsDefinition);
 		$this->setCaptions($captions);
 	}
 
diff --git a/Ajax/semantic/widgets/business/user/FormLogin.php b/Ajax/semantic/widgets/business/user/FormLogin.php
@@ -13,13 +13,42 @@ class FormLogin extends BusinessForm {
 	 * @param string $identifier
 	 * @param object $modelInstance
 	 */
-	public function __construct($identifier,$modelInstance=null) {
-		if(!isset($modelInstance))
-			$modelInstance=new UserModel();
-			$this->_fieldsOrder=["message","login","password","remember","forget","submit"];
-			$this->_fieldsDefinition=["message"=>["icon"=>"sign in"],"input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"checkbox","link","submit"=>"green fluid"];
-		parent::__construct($identifier,$modelInstance,["Connection","login","password","remember","forget","submit"],
+	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
+		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
+	}
+
+	protected function getDefaultModelInstance(){
+		return new UserModel();
+	}
+
+	public static function default($identifier,$modelInstance=null){
+		return new FormLogin($identifier,$modelInstance,
+				["message","login","password","remember","forget","submit"],
+				["message"=>["icon"=>"sign in"],"input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"checkbox","link","submit"=>"green fluid"],
+				["Connection","login","password","remember","forget","submit"],
 				["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"],
 				[0,2,4,5]);
 	}
+
+	public static function smallInline($identifier,$modelInstance=null){
+		$result=new FormLogin($identifier,$modelInstance,
+				["login","password","submit"],
+				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
+				["login","password","submit"],
+				["","","Connection"],
+				[2]);
+			$result->addDividerBefore(0, "Connection");
+		return $result;
+	}
+
+	public static function small($identifier,$modelInstance=null){
+		$result=new FormLogin($identifier,$modelInstance,
+				["login","password","submit"],
+				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
+				["login","password","submit"],
+				["Login","Password","Connection"],
+				[1,2]);
+		$result->addDividerBefore(0, "Connection");
+		return $result;
+	}
 }
diff --git a/Ajax/semantic/widgets/business/user/UserModel.php b/Ajax/semantic/widgets/business/user/UserModel.php
@@ -3,8 +3,11 @@
 namespace Ajax\semantic\widgets\business\user;
 
 class UserModel {
-	protected $login="abc";
-	protected $password="0000";
+	protected $lastname;
+	protected $firstname;
+	protected $login;
+	protected $password;
+	protected $email;
 
 	public function getLogin() {
 		return $this->login;
diff --git a/Ajax/semantic/widgets/dataform/DataForm.php b/Ajax/semantic/widgets/dataform/DataForm.php
@@ -29,15 +29,18 @@ protected function _getFieldIdentifier($prefix,$name=""){
 	}
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		$this->_instanceViewer->setInstance($this->_modelInstance);
+		if(!$this->_generated){
+			$this->_instanceViewer->setInstance($this->_modelInstance);
 
-		$form=$this->content["form"];
-		$this->_generateContent($form);
+			$form=$this->content["form"];
+			$this->_generateContent($form);
 
-		if(isset($this->_toolbar)){
-			$this->_setToolbarPosition($form);
+			if(isset($this->_toolbar)){
+				$this->_setToolbarPosition($form);
+			}
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
+			$this->_generated=true;
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
 		return parent::compile($js,$view);
 	}
 
@@ -48,6 +51,7 @@ protected function _generateContent($form){
 		$values= $this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
+		$headers=$this->_instanceViewer->getHeaders();
 		\sort($separators);
 		$size=\sizeof($separators);
 		if($size===1){
@@ -58,6 +62,8 @@ protected function _generateContent($form){
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
+				if(isset($headers[$separators[$i]+1]))
+					$form->addHeader($headers[$separators[$i]+1],4,true);
 				//TODO check why $fields is empty
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
@@ -115,6 +121,12 @@ protected function _setToolbarPosition($table, $captions=NULL) {
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
+	public function addDividerBefore($index,$title){
+		$index=$this->_getIndex($index);
+		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
+		return $this;
+	}
+
 	public function run(JsUtils $js){
 		return parent::run($js);
 	}
diff --git a/Ajax/semantic/widgets/dataform/FormInstanceViewer.php b/Ajax/semantic/widgets/dataform/FormInstanceViewer.php
@@ -8,10 +8,12 @@
 
 class FormInstanceViewer extends InstanceViewer {
 	protected $separators;
+	protected $headers;
 
 	public function __construct($identifier,$instance=NULL, $captions=NULL) {
 		parent::__construct($identifier,$instance=NULL, $captions=NULL);
 		$this->separators=[-1];
+		$this->headers=[];
 		$this->defaultValueFunction=function($name,$value,$index){
 			$caption=$this->getCaption($index);
 			$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
@@ -28,6 +30,18 @@ protected function _beforeAddProperty($index,&$field){
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
+		if(($header=$this->hasHeader($field))!==false){
+			$this->addHeaderDividerBefore($index, $header);
+		}
+	}
+
+	protected function hasHeader(&$field){
+		$matches=[];$result=false;
+		if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){
+			$result=$matches[1];
+			$field=\str_replace("{".$result."}","", $field);
+		}
+		return $result;
 	}
 
 
@@ -38,6 +52,13 @@ public function addSeparatorAfter($fieldNum){
 		return $this;
 	}
 
+	public function addHeaderDividerBefore($fieldNum,$header){
+		$this->headers[$fieldNum]=$header;
+		if($fieldNum>0)
+			$this->addSeparatorAfter($fieldNum-1);
+		return $this;
+	}
+
 	public function getSeparators() {
 		return $this->separators;
 	}
@@ -63,4 +84,9 @@ public function setSeparators($separators) {
 		return $this;
 	}
 
+	public function getHeaders() {
+		return $this->headers;
+	}
+
+
 }
diff --git a/Ajax/service/JString.php b/Ajax/service/JString.php

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCal`
`50`	`50`	`$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";`
`51`	`51`	`if ($immediatly)`
`52`	`52`	`$this->jquery_code_for_compile[]=$retour;`
`53`		`- return $retour;`
	`53`	`+ return $retour;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`protected function setAjaxDataCall($params){`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,11 @@ public function setLoading() {`
`46`	`46`	`return $this->getForm()->addToProperty("class", "loading");`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ public function setState($state) {`
	`50`	`+ $this->getForm()->addToProperty("class", $state);`
	`51`	`+ return $this;`
	`52`	`+ }`
	`53`	`+`
`49`	`54`	`public function setAttached($value=true){`
`50`	`55`	`$form=$this->getForm();`
`51`	`56`	`if($value)`
`@@ -122,7 +127,7 @@ public function onValid($jsCode){`
`122`	`127`	`*/`
`123`	`128`	`public function onSuccess($jsCode){`
`124`	`129`	`$form=$this->getForm();`
`125`		`- $form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");`
	`130`	`+ $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");`
`126`	`131`	`return $form;`
`127`	`132`	`}`
`128`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@ public function setTextValues($active=false, $error=false, $success=false, $warn`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public function onChange($jsCode) {`
`106`		`- return $this->_params["onChange"]="%function(percent, value, total){" . $jsCode . "}%";`
	`106`	`+ $this->addBehavior($this->_params, "onChange", $jsCode,"%function(percent, value, total){","}%");`
	`107`	`+ return $this;`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ public function dataForm($identifier, $instance){`
`38`	`38`	`return $this->addHtmlComponent(new DataForm($identifier,$instance));`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function formLogin($identifier){`
`42`		`- return $this->addHtmlComponent(new FormLogin($identifier));`
	`41`	`+ public function defaultLogin($identifier,$instance=null){`
	`42`	`+ return $this->addHtmlComponent(FormLogin::default($identifier,$instance));`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ public function smallLogin($identifier,$instance=null){`
	`46`	`+ return $this->addHtmlComponent(FormLogin::small($identifier,$instance));`
`43`	`47`	`}`
`44`	`48`	`}`