getField, getDataField refactoring

jcheron · jcheron · commit 552305cafa77 · 2017-01-23T02:28:38.000+01:00
diff --git a/Ajax/semantic/html/collections/HtmlMessage.php b/Ajax/semantic/html/collections/HtmlMessage.php
@@ -8,6 +8,7 @@
 use Ajax\JsUtils;
 use Ajax\semantic\html\base\constants\Style;
 use Ajax\semantic\html\base\traits\AttachedTrait;
+use Ajax\common\html\HtmlDoubleElement;
 /**
  * Semantic Message component
  * @see http://semantic-ui.com/collections/message.html
@@ -95,4 +96,11 @@ public function setStyle($style){
 	public function setError(){
 		return $this->setStyle("error");
 	}
+
+	public function setMessage($message){
+		if(\is_array($this->content)){
+			$this->content[\sizeof($this->content)-1]=$message;
+		}else
+			$this->setContent($message);
+	}
 }
diff --git a/Ajax/semantic/html/collections/form/HtmlFormDropdown.php b/Ajax/semantic/html/collections/form/HtmlFormDropdown.php
@@ -20,4 +20,8 @@ public function addItem($item,$value=NULL,$image=NULL){
 	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL){
 		return new HtmlFormDropdown($identifier,$items,$label,$value,true);
 	}
+
+	public function getDataField(){
+		return $this->getField()->getInput();
+	}
 }
diff --git a/Ajax/semantic/html/collections/form/HtmlFormField.php b/Ajax/semantic/html/collections/form/HtmlFormField.php
@@ -8,8 +8,10 @@
 use Ajax\semantic\html\base\constants\Direction;
 use Ajax\semantic\html\elements\HtmlLabel;
 use Ajax\semantic\components\validation\FieldValidation;
+use Ajax\semantic\html\collections\form\traits\FieldTrait;
 
 class HtmlFormField extends HtmlSemDoubleElement {
+	use FieldTrait;
 	protected $_container;
 	protected $_validation;
 	public function __construct($identifier, $field,$label=NULL) {
@@ -124,6 +126,9 @@ public function addRule($type,$prompt=NULL,$value=NULL){
 			if(!isset($this->_validation)){
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
+			if($type==="empty"){
+				$this->addToProperty("class","required");
+			}
 			$this->_validation->addRule($type,$prompt,$value);
 		}
 		return $this;
diff --git a/Ajax/semantic/html/collections/form/HtmlFormFields.php b/Ajax/semantic/html/collections/form/HtmlFormFields.php
@@ -119,7 +119,8 @@ public static function checkeds($name, $items=array(), $label=NULL, $values=arra
 		foreach ( $items as $val => $caption ) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
 			if (\array_search($val, $values)!==false) {
-				$itemO->getField()->getField()->setProperty("checked", "");
+				//TODO check getField
+				$itemO->getField()->getDataField()->setProperty("checked", "");
 			}
 			$fields[]=$itemO;
 		}
diff --git a/Ajax/semantic/html/collections/form/HtmlFormInput.php b/Ajax/semantic/html/collections/form/HtmlFormInput.php
@@ -3,11 +3,10 @@
 namespace Ajax\semantic\html\collections\form;
 
 use Ajax\semantic\html\collections\form\traits\TextFieldsTrait;
-use Ajax\semantic\html\collections\form\traits\FieldTrait;
 use Ajax\semantic\html\elements\HtmlInput;
 
 class HtmlFormInput extends HtmlFormField {
-	use TextFieldsTrait,FieldTrait;
+	use TextFieldsTrait;
 
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
 		if(!isset($placeholder) && $type==="text")
@@ -17,8 +16,9 @@ public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$p
 
 	public function getDataField(){
 		$field= $this->getField();
+		//TODO check getField
 		if($field instanceof HtmlInput)
-			$field=$field->getField();
+			$field=$field->getDataField();
 		return $field;
 	}
 }
diff --git a/Ajax/semantic/html/collections/form/HtmlFormTextarea.php b/Ajax/semantic/html/collections/form/HtmlFormTextarea.php
@@ -26,4 +26,8 @@ public function setRows($count){
 	public function getDataField() {
 		return $this->content["field"];
 	}
+
+	public function setName($name){
+		$this->getDataField()->setProperty("name",$name);
+	}
 }
diff --git a/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php b/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php
@@ -45,7 +45,7 @@ public function getDataField(){
 		$field= $this->getField();
 		if($field instanceof AbstractCheckbox)
 			$field=$field->getField();
-			return $field;
+		return $field;
 	}
 
 	/**
diff --git a/Ajax/semantic/html/collections/form/traits/FieldTrait.php b/Ajax/semantic/html/collections/form/traits/FieldTrait.php
@@ -9,11 +9,12 @@
 
 trait FieldTrait {
 
-	public abstract function addToProperty($name, $value, $separator=" ");
-	public abstract function addLabel($caption, $style="label-default", $leftSeparator="&nbsp;");
-	public abstract function addContent($content,$before=false);
+	abstract public function addToProperty($name, $value, $separator=" ");
+	abstract public function addLabel($caption, $style="label-default", $leftSeparator="&nbsp;");
+	abstract public function addContent($content,$before=false);
+	abstract public function getField();
 	public function setFocus() {
-		$this->addToProperty("class", State::FOCUS);
+		$this->getField()->addToProperty("class", State::FOCUS);
 	}
 
 	public function addLoading() {
@@ -24,8 +25,9 @@ public function addLoading() {
 	}
 
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
-		$labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon);
-		$this->addToProperty("class", $direction . " labeled");
+		$field=$this->getField();
+		$labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);
+		$field->addToProperty("class", $direction . " labeled");
 		return $labelO;
 	}
 
@@ -34,14 +36,15 @@ public function labeledToCorner($icon, $direction=Direction::LEFT) {
 	}
 
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
+		$field=$this->getField();
 		$actionO=$action;
 		if (\is_object($action) === false) {
 			$actionO=new HtmlButton("action-" . $this->identifier, $action);
 			if (isset($icon))
 				$actionO->addIcon($icon, true, $labeled);
 		}
-		$this->addToProperty("class", $direction . " action");
-		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
+		$field->addToProperty("class", $direction . " action");
+		$field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
 		return $actionO;
 	}
 
@@ -52,11 +55,15 @@ public function addDropdown($label="", $items=array(),$direction=Direction::RIGH
 	}
 
 	public function setTransparent() {
-		return $this->addToProperty("class", "transparent");
+		return $this->getField()->addToProperty("class", "transparent");
 	}
 
 	public function setReadonly(){
 		$this->getDataField()->setProperty("readonly", "");
 	}
 
+	public function setName($name){
+		$this->getDataField()->setProperty("name",$name);
+	}
+
 }
diff --git a/Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php b/Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php
@@ -4,7 +4,8 @@
 
 trait TextFieldsTrait {
 
-	public abstract function getDataField();
+	abstract public function getDataField();
+	abstract public function addToProperty($name, $value, $separator=" ");
 	public function setPlaceholder($value){
 		$this->getDataField()->setPlaceholder($value);
 		return $this;
@@ -14,4 +15,11 @@ public function setValue($value){
 		$this->getDataField()->setValue($value);
 		return $this;
 	}
+
+	public function setInputType($type){
+		if($type==="hidden")
+			$this->addToProperty("style","display:none;");
+		$this->getDataField()->setInputType($type);
+		return $this;
+	}
 }
diff --git a/Ajax/semantic/html/elements/HtmlInput.php b/Ajax/semantic/html/elements/HtmlInput.php
@@ -20,11 +20,12 @@ public function __construct($identifier, $type="text", $value="", $placeholder="
 	}
 
 	public function getField() {
-		return $this->content["field"];
+		return $this;
+		//return $this->content["field"];
 	}
 
 	public function getDataField() {
-		return $this->getField();
+		return $this->content["field"];
 	}
 
 	public static function outline($identifier, $icon, $value="", $placeholder="") {
diff --git a/Ajax/semantic/html/modules/HtmlDropdown.php b/Ajax/semantic/html/modules/HtmlDropdown.php
@@ -10,9 +10,10 @@
 use Ajax\semantic\html\base\constants\Direction;
 use Ajax\semantic\html\base\traits\LabeledIconTrait;
 use Ajax\JsUtils;
+use Ajax\semantic\html\collections\form\traits\FieldTrait;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use LabeledIconTrait {
+	use FieldTrait,LabeledIconTrait {
 		addIcon as addIconP;
 	}
 	protected $mClass="menu";
@@ -35,6 +36,10 @@ public function __construct($identifier, $value="", $items=array()) {
 		$this->addItems($items);
 	}
 
+	public function getField(){
+		return $this->input;
+	}
+
 	public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
 		$itemO=$this->beforeAddItem($item,$value,$image,$description);
 		$this->items[]=$itemO;
@@ -286,4 +291,9 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
 		return parent::compile($js,$view);
 	}
+
+	public function getInput() {
+		return $this->input;
+	}
+
 }
diff --git a/Ajax/semantic/html/modules/HtmlSearch.php b/Ajax/semantic/html/modules/HtmlSearch.php
@@ -25,7 +25,8 @@ private function createField($placeholder=NULL, $icon=NULL) {
 			$field->setPlaceholder($placeholder);
 		if (isset($icon) === true)
 			$field->addIcon($icon, Direction::RIGHT);
-		$field->getField()->setClass("prompt");
+		//TODO check getField
+		$field->getDataField()->setClass("prompt");
 		$this->content["field"]=$field;
 		return $field;
 	}
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
@@ -10,6 +10,7 @@
 use Ajax\semantic\html\elements\HtmlLabel;
 use Ajax\semantic\html\modules\HtmlProgress;
 use Ajax\semantic\html\modules\HtmlRating;
+use Ajax\semantic\html\collections\HtmlMessage;
 /**
  * @author jc
  * @property InstanceViewer $_instanceViewer
@@ -82,7 +83,6 @@ public function fieldAsAvatar($index,$attributes=NULL){
 		}, $index,$attributes,"avatar");
 	}
 
-
 	public function fieldAsRadio($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value){
 			$input= new HtmlRadio($id,$name,$value,$value);
@@ -93,11 +93,20 @@ public function fieldAsRadio($index,$attributes=NULL){
 	public function fieldAsInput($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value){
 			$input= new HtmlInput($id,"text",$value);
-			$input->getField()->setProperty("name", $name);
+			//TODO check getField
+			$input->setName($name);
 			return $input;
 		}, $index,$attributes,"input");
 	}
 
+	public function fieldAsHidden($index,$attributes=NULL){
+		if(\is_array($attributes)===false){
+			$attributes=[];
+		}
+		$attributes["imputType"]="hidden";
+		return $this->fieldAsInput($index,$attributes);
+	}
+
 	public function fieldAsCheckbox($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value){
 			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
diff --git a/Ajax/semantic/widgets/base/InstanceViewer.php b/Ajax/semantic/widgets/base/InstanceViewer.php
@@ -195,12 +195,15 @@ public function getProperties() {
 	}
 
 	public function getCaption($index){
+		if(isset($this->captions[$index])){
+			return $this->captions[$index];
+		}
 		if($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-			elseif(\is_callable($this->properties[$index]))
+		elseif(\is_callable($this->properties[$index]))
 			return "";
-			else
-				return $this->properties[$index];
+		else
+			return $this->properties[$index];
 	}
 
 	public function getCaptions(){
@@ -220,6 +223,13 @@ public function getCaptions(){
 		return $captions;
 	}
 
+	public function setCaption($index,$caption){
+		if(isset($this->captions)===false)
+			$this->captions=[];
+		$this->captions[$index]=$caption;
+		return $this;
+	}
+
 	public function setCaptions($captions) {
 		$this->captions=$captions;
 		return $this;
diff --git a/Ajax/semantic/widgets/dataform/DataForm.php b/Ajax/semantic/widgets/dataform/DataForm.php
@@ -45,6 +45,7 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 	protected function _generateContent($form){
 		$values= $this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
+
 		$separators=$this->_instanceViewer->getSeparators();
 		$size=\sizeof($separators);
 		if($size===1){
@@ -53,7 +54,7 @@ protected function _generateContent($form){
 			}
 		}else{
 			$separators[]=$count;
-			for($i=0;$i<$size-1;$i++){
+			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
diff --git a/Ajax/semantic/widgets/dataform/FormFieldAsTrait.php b/Ajax/semantic/widgets/dataform/FormFieldAsTrait.php
diff --git a/Ajax/semantic/widgets/dataform/FormInstanceViewer.php b/Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,8 @@ public function addItem($item,$value=NULL,$image=NULL){`
`20`	`20`	`public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL){`
`21`	`21`	`return new HtmlFormDropdown($identifier,$items,$label,$value,true);`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ public function getDataField(){`
	`25`	`+ return $this->getField()->getInput();`
	`26`	`+ }`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ public static function checkeds($name, $items=array(), $label=NULL, $values=arra`
`119`	`119`	`foreach ( $items as $val => $caption ) {`
`120`	`120`	`$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);`
`121`	`121`	`if (\array_search($val, $values)!==false) {`
`122`		`- $itemO->getField()->getField()->setProperty("checked", "");`
	`122`	`+ //TODO check getField`
	`123`	`+ $itemO->getField()->getDataField()->setProperty("checked", "");`
`123`	`124`	`}`
`124`	`125`	`$fields[]=$itemO;`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,8 @@ public function setRows($count){`
`26`	`26`	`public function getDataField() {`
`27`	`27`	`return $this->content["field"];`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ public function setName($name){`
	`31`	`+ $this->getDataField()->setProperty("name",$name);`
	`32`	`+ }`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function getDataField(){`
`45`	`45`	`$field= $this->getField();`
`46`	`46`	`if($field instanceof AbstractCheckbox)`
`47`	`47`	`$field=$field->getField();`
`48`		`- return $field;`
	`48`	`+ return $field;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,12 @@`
`9`	`9`
`10`	`10`	`trait FieldTrait {`
`11`	`11`
`12`		`- public abstract function addToProperty($name, $value, $separator=" ");`
`13`		`- public abstract function addLabel($caption, $style="label-default", $leftSeparator=" ");`
`14`		`- public abstract function addContent($content,$before=false);`
	`12`	`+ abstract public function addToProperty($name, $value, $separator=" ");`
	`13`	`+ abstract public function addLabel($caption, $style="label-default", $leftSeparator=" ");`
	`14`	`+ abstract public function addContent($content,$before=false);`
	`15`	`+ abstract public function getField();`
`15`	`16`	`public function setFocus() {`
`16`		`- $this->addToProperty("class", State::FOCUS);`
	`17`	`+ $this->getField()->addToProperty("class", State::FOCUS);`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`public function addLoading() {`
`@@ -24,8 +25,9 @@ public function addLoading() {`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {`
`27`		`- $labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon);`
`28`		`- $this->addToProperty("class", $direction . " labeled");`
	`28`	`+ $field=$this->getField();`
	`29`	`+ $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon);`
	`30`	`+ $field->addToProperty("class", $direction . " labeled");`
`29`	`31`	`return $labelO;`
`30`	`32`	`}`
`31`	`33`
`@@ -34,14 +36,15 @@ public function labeledToCorner($icon, $direction=Direction::LEFT) {`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {`
	`39`	`+ $field=$this->getField();`
`37`	`40`	`$actionO=$action;`
`38`	`41`	`if (\is_object($action) === false) {`
`39`	`42`	`$actionO=new HtmlButton("action-" . $this->identifier, $action);`
`40`	`43`	`if (isset($icon))`
`41`	`44`	`$actionO->addIcon($icon, true, $labeled);`
`42`	`45`	`}`
`43`		`- $this->addToProperty("class", $direction . " action");`
`44`		`- $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);`
	`46`	`+ $field->addToProperty("class", $direction . " action");`
	`47`	`+ $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);`
`45`	`48`	`return $actionO;`
`46`	`49`	`}`
`47`	`50`
`@@ -52,11 +55,15 @@ public function addDropdown($label="", $items=array(),$direction=Direction::RIGH`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`public function setTransparent() {`
`55`		`- return $this->addToProperty("class", "transparent");`
	`58`	`+ return $this->getField()->addToProperty("class", "transparent");`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`public function setReadonly(){`
`59`	`62`	`$this->getDataField()->setProperty("readonly", "");`
`60`	`63`	`}`
`61`	`64`
	`65`	`+ public function setName($name){`
	`66`	`+ $this->getDataField()->setProperty("name",$name);`
	`67`	`+ }`
	`68`	`+`
`62`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,12 @@ public function __construct($identifier, $type="text", $value="", $placeholder="`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function getField() {`
`23`		`- return $this->content["field"];`
	`23`	`+ return $this;`
	`24`	`+ //return $this->content["field"];`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public function getDataField() {`
`27`		`- return $this->getField();`
	`28`	`+ return $this->content["field"];`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public static function outline($identifier, $icon, $value="", $placeholder="") {`