diff --git a/pom.xml b/pom.xml index 08c8e59..38b8247 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.tilman next-transactions - 1.5.5 + 1.5.6 org.springframework.boot diff --git a/src/main/resources/static/app/controllers.js b/src/main/resources/static/app/controllers.js index 130b238..1bb91a4 100644 --- a/src/main/resources/static/app/controllers.js +++ b/src/main/resources/static/app/controllers.js @@ -464,9 +464,13 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l } + console.log('$scope.csv.length: ' + $scope.csv.length); + for (i = 0; i < $scope.csv.length; i++) { var j = 0; + console.log($scope.csv[i]); + while (j < $scope.matchers.length) { var match = true; @@ -476,8 +480,8 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l match = $scope.matchers[j].typeMatcher($scope.csv[i][2]); if (match && $scope.matchers[j].textMatcher) match = $scope.matchers[j].textMatcher($scope.csv[i][3]); - if (match && $scope.matchers[j].amountMatcher) - match = $scope.matchers[j].amountMatcher(amountToNumber($scope.csv[i][4])); + if (match && $scope.matchers[j].amountMatcher) + match = $scope.matchers[j].amountMatcher($scope.csv[i][4].toString().replace(',', '.')); if (match) { $scope.csv[i].targetDescription = $scope.matchers[j].targetDescription;