Changeset 1028

Timestamp:

07/19/08 15:53:48 (1 month ago)

Author:

laurentj

Message:

ticket #564: finished to implement <choice> in jforms

Files:

• branches/experimental/jforms-groups/lib/jelix-www/design/jform.css (modified) (1 diff)
• branches/experimental/jforms-groups/lib/jelix-www/js/jforms.js (modified) (4 diffs)
• branches/experimental/jforms-groups/lib/jelix/forms/jFormsControl.class.php (modified) (1 diff)
• branches/experimental/jforms-groups/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (4 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (21 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder2.html_cli.php (modified) (1 diff)

branches/experimental/jforms-groups/lib/jelix-www/design/jform.css

@@ -7 +7 @@
-.jforms-label {}
-.jforms-value {}
+.jforms-readonly { color:#aaa; }
-
-span.jforms-required, label.jforms-required { font-weight:bold; }

branches/experimental/jforms-groups/lib/jelix-www/js/jforms.js

@@ -150 +150 @@
-            frm.helpDecorator.show(ctrl.help);
-        }
+    },
+
+    hasClass: function (elt,clss) {
+        return elt.className.match(new RegExp('(\\s|^)'+clss+'(\\s|$)'));
+    },
+    addClass: function (elt,clss) {
+        if (!this.hasClass(elt,clss)) elt.className += " "+clss;
+    },
+    removeClass: function (elt,clss) {
+        if (this.hasClass(elt,clss)) {
+            elt.className = elt.className.replace(new RegExp('(\\s|^)'+clss+'(\\s|$)'),' ');
+        }
-    }
-};
@@ -166 +178 @@
-    addControl : function(ctrl){
-        this.controls.push(ctrl);
+        ctrl.formName = this.name;
-    },
-
@@ -174 +187 @@
-    setHelpDecorator : function (decorator){
-        this.helpDecorator = decorator;
+    },
+    getControl : function(aControlName) {
+        var ctrls = this.controls;
+        for(var i=0; i < ctrls.length; i++){
+            if (ctrls[i].name == aControlName) {
+                return ctrls[i];
+            }
+        }
+        return null;
-    }
-};
@@ -535 +557 @@
-    this.items = {};
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

branches/experimental/jforms-groups/lib/jelix/forms/jFormsControl.class.php

@@ -628 +628 @@
-    }
-
-
-    function setData($value) {
-        parent::setData($value);

branches/experimental/jforms-groups/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -161 +161 @@
-        $class = ($ctrl->required == false || $ro?'':' jforms-required');
-        $class.= (isset($this->_form->getContainer()->errors[$ctrl->ref]) ?' jforms-error':'');
+        $class.= ($ro && $ctrl->type != 'captcha'?' jforms-readonly':'');
+        $readonly = ($ro?' readonly="readonly"':'');
-        if($class !='') $class = ' class="'.$class.'"';
-        $readonly = ($ro?' readonly="readonly"':'');
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-
-        $this->{'output'.$ctrl->type}($ctrl, $id, $class, $readonly, $hint);
-
-        $this->outputHelp($ctrl);
-    }
@@ -388 +387 @@
-        foreach( $ctrl->items as $itemName=>$listctrl){
-            echo '<li><label><input type="radio"',$id,$i,'" value="',htmlspecialchars($itemName),'"';
-
+
+
-            echo htmlspecialchars($ctrl->itemsNames[$itemName]),'</label> ';
-
@@ -394 +394 @@
-                if(!$this->_form->isActivated($ref)) continue;
-                echo ' <span class="jforms-item-controls">';
+                // we remove readonly status so when a user change the choice and 
+                // javascript is deactivated, it can still change the value of the control
+                $ro = $c->isReadOnly() && $readonly != '';
+                if($ro) $c->setReadOnly(false);
-                $this->outputControlLabel($c);
-                echo ' ';
-                $this->outputControl($c);
+                if($ro) $c->setReadOnly($ro);
-                echo "</span>\n";
-            }
@@ -403 +408 @@
-        }
-        echo "</ul>\n";
+
+        echo '<script type="text/javascript">
+//<![CDATA[
+jForms.getForm("',$this->_name,'").getControl("',$ctrl->ref,'").activate("',$value,'");
+//]]>
+</script>';
-    }
-

branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -105 +105 @@
-        $ctrl->required=false;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->setReadOnly(false);
@@ -164 +164 @@
-        $ctrl->setReadOnly(true);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $this->form->setData('chk2', '1');
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+lass=" jforms-readonly" c
-
-        $ctrl->hint='ceci est un tooltip';
@@ -175 +175 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+lass=" jforms-readonly" c
-    }
-
@@ -249 +249 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
-
-
+ class=" jforms-readonly"
+ class=" jforms-readonly"
+ class=" jforms-readonly"
-        $this->assertEqualOrDiff($result, $out);
-
@@ -306 +306 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
-
-
+ class=" jforms-readonly"
+ class=" jforms-readonly"
+ class=" jforms-readonly"
-        $this->assertEqualOrDiff($result, $out);
-    }
@@ -358 +358 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-        $result.='<option value=""></option>';
-        $result.='<option value="10">foo</option>';
@@ -369 +369 @@
-        $this->form->setData('menulist1',"23");
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11">bar</option>';
@@ -379 +379 @@
-        $this->form->setData('menulist1',"");
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-        $result.='<option value="" selected="selected"></option>';
-        $result.='<option value="10">foo</option>';
@@ -491 +491 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11">bar</option>';
@@ -604 +604 @@
-        $ctrl->setReadOnly(true);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -611 +611 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->rows=20;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->cols=60;
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-    }
@@ -640 +640 @@
-        $ctrl->setReadOnly(true);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -646 +646 @@
-        $this->assertEqualOrDiff('<label class="jforms-label" for="'.$this->formname.'_passwd" title="ceci est un tooltip">mot de passe</label>', $out);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-    }
-    function testOutputSecretConfirm(){
@@ -661 +661 @@
-        $ctrl->setReadOnly(true);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -667 +667 @@
-        $this->assertEqualOrDiff('<label class="jforms-label" for="'.$this->formname.'_passwd_confirm" title="ceci est un tooltip">confirmation mot de passe</label>', $out);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-    }
-
@@ -712 +712 @@
-        $ctrl->setReadOnly(true);
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -719 +719 @@
-
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-
+class=" jforms-readonly" 
-
-
@@ -888 +888 @@
-jelix_wymeditor_default("'.$this->formname.'_contenu","'.$this->formname.'");
-//]]>
-
+class=" jforms-readonly" 
-
-        $ctrl->hint='ceci est un tooltip';
@@ -899 +899 @@
-jelix_wymeditor_default("'.$this->formname.'_contenu","'.$this->formname.'");
-//]]>
-
+class=" jforms-readonly" 
-
-        $ctrl->rows=20;
@@ -907 +907 @@
-jelix_wymeditor_default("'.$this->formname.'_contenu","'.$this->formname.'");
-//]]>
-
+class=" jforms-readonly" 
-
-        $ctrl->cols=60;
@@ -915 +915 @@
-jelix_wymeditor_default("'.$this->formname.'_contenu","'.$this->formname.'");
-//]]>
-
+class=" jforms-readonly" 
-
-    }

branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder2.html_cli.php

@@ -99 +99 @@
-        $expected .= '<table class="jforms-table-group" border="0">'."\n";
-        $expected .= '<tr><th scope="row"><label class="jforms-label" for="'.$this->formname.'_nom">Your name</label></th>'."\n";
-
+class=" jforms-readonly" 
-        $expected .= '<tr><th scope="row"><label class="jforms-label" for="'.$this->formname.'_prenom">Your firstname</label></th>'."\n";
-
+class=" jforms-readonly" 
-        $expected .= '<tr><th scope="row"><span class="jforms-label">Vous êtes </span></th>'."\n";
-
-
-
+ class=" jforms-readonly"
+ class=" jforms-readonly"
+ class=" jforms-readonly"
-        $expected .= '<tr><th scope="row"><label class="jforms-label" for="'.$this->formname.'_mail">Votre mail</label></th>'."\n";
-
+class=" jforms-readonly" 
-        ob_start();$this->builder->outputControl($group);$out = ob_get_clean();
-        $this->assertEqualOrDiff($expected, $out);
-
-    }
+
+
+    function testOutputChoice(){
+
+        $choice= new jFormsControlChoice('status');
+        $choice->label='Task Status';
+        $choice->createItem('new','New');
+        $choice->createItem('assigned','Assigned');
+        $choice->createItem('closed','Closed');
+
+        $ctrl= new jFormsControlinput('nom');
+        $ctrl->required=true;
+        $ctrl->label='Name';
+        $choice->addChildControl($ctrl,'assigned');
+
+
+        $ctrl= new jFormsControlinput('prenom');
+        $ctrl->defaultValue='robert';
+        $ctrl->label='Firstname';
+        $choice->addChildControl($ctrl,'assigned');
+
+        $ctrl= new jFormsControlMenulist('reason');
+        $ctrl->required=true;
+        $ctrl->label='Reason ';
+        $ctrl->alertRequired='Hey, specify a reason !';
+        $ctrl->datasource= new jFormsStaticDatasource();
+        $ctrl->datasource->data = array(
+        'aa'=>'fixed',
+        'bb'=>'won t fixed',
+        'cc'=>'later',
+        );
+        $choice->addChildControl($ctrl,'closed');
+
+        $this->form->addControl($choice);
+
+
+        ob_start();$this->builder->outputControlLabel($choice);$out = ob_get_clean();
+        $this->assertEqualOrDiff('<label class="jforms-label" for="'.$this->formname.'_status">Task Status</label>', $out);
+
+
+        $expected = '<ul class="jforms-choice jforms-ctl-status" >'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_0" value="new" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'new\')"/>New</label> </li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_1" value="assigned" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'assigned\')"/>Assigned</label>  <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_nom">Name</label> <input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" class=" jforms-readonly" value=""/></span>'."\n";
+        $expected .= ' <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_prenom">Firstname</label> <input type="text" name="prenom" id="'.$this->formname.'_prenom" readonly="readonly" class=" jforms-readonly" value="robert"/></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_2" value="closed" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'closed\')"/>Closed</label>  <span class="jforms-item-controls"><label class="jforms-label jforms-required" for="'.$this->formname.'_reason">Reason </label> <select name="reason" id="'.$this->formname.'_reason" class=" jforms-required" size="1"><option value="aa">fixed</option><option value="bb">won t fixed</option><option value="cc">later</option></select></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '</ul>'."\n";
+        $expected .= '<script type="text/javascript">'."\n";
+        $expected .= '//<![CDATA['."\n";
+        $expected .= 'jForms.getForm("").getControl("status").activate("");'."\n";
+        $expected .= '//]]>'."\n";
+        $expected .= '</script>';
+        ob_start();$this->builder->outputControl($choice);$out = ob_get_clean();
+        $this->assertEqualOrDiff($expected, $out);
+
+        $this->form->getContainer()->data['status']='assigned';
+
+        $expected = '<ul class="jforms-choice jforms-ctl-status" >'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_0" value="new" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'new\')"/>New</label> </li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_1" value="assigned" checked="checked" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'assigned\')"/>Assigned</label>  <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_nom">Name</label> <input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" class=" jforms-readonly" value=""/></span>'."\n";
+        $expected .= ' <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_prenom">Firstname</label> <input type="text" name="prenom" id="'.$this->formname.'_prenom" readonly="readonly" class=" jforms-readonly" value="robert"/></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_2" value="closed" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'closed\')"/>Closed</label>  <span class="jforms-item-controls"><label class="jforms-label jforms-required" for="'.$this->formname.'_reason">Reason </label> <select name="reason" id="'.$this->formname.'_reason" class=" jforms-required" size="1"><option value="aa">fixed</option><option value="bb">won t fixed</option><option value="cc">later</option></select></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '</ul>'."\n";
+        $expected .= '<script type="text/javascript">'."\n";
+        $expected .= '//<![CDATA['."\n";
+        $expected .= 'jForms.getForm("").getControl("status").activate("assigned");'."\n";
+        $expected .= '//]]>'."\n";
+        $expected .= '</script>';
+        ob_start();$this->builder->outputControl($choice);$out = ob_get_clean();
+        $this->assertEqualOrDiff($expected, $out);
+
+        $this->form->getContainer()->data['status']='new';
+        $expected = '<ul class="jforms-choice jforms-ctl-status" >'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_0" value="new" checked="checked" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'new\')"/>New</label> </li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_1" value="assigned" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'assigned\')"/>Assigned</label>  <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_nom">Name</label> <input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" class=" jforms-readonly" value=""/></span>'."\n";
+        $expected .= ' <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_prenom">Firstname</label> <input type="text" name="prenom" id="'.$this->formname.'_prenom" readonly="readonly" class=" jforms-readonly" value="robert"/></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_2" value="closed" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'closed\')"/>Closed</label>  <span class="jforms-item-controls"><label class="jforms-label jforms-required" for="'.$this->formname.'_reason">Reason </label> <select name="reason" id="'.$this->formname.'_reason" class=" jforms-required" size="1"><option value="aa">fixed</option><option value="bb">won t fixed</option><option value="cc">later</option></select></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '</ul>'."\n";
+        $expected .= '<script type="text/javascript">'."\n";
+        $expected .= '//<![CDATA['."\n";
+        $expected .= 'jForms.getForm("").getControl("status").activate("new");'."\n";
+        $expected .= '//]]>'."\n";
+        $expected .= '</script>';
+        ob_start();$this->builder->outputControl($choice);$out = ob_get_clean();
+        $this->assertEqualOrDiff($expected, $out);
+
+        $this->form->getContainer()->data['status']='closed';
+        $expected = '<ul class="jforms-choice jforms-ctl-status" >'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_0" value="new" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'new\')"/>New</label> </li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_1" value="assigned" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'assigned\')"/>Assigned</label>  <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_nom">Name</label> <input type="text" name="nom" id="'.$this->formname.'_nom" readonly="readonly" class=" jforms-readonly" value=""/></span>'."\n";
+        $expected .= ' <span class="jforms-item-controls"><label class="jforms-label" for="'.$this->formname.'_prenom">Firstname</label> <input type="text" name="prenom" id="'.$this->formname.'_prenom" readonly="readonly" class=" jforms-readonly" value="robert"/></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '<li><label><input type="radio" name="status" id="'.$this->formname.'_status_2" value="closed" checked="checked" onclick="jForms.getForm(\'\').getControl(\'status\').activate(\'closed\')"/>Closed</label>  <span class="jforms-item-controls"><label class="jforms-label jforms-required" for="'.$this->formname.'_reason">Reason </label> <select name="reason" id="'.$this->formname.'_reason" class=" jforms-required" size="1"><option value="aa">fixed</option><option value="bb">won t fixed</option><option value="cc">later</option></select></span>'."\n";
+        $expected .= '</li>'."\n";
+        $expected .= '</ul>'."\n";
+        $expected .= '<script type="text/javascript">'."\n";
+        $expected .= '//<![CDATA['."\n";
+        $expected .= 'jForms.getForm("").getControl("status").activate("closed");'."\n";
+        $expected .= '//]]>'."\n";
+        $expected .= '</script>';
+        ob_start();$this->builder->outputControl($choice);$out = ob_get_clean();
+        $this->assertEqualOrDiff($expected, $out);
+    }
+
+
+
-}
-