From 73d0169ca39d9090569d60a2c343ea3b0a9cfe9f Mon Sep 17 00:00:00 2001
From: Fateme <F.Fyz>
Date: Thu, 23 Jul 2020 19:49:14 +0430
Subject: [PATCH] new correction on access

---
 app/Http/Controllers/CycleController.php      |  4 ++--
 app/Http/Controllers/ItemController.php       |  6 ++---
 app/Http/Controllers/LabelController.php      | 10 ++++----
 app/Http/Controllers/PackageController.php    |  8 +++----
 app/Http/Controllers/TestResultController.php |  2 +-
 .../show/views/TestResult/ShowTestResult.vue  | 14 +++++++++--
 resources/js/vue/components/core/Toolbar.vue  |  5 ++--
 .../vue/components/modal/testresult/Show.vue  | 23 +++++++++++++++----
 resources/js/vue/views/Cycle/List.vue         | 15 +++++++++---
 resources/js/vue/views/Item/List.vue          | 11 ++++++++-
 resources/js/vue/views/Label/List.vue         |  1 +
 resources/js/vue/views/Package/List.vue       | 13 +++++++++--
 resources/js/vue/views/TestResult/List.vue    | 14 +++++++----
 resources/js/vue/views/User/List.vue          |  3 ++-
 14 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php
index 7b0d1308..58496dd4 100644
--- a/app/Http/Controllers/CycleController.php
+++ b/app/Http/Controllers/CycleController.php
@@ -14,7 +14,7 @@ class CycleController extends Controller
         $user =  auth('api')->user();
 
         $Cycles = Cycle::
-        when($user->cant('showAll'), function($query) use ($user) {
+        when($user->cant('showAll', Cycle::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
@@ -36,7 +36,7 @@ class CycleController extends Controller
         ->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
             $query->where('cycle_number', $request->cycle_number);
         })
-        ->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
+        ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){
             $query->whereHas('user', function($query) use ($request) {
                 $query->where('medical_center_id', $request->medical_center_id);
             });
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 6814ea51..9b14b69e 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -17,7 +17,7 @@ class ItemController extends Controller
             return \MessageResponse::error('You dont have access to this section!');
         }
 
-        $Items = Item::when($user->cant('showAll'), function($query) use ($user) {
+        $Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
@@ -36,7 +36,7 @@ class ItemController extends Controller
         ->when($request->has('specific') && $request->specific != '', function($query) use($request){
             $query->where('specific', $request->specific);
         })
-        ->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
+        ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){
             $query->whereHas('user', function($query) use ($request) {
                 $query->where('medical_center_id', $request->medical_center_id);
             });
@@ -109,7 +109,7 @@ class ItemController extends Controller
             return \MessageResponse::data([]);
         }
 
-        $Items = Item::when($user->cant('showAll'), function($query) use ($user) {
+        $Items = Item::when($user->cant('showAll', Item::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
diff --git a/app/Http/Controllers/LabelController.php b/app/Http/Controllers/LabelController.php
index 2fae9444..87b645c6 100644
--- a/app/Http/Controllers/LabelController.php
+++ b/app/Http/Controllers/LabelController.php
@@ -13,13 +13,11 @@ class LabelController extends Controller
     public function index(Request $request)
     {
         $user =  auth('api')->user();
-        $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
-        $admin_users[] = $user->id;
 
         $Labels = Label::
-        when($user->cant('showAll'), function($query) use ($user, $admin_users) {
+        when($user->cant('showAll', Label::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor')) {
-                $query->whereHas('user', function($query) use ($user, $admin_users) {
+                $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
                 });
             }
@@ -39,7 +37,7 @@ class LabelController extends Controller
         ->when($request->has('label_id') && $request->label_id != '', function($query) use($request){
             $query->where('id', $request->label_id);
         })
-        ->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
+        ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){
             $query->whereHas('user', function($query) use ($request) {
                 $query->where('medical_center_id', $request->medical_center_id);
             });
@@ -117,7 +115,7 @@ class LabelController extends Controller
         // $admin_users[] = $user->id;
 
         $Labels = Label::
-        when($user->cant('showAll'), function($query) use ($user) {
+        when($user->cant('showAll', Label::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor|User')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 99900bf6..90f4f959 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -18,7 +18,7 @@ class PackageController extends Controller
         }
 
         $Packages = Package::
-        when($user->cant('showAll'), function($query) use ($user) {
+        when($user->cant('showAll', Package::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
@@ -31,7 +31,7 @@ class PackageController extends Controller
         ->when($request->has('package_id') && $request->package_id != '', function($query) use($request){
             $query->where('id', $request->package_id);
         })
-        ->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
+        ->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){
             $query->whereHas('user', function($query) use ($request) {
                 $query->where('medical_center_id', $request->medical_center_id);
             });
@@ -159,11 +159,9 @@ class PackageController extends Controller
     public function getPackages()
     {
         $user =  auth('api')->user();
-        // $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
-        // $admin_users[] = $user->id;
 
         $Packages = Package::
-        when($user->cant('showAll'), function($query) use ($user) {
+        when($user->cant('showAll', Package::class), function($query) use ($user) {
             if ($user->hasRole('Supervisor|User')) {
                 $query->whereHas('user', function($query) use ($user) {
                     $query->where('medical_center_id', $user->medical_center_id);
diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php
index bb419168..b2456bae 100644
--- a/app/Http/Controllers/TestResultController.php
+++ b/app/Http/Controllers/TestResultController.php
@@ -41,7 +41,7 @@ class TestResultController extends Controller
         if ($user->hasRole('Supervisor|User')) {
             $medical_center_id = $user->medical_center_id;
         }
-        elseif($request->has('medicalCenter_id') && $request->medicalCenter_id) {
+        elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
             $medical_center_id = $request->medicalCenter_id;
         } else {
             $medical_center_id = null;
diff --git a/resources/js/show/views/TestResult/ShowTestResult.vue b/resources/js/show/views/TestResult/ShowTestResult.vue
index e00a872c..f7fbbe67 100644
--- a/resources/js/show/views/TestResult/ShowTestResult.vue
+++ b/resources/js/show/views/TestResult/ShowTestResult.vue
@@ -20,7 +20,12 @@
                     <v-flex xs12 md12 sm12>
                         <div class>
                             <span class="title CSSD-font">Result :</span>
-                            <v-icon class="green--text ml-2 caption">fas fa-check</v-icon>
+                            <span v-if="data.result == 'Reject'" class="NotVerified">
+                                <v-icon class="caption fa fa-times NotVerified"></v-icon>
+                            </span>
+                            <span v-if="data.result == 'Accept'" class="">
+                                <v-icon class="caption fa fa-check Verified"></v-icon>
+                            </span>
                             <span
                                 class="headline ml-1 CSSD-font"
                                 style="letter-spacing:0 !important"
@@ -30,7 +35,12 @@
                     <v-flex xs12 md12 sm12>
                         <div class>
                             <span class="title CSSD-font">verify :</span>
-                            <v-icon class="pink--text ml-2 caption">fas fa-times</v-icon>
+                            <span v-if="data.verified == 'NotVerified'" class="NotVerified">
+                                <v-icon class="caption fa fa-times NotVerified"></v-icon>
+                            </span>
+                            <span v-if="data.verified == 'Verified'" class="">
+                                <v-icon class="caption fa fa-check Verified"></v-icon>
+                            </span>
                             <span
                                 class="headline ml-1"
                                 style="letter-spacing:0 !important"
diff --git a/resources/js/vue/components/core/Toolbar.vue b/resources/js/vue/components/core/Toolbar.vue
index 996ccba2..552fed16 100644
--- a/resources/js/vue/components/core/Toolbar.vue
+++ b/resources/js/vue/components/core/Toolbar.vue
@@ -146,7 +146,8 @@ export default {
 
   watch: {
     '$route' (val) {
-      this.title = val.name
+      // this.title = val.name
+      this.title = val.name.replace(/([A-Z])/g, ' $1').trim()
     }
   },
 
@@ -192,4 +193,4 @@ export default {
   .Pointer {
       cursor: pointer;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/vue/components/modal/testresult/Show.vue b/resources/js/vue/components/modal/testresult/Show.vue
index 297bcdf1..fd1fecac 100644
--- a/resources/js/vue/components/modal/testresult/Show.vue
+++ b/resources/js/vue/components/modal/testresult/Show.vue
@@ -20,7 +20,12 @@
                     <v-flex xs3 md3 sm3>
                         <div class>
                             <span class="subtitle-1">Result :</span>
-                            <v-icon class="green--text ml-2 caption">fas fa-check</v-icon>
+                            <span v-if="data.result == 'Reject'" class="NotVerified">
+                                <v-icon class="caption fa fa-times NotVerified"></v-icon>
+                            </span>
+                            <span v-if="data.result == 'Accept'" class="">
+                                <v-icon class="caption fa fa-check Verified"></v-icon>
+                            </span>
                             <span
                                 class="title font-weight-bold ml-1"
                                 style="letter-spacing:0 !important"
@@ -30,7 +35,17 @@
                     <v-flex xs3 md3 sm3>
                         <div class>
                             <span class="subtitle-1">verify :</span>
-                            <v-icon class="pink--text ml-2 caption">fas fa-times</v-icon>
+                            <!-- <v-icon class="pink--text ml-2 caption">fas fa-times</v-icon> -->
+                            <!-- <span
+                                class="title font-weight-bold ml-1"
+                                style="letter-spacing:0 !important"
+                            >{{ data.verified }}</span> -->
+                            <span v-if="data.verified == 'NotVerified'" class="NotVerified">
+                                <v-icon class="caption fa fa-times NotVerified"></v-icon>
+                            </span>
+                            <span v-if="data.verified == 'Verified'" class="">
+                                <v-icon class="caption fa fa-check Verified"></v-icon>
+                            </span>
                             <span
                                 class="title font-weight-bold ml-1"
                                 style="letter-spacing:0 !important"
@@ -148,7 +163,7 @@
                 </v-flex>
                 <v-layout row wrap class="ml-4">
                     <!-- <LightBox :media="data.images.map(img => ({thumb: img.path, src: img.path}))" style="width: 20%"></LightBox> -->
-                    <v-flex xs6 md2 sm2  v-for="(file, key) in data.files" :key="key">  
+                    <v-flex xs6 md2 sm2  v-for="(file, key) in data.files" :key="key">
                         <template v-if="file.file_type == 'document'">
                             <a target="_blank" :href="'/'+file.path"><v-icon class="mr-2 caption">fas fa-check</v-icon>{{ file.file_name }}</a>
                         </template>
@@ -175,7 +190,7 @@
                         <span class="white--text">Verify</span>
                     </v-btn>
                 </v-flex>
-                <v-flex class="WM-Align-R" xs6 md3 sm3 v-else>
+                <v-flex class="WM-Align-R" xs6 md3 sm3 v-else-if="$hasRole('Admin')">
                     <v-btn
                         class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
                         @click="verify(data.id)"
diff --git a/resources/js/vue/views/Cycle/List.vue b/resources/js/vue/views/Cycle/List.vue
index a3c0e2c2..e98f3687 100644
--- a/resources/js/vue/views/Cycle/List.vue
+++ b/resources/js/vue/views/Cycle/List.vue
@@ -40,6 +40,7 @@
                         label="Hospital"
                         color="black"
                         :items="medicalCenters"
+                        :clearable="true"
                       ></v-autocomplete>
                     </v-flex>
                     <v-flex xs12 sm2 md2 class="WM-FlexCenter pl-3">
@@ -97,6 +98,9 @@
                             </template>
                             <template slot="items" slot-scope="{ item }">
                                 <td class="headline font-weight-light">{{ item.id }}</td>
+                                <td
+                									class="title font-weight-light"
+                								>{{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}</td>
                                 <td class="title font-weight-light">{{ item.sterilizer_id }}</td>
                                 <td class="title font-weight-light">{{ item.cycle_number }}</td>
                                 <td class="title font-weight-light">{{ item.date }}</td>
@@ -142,9 +146,9 @@
                                     </v-tooltip>
                                     <v-tooltip bottom open-on-hover>
                                     <template v-slot:activator="{ on, attrs }">
-                                    <v-btn 
-                                    v-bind="attrs" v-on="on" 
-                                    color="orange darken-1" 
+                                    <v-btn
+                                    v-bind="attrs" v-on="on"
+                                    color="orange darken-1"
                                     @click="generateBarcode(item.id, 'Cycle')">
                                         <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
                                         <span>Generate Barcode</span>
@@ -186,6 +190,11 @@ export default {
                 text: "Cycle ID",
                 value: "Cycle ID"
             },
+            {
+              sortable: true,
+              text: "Hospital",
+              value: "Hospital"
+            },
             {
                 sortable: true,
                 text: "Sterilizer ID",
diff --git a/resources/js/vue/views/Item/List.vue b/resources/js/vue/views/Item/List.vue
index e9d3706f..645875cd 100644
--- a/resources/js/vue/views/Item/List.vue
+++ b/resources/js/vue/views/Item/List.vue
@@ -1,7 +1,7 @@
 <template>
     <div class>
         <v-container fluid>
-            <material-card class color="black" title="All Instrument" text>
+            <material-card class color="black" title="All Items" text>
                 <v-layout align-center wrap class="my-3 px-5">
                     <v-flex xs12 md3 sm3 class="WM-FlexCenter">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
@@ -31,6 +31,7 @@
           							label="Hospital"
           							color="black"
           							:items="medicalCenters"
+                        :clearable="true"
           						></v-autocomplete>
           					</v-flex>
                     <v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
@@ -74,6 +75,9 @@
                                 <td class="title font-weight-light">{{ item.id }}</td>
                                 <!-- <td class="title font-weight-light">{{ item.unique_id }}</td> -->
                                 <td class="title font-weight-light">{{ item.name }}</td>
+                                <td
+                									class="title font-weight-light"
+                								>{{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}</td>
                                 <td class="title font-weight-light">{{ item.size }}</td>
                                 <td class="text-xs-right FlexBtn Height-MD-60">
                                     <v-tooltip bottom open-on-hover>
@@ -167,6 +171,11 @@ export default {
                 text: "Name",
                 value: "name"
             },
+            {
+      				sortable: true,
+      				text: "Hospital",
+      				value: "Hospital"
+      			},
             {
                 sortable: false,
                 text: "Size",
diff --git a/resources/js/vue/views/Label/List.vue b/resources/js/vue/views/Label/List.vue
index e2a6ccaf..f5775b8d 100644
--- a/resources/js/vue/views/Label/List.vue
+++ b/resources/js/vue/views/Label/List.vue
@@ -19,6 +19,7 @@
 							label="Hospital"
 							color="black"
 							:items="medicalCenters"
+							:clearable="true"
 						></v-autocomplete>
 					</v-flex>
 					<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
diff --git a/resources/js/vue/views/Package/List.vue b/resources/js/vue/views/Package/List.vue
index d165c75c..20cd7f8d 100644
--- a/resources/js/vue/views/Package/List.vue
+++ b/resources/js/vue/views/Package/List.vue
@@ -31,6 +31,7 @@
                         label="Hospital"
                         color="black"
                         :items="medicalCenters"
+                        :clearable="true"
                       ></v-autocomplete>
                     </v-flex>
                     <!-- <v-flex class xs12 md2 sm3>
@@ -41,7 +42,7 @@
                     </v-flex>
                     <v-spacer></v-spacer> -->
                     <!-- <v-spacer></v-spacer> -->
-                    
+
                 </v-layout>
                 <v-layout align-center wrap class="mb-3 px-5">
                     <v-flex class xs12 md2 sm3>
@@ -76,6 +77,9 @@
                                 <td class="title font-weight-light">{{ item.id }}</td>
                                 <!-- <td class="title font-weight-light">{{ item.unique_id }}</td> -->
                                 <td class="title font-weight-light">{{ item.name }}</td>
+                                <td
+                									class="title font-weight-light"
+                								>{{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}</td>
                                 <td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td>
                                 <td class="title font-weight-light">{{ item.description }}</td>
                                 <td class="text-xs-right FlexBtn Height-MD-60">
@@ -105,7 +109,7 @@
                                     </v-tooltip>
                                     <v-tooltip bottom open-on-hover>
                                     <template v-slot:activator="{ on, attrs }">
-                                    <v-btn 
+                                    <v-btn
                                         v-bind="attrs" v-on="on"
                                         color="pink"
                                         class="WM-ActionButton mr-2"
@@ -171,6 +175,11 @@ export default {
                 text: "Name",
                 value: "name"
             },
+            {
+      				sortable: true,
+      				text: "Hospital",
+      				value: "Hospital"
+      			},
             {
                 sortable: true,
                 text: "User",
diff --git a/resources/js/vue/views/TestResult/List.vue b/resources/js/vue/views/TestResult/List.vue
index 24e63fb4..e3605b8c 100644
--- a/resources/js/vue/views/TestResult/List.vue
+++ b/resources/js/vue/views/TestResult/List.vue
@@ -47,6 +47,7 @@
                             :items="medicalCenters"
                             item-text="name"
                             item-value="id"
+                            :clearable="true"
                         ></v-autocomplete>
                     </v-flex>
                     <v-flex xs12 md2 sm3 class="WM-FlexCenter">
@@ -203,8 +204,10 @@
                                     </v-tooltip>
                                     <v-tooltip bottom open-on-hover>
                                     <template v-slot:activator="{ on, attrs }">
+                                        <!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" -->
                                     <router-link class="LinkBtn"
-                                        v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
+                                        v-if="$hasRole('Admin')"
+
                                         :to="{name: 'EditTestResult', params: {testResult: item.id}}"
                                     >
                                         <v-btn color="orange" class="mr-2" v-bind="attrs"
@@ -218,11 +221,12 @@
                                     </v-tooltip>
                                     <v-tooltip bottom open-on-hover>
                                     <template v-slot:activator="{ on, attrs }">
+                                      <!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" -->
                                     <v-btn
                                         color="pink"
                                         class="WM-ActionButton"
                                         @click="remove(item.id)"
-                                        v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" 
+                                        v-if="$hasRole('Admin')"
                                         v-bind="attrs"
                                         v-on="on"
                                     >
@@ -456,7 +460,7 @@ td.FlexBtn .theme--light.v-btn {
 }
 td.FlexBtn a.LinkBtn .theme--light.v-btn  {
     padding: 12px 10px;
-}    
+}
 @media screen and (max-width:1536px) {
 .FlexBtn {
     padding: 30px 8px !important;
@@ -468,8 +472,8 @@ td.FlexBtn .theme--light.v-btn {
     min-width: 30px;
     padding: 15px 10px;
     margin-right: 1 !important;
-    
-} 
+
+}
 td.FlexBtn a.LinkBtn .theme--light.v-btn  {
     padding: 9px 10px;
 }
diff --git a/resources/js/vue/views/User/List.vue b/resources/js/vue/views/User/List.vue
index b5e1584f..dc6473d4 100644
--- a/resources/js/vue/views/User/List.vue
+++ b/resources/js/vue/views/User/List.vue
@@ -152,7 +152,8 @@
                                         </template>
                                     </v-btn>
                                 </template>
-                                <span>Active</span>
+                                <span v-if="item.status == 'Active'">Susspended</span>
+                                <span v-else>Active</span>
                                 </v-tooltip>
                                 <v-tooltip bottom open-on-hover>
                                 <template v-slot:activator="{ on, attrs }">