fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9438 Don't add ceros the mask in the fields SOLVED

Browse Source 
- I add code for add ceros in the fields
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-07-11 18:53:53 -04:00
parent b18a424295
commit 9a1c4e6f72
2 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,6 +334,7 @@ function G_Text( form, element, name)
this.mType = 'text'; this.mType = 'text';
this.parent = G_Field; this.parent = G_Field;
this.browser = {}; this.browser = {};
this.comma_separator = ".";
this.checkBrowser = function(){ this.checkBrowser = function(){
var nVer = navigator.appVersion; var nVer = navigator.appVersion;
@@ -1026,7 +1027,7 @@ function G_Text( form, element, name)
} }
if (newCursor < 0) newCursor = 0; if (newCursor < 0) newCursor = 0;
if (keyCode != 8 && keyCode != 46 && keyCode != 35 && keyCode != 36 && keyCode != 37 && keyCode != 39){ if (keyCode != 8 && keyCode != 46 && keyCode != 35 && keyCode != 36 && keyCode != 37 && keyCode != 39){
testData = dataWOMask.result; testData = dataWOMask.result;
tamData = testData.length; tamData = testData.length;
cleanMask = me.getCleanMask(); cleanMask = me.getCleanMask();
tamMask = cleanMask.length; tamMask = cleanMask.length;
@@ -1044,6 +1045,7 @@ function G_Text( form, element, name)
} }
} }
switch(action){ switch(action){
case 'mask': case 'move': case 'mask': case 'move':
dataNewMask = me.replaceMasks(newValue, newCursor); dataNewMask = me.replaceMasks(newValue, newCursor);
@@ -1232,19 +1234,6 @@ function G_Text( form, element, name)
patron = /[0-9,\.]/; patron = /[0-9,\.]/;
} }
if (me.mType == 'text') {
me.comma_separator = '';
patron = /[0-9\-]/;
txtRealMask = me.mask.split('');
p = txtRealMask.length - 1;
for ( ; p >= 0; p--) {
if (txtRealMask[p] != '#' && txtRealMask[p] != '%' && txtRealMask[p] != ' ') {
me.comma_separator = txtRealMask[p];
break;
}
}
}
key = String.fromCharCode(pressKey); key = String.fromCharCode(pressKey);
keyValid = patron.test(key); keyValid = patron.test(key);
keyValid = keyValid || (pressKey == 45); keyValid = keyValid || (pressKey == 45);
@@ -1352,55 +1341,58 @@ function G_Text( form, element, name)
} }
} }
var countDecimal = 0; var partsMaskSep = me.mask.split(separatorField);
txtRealMask = me.mask.split(''); if (partsMaskSep.length == 2) {
p = txtRealMask.length - 1; var countDecimal = 0;
for ( ; p >= 0; p--) { txtRealMask = me.mask.split('');
if (txtRealMask[p] == '#') { p = txtRealMask.length - 1;
countDecimal++; for ( ; p >= 0; p--) {
} if (txtRealMask[p] == '#') {
if (txtRealMask[p] == separatorField) { countDecimal++;
break; }
} if (txtRealMask[p] == separatorField) {
} break;
var decimalString = '';
var pluginDecimal = '';
var numberSet = me.element.value.split(separatorField);
if (typeof(numberSet[1]) == 'undefined') {
var decimalSet = '';
var newInt = '';
var newPluginDecimal = '';
var decimalCade = numberSet[0].split('');
for (p = 0; p < decimalCade.length; p++) {
if (!isNaN(parseFloat(decimalCade[p])) && isFinite(decimalCade[p])) {
newInt += decimalCade[p];
} else {
newPluginDecimal += decimalCade[p];
} }
} }
numberSet[0] = newInt;
numberSet[1] = newPluginDecimal;
}
var decimalSet = numberSet[1]; var decimalString = '';
var decimalCade = decimalSet.split(''); var pluginDecimal = '';
var countDecimalNow = 0; var numberSet = me.element.value.split(separatorField);
for (p = 0; p < decimalCade.length; p++) {
if (!isNaN(parseFloat(decimalCade[p])) && isFinite(decimalCade[p])) { if (typeof(numberSet[1]) == 'undefined') {
countDecimalNow++; var decimalSet = '';
decimalString += decimalCade[p]; var newInt = '';
} else { var newPluginDecimal = '';
pluginDecimal += decimalCade[p]; var decimalCade = numberSet[0].split('');
for (p = 0; p < decimalCade.length; p++) {
if ((!isNaN(parseFloat(decimalCade[p])) && isFinite(decimalCade[p])) || (decimalCade[p] == ',') || (decimalCade[p] == '.') ) {
newInt += decimalCade[p];
} else {
newPluginDecimal += decimalCade[p];
}
}
numberSet[0] = newInt;
numberSet[1] = newPluginDecimal;
} }
}
if(countDecimalNow < countDecimal) { var decimalSet = numberSet[1];
for(; countDecimalNow < countDecimal; countDecimalNow++) { var decimalCade = decimalSet.split('');
decimalString += '0'; var countDecimalNow = 0;
} for (p = 0; p < decimalCade.length; p++) {
me.element.value = numberSet[0] + separatorField + decimalString + pluginDecimal; if (!isNaN(parseFloat(decimalCade[p])) && isFinite(decimalCade[p])) {
countDecimalNow++;
decimalString += decimalCade[p];
} else {
pluginDecimal += decimalCade[p];
}
}
if(countDecimalNow < countDecimal) {
for(; countDecimalNow < countDecimal; countDecimalNow++) {
decimalString += '0';
}
me.element.value = numberSet[0] + separatorField + decimalString + pluginDecimal;
}
} }
} }

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

@@ -968,6 +968,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
var $function = ''; var $function = '';
var $replaceTags = 0; var $replaceTags = 0;
var $renderMode = ''; var $renderMode = '';
var $comma_separator = '.';
/** /**
@@ -1012,6 +1013,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
$html .= 'onkeypress="'.$this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8').'" '; $html .= 'onkeypress="'.$this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8').'" ';
$html .= $this->NSDefaultValue().' '; $html .= $this->NSDefaultValue().' ';
$html .= $this->NSRequiredValue().' '; $html .= $this->NSRequiredValue().' ';
$html .= 'pm:decimal_separator="' + $this->comma_separator + '" ';
$html .= '/>'; $html .= '/>';
}else{ //VIEW MODE }else{ //VIEW MODE
$html .= $this->htmlentities($value, ENT_QUOTES, 'utf-8'); $html .= $this->htmlentities($value, ENT_QUOTES, 'utf-8');