Changeset 526

Timestamp:

08/08/07 15:52:45 (1 year ago)

Author:

laurentj

Message:

ticket #186: jforms, required field are indicated
ticket #181: jforms, errors are displayed in the form
many bug fixes in jforms compiler, checker, javascript etc.. added some additionnal unit tests.

Files:

• trunk/build/manifests/testapp.mn (modified) (2 diffs)
• trunk/build/manifests/testapp.mn (modified) (2 diffs)
• trunk/lib/jelix-www/design/jform.css (modified) (1 diff)
• trunk/lib/jelix-www/design/jform.css (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (2 diffs)
• trunk/lib/jelix-www/js/jforms.js (modified) (2 diffs)
• trunk/lib/jelix/docs/ns/jforms-controls.rng (modified) (2 diffs)
• trunk/lib/jelix/docs/ns/jforms-controls.rng (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (13 diffs)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (13 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php (modified) (1 diff)
• trunk/lib/jelix/utils/jDatatype.class.php (modified) (5 diffs)
• trunk/lib/jelix/utils/jDatatype.class.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.check_datas.html.php (added)
• trunk/testapp/modules/jelix_tests/tests/jforms.check_datas.html.php (added)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (9 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (9 diffs)
• trunk/testapp/modules/jelix_tests/tests/utils.jdatatype.html_cli.php (added)
• trunk/testapp/modules/jelix_tests/tests/utils.jdatatype.html_cli.php (added)
• trunk/testapp/modules/testapp/controllers/sampleform.classic.php (modified) (1 diff)
• trunk/testapp/modules/testapp/controllers/sampleform.classic.php (modified) (1 diff)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (3 diffs)
• trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (3 diffs)
• trunk/testapp/modules/testapp/templates/sampleform.tpl (modified) (1 diff)
• trunk/testapp/modules/testapp/templates/sampleform.tpl (modified) (1 diff)

trunk/build/manifests/testapp.mn

@@ -114 +114 @@
-  jdb.2_queries_with_pdo.html.php
-  jforms.html.php
+  jforms.check_datas.html.php
-  jforms.compiler.html.php
-  jforms.htmlbuilder.html.php
@@ -119 +120 @@
-  jtpl.compiler.html_cli.php
-  jtpl.expressions_parsing.html_cli.php
+  utils.jdatatype.html_cli.php
-  utils.jfilter.html_cli.php
-

trunk/build/manifests/testapp.mn

@@ -114 +114 @@
-  jdb.2_queries_with_pdo.html.php
-  jforms.html.php
+  jforms.check_datas.html.php
-  jforms.compiler.html.php
-  jforms.htmlbuilder.html.php
@@ -119 +120 @@
-  jtpl.compiler.html_cli.php
-  jtpl.expressions_parsing.html_cli.php
+  utils.jdatatype.html_cli.php
-  utils.jfilter.html_cli.php
-

trunk/lib/jelix-www/design/jform.css

@@ -9 +9 @@
-
-.jforms-required { font-weight:bold; }
-
-
+
-
+.jforms-error-list { color:red; border:1px solid red;}
+
+input.jforms-error, textarea.jforms-error, select.jforms-error {background-color: #ffd6d7;}
+
+label.jforms-error, span.jforms-error {font-style:italic; color:red;}

trunk/lib/jelix-www/design/jform.css

@@ -9 +9 @@
-
-.jforms-required { font-weight:bold; }
-
-
+
-
+.jforms-error-list { color:red; border:1px solid red;}
+
+input.jforms-error, textarea.jforms-error, select.jforms-error {background-color: #ffd6d7;}
+
+label.jforms-error, span.jforms-error {font-style:italic; color:red;}

trunk/lib/jelix-www/js/jforms.js

@@ -166 +166 @@
-    _getValue : function (elt){
-        var value='';
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    break;
-default
- 
+case "textarea"
+
-                    break;
+                case "select":
+                    if (!elt.multiple) {
+                        value =  elt.value;
+                        break;
+                    }
+                    var options = elt.getElementsByTagName("option");
+                    value = [];
+                    for (var i = 0; i < options.length; i++) {
+                        if (options[i].selected) {
+                            value.push(options[i].value);
+                        }
+                    }
+                    break;
+            }
+        } else if(elt.item){
+            // this is a NodeList of radio buttons
+            value = []
+            for (var i = 0; i < elt.length; i++) {
+                var radio = elt.item(i);
+                if (radio.checked) {
+                    value.push(radio.value);
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-        return value;
-    },
-
-, aControl
-.n
+Name, aControlName
+N
-        var ctrls = frm.controls;
-        var ctrl = null;
-        for(var i=0; i < ctrls.length; i++){
-
+Name
-                ctrl = ctrls[i];
-                break;
@@ -272 +283 @@
-    addError : function(control, messageType){
-        if(messageType == 1){
- 
+"* "+
-        }else if(messageType == 2){
- 
+"* "+
-        }else{
-
+* 
-        }
-    },

trunk/lib/jelix-www/js/jforms.js

@@ -166 +166 @@
-    _getValue : function (elt){
-        var value='';
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    break;
-default
- 
+case "textarea"
+
-                    break;
+                case "select":
+                    if (!elt.multiple) {
+                        value =  elt.value;
+                        break;
+                    }
+                    var options = elt.getElementsByTagName("option");
+                    value = [];
+                    for (var i = 0; i < options.length; i++) {
+                        if (options[i].selected) {
+                            value.push(options[i].value);
+                        }
+                    }
+                    break;
+            }
+        } else if(elt.item){
+            // this is a NodeList of radio buttons
+            value = []
+            for (var i = 0; i < elt.length; i++) {
+                var radio = elt.item(i);
+                if (radio.checked) {
+                    value.push(radio.value);
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-        return value;
-    },
-
-, aControl
-.n
+Name, aControlName
+N
-        var ctrls = frm.controls;
-        var ctrl = null;
-        for(var i=0; i < ctrls.length; i++){
-
+Name
-                ctrl = ctrls[i];
-                break;
@@ -272 +283 @@
-    addError : function(control, messageType){
-        if(messageType == 1){
- 
+"* "+
-        }else if(messageType == 2){
- 
+"* "+
-        }else{
-
+* 
-        }
-    },

trunk/lib/jelix/docs/ns/jforms-controls.rng

@@ -12 +12 @@
-        <ref name="hint" />
-     </optional>
-     <!--
-     <optional>
-        <ref name="alert" />
-     </optional>
-     <optional>
-        <ref name="help" />
-     </optional>-->
-  </define>
-  <!--
@@ -324 +320 @@
-  </define>
-  
-<!--
-  <define name="alert">
-     <element name="alert">
+        <optional>
+           <attribute name="type">
+                <choice>
+                    <value>required</value>
+                    <value>invalid</value>
+                </choice>
+            </attribute>
+        </optional>
-        <ref name="message.content" />
-     </element>
-  </define>
--->
-</grammar>

trunk/lib/jelix/docs/ns/jforms-controls.rng

@@ -12 +12 @@
-        <ref name="hint" />
-     </optional>
-     <!--
-     <optional>
-        <ref name="alert" />
-     </optional>
-     <optional>
-        <ref name="help" />
-     </optional>-->
-  </define>
-  <!--
@@ -324 +320 @@
-  </define>
-  
-<!--
-  <define name="alert">
-     <element name="alert">
+        <optional>
+           <attribute name="type">
+                <choice>
+                    <value>required</value>
+                    <value>invalid</value>
+                </choice>
+            </attribute>
+        </optional>
-        <ref name="message.content" />
-     </element>
-  </define>
--->
-</grammar>

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -94 +94 @@
-        foreach($this->_controls as $name=>$ctrl){
-            $value=$this->_container->datas[$name];
-$value === null && $ctrl->required
-$this->_container->errors[$name]=JFORM_ERRDATA_REQUIRED;
-}else{
-if(is_array($value))
+is_array($value)
+if(count($value) == 0 && $ctrl->required){
+        $this->_container->errors[$name]=JFORM_ERRDATA_REQUIRED;
+}else
-                    foreach($value as $v){
-                        if(!$ctrl->datatype->check($v)){
@@ -104 +104 @@
-                        }
-                    }
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -94 +94 @@
-        foreach($this->_controls as $name=>$ctrl){
-            $value=$this->_container->datas[$name];
-$value === null && $ctrl->required
-$this->_container->errors[$name]=JFORM_ERRDATA_REQUIRED;
-}else{
-if(is_array($value))
+is_array($value)
+if(count($value) == 0 && $ctrl->required){
+        $this->_container->errors[$name]=JFORM_ERRDATA_REQUIRED;
+}else
-                    foreach($value as $v){
-                        if(!$ctrl->datatype->check($v)){
@@ -104 +104 @@
-                        }
-                    }
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -95 +95 @@
-//]]>
-</script>';
+        $errors = $this->_form->getContainer()->errors;
+        if(count($errors)){
+            $ctrls = $this->_form->getControls();
+            echo '<ul class="jforms-error-list">';
+            $errRequired='';
+            foreach($errors as $cname => $err){
+                if($err == JFORM_ERRDATA_REQUIRED) {
+                    if($ctrls[$cname]->alertRequired){
+                        echo '<li>', $ctrls[$cname]->alertRequired,'</li>';
+                    }else{
+                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>';
+                    }
+                }else{
+                    if($ctrls[$cname]->alertRequired){
+                        echo '<li>', $ctrls[$cname]->alertInvalid,'</li>';
+                    }else{
+                        echo '<li>', jLocale::get('jelix~formserr.js.err.invalid', $ctrls[$cname]->label),'</li>';
+                    }
+                }
+
+            }
+            echo '</ul>';
+        }
-    }
-
@@ -103 +126 @@
-    public function outputControlLabel($ctrl){
-        $required = ($ctrl->required == ''?'':' jforms-required');
+        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){
-
-
+
-        }else if($ctrl->type != 'submit'){
-            $id = $this->_name.'_'.$ctrl->ref;
-'" for="'.$id.'"
+$inError,'" for="'.$id.'"',$hint,'
-        }
-    }
@@ -116 +140 @@
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-
+
-        switch($ctrl->type){
-        case 'input':
@@ -122 +146 @@
-            if($value === null)
-                $value = $ctrl->defaultValue;
-
+$class,
-            break;
-        case 'checkbox':
@@ -133 +157 @@
-                $v="";
-            }
-
+class,$
-            break;
-        case 'checkboxes':
@@ -152 +176 @@
-                    if(in_array($v,$value)) 
-                        echo ' checked="checked"';
-
+$class,
-                    $i++;
-                }
@@ -160 +184 @@
-                    if($v == $value) 
-                        echo ' checked="checked"';
-
+$class,
-                    $i++;
-                }
@@ -174 +198 @@
-            }
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-
+$class,
-                echo '<label for="',$this->_name,'_',$ctrl->ref,'_',$i,'">',htmlspecialchars($label),'</label>';
-                $i++;
@@ -180 +204 @@
-            break;
-        case 'menulist':
-
+$class,
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null){
@@ -193 +217 @@
-        case 'listbox':
-            if($ctrl->multiple){
-
+$class,
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
@@ -225 +249 @@
-                }
-
-
+$class,
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';
@@ -236 +260 @@
-            if($value === null)
-                $value = $ctrl->defaultValue;
-
+$class,
-            break;
-        case 'secret':
-
+$class,
-            break;
-        case 'output':
@@ -249 +273 @@
-            break;
-        case 'upload':
-
+$class,
-            break;
-        case 'submit':

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -95 +95 @@
-//]]>
-</script>';
+        $errors = $this->_form->getContainer()->errors;
+        if(count($errors)){
+            $ctrls = $this->_form->getControls();
+            echo '<ul class="jforms-error-list">';
+            $errRequired='';
+            foreach($errors as $cname => $err){
+                if($err == JFORM_ERRDATA_REQUIRED) {
+                    if($ctrls[$cname]->alertRequired){
+                        echo '<li>', $ctrls[$cname]->alertRequired,'</li>';
+                    }else{
+                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>';
+                    }
+                }else{
+                    if($ctrls[$cname]->alertRequired){
+                        echo '<li>', $ctrls[$cname]->alertInvalid,'</li>';
+                    }else{
+                        echo '<li>', jLocale::get('jelix~formserr.js.err.invalid', $ctrls[$cname]->label),'</li>';
+                    }
+                }
+
+            }
+            echo '</ul>';
+        }
-    }
-
@@ -103 +126 @@
-    public function outputControlLabel($ctrl){
-        $required = ($ctrl->required == ''?'':' jforms-required');
+        $inError = (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        if($ctrl->type == 'output' || $ctrl->type == 'checkboxes' || $ctrl->type == 'radiobuttons'){
-
-
+
-        }else if($ctrl->type != 'submit'){
-            $id = $this->_name.'_'.$ctrl->ref;
-'" for="'.$id.'"
+$inError,'" for="'.$id.'"',$hint,'
-        }
-    }
@@ -116 +140 @@
-        $readonly = ($ctrl->readonly?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-
+
-        switch($ctrl->type){
-        case 'input':
@@ -122 +146 @@
-            if($value === null)
-                $value = $ctrl->defaultValue;
-
+$class,
-            break;
-        case 'checkbox':
@@ -133 +157 @@
-                $v="";
-            }
-
+class,$
-            break;
-        case 'checkboxes':
@@ -152 +176 @@
-                    if(in_array($v,$value)) 
-                        echo ' checked="checked"';
-
+$class,
-                    $i++;
-                }
@@ -160 +184 @@
-                    if($v == $value) 
-                        echo ' checked="checked"';
-
+$class,
-                    $i++;
-                }
@@ -174 +198 @@
-            }
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-
+$class,
-                echo '<label for="',$this->_name,'_',$ctrl->ref,'_',$i,'">',htmlspecialchars($label),'</label>';
-                $i++;
@@ -180 +204 @@
-            break;
-        case 'menulist':
-
+$class,
-            $value = $this->_form->getData($ctrl->ref);
-            if($value === null){
@@ -193 +217 @@
-        case 'listbox':
-            if($ctrl->multiple){
-
+$class,
-                $value = $this->_form->getData($ctrl->ref);
-                if($value == null){
@@ -225 +249 @@
-                }
-
-
+$class,
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';
@@ -236 +260 @@
-            if($value === null)
-                $value = $ctrl->defaultValue;
-
+$class,
-            break;
-        case 'secret':
-
+$class,
-            break;
-        case 'output':
@@ -249 +273 @@
-            break;
-        case 'upload':
-
+$class,
-            break;
-        case 'submit':

trunk/lib/jelix/forms/jFormsControl.class.php

@@ -19 +19 @@
-   public $type = null;
-   public $ref='';
-='string'
+
-   public $required = false;
-   public $readonly = false;
@@ -31 +31 @@
-   function __construct($ref){
-      $this->ref = $ref;
+      $this->datatype = new jDatatypeString();
-   }
-

trunk/lib/jelix/forms/jFormsControl.class.php

@@ -19 +19 @@
-   public $type = null;
-   public $ref='';
-='string'
+
-   public $required = false;
-   public $readonly = false;
@@ -31 +31 @@
-   function __construct($ref){
-      $this->ref = $ref;
+      $this->datatype = new jDatatypeString();
-   }
-

trunk/lib/jelix/plugins/tpl/html/block.form.php

@@ -41 +41 @@
-    }
-
-
+=
-        $errdecorator = $param[3];
-    else
-        $errdecorator = "'jFormsErrorDecoratorAlert'";
-
-
+=
-        $helpdecorator = $param[4];
-    else
@@ -55 +55 @@
-$t->_privateVars[\'__builder\']->outputHeader(array('.$errdecorator.','.$helpdecorator.'));
-if($GLOBALS[\'gJCoord\']->response!= null){
-basePath\'].\'jelix/
-basePath\'].\'jelix/design/jforms
+jelixWWWPath\'].\'
+jelixWWWPath\'].\'design/jform
-}
-';

trunk/lib/jelix/plugins/tpl/html/block.form.php

@@ -41 +41 @@
-    }
-
-
+=
-        $errdecorator = $param[3];
-    else
-        $errdecorator = "'jFormsErrorDecoratorAlert'";
-
-
+=
-        $helpdecorator = $param[4];
-    else