Categories can now be retired
This commit is contained in:
@@ -19,6 +19,8 @@ public class Category {
|
|||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
private Integer position;
|
private Integer position;
|
||||||
|
|
||||||
|
private Boolean retired = false;
|
||||||
|
|
||||||
public Account getAccount() {
|
public Account getAccount() {
|
||||||
return account;
|
return account;
|
||||||
@@ -47,5 +49,13 @@ public class Category {
|
|||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean isRetired() {
|
||||||
|
return retired;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRetired(Boolean retired) {
|
||||||
|
this.retired = retired;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
INSERT INTO User (id, name, username) VALUES (1, 'Adam', 'adam'), (2, 'Betty', 'betty'), (3, 'Curt', 'curt');
|
INSERT INTO User (id, name, username) VALUES (1, 'Adam', 'adam'), (2, 'Betty', 'betty'), (3, 'Curt', 'curt');
|
||||||
INSERT INTO Account (id, name, owner_id) VALUES (1, 'Gemeinschaftskonto', 1), (2, 'Konto Adam', 1);
|
INSERT INTO Account (id, name, owner_id) VALUES (1, 'Gemeinschaftskonto', 1), (2, 'Konto Adam', 1);
|
||||||
|
|
||||||
INSERT INTO Category (id, name, account_id, position) VALUES
|
INSERT INTO Category (id, name, account_id, position, retired) VALUES
|
||||||
(null, 'Essen - Lebensmittel', 1, 2),
|
(null, 'Essen - Lebensmittel', 1, 2, false),
|
||||||
(null, 'Einnahmen - Gehalt', 1, 1),
|
(null, 'Einnahmen - Gehalt', 1, 1, false),
|
||||||
(null, 'Essen - Arbeit', 1, 3),
|
(null, 'Essen - Arbeit', 1, 3, false),
|
||||||
(null, 'Wohnen - Haushalt', 1, 4),
|
(null, 'Sonstiges - Projekt 1000', 1, 4, true),
|
||||||
(null, 'Private Entnahme', 1, 5),
|
(null, 'Wohnen - Haushalt', 1, 4, false),
|
||||||
(null, 'Einnahmen - Gehalt', 2, 1),
|
(null, 'Private Entnahme', 1, 5, false),
|
||||||
(null, 'Technik - Server und Hosting', 2, 2);
|
(null, 'Einnahmen - Gehalt', 2, 1, false),
|
||||||
|
(null, 'Technik - Server und Hosting', 2, 2, false);
|
||||||
|
|
||||||
INSERT INTO Account_User (account_id, user_id) VALUES (1, 1), (1, 2), (1, 3), (2, 1);
|
INSERT INTO Account_User (account_id, user_id) VALUES (1, 1), (1, 2), (1, 3), (2, 1);
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,14 @@ transactionControllers.controller('TransactionListCtrl', [ '$scope', '$routePara
|
|||||||
var categories = $resource('/api/categories/search/listForAccount', { accountId: $scope.account.id }).get();
|
var categories = $resource('/api/categories/search/listForAccount', { accountId: $scope.account.id }).get();
|
||||||
categories.$promise.then(function(data) {
|
categories.$promise.then(function(data) {
|
||||||
$scope.categories = categories._embedded.categories;
|
$scope.categories = categories._embedded.categories;
|
||||||
|
|
||||||
|
// remove retired categories
|
||||||
|
for (i = 0; i < $scope.categories.length; i++) {
|
||||||
|
if ($scope.categories[i].retired) {
|
||||||
|
$scope.categories.splice(i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$scope.refreshList();
|
$scope.refreshList();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user