kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Last fixes for budget before work on charts.

Browse Source
This commit is contained in:
James Cole
2014-08-22 10:46:33 +02:00
parent 6f4141477d
commit 1b1dc99bf7
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/lib/Firefly/Helper/Controllers/Budget.php
View File

@@ -30,6 +30,7 @@ class Budget implements BudgetInterface
$return[$periodOrder] = isset($return[$periodOrder]) $return[$periodOrder] = isset($return[$periodOrder])
? $return[$periodOrder] ? $return[$periodOrder]
: ['date' => $period, : ['date' => $period,
'dateObject' => $rep->startdate,
'budget_id' => $limit->budget_id]; 'budget_id' => $limit->budget_id];
} }

2
app/views/budgets/indexByDate.blade.php
View File

@@ -35,7 +35,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<h3><a href="#transactions-in-this-period">{{$entry['date']}}</a> <h3><a href="#transactions-in-this-period">{{$entry['date']}}</a>
<a class="btn btn-default btn-xs" href ="{{route('budgets.limits.create')}}#date-and-budget-selected"><span class="glyphicon glyphicon-plus-sign"></span> Create a new envelope for {{$entry['date']}}</a> <a class="btn btn-default btn-xs" href ="{{route('budgets.limits.create')}}?startdate={{$entry['dateObject']->format('Y-m-d')}}"><span class="glyphicon glyphicon-plus-sign"></span> Create a new envelope for {{$entry['date']}}</a>
</h3> </h3>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tr> <tr>

3
app/views/budgets/show.blade.php
View File

@@ -61,7 +61,8 @@
same as the first but bigger range (potentially). same as the first but bigger range (potentially).
</p> </p>
@else @else
<p class="small text-center">(Some sort of chart here)</p> <p class="small text-center">(For each visible repetition, a sum of the expense as a bar. A line shows
the percentage spent for each rep.)</p>
@endif @endif