Fixed more views. [skip ci]

app/Http/Controllers/BudgetController.php

@@ -190,6 +190,7 @@ class BudgetController extends Controller
         $journals = $repository->getJournals($budget, $repetition);
         $limits   = !is_null($repetition->id) ? [$repetition->budgetLimit] : $repository->getBudgetLimits($budget);
         $subTitle = !is_null($repetition->id) ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
+        $journals->setPath('/budgets/show/'.$budget->id);
 
         return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
     }

app/Providers/ConfigServiceProvider.php

@@ -162,6 +162,7 @@ class ConfigServiceProvider extends ServiceProvider
                             ],
                             'Session',
                             'Route',
+                            'URL',
                             'Config',
                             'ExpandedForm' => [
                                 'is_safe' => [

app/Providers/FireflyServiceProvider.php

@@ -9,6 +9,7 @@ use FireflyIII\Support\ExpandedForm;
 use FireflyIII\Support\Navigation;
 use FireflyIII\Support\Preferences;
 use FireflyIII\Support\Steam;
+use FireflyIII\Support\Twig\Budget;
 use FireflyIII\Support\Twig\General;
 use FireflyIII\Support\Twig\Journals;
 use FireflyIII\Validation\FireflyValidator;
@@ -39,6 +40,7 @@ class FireflyServiceProvider extends ServiceProvider
         Twig::addExtension(new Functions($config));
         Twig::addExtension(new General);
         Twig::addExtension(new Journals);
+        Twig::addExtension(new Budget);
     }
 
     public function register()

app/Support/Twig/Budget.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace FireflyIII\Support\Twig;
+
+use Auth;
+use DB;
+use FireflyIII\Models\LimitRepetition;
+use Twig_Extension;
+use Twig_SimpleFunction;
+
+/**
+ * Class Budget
+ *
+ * @package FireflyIII\Support\Twig
+ */
+class Budget extends Twig_Extension
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getFunctions()
+    {
+        $functions[] = new Twig_SimpleFunction(
+            'spentInRepetition', function (LimitRepetition $repetition) {
+            $sum = DB::table('transactions')
+                     ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                     ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                     ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
+                     ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
+                     ->where('transaction_journals.date', '>=', $repetition->startdate->format('Y-m-d'))
+                     ->where('transaction_journals.date', '<=', $repetition->enddate->format('Y-m-d'))
+                     ->where('transaction_journals.user_id', Auth::user()->id)
+                     ->whereNull('transactions.deleted_at')
+                     ->where('transactions.amount', '>', 0)
+                     ->where('limit_repetitions.id', '=', $repetition->id)
+                     ->sum('transactions.amount');
+
+            return floatval($sum);
+        }
+        );
+
+        return $functions;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'FireflyIII\Support\Twig\Budget';
+    }
+}

resources/twig/budgets/delete.twig

@@ -0,0 +1,43 @@
+{% extends "./layout/default.twig" %}
+{% block content %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
+    {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) })  }}
+        <div class="row">
+    <div class="col-lg-6 col-md-12 col-sm-12">
+        <div class="panel panel-red">
+            <div class="panel-heading">
+                Delete budget "{{ budget.name}}"
+            </div>
+            <div class="panel-body">
+                <p>
+                Are you sure that you want to delete budget "{{ budget.name }}"?
+                </p>
+
+                {% if budget.transactionjournals|length > 0 %}
+                    <p class="text-info">
+                        Budget "{{ budget.name }}" still has {{ budget.transactionjournals|length }} transactions connected
+                        to it. These will <strong>not</strong> be removed but will lose their connection to this budget.
+                    </p>
+                {% endif %}
+
+                <p>
+                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
+                    <a href="{{URL.previous()}}" class="btn-default btn">Cancel</a >
+                </p>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-lg-6">
+        <div class="form-group">
+            <div class="col-sm-8">
+
+            </div>
+        </div>
+    </div>
+</div>
+
+</form>
+{% endblock %}

resources/twig/budgets/edit.twig

@@ -0,0 +1,49 @@
+{% extends "./layout/default.twig" %}
+{% block content %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
+<div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <p class="lead">Use budgets to organize and limit your expenses.</p>
+        </div>
+    </div>
+
+    {{ Form.model(budget, {'class' : 'form-horizontal','id' : 'update','url' : route('budgets.update',budget.id) } ) }}
+    <input type="hidden" name="id" value="{{budget.id}}" />
+    <div class="row">
+        <div class="col-lg-6 col-md-12 col-sm-6">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <i class="fa fa-fw fa-exclamation"></i> Mandatory fields
+                </div>
+                <div class="panel-body">
+                    {{ ExpandedForm.checkbox('active') }}
+                    {{ ExpandedForm.text('name') }}
+                </div>
+            </div>
+
+        </div>
+        <div class="col-lg-6 col-md-12 col-sm-6">
+            <!-- panel for options -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <i class="fa fa-bolt"></i> Options
+                </div>
+                <div class="panel-body">
+                    {{ ExpandedForm.optionsList('update','budget')  }}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <p>
+                <button type="submit" class="btn btn-lg btn-success">
+                    <i class="fa fa-pencil"></i> Update budget
+                </button>
+            </p>
+        </div>
+    </div>
+    </form>
+
+
+{% endblock %}

resources/twig/budgets/income.twig

@@ -0,0 +1,22 @@
+<form style="display: inline;" id="income" action="{{route('budgets.postIncome')}}" method="POST">
+    <input type="hidden" name="_token" value="{{ csrf_token() }}"
+
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title" id="myModalLabel">Update (expected) available amount for {{Session.get('start').format('F Y')}}</h4>
+            </div>
+            <div class="modal-body">
+                <div class="input-group">
+                    <div class="input-group-addon">{{ getCurrencySymbol() }}</div>
+                    <input step="any" class="form-control" id="amount" value="{{ amount.data }}" autocomplete="off" name="amount" type="number">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="submit" class="btn btn-primary">Update</button>
+            </div>
+        </div>
+    </div>
+</form>

resources/twig/budgets/noBudget.twig

@@ -0,0 +1,17 @@
+{% extends "./layout/default.twig" %}
+{% block content %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+<div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                {{ subTitle }}
+            </div>
+            <div class="panel-body">
+                {% include 'list/journals.twig' with {'journals': list} %}
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}

resources/twig/budgets/show.twig

@@ -0,0 +1,108 @@
+{% extends "./layout/default.twig" %}
+{% block content %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName,budget, repetition) }}
+<div class="row">
+    <div class="col-lg-9 col-md-9 col-sm-7">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Overview
+
+
+                <!-- ACTIONS MENU -->
+                <div class="pull-right">
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
+                            Actions
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu pull-right" role="menu">
+                            <li><a href="{{ route('budgets.edit',budget.id) }}"><i class="fa fa-pencil fa-fw"></i> Edit</a></li>
+                            <li><a href="{{ route('budgets.delete',budget.id) }}"><i class="fa fa-trash fa-fw"></i> Delete</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="panel-body">
+                <div id="budgetOverview"></div>
+            </div>
+        </div>
+
+         <div class="panel panel-default">
+            <div class="panel-heading">
+                Transactions
+            </div>
+             {% include 'list/journals.twig' %}
+        </div>
+    </div>
+    <div class="col-lg-3 col-md-3 col-sm-5">
+        {% if limits|length == 1 %}
+        <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">Show everything</a></p>
+        {% endif %}
+
+        {% for limit in limits %}
+            {% for rep in limit.limitRepetitions %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <a href="{{route('budgets.show',[budget.id,rep.id])}}">{{rep.startdate.format('F Y')}}</a>
+                    </div>
+                    <div class="panel-body">
+                        <div class="row">
+                            <div class="col-lg-6 col-md-6 col-sm-6">
+                                Amount: {{ rep.amount|formatAmount  }}
+                            </div>
+                            <div class="col-lg-6 col-md-6 col-sm-6">
+                                Spent: {{ spentInRepetition(rep)|formatAmount }}
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-12 col-md-12 col-sm-12">
+                                {% set overspent = spentInRepetition(rep) > rep.amount %}
+                                {% if overspent %}
+                                    {% set spent = spentInRepetition(rep) %}
+                                    {% set pct = (spent != 0 ? (rep.amount / spent)*100 : 0) %}
+                                    <div class="progress progress-striped">
+                                        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{pct|round}}" aria-valuemin="0" aria-valuemax="100" style="width: {{pct|round}}%;"></div>
+                                        <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="{{(100-pct)|round}}" aria-valuemin="0" aria-valuemax="100" style="width: {{(100-pct)|round}}%;"></div>
+                                    </div>
+                                {% else %}
+                                    {% set amount = rep.amount %}
+                                    {% set pct = (amount != 0 ? (spentInRepetition(rep) / amount)*100 : 0) %}
+                                    <div class="progress progress-striped">
+                                        <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="{{pct|round}}" aria-valuemin="0" aria-valuemax="100" style="width: {{pct|round}}%;"></div>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        {% endfor %}
+
+        {% if limits|length == 1 %}
+            <p class="small text-center"><a href="{{route('budgets.show',budget.id)}}">Show everything</a></p>
+        {% endif %}
+
+    </div>
+</div>
+
+{% endblock %}
+{% block scripts %}
+<script type="text/javascript">
+    var budgetID = {{budget.id}};
+    var currencyCode = '{{ getCurrencyCode() }}';
+    {% if repetition.id %}
+        var repetitionID = {{repetition.id}};
+        var year = {{repetition.startdate.format('Y')}};
+    {% else %}
+        var year = {{Session.get('start').format('Y')}};
+    {% endif %}
+
+</script>
+
+<!-- load the libraries and scripts necessary for Google Charts: -->
+<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript" src="js/gcharts.options.js"></script>
+<script type="text/javascript" src="js/gcharts.js"></script>
+<script type="text/javascript" src="js/budgets.js"></script>
+
+{% endblock %}

resources/twig/list/journals.twig

@@ -1,4 +1,4 @@
-{{ journals.render }}
+{{ journals.render|raw }}
 
 <table class="table table-striped table-bordered sortable-table">
     <tr class="ignore">
@@ -110,4 +110,4 @@
     {% endfor %}
 </table>
 
-{{ journals.render }}
+{{ journals.render|raw }}