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

Bugfix for matcher order

Browse Source
This commit is contained in:
tliero
2016-08-01 13:38:01 +02:00
parent bef78693be
commit ecbdb5be21
3 changed files with 5 additions and 5 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.4</version> <version>1.5.5</version>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
src/main/resources/static/app/controllers.js
+3 -3
View File
@@ -465,13 +465,12 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
} }
for (i = 0; i < $scope.csv.length; i++) { for (i = 0; i < $scope.csv.length; i++) {
var matched = false;
var j = 0; var j = 0;
while (!matched && j < $scope.matchers.length) { while (j < $scope.matchers.length) {
var match = true; var match = true;
if (match && $scope.matchers[j].dateMatcher) if ($scope.matchers[j].dateMatcher)
match = $scope.matchers[j].dateMatcher($scope.csv[i][1]); match = $scope.matchers[j].dateMatcher($scope.csv[i][1]);
if (match && $scope.matchers[j].typeMatcher) if (match && $scope.matchers[j].typeMatcher)
match = $scope.matchers[j].typeMatcher($scope.csv[i][2]); match = $scope.matchers[j].typeMatcher($scope.csv[i][2]);
@@ -487,6 +486,7 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
if ($scope.categories[k].name == $scope.matchers[j].targetCategory.name) if ($scope.categories[k].name == $scope.matchers[j].targetCategory.name)
$scope.csv[i].targetCategory = $scope.categories[k]; $scope.csv[i].targetCategory = $scope.categories[k];
} }
break;
} }
j++; j++;
src/main/resources/static/app/import-list.html
+1 -1
View File
@@ -42,7 +42,7 @@
</table> </table>
</div> </div>
<div class="row" style="margin-top: 4ex; text-align: center;"> <div class="row" style="margin-top: 4ex; text-align: center;">
<textarea ng-model='csvInput' name="csvText" cols="220" rows="30" style="font-family: monospace; font-size: 70%;" disabled></textarea> <textarea ng-model='csvInput' name="csvText" cols="220" rows="30" style="font-family: monospace; font-size: 70%;"></textarea>
</div> </div>
<!-- div class="row" style="margin-top: 4ex;"> <!-- div class="row" style="margin-top: 4ex;">
<table class="importTable"> <table class="importTable">