artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 09:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor decimal point issue solved.

Browse Source
This commit is contained in:
Gaurav Saini 2014-08-05 15:55:51 +05:30
parent 1c9bdb95c4
commit 443345bbed
3 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/angular/i18n/angular-locale_zh-cn.js → app/angular/i18n/angular-locale_zh_cn.js vendored
View File

77
app/scripts/directives/NumberFormatDirective.js
View File

@ -1,55 +1,68 @@
(function (module) {
mifosX.directives = _.extend(module, {
NumberFormatDirective: function ($filter) {
NumberFormatDirective: function ($filter, $locale) {
return {
replace: false,
//restrict: "A",
require: 'ngModel',
link: function (scope, element, attrs, modelCtrl) {
var filter = $filter('number');
var filter = $filter('number');
function number(value, fractionLength) {
return filter(value, fractionLength);
return filter(value, fractionLength);
}
modelCtrl.$formatters.push(number);
function initialNumber(value) {
var stringValue = modelCtrl.$modelValue + '';
var index = stringValue.indexOf($locale.NUMBER_FORMATS.DECIMAL_SEP);
var fraction = stringValue.substring(index + 1);
var fractionLength = fraction.length;
var initialnumber = $filter('number')(modelCtrl.$modelValue,fractionLength);
return initialnumber;
}
modelCtrl.$formatters.push(initialNumber);
modelCtrl.$parsers.push(function (stringValue) {
var index = stringValue.indexOf($locale.NUMBER_FORMATS.DECIMAL_SEP),
decimal,
fraction,
fractionLength;
if (index >= 0) {
decimal = stringValue.substring(0, index);
fraction = stringValue.substring(index + 1);
if(index!=stringValue.length-1)
fractionLength = fraction.length;
else
fractionLength = 0;
} else {
decimal = stringValue;
fraction = '';
}
decimal = decimal.replace(/[^0-9]/g, '');
fraction = fraction.replace(/[^0-9]/g, '');
var result = +(decimal + '.' + fraction);
if (result !== modelCtrl.$modelValue) {
scope.$evalAsync(function () {
modelCtrl.$viewValue = number(modelCtrl.$modelValue, fractionLength);
modelCtrl.$render();
});
}
return result;
if(stringValue){
var index = stringValue.indexOf($locale.NUMBER_FORMATS.DECIMAL_SEP),
decimal,
fraction,
fractionLength;
if (index >= 0) {
decimal = stringValue.substring(0, index);
fraction = stringValue.substring(index + 1);
if(index!=stringValue.length-1)
fractionLength = fraction.length;
else
fractionLength = 0;
} else {
decimal = stringValue;
fraction = '';
}
decimal = decimal.replace(/[^0-9]/g, '');
fraction = fraction.replace(/[^0-9]/g, '');
var result = +(decimal + '.' + fraction);
if (result !== modelCtrl.$modelValue) {
scope.$evalAsync(function () {
modelCtrl.$viewValue = number(modelCtrl.$modelValue, fractionLength);
modelCtrl.$render();
});
}
return result;
}
});
scope.$on('$localeChangeSuccess', function (event, localeId) {
modelCtrl.$viewValue = $filter('number')(modelCtrl.$modelValue);
modelCtrl.$render();
});
}
}
};
}
});
}(mifosX.directives || {}));
mifosX.ng.application.directive("numberFormat", ['$filter', mifosX.directives.NumberFormatDirective]).run(function ($log) {
mifosX.ng.application.directive("numberFormat", ['$filter', '$locale', mifosX.directives.NumberFormatDirective]).run(function ($log) {
$log.info("NumberFormatDirective initialized");
});

2
app/scripts/models/Langs.js
View File

@ -5,7 +5,7 @@
{"name": "Français", "code": "fr"},
{"name": "Español", "code": "es"},
{"name": "Português", "code": "pt"},
{"name": "中文", "code": "zh_cn"},
{"name": "中文", "code": "zh_CN"},
{"name": "हिंदी", "code": "hi"},
{"name": "ქართული", "code": "ka"}
]