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

Merge pull request #55 from victorsl/BUG-9106

Browse Source 
BUG 9106 "Enmascaramiento en grillas no permite decimales." SOLVED
This commit is contained in:
julceslauhub
2012-06-08 15:08:00 -07:00
parent 188d538c52 2954bb0c05
commit 7a41560382
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1365,7 +1365,7 @@ function G_Percentage( form, element, name )
var me=this;
this.parent = G_Text;
this.parent( form, element, name);
this.validate = 'Int';
//this.validate = 'Int'; //Commented for allow enter the character '.'
this.mType = 'percentage';
this.mask= '###.##';
this.comma_separator = ".";
@@ -1377,7 +1377,7 @@ function G_Currency( form, element, name )
var me=this;
this.parent = G_Text;
this.parent( form, element, name);
//this.validate = 'Int'; //commented for allow enter the character '.'
//this.validate = 'Int'; //Commented for allow enter the character '.'
this.mType = 'currency';
this.mask= '_###,###,###,###,###;###,###,###,###,###.00';
this.comma_separator = ".";

26
gulliver/js/grid/core/grid.js
View File

@@ -60,26 +60,41 @@ var G_Grid = function(oForm, sGridName){
j++;
}
break;
case 'currency':
while (oAux = document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']')) {
this.aElements.push(new G_Currency(oForm, document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']'), this.sGridName + '][' + j + ']['
+ this.aFields[i].sFieldName));
if (aFields[i].oProperties) {
this.aElements[this.aElements.length - 1].mask = aFields[i].oProperties.mask;
if (this.aFields[i].oProperties) {
if (this.aFields[i].oProperties.comma_separator) {
this.aElements[this.aElements.length - 1].comma_separator = this.aFields[i].oProperties.comma_separator;
}
this.aElements[this.aElements.length - 1].mask = this.aFields[i].oProperties.mask;
}
j++;
}
break;
case 'percentage':
while (oAux = document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']')) {
this.aElements.push(new G_Percentage(oForm, document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']'), this.sGridName + '][' + j
+ '][' + this.aFields[i].sFieldName));
if (aFields[i].oProperties) {
this.aElements[this.aElements.length - 1].mask = aFields[i].oProperties.mask;
if (this.aFields[i].oProperties) {
if (this.aFields[i].oProperties.comma_separator) {
this.aElements[this.aElements.length - 1].comma_separator = this.aFields[i].oProperties.comma_separator;
}
this.aElements[this.aElements.length - 1].mask = this.aFields[i].oProperties.mask;
}
j++;
}
break;
case 'dropdown':
while (oAux = document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']')) {
this.aElements.push(new G_DropDown(oForm, document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']'), this.sGridName + '][' + j + ']['
@@ -90,6 +105,7 @@ var G_Grid = function(oForm, sGridName){
j++;
}
break;
default:
while (oAux = document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']')) {
this.aElements.push(new G_Field(oForm, document.getElementById('form[' + this.sGridName + '][' + j + '][' + this.aFields[i].sFieldName + ']'), this.sGridName + '][' + j + ']['
@@ -99,7 +115,7 @@ var G_Grid = function(oForm, sGridName){
}
j++;
}
break;
break;
}
}
// Set dependent fields