live charts update added

This commit is contained in:
Anatoliy Poloz
2022-06-02 12:02:58 +00:00
parent 3cd66a54e5
commit 12e42ddddd
61 changed files with 1881 additions and 546 deletions

View File

@@ -0,0 +1,110 @@
<?php
namespace App\Http\Controllers;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class ConsultantRequestFormController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('consultant.index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
$user = Auth::user();
$state = $user->consultant_state;
if ($state !== 'incomplete') {
return redirect()->route('consultant_request.show', [$user]);
}
return view(
'consultant.registration',
[
'user' => $user,
'currentConsultantRegistrationState' => $state,
]
);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function show(User $user)
{
$requestData = $user->consultant_request;
$medicalEducations = $requestData ? json_decode($requestData->completed_courses, true) : [];
$certs = $user->attachments()->certs()->get();
return view(
'consultant.show',
[
'user' => $user,
'currentConsultantRegistrationState' => $user->consultant_state,
'medicalEducations' => $medicalEducations,
'certPhotos' => $certs,
'requestData' => $requestData,
]
);
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function edit(User $user)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function update(Request $request, User $user)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Models\User $user
* @return \Illuminate\Http\Response
*/
public function destroy(User $user)
{
//
}
}

View File

@@ -78,7 +78,6 @@ class DiaryController extends Controller
/* $curDiary = Diary::find($id); */
$daysCount = Diary::where('user_id', auth()->id())->count();
return view('diary.show', ['curDiary' => $diary, 'daysCount' => $daysCount]);
//
}
/**

View File

@@ -6,8 +6,6 @@ use App\Models\UserDetailz;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Asantibanez\LivewireCharts\Models\LineChartModel;
use Asantibanez\LivewireCharts\Models\AreaChartModel;
class ProfileController extends Controller
{
@@ -18,59 +16,7 @@ class ProfileController extends Controller
*/
public function index()
{
$user = Auth::user();
$lastFourMisures = $user
->circumference_measures()
->orderBy('created_at', 'desc')
->limit(4)
->get()
->sortBy('id');
$lastOneMisure = $user->circumference_measures()->get()->last();
$lineChartModel =
(new LineChartModel())
->setSmoothCurve()
->multiLine()
->setColors(['#b2df8a', '#1f78b4', '#e3a6a6']);
$lastFourMisures->each(
function ($item, $key) use ($lineChartModel) {
$createdAt = \Carbon\Carbon::parse($item['created_at'])->format('d.m.y');
$lineChartModel->addSeriesPoint(__('chest'), $createdAt, $item['chest_circumference']);
$lineChartModel->addSeriesPoint(__('waist'), $createdAt, $item['waist_circumference']);
$lineChartModel->addSeriesPoint(__('hip'), $createdAt, $item['hip_circumference']);
});
$areaChartModel =
(new AreaChartModel())
->setSmoothCurve()
->setColors(['#b7d7e8']);
$lastFourWeightMisures = $user
->weight_measures()
->orderBy('created_at', 'desc')
->limit(4)
->get()
->sortBy('id');
$lastFourWeightMisures->each(
function ($item, $key) use ($areaChartModel) {
$createdAt = \Carbon\Carbon::parse($item['created_at'])->format('d.m.y');
$areaChartModel->addPoint($createdAt, $item['weight']);
}
);
return view(
'profile.index',
[
'user' => $user,
'lastFourMisures' => $lastFourMisures,
'lastOneMisure' => $lastOneMisure,
'lineChartModel' => $lineChartModel,
'areaChartModel' => $areaChartModel,
]
);
return view('profile.index', ['user' => Auth::user()]);
}
/**

View File

@@ -181,4 +181,5 @@ class UserDetailzController extends Controller
{
//
}
}