cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 14:31:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

webpack And status User And Refactor TestResult

Browse Source
This commit is contained in:
saeid_01
2019-05-12 05:48:29 +04:30
parent b01792da19
commit 723ada1118
32 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+4 -13
View File
@@ -30,7 +30,7 @@ class TestResultController extends Controller
$query->where('medical_center_id', $user->medical_center_id);
}]);
})
->when($user->hasRole('User') || ( !$user->hasRole('Admin') && !$user->hasRole('Supervisor')), function($query) {
->when($user->hasRole('User') || ( !$user->hasRole('Admin') && !$user->hasRole('Supervisor')), function($query) use ($user) {
return $query->where('user_id', $user->id);
})
->paginate(10);
@@ -388,19 +388,10 @@ class TestResultController extends Controller
->when($request->has('verify') && $request->verify, function ($query) use ($request)
{
$query->where('verified', $request->verify);
})->get();
$AcceptCount = 0;
$RejectCount = 0;
foreach ($TestResults as $TestResult) {
if ($TestResult->result == 'Accept') {
$AcceptCount++;
}
if ($TestResult->result == 'Reject') {
$RejectCount++;
}
}
})->select('result')->get()->groupBy('result');
$AcceptCount = (isset($TestResults['Accept'])) ? $TestResults['Accept']->count() : 0;
$RejectCount = (isset($TestResults['Reject'])) ? $TestResults['Reject']->count() : 0;
// return \MessageResponse::data(['AcceptCount' => $AcceptCount, 'RejectCount' => $RejectCount]);
return \MessageResponse::data(['labels' => ['Number Of Accepted Test Results', 'Number Of Rejected Test Results'], 'data' => [$AcceptCount,$RejectCount]]);
}
}