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

change filter of test result

Browse Source
This commit is contained in:
Fateme
2020-03-04 10:04:45 +03:30
parent 13012c934d
commit bf362a8265
3 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TestResultController.php
+24 -3
View File
@@ -17,6 +17,21 @@ use Illuminate\Support\Facades\Storage;
class TestResultController extends Controller
{
private function filterByInputs($inputArray){
$searchArray = ['Patient ID' => 1111, 'Autoclave ID' => 2222];
$TestResults = TestResult::query();
foreach ($inputArray as $key => $value) {
$TestResults .= $TestResults->whereHas('input_values', function($query) use($value, $key){
$query->whereHas('input', function($query) use($key){
$query->where('name', $key);
})->where('value', $value);
});
}
return $query;
}
public function index(Request $request)
{
$user = auth('api')->user();
@@ -55,9 +70,15 @@ class TestResultController extends Controller
->when($request->has('device_id') && $request->device_id, function($query) use($request){
$device_label = $request->device_label ? $request->device_label : '';
if ($device_label){
$query->whereHas('test_type', function($query) use($request, $device_label){
$query->where('device_label', $device_label);
})->where('device_id', $request->device_id);
// $query->whereHas('test_type', function($query) use($request, $device_label){
// $query->where('device_label', $device_label);
// })->where('device_id', $request->device_id);
$query->whereHas('input_values', function($query) use($request, $device_label){
$query->whereHas('input', function($query) use($request, $device_label){
$query->where('name', $device_label);
})->where('value', $request->device_id);
});
}
else{
$query->where(function($query) use($request){
resources/js/show/views/Home/Intro.vue
+1 -1
View File
@@ -88,7 +88,7 @@
<div class="text-center WM-Align-C">
<h2 class="headline">Product identification and traceability</h2>
<span class="subheading">
Cras facilisis mi vitae nunc
Surgical Instrument Traceability
</span>
</div>
</v-flex>
resources/js/vue/views/TestResult/List.vue
+11 -11
View File
@@ -263,17 +263,17 @@ export default {
testTypes: [],
medicalCenters: [],
deviceLabels: [
{ name: "Washer ID", id: "WasherID" },
{ name: "Autoclave ID", id: "AutoclaveID" },
{ name: "Sterilizer ID", id: "SterilizerID" },
{ name: "WasherMachine ID", id: "WasherMachineID" },
{ name: "SealMachine ID", id: "SealMachineID" },
{ name: "Patient ID", id: "PatientID" },
{ name: "Set/Pack ID", id: "Set/PackID" },
{ name: "MD ID", id: "MDID" },
{ name: "OR ID", id: "ORID" },
{ name: "Personal ID", id: "PersonalID" },
{ name: "Instrument ID", id: "InstrumentID" },
{ name: "ID Washer", id: "ID Washer" },
{ name: "Autoclave ID", id: "Autoclave ID" },
{ name: "Sterilizer ID", id: "Sterilizer ID" },
{ name: "ID WasherMachine", id: "ID WasherMachine" },
{ name: "ID SealMachine", id: "ID SealMachine" },
{ name: "ID Patient", id: "ID Patient" },
{ name: "ID Set/Pack", id: "ID Set/Pack" },
{ name: "MD ID", id: "MD ID" },
{ name: "OR ID", id: "OR ID" },
{ name: "Personal ID", id: "Personal ID" },
{ name: "ID Instrument", id: "ID Instrument" },
{ name: "ID", id: "ID" },
]
}),