kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-11 00:16:54 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new stuff.

Browse Source
This commit is contained in:
James Cole
2014-11-24 10:12:34 +01:00
parent 4456ef2326
commit bfda4bc199
12 changed files with 467 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/repeatedexpense/index.blade.php
View File

@@ -14,14 +14,36 @@
</div>
</div>
@foreach($expenses as $entry)
<?php
$barSize = floor(12 / $entry->currentRep->bars->count()) == 0 ? 1 : floor(12 / $entry->currentRep->bars->count());
?>
<div class="row">
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<a href="{{route('repeated.show',$entry->id)}}" title="{{{$entry->name}}}">{{{$entry->name}}}</a> ({{mf($entry->currentRep->currentamount)}})
<a href="{{route('repeated.show',$entry->id)}}" title="{{{$entry->name}}}">{{{$entry->name}}}</a>
</div>
<div class="panel-body">
<div class="row">
<div class="col-lg-12 col-sm-12 col-md-12">
<p>
Target amount: {{mf($entry->targetamount)}}. Currently saved: {{mf($entry->currentRep->currentamount)}}. Left to save: {{mf($entry->targetamount-$entry->currentRep->currentamount)}}<br />
Runs from {{$entry->currentRep->startdate->format('j F Y')}} to {{$entry->currentRep->targetdate->format('j F Y')}}
</p>
</div>
</div>
<div class="row">
@foreach($entry->currentRep->bars as $bar)
<div class="col-lg-{{$barSize}} col-md-{{$barSize}} col-sm-{{$barSize}}">
<div class="progress">
<!-- currentAmount:{{$bar->getCurrentAmount()}} getAmount:{{$bar->getAmount()}} -->
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{$bar->percentage()}}" aria-valuemin="0" aria-valuemax="100" style="width: {{$bar->percentage()}}%;"></div>
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="{{100-$bar->percentage()}}" aria-valuemin="0" aria-valuemax="100" style="width: {{100-$bar->percentage()}}%;"></div>
</div>
</div>
@endforeach
{{--
@for($i=0;$i<$entry->parts;$i++)
<!-- {{$entry->currentRep->currentamount}} < {{$entry->bars[$i]['amount']}} -->
<div class="col-lg-{{$entry->barCount}} col-md-{{$entry->barCount}} col-sm-{{$entry->barCount}}">
@@ -37,13 +59,16 @@
</div>
@endfor
--}}
</div>
<div class="row">
{{--
@for($i=0;$i<$entry->parts;$i++)
<div class="col-lg-{{$entry->barCount}} col-md-{{$entry->barCount}} col-sm-{{$entry->barCount}}">
<small>{{DateKit::periodShow($entry->bars[$i]['date'],$entry->reminder)}}</small>
</div>
@endfor
--}}
</div>
</div>
</div>

23
app/views/repeatedexpense/show.blade.php Normal file
View File

@@ -0,0 +1,23 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
@foreach($piggyBank->piggybankrepetitions as $rep)
<div class="panel
@if($today > $rep->startdate && $today < $rep->targetdate)
panel-primary
@else
panel-default
@endif
">
<div class="panel-heading">
Repetition from {{$rep->startdate->format('j F Y')}} to {{$rep->targetdate->format('j F Y')}}
</div>
<div class="panel-body">
{{$piggyBank->reminder}}
</div>
</div>
@endforeach
</div>
</div>
@stop