tilman/next-transactions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed Withdrawal entity

Browse Source
This commit is contained in:
Tilman Liero
2016-07-13 23:53:55 +02:00
parent 2c92dd00fe
commit a3d170be77
10 changed files with 76 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/partials/transaction-list.html
+10 -25
View File
@@ -91,7 +91,7 @@
<tr ng-repeat="transaction in transactions" ng-click="openDetails(transaction)" class="clickable">
<td>{{transaction.date | date:'dd.MM.yyyy'}}</td>
<td>{{transaction.category.name}}</td>
<td align="right" class="{{transaction.creditor.name ? 'creditor-' + transaction.creditor.id : ''}}">{{transaction.amount}}&nbsp;&euro;</td>
<td align="right" class="{{transaction.creditor.name ? 'creditor-' + transaction.creditor.id : ''}}"><span ng-class="transaction.amount.charAt(0) === '+' ? 'color-green' : 'color-black'">{{transaction.amount}}&nbsp;&euro;</span></td>
<td>{{transaction.description}}</td>
</tr>
</table>
@@ -176,13 +176,12 @@
<!-- pre style="font-size: 75%; color: black;">{{transaction | json}}</pre -->
</script>
<script type="text/ng-template" id="expensesTemplate.html">
<script type="text/ng-template" id="outstandingsTemplate.html">
<div class="modal-header">
<h3 class="modal-title">{{accountUser.name}} <span style="margin: 0" ng-class="accountUser.outstandingSum >= 0 ? 'color-green' : 'color-red'">{{accountUser.outstandingAmount}}&nbsp;€</span></h3>
<h3 class="modal-title">{{accountUser.name}} <span ng-class="accountUser.outstandingSum >= 0 ? 'color-green' : 'color-red'">{{accountUser.outstandingAmount}}&nbsp;€</span></h3>
</div>
<div class="modal-body">
<div ng-show="accountUser.expenses.length > 0">
<h4 class="modal-title">Auslagen</h4>
<div ng-show="accountUser.outstandings.length > 0">
<table class="listing">
<tr>
<th>Datum</th>
@@ -190,30 +189,16 @@
<th>Betrag</th>
<th>Beschreibung</th>
</tr>
<tr ng-repeat="expense in accountUser.expenses">
<td>{{expense.date | date:'dd.MM.yyyy'}}</td>
<td>{{expense.category}}</td>
<td align="right">{{expense.amount}}&nbsp;&euro;</td>
<td>{{expense.description}}</td>
<tr ng-repeat="outstanding in accountUser.outstandings">
<td>{{outstanding.date | date:'dd.MM.yyyy'}}</td>
<td>{{outstanding.category}}</td>
<td align="right"><span ng-class="outstanding.amount.charAt(0) === '+' ? 'color-green' : 'color-red'">{{outstanding.amount}}&nbsp;&euro;</span></td>
<td>{{outstanding.description}}</td>
</tr>
</table>
</div>
<div ng-show="accountUser.withdrawals.length > 0">
<h4 class="modal-title" style="margin-top: 3.5ex;">Entnahmen</h4>
<table class="listing">
<tr>
<th>Datum</th>
<th>Betrag</th>
</tr>
<tr ng-repeat="withdrawal in accountUser.withdrawals">
<td>{{withdrawal.date | date:'dd.MM.yyyy'}}</td>
<td align="right">{{withdrawal.amount}}&nbsp;&euro;</td>
</tr>
</table>
</div>
<div ng-show="accountUser.expenses.length == 0 && accountUser.withdrawals.length == 0">
<div ng-show="accountUser.outstandings.length == 0">
<i>Keine Auslagen oder Entnahmen für {{accountUser.name}}</i>
</div>