shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new widget structure

Browse Source
This commit is contained in:
denisdulici
2019-12-31 02:20:10 +03:00
parent 8c6ca5e5fb
commit 71c5caf264
44 changed files with 333 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Common/Dashboard.php
View File

@ -3,10 +3,9 @@
namespace App\Http\Controllers\Common;
use App\Abstracts\Http\Controller;
use App\Models\Common\Dashboard as Model;
use App\Models\Common\DashboardWidget;
use App\Http\Requests\Common\Dashboard as Request;
use App\Models\Common\Dashboard as Model;
use App\Models\Common\Widget;
use App\Traits\DateTime;
class Dashboard extends Controller
@ -40,14 +39,12 @@ class Dashboard extends Controller
// Dashboard
$dashboard = Model::find($dashboard_id);
// Dashboard Widgets
$widgets = DashboardWidget::where('dashboard_id', $dashboard->id)
->where('user_id', $user_id)
->orderBy('sort', 'asc')->get();
// Widgets
$widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get();
$financial_start = $this->getFinancialStart()->format('Y-m-d');
return view('common.dashboard.index', compact('dashboards','dashboard', 'widgets', 'financial_start'));
return view('common.dashboard.index', compact('dashboards', 'dashboard', 'widgets', 'financial_start'));
}
/**

29
app/Http/Controllers/Common/Widgets.php
View File

@ -3,10 +3,9 @@
namespace App\Http\Controllers\Common;
use App\Abstracts\Http\Controller;
use App\Models\Common\DashboardWidget as Model;
use App\Models\Common\Widget;
use App\Http\Requests\Common\Widget as Request;
use App\Models\Common\Widget;
use App\Utilities\Widgets as Utility;
class Widgets extends Controller
{
@ -17,7 +16,7 @@ class Widgets extends Controller
*/
public function index()
{
$widgets = Widget::enabled()->get();
$widgets = Utility::getClasses();
return response()->json($widgets);
}
@ -30,13 +29,11 @@ class Widgets extends Controller
*/
public function store(Request $request)
{
$request['user_id'] = user()->id;
$request['settings'] = [
'width' => $request->get('width'),
];
$widget = Model::create($request->input());
$widget = Widget::create($request->input());
$settings = $widget->settings;
unset($settings['widget']);
@ -59,17 +56,17 @@ class Widgets extends Controller
/**
* Show the form for editing the specified resource.
*
* @param Model $dashboard
* @param Widget $widget
*
* @return Response
*/
public function edit(Model $widget)
public function edit(Widget $widget)
{
$settings = $widget->settings;
unset($settings['widget']);
return response()->json([
'widget_id' => $widget->widget_id,
'class' => $widget->class,
'name' => $widget->name,
'settings' => $settings,
'sort' => $widget->sort,
@ -79,14 +76,12 @@ class Widgets extends Controller
/**
* Update the specified resource in storage.
*
* @param Model $dashboard
* @param Widget $widget
* @param $request
* @return Response
*/
public function update(Model $widget, Request $request)
public function update(Widget $widget, Request $request)
{
$request['user_id'] = user()->id;
$request['settings'] = [
'width' => $request->get('width'),
];
@ -102,7 +97,7 @@ class Widgets extends Controller
'error' => false,
'message' => trans('messages.success.added', ['type' => $widget->name]),
'data' => [
'widget_id' => $widget->widget_id,
'class' => $widget->class,
'name' => $widget->name,
'settings' => $settings,
'sort' => $widget->sort,
@ -114,11 +109,11 @@ class Widgets extends Controller
/**
* Remove the specified resource from storage.
*
* @param Model $dashboard
* @param Widget $widget
*
* @return Response
*/
public function destroy(Model $widget)
public function destroy(Widget $widget)
{
$message = trans('messages.success.deleted', ['type' => $widget->name]);