Tweak reports.

This commit is contained in:
James Cole
2016-10-26 19:37:19 +02:00
parent dc0c1b73bc
commit 5db4f8512b
5 changed files with 86 additions and 66 deletions

View File

@@ -20,7 +20,16 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport"> <div class="col-lg-6 col-md-6 col-sm-6 loading">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="accountReport">
</div>
</div>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<div class="box"> <div class="box">
@@ -42,7 +51,15 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="incomeVsExpenseReport"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="incomeVsExpenseReport">
</div>
</div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
{% include 'reports/partials/tags.twig' %} {% include 'reports/partials/tags.twig' %}

View File

@@ -53,7 +53,14 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="incomeVsExpenseReport"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="incomeVsExpenseReport">
</div>
</div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
{% include 'reports/partials/tags.twig' %} {% include 'reports/partials/tags.twig' %}

View File

@@ -31,9 +31,19 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="loading" id="accountReport"> <div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="accountReport">
</div>
</div>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding loading" id="incomeVsExpenseReport">
</div> </div>
<div class="loading" id="incomeVsExpenseReport">
</div> </div>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">

View File

@@ -1,8 +1,3 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover sortable"> <table class="table table-hover sortable">
<thead> <thead>
<tr> <tr>
@@ -33,5 +28,3 @@
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div>
</div>

View File

@@ -1,8 +1,3 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
<td>{{ 'in'|_ }}</td> <td>{{ 'in'|_ }}</td>
@@ -17,5 +12,3 @@
<td>{{ (incomes.getTotal + expenses.getTotal)|formatAmount }}</td> <td>{{ (incomes.getTotal + expenses.getTotal)|formatAmount }}</td>
</tr> </tr>
</table> </table>
</div>
</div>