diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..0e40fe8f
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/CSSD.iml b/.idea/CSSD.iml
new file mode 100644
index 00000000..17276ca0
--- /dev/null
+++ b/.idea/CSSD.iml
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..03d9549e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..28a804d8
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..540616da
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 00000000..53d0d440
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php
index 21ed2d11..216e8376 100644
--- a/app/Http/Controllers/TestResultController.php
+++ b/app/Http/Controllers/TestResultController.php
@@ -53,9 +53,17 @@ class TestResultController extends Controller
$query->where('test_type_id', $request->testType_id);
})
->when($request->has('device_id') && $request->device_id, function($query) use($request){
- $query->where(function($query) use($request){
- $query->where('device_id', 'LIKE', '%'.$request->device_id.'%')->orWhere('id', $request->device_id);
- });
+ $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);
+ }
+ else{
+ $query->where(function($query) use($request){
+ $query->where('device_id', $request->device_id)->orWhere('id', $request->device_id);
+ });
+ }
})
->when($user_name, function($query) use($user_name){
$query->whereHas('user', function($query) use($user_name){
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index fb65b260..8dbc87ec 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -24,6 +24,7 @@
class="py-3 pr-3"
>
+
-
+
+
+
+
+
-
-
-
-
- fas fa-plus
- Add
-
-
-
@@ -111,6 +114,15 @@
Filter
+
+
+
+
+ fas fa-plus
+ Add
+
+
+
@@ -241,6 +253,7 @@ export default {
user_name: '',
fromPicker: '',
upToPicker: '',
+ device_label:''
},
fromMenu: '',
upToMenu: '',
@@ -249,6 +262,20 @@ export default {
lastPage: 1,
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", id: "ID" },
+ ]
}),
created() {
this.fillSelectFilter();