tilman/next-transactions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix for amountMatcher

Browse Source
This commit is contained in:
Tilman Liero
2016-08-02 05:46:00 +02:00
parent 0a4bb37ff9
commit 9444e6b783
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.tilman</groupId> <groupId>de.tilman</groupId>
<artifactId>next-transactions</artifactId> <artifactId>next-transactions</artifactId>
<version>1.5.5</version> <version>1.5.6</version>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
src/main/resources/static/app/controllers.js
+6 -2
View File
@@ -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++) { for (i = 0; i < $scope.csv.length; i++) {
var j = 0; var j = 0;
console.log($scope.csv[i]);
while (j < $scope.matchers.length) { while (j < $scope.matchers.length) {
var match = true; var match = true;
@@ -476,8 +480,8 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
match = $scope.matchers[j].typeMatcher($scope.csv[i][2]); match = $scope.matchers[j].typeMatcher($scope.csv[i][2]);
if (match && $scope.matchers[j].textMatcher) if (match && $scope.matchers[j].textMatcher)
match = $scope.matchers[j].textMatcher($scope.csv[i][3]); match = $scope.matchers[j].textMatcher($scope.csv[i][3]);
if (match && $scope.matchers[j].amountMatcher) if (match && $scope.matchers[j].amountMatcher)
match = $scope.matchers[j].amountMatcher(amountToNumber($scope.csv[i][4])); match = $scope.matchers[j].amountMatcher($scope.csv[i][4].toString().replace(',', '.'));
if (match) { if (match) {
$scope.csv[i].targetDescription = $scope.matchers[j].targetDescription; $scope.csv[i].targetDescription = $scope.matchers[j].targetDescription;