kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Expand user group views and translations

Browse Source
This commit is contained in:
James Cole
2024-04-01 15:41:16 +02:00
parent ccc005942f
commit baff7c67f9
13 changed files with 376 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/assets/v2/api/v2/model/user-group/get.js
View File

@@ -23,15 +23,15 @@ import format from "date-fns/format";
export default class Get {
// /**
// *
// * @param identifier
// * @param params
// * @returns {Promise<AxiosResponse<any>>}
// */
// show(identifier, params) {
// return api.get('/api/v2/accounts/' + identifier, {params: params});
// }
/**
*
* @param identifier
* @param params
* @returns {Promise<AxiosResponse<any>>}
*/
show(identifier, params) {
return api.get('/api/v2/user-groups/' + identifier, {params: params});
}
/**
*

5
resources/assets/v2/api/v2/model/user-group/post.js
View File

@@ -25,4 +25,9 @@ export default class Post {
let url = './api/v2/user-groups';
return api.post(url, submission);
}
use(groupId) {
let url = './api/v2/user-groups/' + groupId + '/use';
return api.post(url, {});
}
}

28
resources/assets/v2/api/v2/model/user-group/put.js Normal file
View File

@@ -0,0 +1,28 @@
/*
* post.js
* Copyright (c) 2023 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";
export default class Put {
put(submission, params) {
let url = '/api/v2/user-groups/' + parseInt(params.id);
return api.put(url, submission);
}
}

3
resources/assets/v2/pages/administrations/create.js
View File

@@ -60,6 +60,7 @@ let administrations = function () {
pageProperties: {},
submitForm() {
this.errors.title = [];
(new Post()).post({title: this.title}).then(response => {
if (this.formStates.returnHereButton) {
this.notifications.success.show = true;
@@ -73,7 +74,7 @@ let administrations = function () {
window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=created';
}
}).catch(error => {
console.error(error);
this.errors.title = error.response.data.errors.title;
});
},

121
resources/assets/v2/pages/administrations/edit.js Normal file
View File

@@ -0,0 +1,121 @@
/*
* template.js
* Copyright (c) 2024 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 '../../boot/bootstrap.js';
import dates from "../shared/dates.js";
import Post from "../../api/v2/model/user-group/post.js";
import i18next from "i18next";
import Get from "../../api/v2/model/user-group/get.js";
import Put from "../../api/v2/model/user-group/put.js";
let administrations = function () {
return {
title: '',
id: 0,
errors: {
title: []
},
// notifications
notifications: {
error: {
show: false, text: '', url: '',
}, success: {
show: false, text: '', url: '',
}, wait: {
show: false, text: '',
}
},
// state of the form is stored in formState:
formStates: {
isSubmitting: false,
returnHereButton: false,
saveAsNewButton: false, // edit form only
resetButton: false,
},
// form behaviour
formBehaviour: {
formType: 'update', // or 'update'
},
changedTitle() {
},
pageProperties: {},
submitForm() {
console.log('submitForm');
(new Put()).put({title: this.title}, {id: this.id}).then(response => {
if (this.formStates.returnHereButton) {
this.notifications.success.show = true;
this.notifications.success.text = i18next.t('firefly.updated_administration', {title: response.data.data.attributes.title});
// TODO needs a better redirect.
this.notifications.success.url = './administrations';
}
if (this.formStates.resetButton) {
this.title = '';
}
if (!this.formStates.returnHereButton) {
// TODO needs a better redirect.
window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=updated';
}
}).catch(error => {
this.errors.title = error.response.data.errors.title;
});
},
cancelForm() {
window.location.href = './administrations';
},
init() {
const page = window.location.href.split('/');
const groupId = parseInt(page[page.length - 1]);
(new Get()).show(groupId, {}).then(response => {
this.title = response.data.data.attributes.title;
this.id = parseInt(response.data.data.id);
});
}
}
}
let comps = {administrations, dates};
function loadPage() {
Object.keys(comps).forEach(comp => {
console.log(`Loading page component "${comp}"`);
let data = comps[comp]();
Alpine.data(comp, () => data);
});
Alpine.start();
}
// wait for load until bootstrapped event is received.
document.addEventListener('firefly-iii-bootstrapped', () => {
console.log('Loaded through event listener.');
loadPage();
});
// or is bootstrapped before event is triggered.
if (window.bootstrapped) {
console.log('Loaded through window variable.');
loadPage();
}

11
resources/assets/v2/pages/administrations/index.js
View File

@@ -27,6 +27,7 @@ import '@ag-grid-community/styles/ag-grid.css';
import '@ag-grid-community/styles/ag-theme-alpine.css';
import '../../css/grid-ff3-theme.css';
import Get from "../../api/v2/model/user-group/get.js";
import Post from "../../api/v2/model/user-group/post.js";
let index = function () {
return {
@@ -53,6 +54,13 @@ let index = function () {
this.notifications.wait.text = i18next.t('firefly.wait_loading_data')
this.loadAdministrations();
},
useAdministration(id) {
let groupId = parseInt(id);
// try to post "use", then reload administrations.
(new Post()).use(groupId).then(response => {
this.loadAdministrations();
});
},
loadAdministrations() {
this.notifications.wait.show = true;
@@ -73,16 +81,13 @@ let index = function () {
membersVisible: current.attributes.can_see_members,
members: [],
};
console.log('Processing group #' + group.id + ' (' + group.title + ')' );
let memberships = {};
for (let j = 0; j < current.attributes.members.length; j++) {
let member = current.attributes.members[j];
console.log('Found member ' + member.user_email, member.you, member.role);
if ('owner' === member.role) {
group.owner = i18next.t('firefly.administration_owner', {email: member.user_email});
}
if (true === member.you && 'owner' === member.role) {
console.log('You are owner of group ' + group.title );
group.isOwner = true;
}
if (true === member.you) {

3
resources/lang/en_US/firefly.php
View File

@@ -1391,8 +1391,11 @@ return [
'administration_you' => 'Your role: {{role}}',
'other_users_in_admin' => 'Other users in this administration',
'administrations_create_breadcrumb' => 'Create new financial administration',
'administrations_page_create_sub_title' => 'Create new financial administration',
'basic_administration_information' => 'Basic administration information',
'new_administration_created' => 'New financial administration "{{title}}" has been created',
'edit_administration_breadcrumb' => 'Edit financial administration ":title"',
'administrations_page_edit_sub_title'=> 'Edit financial administration ":title"',
// roles
'administration_role_owner' => 'Owner',

1
resources/lang/en_US/validation.php
View File

@@ -264,6 +264,7 @@ return [
// no access to administration:
'no_access_user_group' => 'You do not have the correct access rights for this administration.',
'administration_owner_rename' => 'You can\'t rename your standard administration.',
];
// Ignore this comment

57
resources/views/v2/administrations/edit.blade.php Normal file
View File

@@ -0,0 +1,57 @@
@extends('layout.v2')
@section('scripts')
@vite(['resources/assets/v2/pages/administrations/edit.js'])
@endsection
@section('content')
<div class="app-content">
<!--begin::Container-->
<div class="container-fluid" x-data="administrations" id="form">
<x-messages></x-messages>
<div class="row mb-3">
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
<div class="card">
<div class="card-header">
<h3 class="card-title"
>{{ __('firefly.basic_administration_information') }}</h3>
</div>
<div class="card-body">
<!-- TITLE -->
@include('partials.form.title')
</div>
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">
{{ __('firefly.submission_options') }}
</h3>
</div>
<div class="card-body">
@include('partials.form.submission-options')
</div>
<div class="card-footer">
<div class="row">
<div class="col text-end">
<div class="btn-group">
<button @click="cancelForm()" class="btn btn-danger text-white"
:disabled="formStates.isSubmitting">
<em class="fa-solid fa-arrow-left"></em>
{{ __('firefly.cancel') }}</button>
<button class="btn btn-primary text-white" :disabled="formStates.isSubmitting"
@click="submitForm()">
<em class="fa-regular fa-circle-check"></em>
{{ __('firefly.submit') }}</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection

14
resources/views/v2/administrations/index.blade.php
View File

@@ -19,7 +19,11 @@
<div class="col-xl-4 col-lg-4 col-sm-6 col-xs-12 mb-3">
<div class="card">
<div class="card-header">
<h3 class="card-title">Administration "<span x-text="group.title"></span>"</h3>
<h3 class="card-title">
<template x-if="group.in_use">
<em class="fa-regular fa-square-check"></em>
</template>
Administration "<span x-text="group.title"></span>"</h3>
</div>
<div class="card-body">
<ul>
@@ -53,13 +57,13 @@
<div class="card-footer">
<div class="btn-group">
<template x-if="false === group.in_use">
<a href="#" class="btn btn-primary">
<button @click="useAdministration(group.id)" class="btn btn-primary">
<em class="fa-solid fa-coins"></em> Use
</a>
</button>
</template>
<template x-if="true === group.isOwner">
<a href="#" class="btn btn-primary">
<em class="fa-solid fa-pencil"></em> Edit
<a :href="'{{route('administrations.edit', [''])}}/' + group.id" class="btn btn-primary">
<em class="fa-solid fa-pencil"></em> {{ __('firefly.edit') }}
</a>
</template>
<template x-if="true === group.isOwner">

1
routes/api.php
View File

@@ -216,6 +216,7 @@ Route::group(
Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
Route::delete('{userGroup}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
}

17
routes/breadcrumbs.php
View File

@@ -41,6 +41,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\Models\UserGroup;
use FireflyIII\Models\Webhook;
use FireflyIII\User;
use Illuminate\Support\Arr;
@@ -1288,6 +1289,15 @@ Breadcrumbs::for(
$breadcrumbs->push(trans('firefly.administrations_breadcrumb'), route('administrations.index'));
}
);
Breadcrumbs::for(
'administrations.show',
static function (Generator $breadcrumbs, UserGroup $userGroup): void {
$breadcrumbs->parent('administrations.index');
$breadcrumbs->push(limitStringLength($userGroup->title), route('administrations.show', [$userGroup->id]));
}
);
Breadcrumbs::for(
'administrations.create',
static function (Generator $breadcrumbs): void {
@@ -1295,3 +1305,10 @@ Breadcrumbs::for(
$breadcrumbs->push(trans('firefly.administrations_create_breadcrumb'), route('administrations.create'));
}
);
Breadcrumbs::for(
'administrations.edit',
static function (Generator $breadcrumbs, UserGroup $userGroup): void {
$breadcrumbs->parent('administrations.show',$userGroup);
$breadcrumbs->push(trans('firefly.edit_administration_breadcrumb', ['title' => limitStringLength($userGroup->title)]), route('administrations.edit', [$userGroup->id]));
}
);

321
routes/web.php
View File

@@ -47,7 +47,7 @@ Route::group(
Route::group(
['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System'],
static function (): void {
Route::get('offline', static fn () => view('errors.offline'));
Route::get('offline', static fn() => view('errors.offline'));
Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
}
);
@@ -150,32 +150,27 @@ Route::group(
// show
Route::get('show/{account}/all', ['uses' => 'Account\ShowController@showAll', 'as' => 'show.all']);
Route::get('show/{account}/{start_date?}/{end_date?}', ['uses' => 'Account\ShowController@show', 'as' => 'show'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
// reconcile routes:
Route::get('reconcile/{account}/index/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@reconcile', 'as' => 'reconcile'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::post('reconcile/{account}/submit/{start_date?}/{end_date?}', ['uses' => 'Account\ReconcileController@submit', 'as' => 'reconcile.submit'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
// reconcile JSON routes
Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get(
'reconcile/{account}/transactions/{start_date?}/{end_date?}',
['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions']
)
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
}
);
@@ -252,18 +247,16 @@ Route::group(
Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']);
Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']);
Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
// reorder budgets
Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']);
// index
Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
}
);
@@ -272,9 +265,8 @@ Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budget-limits', 'as' => 'budget-limits.'],
static function (): void {
Route::get('create/{budget}/{start_date}/{end_date}', ['uses' => 'Budget\BudgetLimitController@create', 'as' => 'create'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::post('store', ['uses' => 'Budget\BudgetLimitController@store', 'as' => 'store']);
Route::post('delete/{budgetLimit}', ['uses' => 'Budget\BudgetLimitController@delete', 'as' => 'delete']);
@@ -305,16 +297,14 @@ Route::group(
// show category:
Route::get('show/{category}/all', ['uses' => 'Category\ShowController@showAll', 'as' => 'show.all']);
Route::get('show/{category}/{start_date?}/{end_date?}', ['uses' => 'Category\ShowController@show', 'as' => 'show'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
// no category controller:
Route::get('list/no-category/all', ['uses' => 'Category\NoCategoryController@showAll', 'as' => 'no-category.all']);
Route::get('list/no-category/{start_date?}/{end_date?}', ['uses' => 'Category\NoCategoryController@show', 'as' => 'no-category'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
}
);
@@ -341,30 +331,25 @@ Route::group(
Route::get('expense', ['uses' => 'AccountController@expenseAccounts', 'as' => 'expense']);
Route::get('revenue', ['uses' => 'AccountController@revenueAccounts', 'as' => 'revenue']);
Route::get('report/{accountList}/{start_date}/{end_date}', ['uses' => 'AccountController@report', 'as' => 'report'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('period/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@period', 'as' => 'period'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('income-category/{account}/all/all', ['uses' => 'AccountController@incomeCategoryAll', 'as' => 'income-category-all']);
Route::get('expense-category/{account}/all/all', ['uses' => 'AccountController@expenseCategoryAll', 'as' => 'expense-category-all']);
Route::get('expense-budget/{account}/all/all', ['uses' => 'AccountController@expenseBudgetAll', 'as' => 'expense-budget-all']);
Route::get('income-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@incomeCategory', 'as' => 'income-category'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('expense-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseCategory', 'as' => 'expense-category'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('expense-budget/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseBudget', 'as' => 'expense-budget'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
}
);
@@ -383,13 +368,11 @@ Route::group(
static function (): void {
Route::get('frontpage', ['uses' => 'BudgetController@frontpage', 'as' => 'frontpage']);
Route::get('period/0/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@periodNoBudget', 'as' => 'period.no-budget'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('period/{budget}/{currency}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('budget/{budget}/{budgetLimit}', ['uses' => 'BudgetController@budgetLimit', 'as' => 'budget-limit']);
Route::get('budget/{budget}', ['uses' => 'BudgetController@budget', 'as' => 'budget']);
@@ -403,27 +386,23 @@ Route::group(
'category/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetReportController@categoryExpense', 'as' => 'category-expense']
)
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get(
'budget/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetReportController@budgetExpense', 'as' => 'budget-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'source-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetReportController@sourceAccountExpense', 'as' => 'source-account-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'destination-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetReportController@destinationAccountExpense', 'as' => 'destination-account-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('operations/{accountList}/{budget}/{start_date}/{end_date}', ['uses' => 'BudgetReportController@mainChart', 'as' => 'main']);
}
);
@@ -440,61 +419,51 @@ Route::group(
'report-period/0/{accountList}/{start_date}/{end_date}',
['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@categoryExpense', 'as' => 'category-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/income/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@categoryIncome', 'as' => 'category-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'budget/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@budgetExpense', 'as' => 'budget-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'source/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@sourceExpense', 'as' => 'source-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'source/income/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@sourceIncome', 'as' => 'source-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'dest/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@destinationExpense', 'as' => 'dest-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'dest/income/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@destinationIncome', 'as' => 'dest-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('operations/{accountList}/{category}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@mainChart', 'as' => 'main'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -503,62 +472,52 @@ Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/tag', 'as' => 'chart.tag.'],
static function (): void {
Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense'])
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT]);
Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/expense/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/income/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'budget/expense/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'source/expense/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'source/income/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@sourceIncome', 'as' => 'source-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'dest/expense/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@destinationExpense', 'as' => 'dest-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'dest/income/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@destinationIncome', 'as' => 'dest-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('operations/{accountList}/{tag}/{start_date}/{end_date}', ['uses' => 'TagReportController@mainChart', 'as' => 'main'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -569,40 +528,34 @@ Route::group(
Route::get('main/{accountList}/{account}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@mainChart', 'as' => 'main'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@categoryExpense', 'as' => 'category-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'category/income/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@categoryIncome', 'as' => 'category-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'budget/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@budgetExpense', 'as' => 'budget-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'tag/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@tagExpense', 'as' => 'tag-expense']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'tag/income/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@tagIncome', 'as' => 'tag-income']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -621,13 +574,11 @@ Route::group(
Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@operations', 'as' => 'operations'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('net-worth/{accountList}/{start_date}/{end_date}/', ['uses' => 'ReportController@netWorth', 'as' => 'net-worth'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -638,22 +589,18 @@ Route::group(
Route::get('categories/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@categories', 'as' => 'categories'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('budgets/{start_date}/{end_date}', ['uses' => 'TransactionController@budgets', 'as' => 'budgets'])->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'destinationAccounts/{objectType}/{start_date}/{end_date}',
['uses' => 'TransactionController@destinationAccounts', 'as' => 'destinationAccounts']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('sourceAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@sourceAccounts', 'as' => 'sourceAccounts'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -711,8 +658,7 @@ Route::group(
'budget/total-budgeted/{currency}/{start_date}/{end_date}',
['uses' => 'Json\BudgetController@getBudgetInformation', 'as' => 'budget.total-budgeted']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
// boxes
Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']);
Route::get('box/available', ['uses' => 'Json\BoxController@available', 'as' => 'box.available']);
@@ -852,8 +798,7 @@ Route::group(
Route::get('general/{accountList}/{start_date}/{end_date}', ['uses' => 'AccountController@general', 'as' => 'general'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -864,8 +809,7 @@ Route::group(
Route::get('overview/{accountList}/{start_date}/{end_date}', ['uses' => 'BillController@overview', 'as' => 'overview'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -877,38 +821,32 @@ Route::group(
Route::get('operations/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@operations', 'as' => 'operations'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'ops-asset/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleController@operationsPerAsset', 'as' => 'ops-asset']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'top-expenses/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleController@topExpenses', 'as' => 'top-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'avg-expenses/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleController@avgExpenses', 'as' => 'avg-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('top-income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@topIncome', 'as' => 'top-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('avg-income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleController@avgIncome', 'as' => 'avg-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -924,18 +862,15 @@ Route::group(
Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -952,59 +887,49 @@ Route::group(
Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -1020,41 +945,34 @@ Route::group(
Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -1065,8 +983,7 @@ Route::group(
Route::get('general/{accountList}/{start_date}/{end_date}', ['uses' => 'BalanceController@general', 'as' => 'general'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -1077,41 +994,34 @@ Route::group(
Route::get('general/{accountList}/{start_date}/{end_date}/', ['uses' => 'BudgetController@general', 'as' => 'general'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
// TODO is route still used?
Route::get('period/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period'])->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('accounts/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accounts', 'as' => 'accounts'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('budgets/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@budgets', 'as' => 'budgets'])->where(
['start_date' => DATEFORMAT]
)
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'account-per-budget/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetController@accountPerBudget', 'as' => 'account-per-budget']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'top-expenses/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetController@topExpenses', 'as' => 'top-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get(
'avg-expenses/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetController@avgExpenses', 'as' => 'avg-expenses']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
}
);
@@ -1184,8 +1094,7 @@ Route::group(
Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show'])->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']);
Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']);
@@ -1210,8 +1119,7 @@ Route::group(
Route::get('{objectType}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where(
['objectType' => 'withdrawal|deposit|transfers|transfer|all']
)->where(['start_date' => DATEFORMAT])
->where(['end_date' => DATEFORMAT])
;
->where(['end_date' => DATEFORMAT]);
// create group:
Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']);
@@ -1354,10 +1262,11 @@ Route::group(
static function (): void {
Route::get('', ['uses' => 'UserGroup\IndexController@index', 'as' => 'index']);
Route::get('create', ['uses' => 'UserGroup\CreateController@create', 'as' => 'create']);
Route::get('edit/{userGroup}', ['uses' => 'UserGroup\EditController@edit', 'as' => 'edit']);
Route::get('show/{userGroup}', ['uses' => 'UserGroup\ShowController@show', 'as' => 'show']);
// Route::post('rescan/{bill}', ['uses' => 'Bill\ShowController@rescan', 'as' => 'rescan']);
// Route::get('edit/{bill}', ['uses' => 'Bill\EditController@edit', 'as' => 'edit']);
// Route::get('delete/{bill}', ['uses' => 'Bill\DeleteController@delete', 'as' => 'delete']);
// Route::get('show/{bill}', ['uses' => 'Bill\ShowController@show', 'as' => 'show']);
//
// Route::post('store', ['uses' => 'Bill\CreateController@store', 'as' => 'store']);
// Route::post('update/{bill}', ['uses' => 'Bill\EditController@update', 'as' => 'update']);