fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 7394 1st commit - still not functional

Browse Source
This commit is contained in:
Enrique Ponce De Leon
2011-11-30 18:27:11 -04:00
parent b86ad5c09c
commit 162c0bc650
6 changed files with 379 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

449
gulliver/js/form/core/form.js
View File

File diff suppressed because it is too large Load Diff

4
gulliver/system/class.xmlform.php
View File

@@ -1598,6 +1598,7 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText {
var $formula = '';
var $function = '';
var $gridFieldType = 'currency';
var $comma_separator = '.';
/**
* render the field in a dynaform
@@ -1624,6 +1625,7 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText {
$html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' ';
$html .= $this->NSGridType().' ';
$html .= 'pm:decimal_separator="'.$this->comma_separator.'" ';
$html .= '/>';
}else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
@@ -1673,6 +1675,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText {
var $formula = '';
var $function = '';
var $gridFieldType = 'percentage';
var $comma_separator = '.';
function render( $value = NULL, $owner = NULL) {
@@ -1692,6 +1695,7 @@ class XmlForm_Field_Percentage extends XmlForm_Field_SimpleText {
$html .= 'onkeypress="'.$this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8').'" ';
$html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' ';
$html .= 'pm:decimal_separator="' + $this->comma_separator + '" ';
$html .= '/>';
}else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');

5
workflow/engine/xmlform/dynaforms/fields/currency.html
View File

@@ -54,6 +54,11 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PME_VALIDATE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_VALIDATE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_VALIDATE}</td>
</tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PME_COMMA_SEPARATOR}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_VALIDATE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_COMMA_SEPARATOR}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PME_MASK}</td>

4
workflow/engine/xmlform/dynaforms/fields/currency.xml
View File

@@ -33,7 +33,9 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
<PME_VALIDATE type="dropdown" defaultvalue="Real">
<en>Validate<option name="Int">Integer</option><option name="Real">Real Number</option></en>
</PME_VALIDATE>
<PME_COMMA_SEPARATOR type="dropdown" defaultvalue=".">
<en>Decimal Separator<option name=".">Period [.]</option><option name=",">Comma [,]</option></en>
</PME_COMMA_SEPARATOR>
<PME_MASK type="text" maxlength="50" size="50" defaultvalue="###,###,###,###.##">
<en>Mask</en>
</PME_MASK>

5
workflow/engine/xmlform/dynaforms/fields/percentage.html
View File

@@ -49,6 +49,11 @@
<td class="FormLabel" width="{$form_labelWidth}">{$PME_VALIDATE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_VALIDATE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_VALIDATE}</td>
</tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PME_COMMA_SEPARATOR}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.PME_VALIDATE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PME_COMMA_SEPARATOR}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$PME_MASK}</td>

3
workflow/engine/xmlform/dynaforms/fields/percentage.xml
View File

@@ -32,6 +32,9 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
<PME_VALIDATE type="dropdown" defaultvalue="Real">
<en>Validate<option name="Int">Integer </option><option name="Real">Real Number</option></en>
</PME_VALIDATE>
<PME_COMMA_SEPARATOR type="dropdown" defaultvalue=".">
<en>Decimal Separator<option name=".">Period [.]</option><option name=",">Comma [,]</option></en>
</PME_COMMA_SEPARATOR>
<PME_MASK type="text" maxlength="50" size="30" defaultvalue="###.## %">
<en>Mask</en>