Lots of changes.

2025-11-20 00:20:03 +00:00 · 2015-03-04 09:42:47 +01:00
parent 92af4e5c96
commit f5437a17f8
18 changed files with 316 additions and 162 deletions
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -7,10 +7,10 @@ use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Input;
 use Redirect;
 use Session;
 use View;
-use Input;


 /**
@@ -38,44 +38,6 @@ class CategoryController extends Controller
        return view('categories.create')->with('subTitle', 'Create a new category');
    }

-    /**
-     * @param Category $category
-     *
-     * @return $this
-     */
-    public function show(Category $category, CategoryRepositoryInterface $repository)
-    {
-        $hideCategory = true; // used in list.
-        $page = intval(Input::get('page'));
-        $offset = $page > 0 ? $page * 50 : 0;
-        $set    = $category->transactionJournals()->withRelevantData()->take(50)->offset($offset)->orderBy('date', 'DESC')->get(['transaction_journals.*']);
-        $count  = $category->transactionJournals()->count();
-
-        $journals = new LengthAwarePaginator($set, $count, 50, $page);
-
-        return view('categories.show', compact('category', 'journals', 'hideCategory'));
-    }
-
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function noCategory()
-    {
-        $start    = Session::get('start', Carbon::now()->startOfMonth());
-        $end      = Session::get('end', Carbon::now()->startOfMonth());
-        $list     = Auth::user()
-                         ->transactionjournals()
-                         ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                         ->whereNull('category_transaction_journal.id')
-                         ->before($end)
-                         ->after($start)
-                         ->orderBy('transaction_journals.date')
-                         ->get(['transaction_journals.*']);
-        $subTitle = 'Transactions without a category in ' . $start->format('F Y');
-
-        return view('categories.noCategory', compact('list', 'subTitle'));
-    }
-
    /**
     * @param Category $category
     *
@@ -122,11 +84,60 @@ class CategoryController extends Controller
     */
    public function index()
    {
-        $categories = Auth::user()->categories()->get();
+        $categories = Auth::user()->categories()->orderBy('name', 'ASC')->get();
+
+        $categories->each(
+            function (Category $category) {
+                $latest = $category->transactionjournals()->orderBy('date', 'DESC')->first();
+                if ($latest) {
+                    $category->lastActivity = $latest->date;
+                }
+            }
+        );

        return view('categories.index', compact('categories'));
    }

+    /**
+     * @return \Illuminate\View\View
+     */
+    public function noCategory()
+    {
+        $start    = Session::get('start', Carbon::now()->startOfMonth());
+        $end      = Session::get('end', Carbon::now()->startOfMonth());
+        $list     = Auth::user()
+                        ->transactionjournals()
+                        ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                        ->whereNull('category_transaction_journal.id')
+                        ->before($end)
+                        ->after($start)
+                        ->orderBy('transaction_journals.date')
+                        ->get(['transaction_journals.*']);
+        $subTitle = 'Transactions without a category in ' . $start->format('F Y');
+
+        return view('categories.noCategory', compact('list', 'subTitle'));
+    }
+
+    /**
+     * @param Category $category
+     *
+     * @return $this
+     */
+    public function show(Category $category, CategoryRepositoryInterface $repository)
+    {
+        $hideCategory = true; // used in list.
+        $page         = intval(Input::get('page'));
+        $offset       = $page > 0 ? $page * 50 : 0;
+        $set          = $category->transactionJournals()->withRelevantData()->take(50)->offset($offset)->orderBy('date', 'DESC')->get(
+            ['transaction_journals.*']
+        );
+        $count        = $category->transactionJournals()->count();
+
+        $journals = new LengthAwarePaginator($set, $count, 50, $page);
+
+        return view('categories.show', compact('category', 'journals', 'hideCategory'));
+    }
+
    /**
     * @param CategoryFormRequest         $request
     * @param CategoryRepositoryInterface $repository
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -13,6 +13,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Preference;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -455,36 +456,32 @@ class GoogleChartController extends Controller

    /**
     *
-     * @param Category  $category
-     * @param           $year
+     * @param Category $category
     *
     * @return \Illuminate\Http\JsonResponse
     */
-    public function categoriesAndSpending(Category $category, $year, GChart $chart)
+    public function categoryOverviewChart(Category $category, GChart $chart)
    {
-        try {
-            new Carbon('01-01-' . $year);
-        } catch (Exception $e) {
-            return view('error')->with('message', 'Invalid year.');
-        }
+        // oldest transaction in category:
+        /** @var TransactionJournal $first */
+        $first = $category->transactionjournals()->orderBy('date', 'ASC')->first();
+        $start = $first->date;
+        /** @var Preference $range */
+        $range = Preferences::get('viewRange', '1M');
+        // jump to start of week / month / year / etc (TODO).
+        $start = Navigation::startOfPeriod($start, $range->data);

-        $chart->addColumn('Month', 'date');
-        $chart->addColumn('Budgeted', 'number');
+        $chart->addColumn('Period', 'date');
        $chart->addColumn('Spent', 'number');

-        $start = new Carbon('01-01-' . $year);
-        $end   = clone $start;
-        $end->endOfYear();
+        $end = new Carbon;
        while ($start <= $end) {

-            $currentEnd = clone $start;
-            $currentEnd->endOfMonth();
-            $spent    = floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
-            $budgeted = null;
+            $currentEnd = Navigation::endOfPeriod($start, $range->data);
+            $spent      = floatval($category->transactionjournals()->before($currentEnd)->after($start)->lessThan(0)->sum('amount')) * -1;
+            $chart->addRow(clone $start, $spent);

-            $chart->addRow(clone $start, $budgeted, $spent);
-
-            $start->addMonth();
+            $start = Navigation::addPeriod($start, $range->data, 0);
        }


@@ -495,6 +492,36 @@ class GoogleChartController extends Controller

    }

+    /**
+     *
+     * @param Category $category
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categoryPeriodChart(Category $category, GChart $chart)
+    {
+        // oldest transaction in category:
+        /** @var TransactionJournal $first */
+        $start = Session::get('start');
+        $chart->addColumn('Period', 'date');
+        $chart->addColumn('Spent', 'number');
+
+        $end = Session::get('end');
+        while ($start <= $end) {
+            $spent      = floatval($category->transactionjournals()->onDate($start)->lessThan(0)->sum('amount')) * -1;
+            $chart->addRow(clone $start, $spent);
+            $start->addDay();
+        }
+
+        $chart->generate();
+
+        return Response::json($chart->getData());
+
+
+    }
+
+
+
    /**
     * @param PiggyBank $piggyBank
     *
--- a/app/Http/Controllers/RelatedController.php
+++ b/app/Http/Controllers/RelatedController.php
@@ -10,6 +10,8 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Support\Collection;
 use Response;
 use Input;
+use Redirect;
+use URL;

 /**
 * Class RelatedController
@@ -128,6 +130,34 @@ class RelatedController extends Controller
        return Response::json(true);
    }

+    /**
+     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     *
+     * @param TransactionJournal $parentJournal
+     * @param TransactionJournal $childJournal
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws Exception
+     */
+    public function getRemoveRelation(TransactionJournal $parentJournal, TransactionJournal $childJournal)
+    {
+        $groups = $parentJournal->transactiongroups()->get();
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            foreach ($group->transactionjournals()->get() as $loopJournal) {
+                if ($loopJournal->id == $childJournal->id) {
+                    // remove from group:
+                    $group->transactionjournals()->detach($childJournal);
+                }
+            }
+            if ($group->transactionjournals()->count() == 1) {
+                $group->delete();
+            }
+        }
+
+        return Redirect::to(URL::previous());
+    }
+
    /**
     * @param TransactionJournal $journal
     *
@@ -138,19 +168,9 @@ class RelatedController extends Controller

        $search = e(trim(Input::get('searchValue')));

-        $result = $repository->searchRelated($search, $journal);
-        $result->each(
-            function (TransactionJournal $journal) {
-                /** @var Transaction $t */
-                foreach ($journal->transactions()->get() as $t) {
-                    if ($t->amount > 0) {
-                        $journal->amount = $t->amount;
-                    }
-                }
-            }
-        );
+        $journals = $repository->searchRelated($search, $journal);
+        return view('related.searchResult',compact('journals'));

-        return Response::json($result->toArray());
    }

 }
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -229,18 +229,9 @@ class TransactionController extends Controller
                $t->after  = $t->before + $t->amount;
            }
        );
-        $members = new Collection;
-        /** @var TransactionGroup $group */
-        foreach ($journal->transactiongroups()->get() as $group) {
-            /** @var TransactionJournal $loopJournal */
-            foreach ($group->transactionjournals()->get() as $loopJournal) {
-                if ($loopJournal->id != $journal->id) {
-                    $members->push($loopJournal);
-                }
-            }
-        }

-        return view('transactions.show', compact('journal', 'members'))->with(
+
+        return view('transactions.show', compact('journal'))->with(
            'subTitle', e($journal->transactiontype->type) . ' "' . e($journal->description) . '"'
        );
    }