bugfixes for null descriptions and imported descriptions

This commit is contained in:
2016-07-30 23:51:06 +02:00
parent df8edf4607
commit eb11238bb6
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.tilman</groupId>
<artifactId>next-transactions</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<parent>
<groupId>org.springframework.boot</groupId>
+3 -2
View File
@@ -164,12 +164,13 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$routePara
"account" : $scope.account._links.self.href,
"amount" : amountToNumber($scope.transaction.amount),
"date" : $scope.transaction.date,
"description" : $scope.transaction.description,
"description" : $scope.transaction.description != undefined ? $scope.transaction.description : '',
"category" : $scope.transaction.category._links.self.href,
"creditor" : $scope.transaction.creditor
});
newTransaction.$save(function(transaction) {
console.log(transaction);
document.getElementById('transactionSubmit').disabled = false;
$scope.waitingForSubmission = false;
$scope.refreshList();
@@ -485,7 +486,7 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
"account" : $scope.account._links.self.href,
"amount" : line[4].replace(',', '.'),
"date" : new Date(line[1].substr(6,4) + "-" + line[1].substr(3,2) + "-" + line[1].substr(0,2)),
"description" : line.targetDescription,
"description" : line.targetDescription != undefined ? line.targetDescription : '',
"category" : line.targetCategory._links.self.href,
"creditor" : ""
});
@@ -30,7 +30,7 @@
ng-options="category.name for category in categories track by category._links.self.href">
</select>
</td>
<td><input value="{{line.targetDescription}}"></input></td>
<td><input ng-model="line.targetDescription"></input></td>
<td class="spacer"></td>
<td align="center">{{line.matcherPosition}}</td>
<td class="spacer"></td>