Expand frontend

app/Api/V2/Controllers/Model/Budget/ListController.php

@@ -22,20 +22,38 @@
 namespace FireflyIII\Api\V2\Controllers\Model\Budget;
 
 use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Transformers\V2\BudgetTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
 class ListController extends Controller
 {
+    private BudgetRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetRepositoryInterface::class);
+                return $next($request);
+            }
+        );
+    }
+
     /**
      * @return JsonResponse
      */
-    public function index(): JsonResponse
+    public function index(Request $request): JsonResponse
     {
-        $collection  = new Collection;
+        $collection  = $this->repository->getActiveBudgets();
-        $paginator   = new LengthAwarePaginator($collection, 0, 50, 1);
+        $total = $collection->count();
+        $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);
+
+        $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
         $transformer = new BudgetTransformer();
         return response()
             ->api($this->jsonApiList('budgets', $paginator, $transformer))

app/Api/V2/Controllers/Model/BudgetLimit/ListController.php

@@ -0,0 +1,64 @@
+<?php
+/*
+ * ListController.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V2\Controllers\Model\BudgetLimit;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Transformers\V2\BudgetLimitTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class ListController extends Controller
+{
+    private BudgetLimitRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetLimitRepositoryInterface::class);
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @return JsonResponse
+     */
+    public function index(DateRequest $request, Budget $budget): JsonResponse
+    {
+        $dates      = $request->getAll();
+        $collection = $this->repository->getBudgetLimits($budget,$dates['start'], $dates['end']);
+        $total      = $collection->count();
+        $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize);
+
+        $paginator   = new LengthAwarePaginator($collection, $total, $this->pageSize, $this->parameters->get('page'));
+        $transformer = new BudgetLimitTransformer();
+        return response()
+            ->api($this->jsonApiList('budget_limits', $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE);
+    }
+
+}

app/Transformers/V2/BudgetLimitTransformer.php

@@ -0,0 +1,116 @@
+<?php
+/**
+ * BudgetLimitTransformer.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Transformers\V2;
+
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\OperationsRepository;
+use Illuminate\Support\Collection;
+use League\Fractal\Resource\Item;
+
+/**
+ * Class BudgetLimitTransformer
+ */
+class BudgetLimitTransformer extends AbstractTransformer
+{
+    /** @var string[] */
+    protected array $availableIncludes
+        = [
+            'budget',
+        ];
+
+    /**
+     * Include Budget
+     *
+     * @param BudgetLimit $limit
+     *
+     * @return Item
+     */
+    public function includeBudget(BudgetLimit $limit)
+    {
+        return $this->item($limit->budget, new BudgetTransformer, 'budgets');
+    }
+
+    /**
+     * Transform the note.
+     *
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return array
+     */
+    public function transform(BudgetLimit $budgetLimit): array
+    {
+//        $repository = app(OperationsRepository::class);
+//        $repository->setUser($budgetLimit->budget->user);
+//        $expenses              = $repository->sumExpenses(
+//            $budgetLimit->start_date, $budgetLimit->end_date, null, new Collection([$budgetLimit->budget]), $budgetLimit->transactionCurrency
+//        );
+        $currency              = $budgetLimit->transactionCurrency;
+        $amount                = $budgetLimit->amount;
+        $currencyDecimalPlaces = 2;
+        $currencyId            = null;
+        $currencyName          = null;
+        $currencyCode          = null;
+        $currencySymbol        = null;
+        if (null !== $currency) {
+            $amount                = $budgetLimit->amount;
+            $currencyId            = (int) $currency->id;
+            $currencyName          = $currency->name;
+            $currencyCode          = $currency->code;
+            $currencySymbol        = $currency->symbol;
+            $currencyDecimalPlaces = $currency->decimal_places;
+        }
+        $amount = number_format((float) $amount, $currencyDecimalPlaces, '.', '');
+
+        return [
+            'id'                      => (string) $budgetLimit->id,
+            'created_at'              => $budgetLimit->created_at->toAtomString(),
+            'updated_at'              => $budgetLimit->updated_at->toAtomString(),
+            'start'                   => $budgetLimit->start_date->toAtomString(),
+            'end'                     => $budgetLimit->end_date->endOfDay()->toAtomString(),
+            'budget_id'               => (string) $budgetLimit->budget_id,
+            'currency_id'             => (string) $currencyId,
+            'currency_code'           => $currencyCode,
+            'currency_name'           => $currencyName,
+            'currency_decimal_places' => $currencyDecimalPlaces,
+            'currency_symbol'         => $currencySymbol,
+            'amount'                  => $amount,
+            'period'                  => $budgetLimit->period,
+            //'spent'                   => $expenses[$currencyId]['sum'] ?? '0',
+            'links'                   => [
+                [
+                    'rel' => 'self',
+                    'uri' => sprintf('/budget-limits/%d', $budgetLimit->id),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collectMetaData(Collection $objects): void
+    {
+        // TODO: Implement collectMetaData() method.
+    }
+}

app/Transformers/V2/BudgetTransformer.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers\V2;
 
 use FireflyIII\Models\Budget;
 use Illuminate\Support\Collection;
+use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class BudgetTransformer
@@ -43,7 +44,7 @@ class BudgetTransformer extends AbstractTransformer
     {
         //$this->opsRepository = app(OperationsRepositoryInterface::class);
         //$this->repository    = app(BudgetRepositoryInterface::class);
-        //$this->parameters    = new ParameterBag();
+        $this->parameters    = new ParameterBag();
     }
 
     /**

frontend/src/api/v2/budget-limits/list.js

@@ -0,0 +1,31 @@
+/*
+ * list.js
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {api} from "boot/axios";
+import {format} from "date-fns";
+
+export default class List {
+  list(budget, start, end, page) {
+    let url = '/api/v2/budgets/' + budget + '/limits';
+    let startStr = format(start, 'y-MM-dd');
+    let endStr = format(end, 'y-MM-dd');
+    return api.get(url, {params: {page: page, start: startStr, end: endStr}});
+  }
+}

frontend/src/components/dashboard/BudgetBox.vue

@@ -30,30 +30,31 @@
       </q-item>
       <q-separator/>
       <q-card-section>
+        <div v-for="budget in budgets" :key="budget.id">
           <div class="row">
             <div class="col">
-            I am budget<br/>
+              <router-link :to="{ name: 'budgets.show', params: {id: budget.id} }">
+                {{ budget.name }}
+              </router-link>
             </div>
           </div>
+          <div v-for="limit in budget.limits">
             <div class="row">
               <div class="col">
-            <small>I am range</small>
+                <small>{{ limit.amount }}</small><br>
+                {{ limit.start }}<br>
+                {{ limit.end }}
               </div>
               <div class="col">
                 I am bar
               </div>
             </div>
+          </div>
+        </div>
+
         <div class="row">
           <div class="col">
-            <small>I am range</small>
+            I am no budget<br/>
-          </div>
-          <div class="col">
-            I am bar
-          </div>
-        </div>
-        <div class="row">
-          <div class="col">
-            I am budget<br/>
           </div>
         </div>
       </q-card-section>
@@ -65,6 +66,7 @@
 <script>
 import {useFireflyIIIStore} from "../../stores/fireflyiii";
 import List from '../../api/v2/budgets/list';
+import ListLimit from '../../api/v2/budget-limits/list';
 
 export default {
   name: "BudgetBox",
@@ -72,7 +74,8 @@ export default {
     return {
       budgets: [],
       locale: 'en-US',
-      page: 1
+      page: 1,
+      loadingBudgets: false
     }
   },
   mounted() {
@@ -93,13 +96,63 @@ export default {
   },
   methods: {
     loadBox: function () {
-
+      this.loadingBudgets = true;
-      (new List).list(1).then((data) => {
+      (new List).list(this.page).then((data) => {
-        console.log(data.data);
+        this.parseBudgets(data.data.data);
+        if (data.data.meta.pagination.current_page < data.data.meta.pagination.total_pages) {
+          this.page = data.data.meta.pagination.current_page + 1;
+          this.loadBox();
+          return;
+        }
+        this.loadingBudgets = false;
+        this.processBudgets();
       });
       // todo go to next page as well.
+    },
+    parseBudgets: function (data) {
+      for (let i in data) {
+        if (data.hasOwnProperty(i)) {
+          const current = data[i];
+          this.budgets.push(
+            {
+              id: parseInt(current.id),
+              name: current.attributes.name,
+              limits: [],
+            }
+          );
+        }
+      }
+    },
+    processBudgets: function () {
+      for (let i in this.budgets) {
+        if (this.budgets.hasOwnProperty(i)) {
+          const current = this.budgets[i];
+          // get budget limits in current view range.
 
-      console.log('loadbox');
+          // todo must also be paginated because you never know
+          (new ListLimit).list(current.id, this.store.getRange.start, this.store.getRange.end, 1).then((data) => {
+            this.parseBudgetLimits(data.data.data, current);
+          });
+        }
+      }
+      console.log('Processing...');
+    },
+    parseBudgetLimits: function (data, budget) {
+      console.log('Parse for ' + budget.name);
+      for(let i in data) {
+        if(data.hasOwnProperty(i)) {
+          const current = data[i];
+          budget.limits.push(
+            {
+              amount: current.attributes.amount,
+              start: new Date(current.attributes.start),
+              end: new Date(current.attributes.end),
+            }
+          );
+          console.log('A ' +  new Date(current.attributes.start));
+          console.log('B ' + this.store.getRange.start);
+        }
+      }
     }
   }
 }

routes/api.php

@@ -90,15 +90,17 @@ Route::group(
     }
 );
 /**
- * V2 API route for budgets.
+ * V2 API route for budgets and budget limits:
  */
 Route::group(
-    ['namespace' => 'FireflyIII\Api\V2\Controllers\Model\Budget', 'prefix' => 'v2/budgets',
+    ['namespace' => 'FireflyIII\Api\V2\Controllers\Model', 'prefix' => 'v2/budgets',
      'as'        => 'api.v2.budgets',],
     static function () {
-        Route::get('', ['uses' => 'ListController@index', 'as' => 'index']);
+        Route::get('', ['uses' => 'Budget\ListController@index', 'as' => 'index']);
-        Route::get('sum/budgeted', ['uses' => 'SumController@budgeted', 'as' => 'sum.budgeted']);
+        Route::get('{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
-        Route::get('sum/spent', ['uses' => 'SumController@spent', 'as' => 'sum.spent']);
+        Route::get('{budget}/limits', ['uses' => 'BudgetLimit\ListController@index', 'as' => 'budget-limits.index']);
+        Route::get('sum/budgeted', ['uses' => 'Budget\SumController@budgeted', 'as' => 'sum.budgeted']);
+        Route::get('sum/spent', ['uses' => 'Budget\SumController@spent', 'as' => 'sum.spent']);
     }
 );