diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index 5707dd50..84a914a8 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -14,7 +14,9 @@ class UserPolicy } public function delete(User $User, User $Operator) { - if($User->hasRole('Admin') && $Operator->test_results->count() == 0 && $Operator->test_types->count() == 0) + if($User->hasRole('Admin') && $Operator->test_results->count() == 0 && $Operator->test_types->count() == 0 + && $Operator->items->count() == 0 && $Operator->packages->count() == 0 && $Operator->labels->count() == 0 + && $Operator->cycles->count() == 0) return true; } diff --git a/app/User.php b/app/User.php index 7c6f54a9..a3a5208b 100644 --- a/app/User.php +++ b/app/User.php @@ -73,4 +73,12 @@ class User extends Authenticatable { return $this->hasMany('App\Item'); } + public function labels() + { + return $this->hasMany('App\Label'); + } + public function cycles() + { + return $this->hasMany('App\Cycle'); + } } diff --git a/resources/js/show/views/Cycle/ShowCycle.vue b/resources/js/show/views/Cycle/ShowCycle.vue index acc9fafb..1ed04213 100644 --- a/resources/js/show/views/Cycle/ShowCycle.vue +++ b/resources/js/show/views/Cycle/ShowCycle.vue @@ -22,7 +22,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/show/views/Item/ShowItem.vue b/resources/js/show/views/Item/ShowItem.vue index 74e8563f..61548cce 100644 --- a/resources/js/show/views/Item/ShowItem.vue +++ b/resources/js/show/views/Item/ShowItem.vue @@ -34,7 +34,7 @@ Register User : - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/show/views/Label/ShowLabel.vue b/resources/js/show/views/Label/ShowLabel.vue index a3d5891b..fd334c7d 100644 --- a/resources/js/show/views/Label/ShowLabel.vue +++ b/resources/js/show/views/Label/ShowLabel.vue @@ -41,7 +41,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/show/views/Package/ShowPackage.vue b/resources/js/show/views/Package/ShowPackage.vue index a9e7325e..7fae6fd8 100644 --- a/resources/js/show/views/Package/ShowPackage.vue +++ b/resources/js/show/views/Package/ShowPackage.vue @@ -22,7 +22,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} @@ -112,8 +112,8 @@ export default { if (result.status == 200) { this.data = result.data.data; - this.generateBarcode(this.data.id); - this.MedicalCenter = this.data.user.medical_center.name; + this.generateBarcode(this.data.id); + this.MedicalCenter = this.data.user.medical_center.name; } }, diff --git a/resources/js/vue/components/modal/cycle/Show.vue b/resources/js/vue/components/modal/cycle/Show.vue index 8f8f282c..3bd4833d 100644 --- a/resources/js/vue/components/modal/cycle/Show.vue +++ b/resources/js/vue/components/modal/cycle/Show.vue @@ -3,7 +3,7 @@ - Cycle - {{ data.user.medical_center.name }} + Cycle - {{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }} @@ -25,7 +25,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/vue/components/modal/label/Show.vue b/resources/js/vue/components/modal/label/Show.vue index ec6dabd9..c5eedb05 100644 --- a/resources/js/vue/components/modal/label/Show.vue +++ b/resources/js/vue/components/modal/label/Show.vue @@ -39,7 +39,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/vue/components/modal/package/Show.vue b/resources/js/vue/components/modal/package/Show.vue index dd389184..f131575d 100644 --- a/resources/js/vue/components/modal/package/Show.vue +++ b/resources/js/vue/components/modal/package/Show.vue @@ -3,7 +3,7 @@ - Package - {{ data.user.medical_center.name }} + Package - {{ (data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : ''}} @@ -23,7 +23,7 @@ - {{ (typeof data.user != 'undefined') ? data.user.name : '' }} + {{ data.user ? data.user.name : '' }} diff --git a/resources/js/vue/views/Package/List.vue b/resources/js/vue/views/Package/List.vue index e50e73b9..def989e8 100644 --- a/resources/js/vue/views/Package/List.vue +++ b/resources/js/vue/views/Package/List.vue @@ -64,7 +64,7 @@ {{ item.id }} {{ item.name }} - {{ item.user.name }} + {{ item.user ? item.user.name : '' }} {{ item.description }}