Withdrawals and deleteLastSubmission()

src/main/resources/data-h2.sql

@@ -1,12 +1,13 @@
 INSERT INTO User (id, name, username) VALUES (1, 'Adam', 'adam@mail.com'), (2, 'Betty', 'betty@mail.com');
 INSERT INTO Account (id, name, owner_id) VALUES (1, 'Gemeinschaftskonto', 1), (2, 'Konto Adam', 1);
 
+INSERT INTO Withdrawal(id, account_id, amount, user_id, date) VALUES (1, 1, 20.00, 2, '2014-06-12');
+INSERT INTO Withdrawal(id, account_id, amount, user_id, date) VALUES (2, 1, 10.00, 1, '2014-06-14');
+
 INSERT INTO Category (id, name, account_id, position) VALUES (1, 'Essen - Lebensmittel', 1, 2), (2, 'Einnahmen - Gehalt', 1, 1), (3, 'Essen - Arbeit', 1, 3), (4, 'Einnahmen - Gehalt', 2, 1), (5, 'Technik - Server und Hosting', 2, 2);
 
-
 INSERT INTO Account_User (account_id, user_id) VALUES (1, 1), (1, 2), (2, 1);
 
-
 INSERT INTO Transaction (id, amount, account_id, category_id, date, description, creditor_id) VALUES
  (NULL, 1280.81, 1, 1, '2014-06-01', 'Gehalt', null),
  (NULL, -2.21, 1, 2, '2014-06-10', 'Brot', null),

src/main/resources/static/css/app.css

@@ -28,4 +28,17 @@ body {
 
 .clickable {
   cursor: pointer;
+}
+
+#accountSelector {
+	text-align: right;
+	margin-right: 4em;
+}
+
+.color-red {
+	color: red;
+}
+
+.color-green {
+	color: green;
 }

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

@@ -63,7 +63,6 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
 			}
 			radioButtons[0].checked = true;
 		}
-		
 	}
 	
 	$scope.initList = function() {
@@ -104,6 +103,30 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
 			amount = '-' + amount;
 		}
 		
+		// handle withdrawals
+		if ($scope.transaction.category._links.self.href === 'withdrawal') {
+			if (amount.charAt(0) === '-') {
+				amount = amount.substr(1);
+			}
+			
+			var Withdrawal = $resource('/withdrawals');
+			
+			var newWithdrawal = new Withdrawal({
+				"account" : $scope.account._links.self.href,
+				"amount" : amount,
+				"date" : $scope.transaction.date,
+				"user" : $scope.userinfo._links.self.href
+			});
+			
+			newWithdrawal.$save(function(withdrawal) {
+				$scope.refreshList();
+				$scope.lastSubmission = newWithdrawal;
+				console.log(newWithdrawal);
+			});
+			
+			return;
+		}
+			
 		// via Resource (might be moved into a service)
 		var Transaction = $resource('/transactions');
 
@@ -118,6 +141,16 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$location'
 		
 		newTransaction.$save(function(transaction) {
 			$scope.refreshList();
+			$scope.lastSubmission = newTransaction;
+		});
+		
+	};
+	
+	$scope.deleteLastSubmission = function() {
+		console.log($scope.lastSubmission._links.self.href);
+		var testTrns = $resource($scope.lastSubmission._links.self.href).delete(function() {
+			$scope.lastSubmission = undefined;
+			$scope.refreshList();
 		});
 	};
 	

src/main/resources/static/partials/transaction-list.html

@@ -1,11 +1,20 @@
 <div>
 	<div>
-		<div><select ng-model='account' ng-change='refreshList()' ng-options="account.name for account in accounts track by account.id"></select></div>
+		<div id="accountSelector"><select ng-model='account' ng-change='refreshList()' ng-options="account.name for account in accounts track by account.id"></select></div>
+		
+		<div ng-show="lastSubmission" class='ui-state-highlight' style='text-align: center; padding: 0.5ex; width: 30em; margin:auto; margin-bottom: 2em;'>
+			{{lastSubmission.date | date:'dd.MM.yyyy'}}
+			<span ng-class="{ 'color-green': lastSubmission.amount > 0, 'color-red': lastSubmission.amount < 0 }">{{lastSubmission.amount}}&nbsp;€</span>
+			&nbsp;&nbsp;&nbsp;
+			<span style='color: red; font-weight: bold;'><a href='' ng-click='deleteLastSubmission()'>löschen</a></span>
+		</div>
+		
+		
 		<form name="form" ng-submit="postTransaction()">
 			<table border='0' cellpadding='1' style='margin: auto;'>
 				<tr>
 					<td align='right'>Betrag:</td>
-					<td><input name="amount" ng-model='transaction.amount' type='text' required
+					<td><input name="amount" ng-model='transaction.amount' type='text' required autofocus="autofocus"
 						ng-pattern="/^[+-]?(?:\d+(?:[\.,]\d{0,2})?|[\.,]\d{1,2})$/" /><span ng-show="form.amount.$error.pattern"><br/>The value
 							is not valid!</span></td>
 				</tr>