kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-29 22:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Ability to highlight a particular transaction. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-08-09 06:56:38 +02:00
parent f2cee8fea7
commit ebb28df607
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/BudgetController.php
View File

@@ -117,7 +117,7 @@ class BudgetController extends BaseController
return View::make('budgets.show')->with('budget', $budget)->with('repetitions', $repetitions)->with( return View::make('budgets.show')->with('budget', $budget)->with('repetitions', $repetitions)->with(
'filters', $filters 'filters', $filters
); )->with('highlight',Input::get('highlight'));
} }
/** /**

9
app/controllers/CategoryController.php
View File

@@ -60,7 +60,9 @@ class CategoryController extends BaseController
$journals = $this->_category->journalsInRange($category, $start, $end); $journals = $this->_category->journalsInRange($category, $start, $end);
return View::make('categories.show')->with('category', $category)->with('journals', $journals); return View::make('categories.show')->with('category', $category)->with('journals', $journals)->with(
'highlight', Input::get('highlight')
);
} }
public function store() public function store()
@@ -84,16 +86,17 @@ class CategoryController extends BaseController
public function update(Category $category) public function update(Category $category)
{ {
$category = $this->_repository->update($category, Input::all()); $category = $this->_repository->update($category, Input::all());
if($category->validate()) { if ($category->validate()) {
Session::flash('success', 'Category "' . $category->name . '" updated.'); Session::flash('success', 'Category "' . $category->name . '" updated.');
return Redirect::route('categories.index'); return Redirect::route('categories.index');
} else { } else {
Session::flash('success', 'Could not update category "' . $category->name . '".'); Session::flash('success', 'Could not update category "' . $category->name . '".');
return Redirect::route('categories.edit')->withErrors($category->errors())->withInput(); return Redirect::route('categories.edit')->withErrors($category->errors())->withInput();
} }
} }

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

@@ -49,9 +49,9 @@
@endif @endif
</h4> </h4>
@if($repetition['paginated'] == true) @if($repetition['paginated'] == true)
@include('paginated.transactions',['journals' => $repetition['journals']]) @include('paginated.transactions',['journals' => $repetition['journals'],'highlight' => $highlight])
@else @else
@include('lists.transactions',['journals' => $repetition['journals'],'sum' => true]) @include('lists.transactions',['journals' => $repetition['journals'],'sum' => true,'highlight' => $highlight])
@endif @endif
</div> </div>
</div> </div>

10
app/views/lists/transactions.blade.php
View File

@@ -10,7 +10,11 @@
</tr> </tr>
<?php $total = 0; ?> <?php $total = 0; ?>
@foreach($journals as $journal) @foreach($journals as $journal)
<tr> <tr
@if(isset($highlight) && $highlight == $journal->id)
class="success"
@endif
>
<td> <td>
@if($journal->transactiontype->type == 'Withdrawal') @if($journal->transactiontype->type == 'Withdrawal')
<span class="glyphicon glyphicon-arrow-left" title="Withdrawal"></span> <span class="glyphicon glyphicon-arrow-left" title="Withdrawal"></span>
@@ -28,10 +32,10 @@
<td> <td>
@foreach($journal->components as $component) @foreach($journal->components as $component)
@if($component->class == 'Budget') @if($component->class == 'Budget')
<a href="{{route('budgets.show',$component->id)}}#GETTHEREPSOMEHOW_ORLIMITQUERYbudget-overview-in-month"><span class="glyphicon glyphicon-tasks" title="Budget: {{{$component->name}}}"></span></a> <a href="{{route('budgets.show',$component->id)}}?highlight={{$journal->id}}"><span class="glyphicon glyphicon-tasks" title="Budget: {{{$component->name}}}"></span></a>
@endif @endif
@if($component->class == 'Category') @if($component->class == 'Category')
<a href="#category-overview-in-month"><span class="glyphicon glyphicon-tag" title="Category: {{{$component->name}}}"></span></a> <a href="{{route('categories.show',$component->id)}}?highlight={{$journal->id}}"><span class="glyphicon glyphicon-tag" title="Category: {{{$component->name}}}"></span></a>
@endif @endif
@endforeach @endforeach
</td> </td>