Skip to content

Commit b5f70d9

Browse files
committed
Fix bug in asset sorting logic
1 parent d877c8f commit b5f70d9

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

app/Http/Controllers/AssetController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ protected function index()
1717

1818
foreach ($expensesWithTypeAfa as $expense) {
1919
$expense->yearsInUse = $year - Carbon::parse($expense->payment_date)->year;
20+
$expense->percUsed = $expense->yearsInUse * 100 / $expense->depreciation;
2021
}
2122

22-
$expensesWithTypeAfa = $expensesWithTypeAfa->sortBy('yearsInUse');
23+
$expensesWithTypeAfa = $expensesWithTypeAfa->sortBy('percUsed');
2324

2425
return view('asset.index', ['expensesWithTypeAfa' => $expensesWithTypeAfa, 'year' => $year]);
2526
}

resources/views/asset/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<div class="absolute top-0 left-0 h-full
3434
bg-green-200 dark:bg-green-700 z-0 max-w-full" style="width:
3535
@if ($expense->yearsInUse == 0) {{0}}
36-
@else {{ $expense->yearsInUse * 100 / $expense->depreciation}}@endif%">
36+
@else {{ $expense->percUsed }}@endif%">
3737
</div>
3838
</td>
3939
<td class="currency">{{Number::currency($expense->net / $expense->depreciation *

0 commit comments

Comments
 (0)