Make imported amounts editable

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.tilman</groupId>
 	<artifactId>next-transactions</artifactId>
-	<version>1.5.12</version>
+	<version>1.5.13</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

src/main/java/de/tilman/transactions/domain/Matcher.java

@@ -5,7 +5,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 
 @Entity
 public class Matcher {
@@ -24,7 +23,7 @@ public class Matcher {
 	private String textMatcherCode;
 	private String amountMatcherCode;
 	
-	@OneToOne
+	@ManyToOne
 	private Category targetCategory;
 	
 	private String targetDescription;

src/main/resources/static/app/controllers.js

@@ -485,6 +485,7 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
 					if (match) {
 						$scope.csv[i].targetDescription = $scope.matchers[j].targetDescription;
 						$scope.csv[i].matcherPosition = $scope.matchers[j].position;
+						$scope.csv[i].creditor = $scope.matchers[j].creditor;
 						for (k = 0; k < $scope.categories.length; k++) {
 							if ($scope.categories[k].name == $scope.matchers[j].targetCategory.name)
 								$scope.csv[i].targetCategory = $scope.categories[k];
@@ -507,9 +508,11 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
 				"date" : new Date(line[1].substr(6,4) + "-" + line[1].substr(3,2) + "-" + line[1].substr(0,2)),
 				"description" : line.targetDescription != undefined ? line.targetDescription : '',
 				"category" : line.targetCategory._links.self.href,
-				"creditor" : ""
+				"creditor" : ''
 			});
 			
+			console.log(newTransaction);
+			
 			newTransaction.$save(function(transaction) {
 				line.submitted = true;
 				console.log(transaction);

src/main/resources/static/app/import-list.html

@@ -20,7 +20,7 @@
 				<td>{{line[1]}}</td>
 				<td>{{line[2]}}</td>
 				<td>{{line[3]}}</td>
-				<td align="right">{{line[4]}}&nbsp;€</td>
+				<td><input ng-model="line[4]"></input></td>
 				<td class="spacer"></td>
 				<td>
 					<select

src/main/resources/static/app/import.html

@@ -33,6 +33,7 @@ SELECT * FROM Category WHERE account_id=1 ORDER BY retired, position
 -- Testdaten
 "08.08.2016";"08.08.2016";"Übertrag/Überweisung";"Empfänger: Adam Kto/IBAN: DE485197745151542243216 BLZ/BIC: COBADEHD001 Buchungstext: none End-to-End-Ref.: nicht angegeben Ref. JK21619010302362/2";"-40,00";
 "27.07.2016";"27.07.2016";"Lastschrift/Belast.";"Auftraggeber: DANKE, IHR LIDL Kto/IBAN: DE61300500000008000119 Buchungstext: Kartenzahlung DANKE, IHR LIDL//Berlin/DE 2016-06-25T09:47:08 KFN 2 VJ 1912 Ref. 6GL16179AXXX0086/7787";"-70,17";
+"25.07.2016";"25.07.2016";"Lastschrift/Belast.";"Auftraggeber: NETTO SAGT DANKE 65296392 Kto/IBAN: DE50130700000450400708 Buchungstext: 240609092061727191200063330 ELV6529 6395 24.06 09.09 ME2";"-15,78";
 "24.07.2016";"24.07.2016";"Übertrag/Überweisung";"Auftraggeber: Adam Buchungstext: Uebertrag comdirect bank End-to-End-Ref.: nicht angegeben Ref. IX216126F0211532/1";"200,00";
 "24.07.2016";"24.07.2016";"Übertrag/Überweisung";"Auftraggeber: Wohnungsbau-Verein Oberwaffeln eG Buchungstext: Mg.-Nr. 12345, Adam - 4, Dividende 2015 End-to-End-Ref.: nicht angegeben Ref. H2216176742235523/75535";"4,42";
  -->