Experiment with boxes.

app/Helpers/Report/ReportQuery.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 22/02/15
- * Time: 18:30
- */
 
 namespace FireflyIII\Helpers\Report;
 

app/Http/Controllers/HomeController.php

@@ -7,7 +7,7 @@ use Input;
 use Preferences;
 use Redirect;
 use Session;
-
+use DB;
 /**
  * Class HomeController
  *
@@ -62,6 +62,7 @@ class HomeController extends Controller
         $start         = Session::get('start', Carbon::now()->startOfMonth());
         $end           = Session::get('end', Carbon::now()->endOfMonth());
 
+
         if ($frontPage->data == []) {
             $accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']);
         } else {
@@ -74,8 +75,8 @@ class HomeController extends Controller
                        ->with(['transactions', 'transactioncurrency', 'transactiontype'])
                        ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                        ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
-                       ->where('date', '>=', $start->format('Y-m-d'))
-                       ->where('date', '<=', $end->format('Y-m-d'))
+                        ->before($end)
+                ->after($start)
                        ->orderBy('transaction_journals.date', 'DESC')
                        ->orderBy('transaction_journals.id', 'DESC')
                        ->take(10)

app/Http/Controllers/JsonController.php

@@ -1,20 +1,112 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Http\Requests;
-use FireflyIII\Http\Controllers\Controller;
-
-use Illuminate\Http\Request;
-use Response;
+use Amount;
 use Auth;
+use DB;
+use FireflyIII\Http\Requests;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use Input;
+use Response;
+use Session;
 
 /**
  * Class JsonController
  *
  * @package FireflyIII\Http\Controllers
  */
-class JsonController extends Controller {
+class JsonController extends Controller
+{
 
 
+    /**
+     *
+     */
+    public function box(BillRepositoryInterface $repository)
+    {
+        $amount = 0;
+        $start  = Session::get('start');
+        $end    = Session::get('end');
+        $box    = 'empty';
+        switch (Input::get('box')) {
+            case 'in':
+                $box = Input::get('box');
+                $in  = Auth::user()->transactionjournals()
+                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                           ->before($end)
+                           ->after($start)
+                           ->transactionTypes(['Deposit'])
+                           ->where('transactions.amount', '>', 0)
+                           ->first([DB::Raw('SUM(transactions.amount) as `amount`')]);
+                if (!is_null($in)) {
+                    $amount = floatval($in->amount);
+                }
+
+                break;
+            case 'out':
+                $box = Input::get('box');
+                $in  = Auth::user()->transactionjournals()
+                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                           ->before($end)
+                           ->after($start)
+                           ->transactionTypes(['Withdrawal'])
+                           ->where('transactions.amount', '>', 0)
+                           ->first([DB::Raw('SUM(transactions.amount) as `amount`')]);
+                if (!is_null($in)) {
+                    $amount = floatval($in->amount);
+                }
+
+                break;
+            case 'bills-unpaid':
+                $box   = 'bills-unpaid';
+                $bills = Auth::user()->bills()->where('active', 1)->get();
+
+                /** @var Bill $bill */
+                foreach ($bills as $bill) {
+                    $ranges = $repository->getRanges($bill, $start, $end);
+
+                    foreach ($ranges as $range) {
+                        // paid a bill in this range?
+                        $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
+                        if ($count == 0) {
+                            $amount += ($bill->amount_max + $bill->amount_min / 2);
+
+                        }
+
+                    }
+                }
+            break;
+            case 'bills-paid':
+                $box = 'bills-paid';
+                // these two functions are the same as the chart TODO
+                $bills = Auth::user()->bills()->where('active', 1)->get();
+
+                /** @var Bill $bill */
+                foreach ($bills as $bill) {
+                    $ranges = $repository->getRanges($bill, $start, $end);
+
+                    foreach ($ranges as $range) {
+                        // paid a bill in this range?
+                        $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
+                        if ($count != 0) {
+                            $journal         = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first();
+                            $paid['items'][] = $journal->description;
+                            $currentAmount   = 0;
+                            foreach ($journal->transactions as $t) {
+                                if (floatval($t->amount) > 0) {
+                                    $currentAmount = floatval($t->amount);
+                                }
+                            }
+                            $amount += $currentAmount;
+                        }
+
+                    }
+                }
+        }
+
+        return Response::json(['box' => $box, 'amount' => Amount::format($amount, false)]);
+    }
+
     /**
      * Returns a list of categories.
      *
@@ -22,8 +114,8 @@ class JsonController extends Controller {
      */
     public function categories()
     {
-        $list       = Auth::user()->categories()->orderBy('name','ASC')->get();
-        $return     = [];
+        $list   = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
@@ -40,8 +132,8 @@ class JsonController extends Controller {
      */
     public function expenseAccounts()
     {
-        $list     = Auth::user()->accounts()->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
-        $return   = [];
+        $list   = Auth::user()->accounts()->accountTypeIn(['Expense account', 'Beneficiary account'])->get();
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }
@@ -55,8 +147,8 @@ class JsonController extends Controller {
      */
     public function revenueAccounts()
     {
-        $list     = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->get();
-        $return   = [];
+        $list   = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->get();
+        $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;
         }

app/Http/Requests/BillFormRequest.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 12:29
- */
 
 namespace FireflyIII\Http\Requests;
 

app/Http/Requests/CurrencyFormRequest.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/02/15
- * Time: 12:29
- */
 
 namespace FireflyIII\Http\Requests;
 

app/Http/routes.php

@@ -250,6 +250,7 @@ Route::group(
     Route::get('/json/expense-accounts', ['uses' => 'JsonController@expenseAccounts', 'as' => 'json.expense-accounts']);
     Route::get('/json/revenue-accounts', ['uses' => 'JsonController@revenueAccounts', 'as' => 'json.revenue-accounts']);
     Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);
+    Route::get('/json/box', ['uses' => 'JsonController@box', 'as' => 'json.box']);
 
 
     /**

public/js/index.js

@@ -3,7 +3,21 @@ google.setOnLoadCallback(drawChart);
 
 function drawChart() {
     googleLineChart('chart/home/account', 'accounts-chart');
-    googleBarChart('chart/home/budgets','budgets-chart');
-    googleColumnChart('chart/home/categories','categories-chart');
-    googlePieChart('chart/home/bills','bills-chart')
+    googleBarChart('chart/home/budgets', 'budgets-chart');
+    googleColumnChart('chart/home/categories', 'categories-chart');
+    googlePieChart('chart/home/bills', 'bills-chart');
+    getBoxAmounts();
+}
+
+function getBoxAmounts() {
+    var boxes = ['in', 'out','bills-unpaid','bills-paid'];
+    for (x in boxes) {
+        var box = boxes[x];
+        $.getJSON('/json/box', {box: box}).success(function (data) {
+            "use strict";
+            $('#box-' + data.box).html(data.amount);
+        }).fail(function () {
+            console.log('Failed to get box!')
+        });
+    }
 }

resources/views/app.blade.php

@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Laravel</title>
-
-	<link href="/css/app.css" rel="stylesheet">
-
-	<!-- Fonts -->
-	<link href='//fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>
-
-	<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-	<!--[if lt IE 9]>
-		<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-	<![endif]-->
-</head>
-<body>
-	<nav class="navbar navbar-default">
-		<div class="container-fluid">
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-					<span class="sr-only">Toggle Navigation</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				<a class="navbar-brand" href="#">Laravel</a>
-			</div>
-
-			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-				<ul class="nav navbar-nav">
-					<li><a href="/">Home</a></li>
-				</ul>
-
-				<ul class="nav navbar-nav navbar-right">
-					@if (Auth::guest())
-						<li><a href="/auth/login">Login</a></li>
-						<li><a href="/auth/register">Register</a></li>
-					@else
-						<li class="dropdown">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ Auth::user()->name }} <span class="caret"></span></a>
-							<ul class="dropdown-menu" role="menu">
-								<li><a href="/auth/logout">Logout</a></li>
-							</ul>
-						</li>
-					@endif
-				</ul>
-			</div>
-		</div>
-	</nav>
-
-	@yield('content')
-
-	<!-- Scripts -->
-	<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-	<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js"></script>
-</body>
-</html>

resources/views/index.blade.php

@@ -17,6 +17,10 @@
     </div>
     @else
 
+<!-- fancy new boxes -->
+    @include('partials.boxes')
+
+
 
 
 <div class="row">

resources/views/partials/boxes.blade.php

@@ -0,0 +1,92 @@
+<!-- /.row -->
+<div class="row">
+    <div class="col-lg-3 col-md-6">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <div class="row">
+                    <div class="col-xs-3">
+                        <i class="fa fa-comments fa-5x"></i>
+                    </div>
+                    <div class="col-xs-9 text-right">
+                        <div id="box-out" class="huge">{{Amount::format(0,false)}}</div>
+                        <div>Money out</div>
+                    </div>
+                </div>
+            </div>
+            <a href="{{route('transactions.index','withdrawal')}}">
+                <div class="panel-footer">
+                    <span class="pull-left">View Details</span>
+                    <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+    </div>
+    <div class="col-lg-3 col-md-6">
+        <div class="panel panel-green">
+            <div class="panel-heading">
+                <div class="row">
+                    <div class="col-xs-3">
+                        <i class="fa fa-tasks fa-5x"></i>
+                    </div>
+                    <div class="col-xs-9 text-right">
+                        <div id="box-in" class="huge">{{Amount::format(0,false)}}</div>
+                        <div>Money in</div>
+                    </div>
+                </div>
+            </div>
+            <a href="{{route('transactions.index','deposit')}}">
+                <div class="panel-footer">
+                    <span class="pull-left">View Details</span>
+                    <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+    </div>
+    <div class="col-lg-3 col-md-6">
+        <div class="panel panel-red">
+            <div class="panel-heading">
+                <div class="row">
+                    <div class="col-xs-3">
+                        <i class="fa fa-shopping-cart fa-5x"></i>
+                    </div>
+                    <div class="col-xs-9 text-right">
+                        <div id="box-bills-unpaid" class="huge">{{Amount::format(0,false)}}</div>
+                        <div>Bills to pay</div>
+                    </div>
+                </div>
+            </div>
+            <a href="{{route('bills.index')}}">
+                <div class="panel-footer">
+                    <span class="pull-left">View Details</span>
+                    <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+    </div>
+    <div class="col-lg-3 col-md-6">
+        <div class="panel panel-green">
+            <div class="panel-heading">
+                <div class="row">
+                    <div class="col-xs-3">
+                        <i class="fa fa-support fa-5x"></i>
+                    </div>
+                    <div class="col-xs-9 text-right">
+                        <div id="box-bills-paid" class="huge">{{Amount::format(0,false)}}</div>
+                        <div>Bills paid</div>
+                    </div>
+                </div>
+            </div>
+            <a href="{{route('bills.index')}}">
+                <div class="panel-footer">
+                    <span class="pull-left">View Details</span>
+                    <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+    </div>
+</div>
+<!-- /.row -->