alahouze/accountant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge scheduling and entries in operation.

Browse Source
This commit is contained in:
Alexis Lahouze
2015-07-17 19:22:04 +02:00
parent d9c1052f5e
commit c8b4c54742
8 changed files with 297 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
accountant/frontend/static/js/entries.js
View File

@ -396,7 +396,7 @@ accountantApp
// Returns true if the entry is a scheduled one.
$scope.isSaved = function(entry) {
return entry.id !== null;
return entry.confirmed;
};
// Cancel current editing entry or clears field if a new one.
@ -426,11 +426,19 @@ accountantApp
// Points an entry.
$scope.pointEntry = function(entry) {
entry.confirmed = true;
entry.pointed = !entry.pointed;
$scope.saveEntry(entry);
};
// Confirm an entry.
$scope.confirmEntry = function(entry) {
entry.confirmed = true;
$scope.saveEntry(entry);
};
// Create an new entry.
$scope.createEntry = function(entry) {
entry.account_id = $scope.account.id;

2
accountant/frontend/static/templates/entries.html
View File

@ -171,7 +171,7 @@
<!-- Button group for an unsaved (scheduled) entry. -->
<div class="btn-group" ng-if="!isSaved(entry)">
<button class="btn btn-xs btn-success" ng-click="saveEntry(entry)" title="Save">
<button class="btn btn-xs btn-success" ng-click="confirmEntry(entry)" title="Save">
<span class="fa fa-plus"></span>
</button>