-
+
-
+
-
-
+
+
| {{ item.name }} |
- {{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }} |
+ {{ (item.user && item.user.medical_center) ?
+ item.user.medical_center.name : '' }} |
{{ item.user ? item.user.name : '' }} |
+ {{ item.udi }} |
{{ item.description }} |
-
-
- fas fa-eye
+
+
+ fas fa-eye
+ Show
+
+
Show
-
-
- Show
-
-
-
- fas fa-pen
- Edit
-
-
-
- Edit
+
+
+
+ fas fa-pen
+ Edit
+
+
+
+ Edit
-
-
- fas fa-times
+
+
+ fas fa-times
+ Remove
+
+
Remove
-
-
- Remove
-
-
- fas fa-barcode
+
+
+ fas fa-barcode
+ Generate Barcode
+
+
Generate Barcode
-
-
- Generate Barcode
|
@@ -176,15 +153,19 @@ export default {
value: "name"
},
{
- sortable: true,
- text: "Hospital",
- value: "Hospital"
- },
+ sortable: true,
+ text: "Hospital",
+ value: "Hospital"
+ },
{
sortable: true,
text: "User",
value: "User"
},
+ {
+ text: "UDI",
+ value: "udi"
+ },
{
sortable: true,
text: "Description",
@@ -199,8 +180,8 @@ export default {
],
filter: {
name: '',
- package_id : '',
- medical_center_id : ''
+ package_id: '',
+ medical_center_id: ''
},
result: ['Pass', 'Fail'],
items: [],
@@ -267,10 +248,10 @@ export default {
}
},
async loadMedicalCenters() {
- const result = await ApiService.get(urls.listFilterItemsTestResult);
- if (result && result.status == 200) {
- this.medicalCenters = result.data.data.MedicalCenters;
- }
+ const result = await ApiService.get(urls.listFilterItemsTestResult);
+ if (result && result.status == 200) {
+ this.medicalCenters = result.data.data.MedicalCenters;
+ }
},
},
computed: {
@@ -295,12 +276,15 @@ export default {
diff --git a/resources/js/vue/views/TestResult/List.vue b/resources/js/vue/views/TestResult/List.vue
index 7332c091..4a52446e 100644
--- a/resources/js/vue/views/TestResult/List.vue
+++ b/resources/js/vue/views/TestResult/List.vue
@@ -1,132 +1,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- fas fa-search
- Filter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fas fa-search
+ Filter
+
+
+
+
+
+
+ fas fa-plus
+ Add
-
-
-
-
-
- fas fa-plus
- Add
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.id }} |
- {{ item.test_type ? item.test_type.name : 'Archived Test' }} |
- {{ item.user.medical_center.name }} |
- {{ item.user.name }} |
-
-
+
+
+
+
+
+
+
+
+
+
+
+ | {{ item.id }} |
+ {{ item.test_type ? item.test_type.name : 'Archived Test' }} |
+ {{ item.user.medical_center.name }} |
+ {{ item.user.name }} |
+
+
{{ item.result }}
-
-
+
+
{{ item.result }}
-
- |
- {{ item.created_at }} |
-
-
-
-
-
-
-
-
- |
-
-
+
+ |
+ {{ item.created_at }} |
+
+
+
+
+
+
+
+
+ |
+
+
-
- fas fa-eye
- Show
-
+
+ fas fa-eye
+ Show
+
Show
-
-
+
+
-
- fa fa-bars
- generate Barcode
-
+
+ fa fa-bars
+ generate Barcode
+
generate Barcode
-
-
+
+
-
-
- fas fa-pen
- Edit
-
-
+
+
+ fas fa-pen
+ Edit
+
+
Edit
-
-
+
+
-
-
- fas fa-times
- Remove
-
+
+
+ fas fa-times
+ Remove
+
Remove
-
- |
-
-
-
-
-
-
-
-
-
-
-
- fas fa-chevron-left
- Back
-
-
-
-
-
-
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ fas fa-chevron-left
+ Back
+
+
+
+
+
+
+
diff --git a/resources/js/vue/views/User/List.vue b/resources/js/vue/views/User/List.vue
index dc6473d4..13f9fdd0 100644
--- a/resources/js/vue/views/User/List.vue
+++ b/resources/js/vue/views/User/List.vue
@@ -137,14 +137,14 @@
fa fa-pause
- Susspended
+ Suspended
fa fa-pause
@@ -152,7 +152,7 @@
- Susspended
+ Suspended
Active