@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | if (\is_array($elements)) { |
62 | 62 | foreach ( $elements as $key => $element ) { |
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | - if ($element instanceof HtmlDropdownItem) |
|
65 | - $this->elements []=$element; |
|
66 | - else if (\is_array($element)) { |
|
64 | + if ($element instanceof HtmlDropdownItem) { |
|
65 | + $this->elements []=$element; |
|
66 | + } else if (\is_array($element)) { |
|
67 | 67 | if (is_string($key)===true) { |
68 | 68 | $dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
69 | 69 | $dropdown->addItems($element); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | 90 | if($caption instanceof HtmlLink){ |
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | parent::__construct($identifier); |
28 | 28 | $this->tagName="ul"; |
29 | 29 | $this->_template='<%tagName% id="%identifier%" class="nav navbar-nav %class%">%elements%</%tagName%>'; |
30 | - $this->elements=array (); |
|
30 | + $this->elements=array(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function setClass($value) { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addElement($element) { |
42 | - if($element instanceof HtmlLink){ |
|
42 | + if ($element instanceof HtmlLink) { |
|
43 | 43 | $this->addLink($element); |
44 | 44 | } else if (is_object($element)) { |
45 | 45 | $this->elements []=$element; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | public function addElements($elements) { |
61 | 61 | if (\is_array($elements)) { |
62 | - foreach ( $elements as $key => $element ) { |
|
62 | + foreach ($elements as $key => $element) { |
|
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | 64 | if ($element instanceof HtmlDropdownItem) |
65 | 65 | $this->elements []=$element; |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | public function addLink($caption, $href="#") { |
88 | 88 | $iid=$this->getElementsCount()+1; |
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | - if($caption instanceof HtmlLink){ |
|
90 | + if ($caption instanceof HtmlLink) { |
|
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + } else { |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | public function run(JsUtils $js) { |
125 | - foreach ( $this->elements as $element ) { |
|
125 | + foreach ($this->elements as $element) { |
|
126 | 126 | $element->run($js); |
127 | 127 | } |
128 | 128 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @param int $index |
144 | 144 | * @return BaseHtml |
145 | 145 | */ |
146 | - public function getElement($index){ |
|
146 | + public function getElement($index) { |
|
147 | 147 | return $this->elements[$index]; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -1,39 +1,39 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\php\ci; |
3 | 3 | |
4 | -class JsUtils extends \Ajax\JsUtils{ |
|
4 | +class JsUtils extends \Ajax\JsUtils { |
|
5 | 5 | protected $ci; |
6 | - protected $_my_controller_paths= array(); |
|
7 | - protected $_my_controllers= array(); |
|
6 | + protected $_my_controller_paths=array(); |
|
7 | + protected $_my_controllers=array(); |
|
8 | 8 | |
9 | - public function __construct($params=array(),$injected=NULL){ |
|
10 | - parent::__construct($params,$injected); |
|
11 | - $this->_my_controller_paths = array(APPPATH); |
|
9 | + public function __construct($params=array(), $injected=NULL) { |
|
10 | + parent::__construct($params, $injected); |
|
11 | + $this->_my_controller_paths=array(APPPATH); |
|
12 | 12 | } |
13 | - public function getUrl($url){ |
|
13 | + public function getUrl($url) { |
|
14 | 14 | return site_url($url); |
15 | 15 | } |
16 | 16 | |
17 | - public function getCi(){ |
|
18 | - if(isset($this->ci)===false){ |
|
19 | - $this->ci =& get_instance(); |
|
17 | + public function getCi() { |
|
18 | + if (isset($this->ci)===false) { |
|
19 | + $this->ci=& get_instance(); |
|
20 | 20 | $this->ci->load->helper('url'); |
21 | 21 | } |
22 | 22 | return $this->ci; |
23 | 23 | } |
24 | 24 | |
25 | - public function addViewElement($identifier,$content,&$view){ |
|
26 | - if(\array_key_exists("q", $view)===false){ |
|
25 | + public function addViewElement($identifier, $content, &$view) { |
|
26 | + if (\array_key_exists("q", $view)===false) { |
|
27 | 27 | $view["q"]=array(); |
28 | 28 | } |
29 | 29 | $view["q"][$identifier]=$content; |
30 | 30 | } |
31 | 31 | |
32 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
32 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
33 | 33 | $view[$view_var]=$output; |
34 | 34 | } |
35 | 35 | |
36 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
36 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
37 | 37 | $ci=$this->getCi(); |
38 | 38 | $controllerName=strtolower($controllerName); |
39 | 39 | $this->controller($controllerName); |
@@ -44,64 +44,64 @@ discard block |
||
44 | 44 | return $result; |
45 | 45 | } |
46 | 46 | |
47 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
47 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
48 | 48 | return $initialControllerInstance->load->view($viewName, $params, true); |
49 | 49 | } |
50 | 50 | |
51 | - public function fromDispatcher($dispatcher){ |
|
51 | + public function fromDispatcher($dispatcher) { |
|
52 | 52 | return array_values($dispatcher->uri->segment_array()); |
53 | 53 | } |
54 | 54 | |
55 | - public function controller($controller, $name = '', $db_conn = FALSE){ |
|
56 | - if (\is_array($controller)){ |
|
57 | - foreach ($controller as $babe){ |
|
55 | + public function controller($controller, $name='', $db_conn=FALSE) { |
|
56 | + if (\is_array($controller)) { |
|
57 | + foreach ($controller as $babe) { |
|
58 | 58 | $this->controller($babe); |
59 | 59 | } |
60 | 60 | return; |
61 | 61 | } |
62 | - if ($controller == ''){ |
|
62 | + if ($controller=='') { |
|
63 | 63 | return; |
64 | 64 | } |
65 | - $path = ''; |
|
65 | + $path=''; |
|
66 | 66 | // Is the controller in a sub-folder? If so, parse out the filename and path. |
67 | - if (($last_slash = strrpos($controller, '/')) !== FALSE){ |
|
67 | + if (($last_slash=strrpos($controller, '/'))!==FALSE) { |
|
68 | 68 | // The path is in front of the last slash |
69 | - $path = substr($controller, 0, $last_slash + 1); |
|
69 | + $path=substr($controller, 0, $last_slash+1); |
|
70 | 70 | // And the controller name behind it |
71 | - $controller = substr($controller, $last_slash + 1); |
|
71 | + $controller=substr($controller, $last_slash+1); |
|
72 | 72 | } |
73 | 73 | |
74 | - if ($name == ''){ |
|
75 | - $name = $controller; |
|
74 | + if ($name=='') { |
|
75 | + $name=$controller; |
|
76 | 76 | } |
77 | 77 | |
78 | - if (in_array($name, $this->_my_controllers, TRUE)){ |
|
78 | + if (in_array($name, $this->_my_controllers, TRUE)) { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | |
82 | - $CI =$this->getCi(); |
|
83 | - if (isset($CI->$name)){ |
|
82 | + $CI=$this->getCi(); |
|
83 | + if (isset($CI->$name)) { |
|
84 | 84 | show_error('The controller name you are loading is the name of a resource that is already being used: '.$name); |
85 | 85 | } |
86 | - $controller = strtolower($controller); |
|
87 | - foreach ($this->_my_controller_paths as $mod_path){ |
|
88 | - if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){ |
|
86 | + $controller=strtolower($controller); |
|
87 | + foreach ($this->_my_controller_paths as $mod_path) { |
|
88 | + if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) { |
|
89 | 89 | continue; |
90 | 90 | } |
91 | - if ($db_conn !== FALSE AND ! class_exists('CI_DB')){ |
|
92 | - if ($db_conn === TRUE){ |
|
93 | - $db_conn = ''; |
|
91 | + if ($db_conn!==FALSE AND !class_exists('CI_DB')) { |
|
92 | + if ($db_conn===TRUE) { |
|
93 | + $db_conn=''; |
|
94 | 94 | } |
95 | 95 | $CI->load->database($db_conn, FALSE, TRUE); |
96 | 96 | } |
97 | - if ( ! class_exists('CI_Controller')){ |
|
97 | + if (!class_exists('CI_Controller')) { |
|
98 | 98 | load_class('Controller', 'core'); |
99 | 99 | } |
100 | 100 | require_once($mod_path.'controllers/'.$path.$controller.'.php'); |
101 | - $controller = ucfirst($controller); |
|
102 | - $CI->$name = new $controller(); |
|
101 | + $controller=ucfirst($controller); |
|
102 | + $CI->$name=new $controller(); |
|
103 | 103 | |
104 | - $this->_my_controllers[] = $name; |
|
104 | + $this->_my_controllers[]=$name; |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | show_error('Unable to locate the controller you have specified: '.$controller); |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | protected $_contentSeparator=""; |
26 | 26 | |
27 | 27 | |
28 | - public function __construct($identifier,$tagName,$baseClass){ |
|
29 | - parent::__construct($identifier,$tagName,$baseClass); |
|
28 | + public function __construct($identifier, $tagName, $baseClass) { |
|
29 | + parent::__construct($identifier, $tagName, $baseClass); |
|
30 | 30 | $this->root=""; |
31 | 31 | $this->attr="data-ajax"; |
32 | 32 | } |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | * @param string $targetSelector the target of the get |
37 | 37 | * @return HtmlNavElement |
38 | 38 | */ |
39 | - public function autoGetOnClick($targetSelector){ |
|
40 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
39 | + public function autoGetOnClick($targetSelector) { |
|
40 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function contentAsString(){ |
|
43 | + public function contentAsString() { |
|
44 | 44 | return JArray::implode($this->_contentSeparator, $this->content); |
45 | 45 | } |
46 | 46 | |
@@ -48,15 +48,15 @@ discard block |
||
48 | 48 | * Generate the jquery script to set the elements to the HtmlNavElement |
49 | 49 | * @param JsUtils $jsUtils |
50 | 50 | */ |
51 | - public function jsSetContent(JsUtils $jsUtils){ |
|
52 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
51 | + public function jsSetContent(JsUtils $jsUtils) { |
|
52 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function getRoot() { |
56 | 56 | return $this->root; |
57 | 57 | } |
58 | 58 | public function setRoot($root) { |
59 | - $this->root = $root; |
|
59 | + $this->root=$root; |
|
60 | 60 | return $this; |
61 | 61 | } |
62 | 62 | public function getAttr() { |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | * @return HtmlNavElement |
70 | 70 | */ |
71 | 71 | public function setAttr($attr) { |
72 | - $this->attr = $attr; |
|
72 | + $this->attr=$attr; |
|
73 | 73 | return $this; |
74 | 74 | } |
75 | 75 | |
76 | 76 | public function __call($method, $args) { |
77 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
77 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
78 | 78 | return call_user_func_array( |
79 | 79 | $this->$method, |
80 | 80 | $args |
@@ -82,32 +82,32 @@ discard block |
||
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
85 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0); |
|
85 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
86 | 86 | |
87 | 87 | |
88 | - public function setContentDivider($divider,$index=NULL) { |
|
88 | + public function setContentDivider($divider, $index=NULL) { |
|
89 | 89 | $divider="<div class='divider'> {$divider} </div>"; |
90 | 90 | return $this->setDivider($divider, $index); |
91 | 91 | } |
92 | 92 | |
93 | - public function setIconContentDivider($iconContentDivider,$index=NULL) { |
|
93 | + public function setIconContentDivider($iconContentDivider, $index=NULL) { |
|
94 | 94 | $contentDivider="<i class='".$iconContentDivider." icon divider'></i>"; |
95 | 95 | return $this->setDivider($contentDivider, $index); |
96 | 96 | } |
97 | 97 | |
98 | - protected function setDivider($divider,$index){ |
|
99 | - if(isset($index)){ |
|
100 | - if(!\is_array($this->_contentSeparator)) |
|
101 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
98 | + protected function setDivider($divider, $index) { |
|
99 | + if (isset($index)) { |
|
100 | + if (!\is_array($this->_contentSeparator)) |
|
101 | + $this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator); |
|
102 | 102 | $this->_contentSeparator[$index]=$divider; |
103 | - }else{ |
|
103 | + } else { |
|
104 | 104 | $this->_contentSeparator=$divider; |
105 | 105 | } |
106 | 106 | return $this; |
107 | 107 | } |
108 | 108 | |
109 | - protected function getContentDivider($index){ |
|
110 | - if(\is_array($this->_contentSeparator)){ |
|
109 | + protected function getContentDivider($index) { |
|
110 | + if (\is_array($this->_contentSeparator)) { |
|
111 | 111 | return @$this->_contentSeparator[$index]; |
112 | 112 | } |
113 | 113 | return $this->_contentSeparator; |
@@ -97,10 +97,11 @@ |
||
97 | 97 | |
98 | 98 | protected function setDivider($divider,$index){ |
99 | 99 | if(isset($index)){ |
100 | - if(!\is_array($this->_contentSeparator)) |
|
101 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
100 | + if(!\is_array($this->_contentSeparator)) { |
|
101 | + $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
102 | + } |
|
102 | 103 | $this->_contentSeparator[$index]=$divider; |
103 | - }else{ |
|
104 | + } else{ |
|
104 | 105 | $this->_contentSeparator=$divider; |
105 | 106 | } |
106 | 107 | return $this; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $state=\explode(" ", $state); |
14 | 14 | } |
15 | 15 | if (\is_array($elements)) { |
16 | - foreach ( $elements as $element ) { |
|
16 | + foreach ($elements as $element) { |
|
17 | 17 | if ($element instanceof BaseHtml) { |
18 | 18 | self::_add($state, $element); |
19 | 19 | } |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | } |
23 | 23 | |
24 | 24 | private static function _add($states, $element) { |
25 | - foreach ( $states as $state ) { |
|
26 | - $element->addToPropertyCtrl("class", $state, array ($state )); |
|
25 | + foreach ($states as $state) { |
|
26 | + $element->addToPropertyCtrl("class", $state, array($state)); |
|
27 | 27 | } |
28 | 28 | } |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -8,34 +8,34 @@ discard block |
||
8 | 8 | private $page_count; |
9 | 9 | private $pages_visibles; |
10 | 10 | |
11 | - public function __construct($items_per_page=10,$pages_visibles=4,$page=1){ |
|
11 | + public function __construct($items_per_page=10, $pages_visibles=4, $page=1) { |
|
12 | 12 | $this->items_per_page=$items_per_page; |
13 | 13 | $this->page=$page; |
14 | 14 | $this->pages_visibles=$pages_visibles; |
15 | 15 | $this->visible=true; |
16 | 16 | } |
17 | 17 | |
18 | - public function getObjects($objects){ |
|
19 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
18 | + public function getObjects($objects) { |
|
19 | + $offset=($this->page-1)*$this->items_per_page; |
|
20 | 20 | $os=$objects; |
21 | - if(!\is_array($os)){ |
|
21 | + if (!\is_array($os)) { |
|
22 | 22 | $os=[]; |
23 | - foreach ($objects as $o){ |
|
23 | + foreach ($objects as $o) { |
|
24 | 24 | $os[]=$o; |
25 | 25 | } |
26 | 26 | } |
27 | - $this->page_count = 0; |
|
27 | + $this->page_count=0; |
|
28 | 28 | $row_count=\sizeof($os); |
29 | - if (0 === $row_count) { |
|
29 | + if (0===$row_count) { |
|
30 | 30 | $this->visible=false; |
31 | 31 | } else { |
32 | 32 | $this->visible=true; |
33 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
34 | - if($this->page > $this->page_count+1) { |
|
35 | - $this->page = 1; |
|
33 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
34 | + if ($this->page>$this->page_count+1) { |
|
35 | + $this->page=1; |
|
36 | 36 | } |
37 | 37 | } |
38 | - return array_slice($os, $offset,$this->items_per_page); |
|
38 | + return array_slice($os, $offset, $this->items_per_page); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function getItemsPerPage() { |
@@ -69,14 +69,14 @@ discard block |
||
69 | 69 | return $this->page_count; |
70 | 70 | } |
71 | 71 | |
72 | - public function getPagesNumbers(){ |
|
73 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
72 | + public function getPagesNumbers() { |
|
73 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
74 | 74 | $first=$this->page-$middle; |
75 | - if($first<1){ |
|
75 | + if ($first<1) { |
|
76 | 76 | $first=1; |
77 | 77 | } |
78 | 78 | $last=$first+$this->pages_visibles-1; |
79 | - if($last>$this->page_count){ |
|
79 | + if ($last>$this->page_count) { |
|
80 | 80 | $last=$this->page_count; |
81 | 81 | } |
82 | 82 | return \range($first, $last); |
@@ -124,6 +124,10 @@ discard block |
||
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | + /** |
|
128 | + * @param string $name |
|
129 | + * @param string[] $typeCtrl |
|
130 | + */ |
|
127 | 131 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
128 | 132 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
129 | 133 | return $name=$value; |
@@ -139,22 +143,35 @@ discard block |
||
139 | 143 | return $this; |
140 | 144 | } |
141 | 145 | |
146 | + /** |
|
147 | + * @param string $name |
|
148 | + */ |
|
142 | 149 | protected function removePropertyValue($name, $value) { |
143 | 150 | $this->properties[$name]=\str_replace($value, "", $this->properties[$name]); |
144 | 151 | return $this; |
145 | 152 | } |
146 | 153 | |
154 | + /** |
|
155 | + * @param string $name |
|
156 | + */ |
|
147 | 157 | protected function removePropertyValues($name, $values) { |
148 | 158 | $this->removeOldValues($this->properties[$name], $values); |
149 | 159 | return $this; |
150 | 160 | } |
151 | 161 | |
162 | + /** |
|
163 | + * @param string $name |
|
164 | + */ |
|
152 | 165 | public function removeProperty($name) { |
153 | 166 | if (\array_key_exists($name, $this->properties)) |
154 | 167 | unset($this->properties[$name]); |
155 | 168 | return $this; |
156 | 169 | } |
157 | 170 | |
171 | + /** |
|
172 | + * @param string $name |
|
173 | + * @param string[] $typeCtrl |
|
174 | + */ |
|
158 | 175 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
159 | 176 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
160 | 177 | if (\is_array($typeCtrl)) { |
@@ -165,6 +182,9 @@ discard block |
||
165 | 182 | return $this; |
166 | 183 | } |
167 | 184 | |
185 | + /** |
|
186 | + * @param string $name |
|
187 | + */ |
|
168 | 188 | protected function addToMember(&$name, $value, $separator=" ") { |
169 | 189 | $name=str_ireplace($value, "", $name) . $separator . $value; |
170 | 190 | return $this; |
@@ -179,6 +199,9 @@ discard block |
||
179 | 199 | return $this->addToProperty($name, $value); |
180 | 200 | } |
181 | 201 | |
202 | + /** |
|
203 | + * @param string $name |
|
204 | + */ |
|
182 | 205 | public function addToPropertyCtrl($name, $value, $typeCtrl) { |
183 | 206 | return $this->addToPropertyUnique($name, $value, $typeCtrl); |
184 | 207 | } |
@@ -278,6 +301,10 @@ discard block |
||
278 | 301 | return null; |
279 | 302 | } |
280 | 303 | |
304 | + /** |
|
305 | + * @param string $propertyName |
|
306 | + * @param string $value |
|
307 | + */ |
|
281 | 308 | protected function getElementByPropertyValue($propertyName,$value, $elements) { |
282 | 309 | if (\is_array($elements)) { |
283 | 310 | $flag=false; |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | use BaseHtmlEventsTrait; |
18 | 18 | protected $_template; |
19 | 19 | protected $tagName; |
20 | - protected $properties=array (); |
|
21 | - protected $_wrapBefore=array (); |
|
22 | - protected $_wrapAfter=array (); |
|
20 | + protected $properties=array(); |
|
21 | + protected $_wrapBefore=array(); |
|
22 | + protected $_wrapAfter=array(); |
|
23 | 23 | protected $_bsComponent; |
24 | 24 | |
25 | 25 | public function getBsComponent() { |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | protected function getTemplate(JsUtils $js=NULL) { |
35 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
35 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function getProperties() { |
@@ -56,13 +56,13 @@ discard block |
||
56 | 56 | |
57 | 57 | public function addToProperty($name, $value, $separator=" ") { |
58 | 58 | if (\is_array($value)) { |
59 | - foreach ( $value as $v ) { |
|
59 | + foreach ($value as $v) { |
|
60 | 60 | $this->addToProperty($name, $v, $separator); |
61 | 61 | } |
62 | - } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
|
62 | + } else if ($value!=="" && $this->propertyContains($name, $value)===false) { |
|
63 | 63 | $v=@$this->properties[$name]; |
64 | - if (isset($v) && $v !== "") |
|
65 | - $v=$v . $separator . $value; |
|
64 | + if (isset($v) && $v!=="") |
|
65 | + $v=$v.$separator.$value; |
|
66 | 66 | else |
67 | 67 | $v=$value; |
68 | 68 | |
@@ -78,19 +78,19 @@ discard block |
||
78 | 78 | |
79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | 80 | $result=$this->getTemplate($js); |
81 | - foreach ( $this as $key => $value ) { |
|
82 | - if (JString::startswith($key, "_") === false && $key !== "events") { |
|
81 | + foreach ($this as $key => $value) { |
|
82 | + if (JString::startswith($key, "_")===false && $key!=="events") { |
|
83 | 83 | if (\is_array($value)) { |
84 | 84 | $v=PropertyWrapper::wrap($value, $js); |
85 | 85 | } else { |
86 | 86 | $v=$value; |
87 | 87 | } |
88 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
88 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | if (isset($js)===true) { |
92 | 92 | $this->run($js); |
93 | - if (isset($view) === true) { |
|
93 | + if (isset($view)===true) { |
|
94 | 94 | $js->addViewElement($this->identifier, $result, $view); |
95 | 95 | } |
96 | 96 | } |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function ctrl($name, $value, $typeCtrl) { |
101 | 101 | if (\is_array($typeCtrl)) { |
102 | - if (array_search($value, $typeCtrl) === false) { |
|
103 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
102 | + if (array_search($value, $typeCtrl)===false) { |
|
103 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
104 | 104 | } |
105 | 105 | } else { |
106 | 106 | if (!$typeCtrl($value)) { |
107 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
107 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | return true; |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
122 | + if ($this->ctrl($name, $value, $typeCtrl)===true) |
|
123 | 123 | return $this->setProperty($name, $value); |
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | 127 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
128 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
128 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
129 | 129 | return $name=$value; |
130 | 130 | } |
131 | 131 | return $this; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
135 | 135 | if (\is_array($typeCtrl)) { |
136 | 136 | $this->removeOldValues($name, $typeCtrl); |
137 | - $name.=$separator . $value; |
|
137 | + $name.=$separator.$value; |
|
138 | 138 | } |
139 | 139 | return $this; |
140 | 140 | } |
@@ -156,17 +156,17 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
159 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
159 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
160 | 160 | if (\is_array($typeCtrl)) { |
161 | 161 | $this->removeOldValues($name, $typeCtrl); |
162 | 162 | } |
163 | - $name.=$separator . $value; |
|
163 | + $name.=$separator.$value; |
|
164 | 164 | } |
165 | 165 | return $this; |
166 | 166 | } |
167 | 167 | |
168 | 168 | protected function addToMember(&$name, $value, $separator=" ") { |
169 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
169 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
187 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
187 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
188 | 188 | return $this->addToProperty($name, $value); |
189 | 189 | } |
190 | 190 | return $this; |
@@ -212,26 +212,26 @@ discard block |
||
212 | 212 | } |
213 | 213 | |
214 | 214 | public function fromArray($array) { |
215 | - foreach ( $this as $key => $value ) { |
|
216 | - if(array_key_exists($key, $array)===true) |
|
217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
215 | + foreach ($this as $key => $value) { |
|
216 | + if (array_key_exists($key, $array)===true) |
|
217 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
218 | 218 | } |
219 | - foreach ( $array as $key => $value ) { |
|
220 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
221 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
219 | + foreach ($array as $key => $value) { |
|
220 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
221 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $array; |
225 | 225 | } |
226 | 226 | |
227 | - private function _callSetter($setter,$key,$value,&$array){ |
|
227 | + private function _callSetter($setter, $key, $value, &$array) { |
|
228 | 228 | $result=false; |
229 | 229 | if (method_exists($this, $setter) && !JString::startswith($key, "_")) { |
230 | 230 | try { |
231 | 231 | $this->$setter($value); |
232 | 232 | unset($array[$key]); |
233 | 233 | $result=true; |
234 | - } catch ( \Exception $e ) { |
|
234 | + }catch (\Exception $e) { |
|
235 | 235 | $result=false; |
236 | 236 | } |
237 | 237 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | public function fromDatabaseObjects($objects, $function) { |
242 | 242 | if (isset($objects)) { |
243 | - foreach ( $objects as $object ) { |
|
243 | + foreach ($objects as $object) { |
|
244 | 244 | $this->fromDatabaseObject($object, $function); |
245 | 245 | } |
246 | 246 | } |
@@ -264,33 +264,33 @@ discard block |
||
264 | 264 | if (\is_array($elements)) { |
265 | 265 | $flag=false; |
266 | 266 | $index=0; |
267 | - while ( !$flag && $index < sizeof($elements) ) { |
|
267 | + while (!$flag && $index<sizeof($elements)) { |
|
268 | 268 | if ($elements[$index] instanceof BaseHtml) |
269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
269 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
270 | 270 | $index++; |
271 | 271 | } |
272 | - if ($flag === true) |
|
273 | - return $elements[$index - 1]; |
|
272 | + if ($flag===true) |
|
273 | + return $elements[$index-1]; |
|
274 | 274 | } elseif ($elements instanceof BaseHtml) { |
275 | - if ($elements->getIdentifier() === $identifier) |
|
275 | + if ($elements->getIdentifier()===$identifier) |
|
276 | 276 | return $elements; |
277 | 277 | } |
278 | 278 | return null; |
279 | 279 | } |
280 | 280 | |
281 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
281 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
282 | 282 | if (\is_array($elements)) { |
283 | 283 | $flag=false; |
284 | 284 | $index=0; |
285 | - while ( !$flag && $index < sizeof($elements) ) { |
|
285 | + while (!$flag && $index<sizeof($elements)) { |
|
286 | 286 | if ($elements[$index] instanceof BaseHtml) |
287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
287 | + $flag=($elements[$index]->propertyContains($propertyName, $value)===true); |
|
288 | 288 | $index++; |
289 | 289 | } |
290 | - if ($flag === true) |
|
291 | - return $elements[$index - 1]; |
|
290 | + if ($flag===true) |
|
291 | + return $elements[$index-1]; |
|
292 | 292 | } elseif ($elements instanceof BaseHtml) { |
293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
293 | + if ($elements->propertyContains($propertyName, $value)===true) |
|
294 | 294 | return $elements; |
295 | 295 | } |
296 | 296 | return null; |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | public function getProperty($name) { |
53 | - if (array_key_exists($name, $this->properties)) |
|
54 | - return $this->properties[$name]; |
|
53 | + if (array_key_exists($name, $this->properties)) { |
|
54 | + return $this->properties[$name]; |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | |
57 | 58 | public function addToProperty($name, $value, $separator=" ") { |
@@ -61,10 +62,11 @@ discard block |
||
61 | 62 | } |
62 | 63 | } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
63 | 64 | $v=@$this->properties[$name]; |
64 | - if (isset($v) && $v !== "") |
|
65 | - $v=$v . $separator . $value; |
|
66 | - else |
|
67 | - $v=$value; |
|
65 | + if (isset($v) && $v !== "") { |
|
66 | + $v=$v . $separator . $value; |
|
67 | + } else { |
|
68 | + $v=$value; |
|
69 | + } |
|
68 | 70 | |
69 | 71 | return $this->setProperty($name, $v); |
70 | 72 | } |
@@ -119,8 +121,9 @@ discard block |
||
119 | 121 | } |
120 | 122 | |
121 | 123 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
123 | - return $this->setProperty($name, $value); |
|
124 | + if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
125 | + return $this->setProperty($name, $value); |
|
126 | + } |
|
124 | 127 | return $this; |
125 | 128 | } |
126 | 129 | |
@@ -150,8 +153,9 @@ discard block |
||
150 | 153 | } |
151 | 154 | |
152 | 155 | public function removeProperty($name) { |
153 | - if (\array_key_exists($name, $this->properties)) |
|
154 | - unset($this->properties[$name]); |
|
156 | + if (\array_key_exists($name, $this->properties)) { |
|
157 | + unset($this->properties[$name]); |
|
158 | + } |
|
155 | 159 | return $this; |
156 | 160 | } |
157 | 161 | |
@@ -171,8 +175,9 @@ discard block |
||
171 | 175 | } |
172 | 176 | |
173 | 177 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
174 | - if (@class_exists($typeCtrl, true)) |
|
175 | - $typeCtrl=$typeCtrl::getConstants(); |
|
178 | + if (@class_exists($typeCtrl, true)) { |
|
179 | + $typeCtrl=$typeCtrl::getConstants(); |
|
180 | + } |
|
176 | 181 | if (\is_array($typeCtrl)) { |
177 | 182 | $this->removeOldValues($this->properties[$name], $typeCtrl); |
178 | 183 | } |
@@ -213,8 +218,9 @@ discard block |
||
213 | 218 | |
214 | 219 | public function fromArray($array) { |
215 | 220 | foreach ( $this as $key => $value ) { |
216 | - if(array_key_exists($key, $array)===true) |
|
217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
221 | + if(array_key_exists($key, $array)===true) { |
|
222 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
223 | + } |
|
218 | 224 | } |
219 | 225 | foreach ( $array as $key => $value ) { |
220 | 226 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -265,15 +271,18 @@ discard block |
||
265 | 271 | $flag=false; |
266 | 272 | $index=0; |
267 | 273 | while ( !$flag && $index < sizeof($elements) ) { |
268 | - if ($elements[$index] instanceof BaseHtml) |
|
269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
274 | + if ($elements[$index] instanceof BaseHtml) { |
|
275 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
276 | + } |
|
270 | 277 | $index++; |
271 | 278 | } |
272 | - if ($flag === true) |
|
273 | - return $elements[$index - 1]; |
|
279 | + if ($flag === true) { |
|
280 | + return $elements[$index - 1]; |
|
281 | + } |
|
274 | 282 | } elseif ($elements instanceof BaseHtml) { |
275 | - if ($elements->getIdentifier() === $identifier) |
|
276 | - return $elements; |
|
283 | + if ($elements->getIdentifier() === $identifier) { |
|
284 | + return $elements; |
|
285 | + } |
|
277 | 286 | } |
278 | 287 | return null; |
279 | 288 | } |
@@ -283,15 +292,18 @@ discard block |
||
283 | 292 | $flag=false; |
284 | 293 | $index=0; |
285 | 294 | while ( !$flag && $index < sizeof($elements) ) { |
286 | - if ($elements[$index] instanceof BaseHtml) |
|
287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
295 | + if ($elements[$index] instanceof BaseHtml) { |
|
296 | + $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
297 | + } |
|
288 | 298 | $index++; |
289 | 299 | } |
290 | - if ($flag === true) |
|
291 | - return $elements[$index - 1]; |
|
300 | + if ($flag === true) { |
|
301 | + return $elements[$index - 1]; |
|
302 | + } |
|
292 | 303 | } elseif ($elements instanceof BaseHtml) { |
293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
294 | - return $elements; |
|
304 | + if ($elements->propertyContains($propertyName, $value) === true) { |
|
305 | + return $elements; |
|
306 | + } |
|
295 | 307 | } |
296 | 308 | return null; |
297 | 309 | } |
@@ -20,6 +20,9 @@ |
||
20 | 20 | class DataForm extends Widget { |
21 | 21 | use FormFieldAsTrait,FormTrait; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $identifier |
|
25 | + */ |
|
23 | 26 | public function __construct($identifier, $modelInstance=NULL) { |
24 | 27 | parent::__construct($identifier, null,$modelInstance); |
25 | 28 | $this->_init(new FormInstanceViewer($identifier), "form", new HtmlForm($identifier), true); |
@@ -18,48 +18,48 @@ discard block |
||
18 | 18 | * @property FormInstanceViewer $_instanceViewer |
19 | 19 | */ |
20 | 20 | class DataForm extends Widget { |
21 | - use FormFieldAsTrait,FormTrait; |
|
21 | + use FormFieldAsTrait, FormTrait; |
|
22 | 22 | |
23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
24 | - parent::__construct($identifier, null,$modelInstance); |
|
24 | + parent::__construct($identifier, null, $modelInstance); |
|
25 | 25 | $this->_init(new FormInstanceViewer($identifier), "form", new HtmlForm($identifier), true); |
26 | 26 | } |
27 | 27 | |
28 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
28 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
30 | 30 | |
31 | 31 | $form=$this->content["form"]; |
32 | 32 | $this->_generateContent($form); |
33 | 33 | |
34 | - if(isset($this->_toolbar)){ |
|
34 | + if (isset($this->_toolbar)) { |
|
35 | 35 | $this->_setToolbarPosition($form); |
36 | 36 | } |
37 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
38 | - return parent::compile($js,$view); |
|
37 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
38 | + return parent::compile($js, $view); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | 42 | * @param HtmlForm $form |
43 | 43 | */ |
44 | - protected function _generateContent($form){ |
|
45 | - $values= $this->_instanceViewer->getValues(); |
|
44 | + protected function _generateContent($form) { |
|
45 | + $values=$this->_instanceViewer->getValues(); |
|
46 | 46 | $count=$this->_instanceViewer->count(); |
47 | 47 | |
48 | 48 | $separators=$this->_instanceViewer->getSeparators(); |
49 | 49 | $size=\sizeof($separators); |
50 | - if($size===1){ |
|
51 | - foreach ($values as $v){ |
|
50 | + if ($size===1) { |
|
51 | + foreach ($values as $v) { |
|
52 | 52 | $form->addField($v); |
53 | 53 | } |
54 | - }else{ |
|
54 | + } else { |
|
55 | 55 | $separators[]=$count; |
56 | - for($i=0;$i<$size;$i++){ |
|
57 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
56 | + for ($i=0; $i<$size; $i++) { |
|
57 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
58 | 58 | //TODO check why $fields is empty |
59 | - if(\sizeof($fields)===1){ |
|
59 | + if (\sizeof($fields)===1) { |
|
60 | 60 | $form->addField($fields[0]); |
61 | - }elseif(\sizeof($fields)>1){ |
|
62 | - $form->addFields($fields,"grouped"); |
|
61 | + }elseif (\sizeof($fields)>1) { |
|
62 | + $form->addFields($fields, "grouped"); |
|
63 | 63 | $i+=\sizeof($fields)-1; |
64 | 64 | } |
65 | 65 | } |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * @return HtmlForm |
71 | 71 | */ |
72 | - protected function getForm(){ |
|
72 | + protected function getForm() { |
|
73 | 73 | return $this->content["form"]; |
74 | 74 | } |
75 | 75 | |
76 | - public function addSeparatorAfter($fieldNum){ |
|
76 | + public function addSeparatorAfter($fieldNum) { |
|
77 | 77 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
78 | 78 | return $this; |
79 | 79 | } |
@@ -87,26 +87,26 @@ discard block |
||
87 | 87 | return $this; |
88 | 88 | } |
89 | 89 | |
90 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
91 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
92 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
90 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
91 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
92 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
93 | 93 | return $this->addInToolbar($button); |
94 | 94 | } |
95 | 95 | |
96 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
97 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){ |
|
98 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
99 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
96 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
97 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){ |
|
98 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
99 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
100 | 100 | return $button; |
101 | - }, $index,$attributes); |
|
101 | + }, $index, $attributes); |
|
102 | 102 | } |
103 | 103 | |
104 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
105 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
106 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
104 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
105 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
106 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
107 | 107 | $button->setProperty("type", "reset"); |
108 | 108 | return $button; |
109 | - }, $index,$attributes); |
|
109 | + }, $index, $attributes); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -51,14 +51,14 @@ |
||
51 | 51 | foreach ($values as $v){ |
52 | 52 | $form->addField($v); |
53 | 53 | } |
54 | - }else{ |
|
54 | + } else{ |
|
55 | 55 | $separators[]=$count; |
56 | 56 | for($i=0;$i<$size;$i++){ |
57 | 57 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
58 | 58 | //TODO check why $fields is empty |
59 | 59 | if(\sizeof($fields)===1){ |
60 | 60 | $form->addField($fields[0]); |
61 | - }elseif(\sizeof($fields)>1){ |
|
61 | + } elseif(\sizeof($fields)>1){ |
|
62 | 62 | $form->addFields($fields,"grouped"); |
63 | 63 | $i+=\sizeof($fields)-1; |
64 | 64 | } |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | protected $attr; |
20 | 20 | |
21 | 21 | |
22 | - public function __construct($identifier,$tagName){ |
|
23 | - parent::__construct($identifier,$tagName); |
|
22 | + public function __construct($identifier, $tagName) { |
|
23 | + parent::__construct($identifier, $tagName); |
|
24 | 24 | $this->root=""; |
25 | 25 | $this->attr="data-ajax"; |
26 | 26 | } |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | * @param string $targetSelector the target of the get |
32 | 32 | * @return HtmlNavElement |
33 | 33 | */ |
34 | - public function autoGetOnClick($targetSelector){ |
|
35 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
34 | + public function autoGetOnClick($targetSelector) { |
|
35 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
36 | 36 | } |
37 | 37 | |
38 | - public function contentAsString(){ |
|
38 | + public function contentAsString() { |
|
39 | 39 | return implode("", $this->content); |
40 | 40 | } |
41 | 41 | |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | * Generate the jquery script to set the elements to the HtmlNavElement |
44 | 44 | * @param JsUtils $jsUtils |
45 | 45 | */ |
46 | - public function jsSetContent(JsUtils $jsUtils){ |
|
47 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
46 | + public function jsSetContent(JsUtils $jsUtils) { |
|
47 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function getRoot() { |
51 | 51 | return $this->root; |
52 | 52 | } |
53 | 53 | public function setRoot($root) { |
54 | - $this->root = $root; |
|
54 | + $this->root=$root; |
|
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | public function getAttr() { |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | * @return HtmlNavElement |
65 | 65 | */ |
66 | 66 | public function setAttr($attr) { |
67 | - $this->attr = $attr; |
|
67 | + $this->attr=$attr; |
|
68 | 68 | return $this; |
69 | 69 | } |
70 | 70 | |
71 | 71 | public function __call($method, $args) { |
72 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
72 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
73 | 73 | return call_user_func_array( |
74 | 74 | $this->$method, |
75 | 75 | $args |
@@ -77,6 +77,6 @@ discard block |
||
77 | 77 | } |
78 | 78 | } |
79 | 79 | |
80 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
80 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
81 | 81 | |
82 | 82 | } |
83 | 83 | \ No newline at end of file |
@@ -56,8 +56,9 @@ discard block |
||
56 | 56 | $name=$attributes["name"]; |
57 | 57 | } |
58 | 58 | $element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,""); |
59 | - if(\is_array($attributes)) |
|
60 | - $this->_applyAttributes($element, $attributes,$index); |
|
59 | + if(\is_array($attributes)) { |
|
60 | + $this->_applyAttributes($element, $attributes,$index); |
|
61 | + } |
|
61 | 62 | $element->setDisabled(!$this->_edition); |
62 | 63 | return $element; |
63 | 64 | }); |
@@ -92,8 +93,9 @@ discard block |
||
92 | 93 | public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
93 | 94 | return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
94 | 95 | $header=new HtmlHeader($id,$niveau,$value); |
95 | - if(isset($icon)) |
|
96 | - $header->asIcon($icon, $value); |
|
96 | + if(isset($icon)) { |
|
97 | + $header->asIcon($icon, $value); |
|
98 | + } |
|
97 | 99 | return $header; |
98 | 100 | }, $index,$attributes,"header"); |
99 | 101 | } |
@@ -101,7 +103,9 @@ discard block |
||
101 | 103 | |
102 | 104 | public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
103 | 105 | $this->setValueFunction($index,function($img) use($size,$circular){ |
104 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
106 | + $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) { |
|
107 | + $image->setCircular(); |
|
108 | + } |
|
105 | 109 | return $image; |
106 | 110 | }); |
107 | 111 | return $this; |
@@ -22,6 +22,10 @@ discard block |
||
22 | 22 | trait FieldAsTrait{ |
23 | 23 | |
24 | 24 | abstract protected function _getFieldIdentifier($prefix); |
25 | + |
|
26 | + /** |
|
27 | + * @param \Closure $callback |
|
28 | + */ |
|
25 | 29 | abstract public function setValueFunction($index,$callback); |
26 | 30 | |
27 | 31 | /** |
@@ -47,6 +51,10 @@ discard block |
||
47 | 51 | |
48 | 52 | protected function _addRules($element,&$attributes){} |
49 | 53 | |
54 | + /** |
|
55 | + * @param \Closure $elementCallback |
|
56 | + * @param string $prefix |
|
57 | + */ |
|
50 | 58 | protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
51 | 59 | $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
52 | 60 | $name=$this->_instanceViewer->getFieldName($index)."[]"; |
@@ -19,43 +19,43 @@ discard block |
||
19 | 19 | * @property boolean $_edition |
20 | 20 | * @property mixed _modelInstance |
21 | 21 | */ |
22 | -trait FieldAsTrait{ |
|
22 | +trait FieldAsTrait { |
|
23 | 23 | |
24 | 24 | abstract protected function _getFieldIdentifier($prefix); |
25 | - abstract public function setValueFunction($index,$callback); |
|
25 | + abstract public function setValueFunction($index, $callback); |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * @param HtmlFormField $element |
29 | 29 | * @param array $attributes |
30 | 30 | */ |
31 | - protected function _applyAttributes($element,&$attributes,$index){ |
|
31 | + protected function _applyAttributes($element, &$attributes, $index) { |
|
32 | 32 | $this->_addRules($element, $attributes); |
33 | - if(isset($attributes["callback"])){ |
|
33 | + if (isset($attributes["callback"])) { |
|
34 | 34 | $callback=$attributes["callback"]; |
35 | - if(\is_callable($callback)){ |
|
36 | - $callback($element,$this->_modelInstance,$index); |
|
35 | + if (\is_callable($callback)) { |
|
36 | + $callback($element, $this->_modelInstance, $index); |
|
37 | 37 | unset($attributes["callback"]); |
38 | 38 | } |
39 | 39 | } |
40 | 40 | $element->fromArray($attributes); |
41 | 41 | } |
42 | 42 | |
43 | - private function _getLabelField($caption,$icon=NULL){ |
|
44 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
43 | + private function _getLabelField($caption, $icon=NULL) { |
|
44 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
45 | 45 | return $label; |
46 | 46 | } |
47 | 47 | |
48 | - protected function _addRules($element,&$attributes){} |
|
48 | + protected function _addRules($element, &$attributes) {} |
|
49 | 49 | |
50 | - protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
|
51 | - $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
|
50 | + protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) { |
|
51 | + $this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){ |
|
52 | 52 | $name=$this->_instanceViewer->getFieldName($index)."[]"; |
53 | - if(isset($attributes["name"])){ |
|
53 | + if (isset($attributes["name"])) { |
|
54 | 54 | $name=$attributes["name"]; |
55 | 55 | } |
56 | - $element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,""); |
|
57 | - if(\is_array($attributes)) |
|
58 | - $this->_applyAttributes($element, $attributes,$index); |
|
56 | + $element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, ""); |
|
57 | + if (\is_array($attributes)) |
|
58 | + $this->_applyAttributes($element, $attributes, $index); |
|
59 | 59 | $element->setDisabled(!$this->_edition); |
60 | 60 | return $element; |
61 | 61 | }); |
@@ -63,102 +63,102 @@ discard block |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | |
66 | - public function fieldAsProgress($index,$label=NULL, $attributes=array()){ |
|
67 | - $this->setValueFunction($index,function($value) use($label,$attributes){ |
|
68 | - $pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes); |
|
66 | + public function fieldAsProgress($index, $label=NULL, $attributes=array()) { |
|
67 | + $this->setValueFunction($index, function($value) use($label, $attributes){ |
|
68 | + $pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes); |
|
69 | 69 | return $pb; |
70 | 70 | }); |
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | - public function fieldAsRating($index,$max=5, $icon=""){ |
|
75 | - $this->setValueFunction($index,function($value) use($max,$icon){ |
|
76 | - $rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon); |
|
74 | + public function fieldAsRating($index, $max=5, $icon="") { |
|
75 | + $this->setValueFunction($index, function($value) use($max, $icon){ |
|
76 | + $rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon); |
|
77 | 77 | return $rating; |
78 | 78 | }); |
79 | 79 | return $this; |
80 | 80 | } |
81 | 81 | |
82 | - public function fieldAsLabel($index,$icon=NULL){ |
|
83 | - $this->setValueFunction($index,function($caption) use($icon){ |
|
84 | - $lbl=$this->_getLabelField($caption,$icon); |
|
82 | + public function fieldAsLabel($index, $icon=NULL) { |
|
83 | + $this->setValueFunction($index, function($caption) use($icon){ |
|
84 | + $lbl=$this->_getLabelField($caption, $icon); |
|
85 | 85 | return $lbl; |
86 | 86 | }); |
87 | 87 | return $this; |
88 | 88 | } |
89 | 89 | |
90 | - public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
|
91 | - return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
|
92 | - $header=new HtmlHeader($id,$niveau,$value); |
|
93 | - if(isset($icon)) |
|
90 | + public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) { |
|
91 | + return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){ |
|
92 | + $header=new HtmlHeader($id, $niveau, $value); |
|
93 | + if (isset($icon)) |
|
94 | 94 | $header->asIcon($icon, $value); |
95 | 95 | return $header; |
96 | - }, $index,$attributes,"header"); |
|
96 | + }, $index, $attributes, "header"); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
100 | - public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
|
101 | - $this->setValueFunction($index,function($img) use($size,$circular){ |
|
102 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
100 | + public function fieldAsImage($index, $size=Size::MINI, $circular=false) { |
|
101 | + $this->setValueFunction($index, function($img) use($size, $circular){ |
|
102 | + $image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular(); |
|
103 | 103 | return $image; |
104 | 104 | }); |
105 | 105 | return $this; |
106 | 106 | } |
107 | 107 | |
108 | - public function fieldAsAvatar($index,$attributes=NULL){ |
|
109 | - return $this->_fieldAs(function($id,$name,$value){ |
|
110 | - $img=new HtmlImage($id,$value); |
|
108 | + public function fieldAsAvatar($index, $attributes=NULL) { |
|
109 | + return $this->_fieldAs(function($id, $name, $value) { |
|
110 | + $img=new HtmlImage($id, $value); |
|
111 | 111 | $img->asAvatar(); |
112 | 112 | return $img; |
113 | - }, $index,$attributes,"avatar"); |
|
113 | + }, $index, $attributes, "avatar"); |
|
114 | 114 | } |
115 | 115 | |
116 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
117 | - return $this->_fieldAs(function($id,$name,$value){ |
|
118 | - $input= new HtmlRadio($id,$name,$value,$value); |
|
116 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
117 | + return $this->_fieldAs(function($id, $name, $value) { |
|
118 | + $input=new HtmlRadio($id, $name, $value, $value); |
|
119 | 119 | return $input; |
120 | - }, $index,$attributes,"radio"); |
|
120 | + }, $index, $attributes, "radio"); |
|
121 | 121 | } |
122 | 122 | |
123 | - public function fieldAsInput($index,$attributes=NULL){ |
|
124 | - return $this->_fieldAs(function($id,$name,$value){ |
|
125 | - $input= new HtmlFormInput($id,"","text",$value); |
|
123 | + public function fieldAsInput($index, $attributes=NULL) { |
|
124 | + return $this->_fieldAs(function($id, $name, $value) { |
|
125 | + $input=new HtmlFormInput($id, "", "text", $value); |
|
126 | 126 | $input->setName($name); |
127 | 127 | return $input; |
128 | - }, $index,$attributes,"input"); |
|
128 | + }, $index, $attributes, "input"); |
|
129 | 129 | } |
130 | 130 | |
131 | - public function fieldAsTextarea($index,$attributes=NULL){ |
|
132 | - return $this->_fieldAs(function($id,$name,$value){ |
|
133 | - $textarea=new HtmlFormTextarea($id,null,$value); |
|
131 | + public function fieldAsTextarea($index, $attributes=NULL) { |
|
132 | + return $this->_fieldAs(function($id, $name, $value) { |
|
133 | + $textarea=new HtmlFormTextarea($id, null, $value); |
|
134 | 134 | $textarea->setName($name); |
135 | 135 | return $textarea; |
136 | - }, $index,$attributes,"textarea"); |
|
136 | + }, $index, $attributes, "textarea"); |
|
137 | 137 | } |
138 | 138 | |
139 | - public function fieldAsHidden($index,$attributes=NULL){ |
|
140 | - if(!\is_array($attributes)){ |
|
139 | + public function fieldAsHidden($index, $attributes=NULL) { |
|
140 | + if (!\is_array($attributes)) { |
|
141 | 141 | $attributes=[]; |
142 | 142 | } |
143 | 143 | $attributes["imputType"]="hidden"; |
144 | - return $this->fieldAsInput($index,$attributes); |
|
144 | + return $this->fieldAsInput($index, $attributes); |
|
145 | 145 | } |
146 | 146 | |
147 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
148 | - return $this->_fieldAs(function($id,$name,$value){ |
|
149 | - $input=new HtmlFormCheckbox($id,NULL,$this->_instanceViewer->getIdentifier()); |
|
147 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
148 | + return $this->_fieldAs(function($id, $name, $value) { |
|
149 | + $input=new HtmlFormCheckbox($id, NULL, $this->_instanceViewer->getIdentifier()); |
|
150 | 150 | $input->setChecked(JString::isBooleanTrue($value)); |
151 | 151 | $input->getField()->setProperty("name", $name); |
152 | 152 | return $input; |
153 | - }, $index,$attributes,"ck"); |
|
153 | + }, $index, $attributes, "ck"); |
|
154 | 154 | } |
155 | 155 | |
156 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
157 | - return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){ |
|
156 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
157 | + return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){ |
|
158 | 158 | //$dd=new HtmlDropdown($id,$value,$elements); |
159 | - $dd=new HtmlFormDropdown($id,$elements,NULL,$value); |
|
160 | - $dd->asSelect($name,$multiple); |
|
159 | + $dd=new HtmlFormDropdown($id, $elements, NULL, $value); |
|
160 | + $dd->asSelect($name, $multiple); |
|
161 | 161 | return $dd; |
162 | - }, $index,$attributes,"dd"); |
|
162 | + }, $index, $attributes, "dd"); |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | \ No newline at end of file |