@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | $this->paramParts=array(); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - protected function generateParamParts(){ |
|
| 15 | + protected function generateParamParts() { |
|
| 16 | 16 | $results=[]; |
| 17 | - foreach ($this->paramParts as $paramPart){ |
|
| 17 | + foreach ($this->paramParts as $paramPart) { |
|
| 18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
| 19 | 19 | } |
| 20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function getScript() { |
| 24 | 24 | $allParams=$this->params; |
| 25 | - $this->jquery_code_for_compile=array (); |
|
| 25 | + $this->jquery_code_for_compile=array(); |
|
| 26 | 26 | $paramParts=""; |
| 27 | - if(\sizeof($this->paramParts)>0){ |
|
| 27 | + if (\sizeof($this->paramParts)>0) { |
|
| 28 | 28 | $paramParts=".".$this->generateParamParts(); |
| 29 | 29 | } |
| 30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | return $this; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function addComponentEvent($event,$jsCode){ |
|
| 41 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
| 40 | + public function addComponentEvent($event, $jsCode) { |
|
| 41 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
| 42 | 42 | return $this->setParam($event, "%function(){".$jsCode."}%"); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | * @version 1.001 |
| 8 | 8 | * Generates a JSON field validator |
| 9 | 9 | */ |
| 10 | -class FieldValidation implements \JsonSerializable{ |
|
| 10 | +class FieldValidation implements \JsonSerializable { |
|
| 11 | 11 | /** |
| 12 | 12 | * @var string |
| 13 | 13 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | protected $optional; |
| 26 | 26 | |
| 27 | - public function __construct($identifier){ |
|
| 27 | + public function __construct($identifier) { |
|
| 28 | 28 | $this->identifier=$identifier; |
| 29 | 29 | $this->rules=[]; |
| 30 | 30 | } |
@@ -42,20 +42,20 @@ discard block |
||
| 42 | 42 | return $this->rules; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
| 46 | - if($type instanceof Rule) |
|
| 45 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
| 46 | + if ($type instanceof Rule) |
|
| 47 | 47 | $this->rules[]=$type; |
| 48 | - else if(\is_array($type)){ |
|
| 48 | + else if (\is_array($type)) { |
|
| 49 | 49 | $value=JArray::getValue($type, "value", 2); |
| 50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
| 51 | 51 | $type=JArray::getValue($type, "type", 0); |
| 52 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 53 | - }else |
|
| 54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 52 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
| 53 | + } else |
|
| 54 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function jsonSerialize(){ |
|
| 58 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
| 57 | + public function jsonSerialize() { |
|
| 58 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function setDepends($depends) { |
@@ -43,15 +43,16 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 46 | - if($type instanceof Rule) |
|
| 47 | - $this->rules[]=$type; |
|
| 48 | - else if(\is_array($type)){ |
|
| 46 | + if($type instanceof Rule) { |
|
| 47 | + $this->rules[]=$type; |
|
| 48 | + } else if(\is_array($type)){ |
|
| 49 | 49 | $value=JArray::getValue($type, "value", 2); |
| 50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
| 51 | 51 | $type=JArray::getValue($type, "type", 0); |
| 52 | 52 | $this->rules[]=new Rule($type,$prompt,$value); |
| 53 | - }else |
|
| 54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 53 | + } else { |
|
| 54 | + $this->rules[]=new Rule($type,$prompt,$value); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | public function jsonSerialize(){ |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | * @version 1.001 |
| 6 | 6 | * Generates a JSON Rule for the validation of a field |
| 7 | 7 | */ |
| 8 | -class Rule implements \JsonSerializable{ |
|
| 8 | +class Rule implements \JsonSerializable { |
|
| 9 | 9 | /** |
| 10 | 10 | * @var string |
| 11 | 11 | */ |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | private $value; |
| 22 | 22 | |
| 23 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
| 23 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
| 24 | 24 | $this->type=$type; |
| 25 | 25 | $this->prompt=$prompt; |
| 26 | 26 | $this->value=$value; |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function jsonSerialize() { |
| 57 | - $result= ["type"=>$this->type]; |
|
| 58 | - if(isset($this->prompt)) |
|
| 57 | + $result=["type"=>$this->type]; |
|
| 58 | + if (isset($this->prompt)) |
|
| 59 | 59 | $result["prompt"]=$this->prompt; |
| 60 | - if(isset($this->value)) |
|
| 60 | + if (isset($this->value)) |
|
| 61 | 61 | $result["value"]=$this->value; |
| 62 | 62 | return $result; |
| 63 | 63 | } |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @param string $prompt |
| 69 | 69 | * @return \Ajax\semantic\components\validation\Rule |
| 70 | 70 | */ |
| 71 | - public static function match($name,$prompt=NULL){ |
|
| 72 | - return new Rule("match[".$name."]",$prompt); |
|
| 71 | + public static function match($name, $prompt=NULL) { |
|
| 72 | + return new Rule("match[".$name."]", $prompt); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | * @param string $prompt |
| 79 | 79 | * @return \Ajax\semantic\components\validation\Rule |
| 80 | 80 | */ |
| 81 | - public static function different($name,$prompt=NULL){ |
|
| 82 | - return new Rule("different[".$name."]",$prompt); |
|
| 81 | + public static function different($name, $prompt=NULL) { |
|
| 82 | + return new Rule("different[".$name."]", $prompt); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -89,78 +89,78 @@ discard block |
||
| 89 | 89 | * @param string $prompt |
| 90 | 90 | * @return \Ajax\semantic\components\validation\Rule |
| 91 | 91 | */ |
| 92 | - public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
|
| 93 | - if(\is_int($min) && \is_int($max)) |
|
| 94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 95 | - return new Rule("integer",$prompt); |
|
| 92 | + public static function integer($min=NULL, $max=NULL, $prompt=NULL) { |
|
| 93 | + if (\is_int($min) && \is_int($max)) |
|
| 94 | + return new Rule("integer[{$min}..{$max}]", $prompt); |
|
| 95 | + return new Rule("integer", $prompt); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public static function decimal($prompt=NULL){ |
|
| 99 | - return new Rule("decimal",$prompt); |
|
| 98 | + public static function decimal($prompt=NULL) { |
|
| 99 | + return new Rule("decimal", $prompt); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public static function number($prompt=NULL){ |
|
| 103 | - return new Rule("number",$prompt); |
|
| 102 | + public static function number($prompt=NULL) { |
|
| 103 | + return new Rule("number", $prompt); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - public static function is($value,$prompt=NULL){ |
|
| 107 | - return new Rule("is[".$value."]",$prompt); |
|
| 106 | + public static function is($value, $prompt=NULL) { |
|
| 107 | + return new Rule("is[".$value."]", $prompt); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public static function isExactly($value,$prompt=NULL){ |
|
| 111 | - return new Rule("isExactly[".$value."]",$prompt); |
|
| 110 | + public static function isExactly($value, $prompt=NULL) { |
|
| 111 | + return new Rule("isExactly[".$value."]", $prompt); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public static function not($value,$prompt=NULL){ |
|
| 115 | - return new Rule("not[".$value."]",$prompt); |
|
| 114 | + public static function not($value, $prompt=NULL) { |
|
| 115 | + return new Rule("not[".$value."]", $prompt); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - public static function notExactly($value,$prompt=NULL){ |
|
| 119 | - return new Rule("notExactly[".$value."]",$prompt); |
|
| 118 | + public static function notExactly($value, $prompt=NULL) { |
|
| 119 | + return new Rule("notExactly[".$value."]", $prompt); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public static function contains($value,$prompt=NULL){ |
|
| 123 | - return new Rule("contains[".$value."]",$prompt); |
|
| 122 | + public static function contains($value, $prompt=NULL) { |
|
| 123 | + return new Rule("contains[".$value."]", $prompt); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - public static function containsExactly($value,$prompt=NULL){ |
|
| 127 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
| 126 | + public static function containsExactly($value, $prompt=NULL) { |
|
| 127 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public static function doesntContain($value,$prompt=NULL){ |
|
| 131 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
| 130 | + public static function doesntContain($value, $prompt=NULL) { |
|
| 131 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
| 135 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
| 134 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
| 135 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public static function minCount($value,$prompt=NULL){ |
|
| 139 | - return new Rule("minCount[".$value."]",$prompt); |
|
| 138 | + public static function minCount($value, $prompt=NULL) { |
|
| 139 | + return new Rule("minCount[".$value."]", $prompt); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - public static function maxCount($value,$prompt=NULL){ |
|
| 143 | - return new Rule("maxCount[".$value."]",$prompt); |
|
| 142 | + public static function maxCount($value, $prompt=NULL) { |
|
| 143 | + return new Rule("maxCount[".$value."]", $prompt); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - public static function exactCount($value,$prompt=NULL){ |
|
| 147 | - return new Rule("exactCount[".$value."]",$prompt); |
|
| 146 | + public static function exactCount($value, $prompt=NULL) { |
|
| 147 | + return new Rule("exactCount[".$value."]", $prompt); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - public static function email($prompt=NULL){ |
|
| 151 | - return new Rule("email",$prompt); |
|
| 150 | + public static function email($prompt=NULL) { |
|
| 151 | + return new Rule("email", $prompt); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - public static function url($prompt=NULL){ |
|
| 155 | - return new Rule("url",$prompt); |
|
| 154 | + public static function url($prompt=NULL) { |
|
| 155 | + return new Rule("url", $prompt); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public static function regExp($value,$prompt=NULL){ |
|
| 159 | - return new Rule("regExp",$prompt,$value); |
|
| 158 | + public static function regExp($value, $prompt=NULL) { |
|
| 159 | + return new Rule("regExp", $prompt, $value); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public static function custom($name,$jsFunction){ |
|
| 163 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
| 162 | + public static function custom($name, $jsFunction) { |
|
| 163 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | } |
| 167 | 167 | \ No newline at end of file |
@@ -55,10 +55,12 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function jsonSerialize() { |
| 57 | 57 | $result= ["type"=>$this->type]; |
| 58 | - if(isset($this->prompt)) |
|
| 59 | - $result["prompt"]=$this->prompt; |
|
| 60 | - if(isset($this->value)) |
|
| 61 | - $result["value"]=$this->value; |
|
| 58 | + if(isset($this->prompt)) { |
|
| 59 | + $result["prompt"]=$this->prompt; |
|
| 60 | + } |
|
| 61 | + if(isset($this->value)) { |
|
| 62 | + $result["value"]=$this->value; |
|
| 63 | + } |
|
| 62 | 64 | return $result; |
| 63 | 65 | } |
| 64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
| 90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
| 91 | 93 | */ |
| 92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
| 93 | - if(\is_int($min) && \is_int($max)) |
|
| 94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 95 | + if(\is_int($min) && \is_int($max)) { |
|
| 96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 97 | + } |
|
| 95 | 98 | return new Rule("integer",$prompt); |
| 96 | 99 | } |
| 97 | 100 | |
@@ -31,11 +31,11 @@ |
||
| 31 | 31 | return $this->getHtmlCk()->attachEvents($events); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function getField(){ |
|
| 34 | + public function getField() { |
|
| 35 | 35 | return $this->content["field"]->getField(); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function getHtmlCk(){ |
|
| 38 | + public function getHtmlCk() { |
|
| 39 | 39 | return $this->content["field"]; |
| 40 | 40 | } |
| 41 | 41 | |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function __construct($identifier, $elements=array()) { |
| 34 | 34 | parent::__construct($identifier, "form", "ui form"); |
| 35 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
| 35 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
| 36 | 36 | $this->setProperty("name", $this->identifier); |
| 37 | - $this->_fields=array (); |
|
| 37 | + $this->_fields=array(); |
|
| 38 | 38 | $this->_validationParams=[]; |
| 39 | 39 | $this->addItems($elements); |
| 40 | 40 | } |
@@ -56,14 +56,14 @@ discard block |
||
| 56 | 56 | * @param string $caption |
| 57 | 57 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
| 58 | 58 | */ |
| 59 | - public function addDivider($caption=NULL){ |
|
| 60 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
| 59 | + public function addDivider($caption=NULL) { |
|
| 60 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function addFields($fields=NULL, $label=NULL) { |
| 64 | 64 | if (isset($fields)) { |
| 65 | 65 | if (!$fields instanceof HtmlFormFields) { |
| 66 | - if (\is_array($fields) === false) { |
|
| 66 | + if (\is_array($fields)===false) { |
|
| 67 | 67 | $fields=\func_get_args(); |
| 68 | 68 | $end=\end($fields); |
| 69 | 69 | if (\is_string($end)) { |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | $label=NULL; |
| 74 | 74 | } |
| 75 | 75 | $this->_fields=\array_merge($this->_fields, $fields); |
| 76 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
| 76 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
| 77 | 77 | } |
| 78 | 78 | if (isset($label)) |
| 79 | 79 | $fields=new HtmlFormField("", $fields, $label); |
| 80 | 80 | } else { |
| 81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
| 81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
| 82 | 82 | } |
| 83 | 83 | $this->addItem($fields); |
| 84 | 84 | return $fields; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | public function addItem($item) { |
| 88 | 88 | $item=parent::addItem($item); |
| 89 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
| 89 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
| 90 | 90 | $this->_fields[]=$item; |
| 91 | 91 | } |
| 92 | 92 | return $item; |
@@ -118,17 +118,17 @@ discard block |
||
| 118 | 118 | return $this->addItem($field); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
| 121 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
| 122 | 122 | $field=$this->getItem($index); |
| 123 | - if(isset($field)){ |
|
| 124 | - $field->addRule($type,$prompt,$value); |
|
| 123 | + if (isset($field)) { |
|
| 124 | + $field->addRule($type, $prompt, $value); |
|
| 125 | 125 | } |
| 126 | 126 | return $this; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public function addFieldRules($index,$rules){ |
|
| 129 | + public function addFieldRules($index, $rules) { |
|
| 130 | 130 | $field=$this->getItem($index); |
| 131 | - if(isset($field)){ |
|
| 131 | + if (isset($field)) { |
|
| 132 | 132 | $field->addRules($rules); |
| 133 | 133 | } |
| 134 | 134 | return $this; |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | return $this->addItem($message); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - private function addCompoValidation($js,$compo,$field){ |
|
| 157 | + private function addCompoValidation($js, $compo, $field) { |
|
| 158 | 158 | $validation=$field->getValidation(); |
| 159 | - if(isset($validation)){ |
|
| 160 | - if(isset($compo)===false){ |
|
| 159 | + if (isset($validation)) { |
|
| 160 | + if (isset($compo)===false) { |
|
| 161 | 161 | $compo=$js->semantic()->form("#".$this->identifier); |
| 162 | 162 | } |
| 163 | 163 | $validation->setIdentifier($field->getField()->getIdentifier()); |
@@ -168,26 +168,26 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | public function run(JsUtils $js) { |
| 170 | 170 | $compo=NULL; |
| 171 | - foreach ($this->_fields as $field){ |
|
| 172 | - if($field instanceof HtmlFormField) |
|
| 171 | + foreach ($this->_fields as $field) { |
|
| 172 | + if ($field instanceof HtmlFormField) |
|
| 173 | 173 | $compo=$this->addCompoValidation($js, $compo, $field); |
| 174 | 174 | } |
| 175 | - foreach ($this->content as $field){ |
|
| 176 | - if($field instanceof HtmlFormFields){ |
|
| 175 | + foreach ($this->content as $field) { |
|
| 176 | + if ($field instanceof HtmlFormFields) { |
|
| 177 | 177 | $items=$field->getItems(); |
| 178 | - foreach ($items as $_field){ |
|
| 179 | - if($_field instanceof HtmlFormField) |
|
| 178 | + foreach ($items as $_field) { |
|
| 179 | + if ($_field instanceof HtmlFormField) |
|
| 180 | 180 | $compo=$this->addCompoValidation($js, $compo, $_field); |
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | - if(isset($compo)===false){ |
|
| 184 | + if (isset($compo)===false) { |
|
| 185 | 185 | return parent::run($js); |
| 186 | 186 | } |
| 187 | - if(isset($this->_validationParams["_ajaxSubmit"])){ |
|
| 188 | - if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
| 187 | + if (isset($this->_validationParams["_ajaxSubmit"])) { |
|
| 188 | + if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
| 189 | 189 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
| 190 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
| 190 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
| 191 | 191 | $this->onSuccess($compilation); |
| 192 | 192 | unset($this->_validationParams["_ajaxSubmit"]); |
| 193 | 193 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | return $this->addToProperty("class", "loading"); |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - public function addErrorMessage(){ |
|
| 205 | + public function addErrorMessage() { |
|
| 206 | 206 | return $this->addContent((new HtmlMessage(""))->setError()); |
| 207 | 207 | } |
| 208 | 208 | |
@@ -215,22 +215,22 @@ discard block |
||
| 215 | 215 | return $this; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
| 218 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
| 219 | 219 | $elem=$this->getElementById($identifier, $this->content); |
| 220 | - if(isset($elem)){ |
|
| 220 | + if (isset($elem)) { |
|
| 221 | 221 | $elem->addEvent($event, "$('#".$this->identifier."').form('validate form');"); |
| 222 | - $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]); |
|
| 222 | + $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier, "responseElement"=>$responseElement, "url"=>$url]); |
|
| 223 | 223 | } |
| 224 | 224 | return $this; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
| 227 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
| 228 | 228 | return $this->submitOn("click", $identifier, $url, $responseElement); |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
| 232 | - $bt=$this->addButton($identifier, $value,$CssStyle); |
|
| 233 | - if(isset($url) && isset($responseElement)) |
|
| 231 | + public function addSubmit($identifier, $value, $CssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
| 232 | + $bt=$this->addButton($identifier, $value, $CssStyle); |
|
| 233 | + if (isset($url) && isset($responseElement)) |
|
| 234 | 234 | $this->submitOnClick($identifier, $url, $responseElement); |
| 235 | 235 | return $bt; |
| 236 | 236 | } |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | * @param string $jsCode |
| 241 | 241 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
| 242 | 242 | */ |
| 243 | - public function onValid($jsCode){ |
|
| 243 | + public function onValid($jsCode) { |
|
| 244 | 244 | $this->_validationParams["onValid"]="%function(){".$jsCode."}%"; |
| 245 | 245 | return $this; |
| 246 | 246 | } |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * @param string $jsCode can use event and fields parameters |
| 251 | 251 | * @return HtmlForm |
| 252 | 252 | */ |
| 253 | - public function onSuccess($jsCode){ |
|
| 253 | + public function onSuccess($jsCode) { |
|
| 254 | 254 | $this->_validationParams["onSuccess"]="%function(evt,fields){".$jsCode."}%"; |
| 255 | 255 | return $this; |
| 256 | 256 | } |
@@ -47,8 +47,9 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 49 | 49 | $header=new HtmlHeader("", $niveau, $title); |
| 50 | - if ($dividing) |
|
| 51 | - $header->setDividing(); |
|
| 50 | + if ($dividing) { |
|
| 51 | + $header->setDividing(); |
|
| 52 | + } |
|
| 52 | 53 | return $this->addItem($header); |
| 53 | 54 | } |
| 54 | 55 | |
@@ -69,14 +70,16 @@ discard block |
||
| 69 | 70 | if (\is_string($end)) { |
| 70 | 71 | $label=$end; |
| 71 | 72 | \array_pop($fields); |
| 72 | - } else |
|
| 73 | - $label=NULL; |
|
| 73 | + } else { |
|
| 74 | + $label=NULL; |
|
| 75 | + } |
|
| 74 | 76 | } |
| 75 | 77 | $this->_fields=\array_merge($this->_fields, $fields); |
| 76 | 78 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
| 77 | 79 | } |
| 78 | - if (isset($label)) |
|
| 79 | - $fields=new HtmlFormField("", $fields, $label); |
|
| 80 | + if (isset($label)) { |
|
| 81 | + $fields=new HtmlFormField("", $fields, $label); |
|
| 82 | + } |
|
| 80 | 83 | } else { |
| 81 | 84 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
| 82 | 85 | } |
@@ -145,12 +148,15 @@ discard block |
||
| 145 | 148 | */ |
| 146 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 147 | 150 | $message=new HtmlMessage($identifier, $content); |
| 148 | - if (isset($header)) |
|
| 149 | - $message->addHeader($header); |
|
| 150 | - if (isset($icon)) |
|
| 151 | - $message->setIcon($icon); |
|
| 152 | - if (isset($type)) |
|
| 153 | - $message->setStyle($type); |
|
| 151 | + if (isset($header)) { |
|
| 152 | + $message->addHeader($header); |
|
| 153 | + } |
|
| 154 | + if (isset($icon)) { |
|
| 155 | + $message->setIcon($icon); |
|
| 156 | + } |
|
| 157 | + if (isset($type)) { |
|
| 158 | + $message->setStyle($type); |
|
| 159 | + } |
|
| 154 | 160 | return $this->addItem($message); |
| 155 | 161 | } |
| 156 | 162 | |
@@ -169,15 +175,17 @@ discard block |
||
| 169 | 175 | public function run(JsUtils $js) { |
| 170 | 176 | $compo=NULL; |
| 171 | 177 | foreach ($this->_fields as $field){ |
| 172 | - if($field instanceof HtmlFormField) |
|
| 173 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
| 178 | + if($field instanceof HtmlFormField) { |
|
| 179 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
| 180 | + } |
|
| 174 | 181 | } |
| 175 | 182 | foreach ($this->content as $field){ |
| 176 | 183 | if($field instanceof HtmlFormFields){ |
| 177 | 184 | $items=$field->getItems(); |
| 178 | 185 | foreach ($items as $_field){ |
| 179 | - if($_field instanceof HtmlFormField) |
|
| 180 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
| 186 | + if($_field instanceof HtmlFormField) { |
|
| 187 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
| 188 | + } |
|
| 181 | 189 | } |
| 182 | 190 | } |
| 183 | 191 | } |
@@ -230,8 +238,9 @@ discard block |
||
| 230 | 238 | |
| 231 | 239 | public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
| 232 | 240 | $bt=$this->addButton($identifier, $value,$CssStyle); |
| 233 | - if(isset($url) && isset($responseElement)) |
|
| 234 | - $this->submitOnClick($identifier, $url, $responseElement); |
|
| 241 | + if(isset($url) && isset($responseElement)) { |
|
| 242 | + $this->submitOnClick($identifier, $url, $responseElement); |
|
| 243 | + } |
|
| 235 | 244 | return $bt; |
| 236 | 245 | } |
| 237 | 246 | |