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

change user policy

Browse Source
This commit is contained in:
Fateme
2020-06-05 17:17:55 +04:30
parent 42934693ce
commit 2ff59d29d0
10 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Policies/UserPolicy.php
+3 -1
View File
@@ -14,7 +14,9 @@ class UserPolicy
} }
public function delete(User $User, User $Operator) 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; return true;
} }
app/User.php
+8
View File
@@ -73,4 +73,12 @@ class User extends Authenticatable
{ {
return $this->hasMany('App\Item'); return $this->hasMany('App\Item');
} }
public function labels()
{
return $this->hasMany('App\Label');
}
public function cycles()
{
return $this->hasMany('App\Cycle');
}
} }
resources/js/show/views/Cycle/ShowCycle.vue
+1 -1
View File
@@ -22,7 +22,7 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
resources/js/show/views/Item/ShowItem.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Register User :</span> <span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
resources/js/show/views/Label/ShowLabel.vue
+1 -1
View File
@@ -41,7 +41,7 @@
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
resources/js/show/views/Package/ShowPackage.vue
+3 -3
View File
@@ -22,7 +22,7 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -112,8 +112,8 @@ export default {
if (result.status == 200) { if (result.status == 200) {
this.data = result.data.data; this.data = result.data.data;
this.generateBarcode(this.data.id); this.generateBarcode(this.data.id);
this.MedicalCenter = this.data.user.medical_center.name; this.MedicalCenter = this.data.user.medical_center.name;
} }
}, },
resources/js/vue/components/modal/cycle/Show.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card id="printMe" color="black" title="Show Cycle"> <material-card id="printMe" color="black" title="Show Cycle">
<v-layout align-left justify-left wrap class="px-5 my-3"> <v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Cycle - {{ data.user.medical_center.name }}</h3> <h3 class="ml-3">Cycle - {{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -25,7 +25,7 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
resources/js/vue/components/modal/label/Show.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
resources/js/vue/components/modal/package/Show.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Package"> <material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3"> <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Package - {{ data.user.medical_center.name }}</h3> <h3 class="ml-3">Package - {{ (data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : ''}}</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -23,7 +23,7 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
resources/js/vue/views/Package/List.vue
+1 -1
View File
@@ -64,7 +64,7 @@
<td class="title font-weight-light">{{ item.id }}</td> <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.unique_id }}</td> -->
<td class="title font-weight-light">{{ item.name }}</td> <td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.user.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="title font-weight-light">{{ item.description }}</td>
<td class="text-xs-right"> <td class="text-xs-right">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-btn color="cyan" class="mr-2" @click="show(item.id)">