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

update item & package & label & cycle

Browse Source
This commit is contained in:
Fayyazi
2019-10-30 14:19:47 +03:30
parent dbd0ddc1d4
commit da3dd22ec5
19 changed files with 292 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Cycle.php
+2 -2
View File
@@ -11,9 +11,9 @@ class Cycle extends Model
{
return $this->belongsTo('App\User');
}
public function packs()
public function labels()
{
return $this->belongsToMany('App\Pack', 'cycle_pack');
return $this->belongsToMany('App\Label', 'cycle_label')->withPivot('count');
}
}
app/Http/Controllers/CycleController.php
+62 -10
View File
@@ -10,7 +10,21 @@ class CycleController extends Controller
{
public function index(Request $request)
{
$Cycles = Cycle::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
$Cycles = Cycle::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -31,7 +45,7 @@ class CycleController extends Controller
}
public function show(Cycle $Cycle)
{
$Cycle->load('user', 'packs');
$Cycle->load('user', 'labels', 'labels.package', 'labels.package.items');
return \MessageResponse::data($Cycle);
}
public function store(StoreCycleRequest $request)
@@ -48,21 +62,59 @@ class CycleController extends Controller
'verified' => 'NotVerified',
];
$CycleObj = Cycle::create($CycleData);
$CycleObj->packs()->attach($request->packs);
$Labels = [];
$count = 1;
foreach ($request->labels as $key => $label) {
if (array_key_exists($label['id'], $Labels)) {
$preCount = $Labels[$label['id']];
$Labels[$label['id']] = $preCount + 1;
}
else {
$Labels[$label['id']] = $count;
}
}
foreach ($Labels as $Label => $Count) {
$CycleObj->labels()->attach(array($Label), ['count' => $Count]);
}
// $CycleObj->labels()->attach($request->labels);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Cycle $Cycle)
{
$Packs = $Cycle->packs->pluck('id')->toArray();
unset($Cycle->packs);
$Cycle->packs = $Packs;
$Labels = [];
$Cycle->load('labels');
foreach ($Cycle->labels as $label) {
for ($i=0; $i < $label->pivot->count ; $i++) {
$Labels[] = (object) array('id' => $label->id, 'name' => $label->name);
}
}
unset($Cycle->labels);
$Cycle->labels = $Labels;
return \MessageResponse::data($Cycle);
}
public function update(StoreCycleRequest $request, Cycle $Cycle)
{
$Cycle->update($request->except(['packs']));
$Cycle->packs()->sync($request->packs);
$Cycle->update($request->except(['labels']));
$Labels = [];
$count = 1;
foreach ($request->labels as $key => $label) {
if (array_key_exists($label['id'], $Labels)) {
$preCount = $Labels[$label['id']];
$Labels[$label['id']] = $preCount + 1;
}
else {
$Labels[$label['id']] = $count;
}
}
$Cycle->labels()->detach();
foreach ($Labels as $Label => $Count) {
$Cycle->labels()->attach(array($Label), ['count' => $Count]);
}
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Cycle $Cycle)
@@ -70,9 +122,9 @@ class CycleController extends Controller
if (auth('api')->user()->cant('delete', $Cycle)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Cycle->packs))
if(count($Cycle->labels))
{
$Cycle->packs()->detach();
$Cycle->labels()->detach();
}
$Cycle->delete();
return \MessageResponse::success(trans('messages.success'));
app/Http/Controllers/ItemController.php
+14 -1
View File
@@ -10,7 +10,21 @@ class ItemController extends Controller
{
public function index(Request $request)
{
$user = auth('api')->user();
$Items = Item::with('user')
->when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
@@ -23,7 +37,6 @@ class ItemController extends Controller
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
})
->where('user_id', auth('api')->user()->id)
->paginate(10);
return \MessageResponse::data($Items);
}
app/Http/Controllers/LabelController.php
+23 -12
View File
@@ -11,7 +11,25 @@ class LabelController extends Controller
{
public function index(Request $request)
{
$Labels = Label::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
if ($user->hasRole('Supervisor|User')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '') {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;
}
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){
@@ -26,7 +44,7 @@ class LabelController extends Controller
->when($request->has('department') && $request->department != '', function($query) use($request){
$query->where('department', 'LIKE', '%'.$request->department.'%');
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
->when($medical_center_id, function($query) use($request){
$query->whereHas('user', function($query) use($request){
$query->where('medical_center_id', $request->medical_center_id);
});
@@ -40,7 +58,7 @@ class LabelController extends Controller
}
public function show(Label $Label)
{
$Label->load('user', 'packages', 'user.medical_center');
$Label->load('user', 'package', 'package.items', 'user.medical_center');
return \MessageResponse::data($Label);
}
public function store(StoreLabelRequest $request)
@@ -55,27 +73,20 @@ class LabelController extends Controller
'department' => $request->department,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'package_id' => $request->package_id
];
$LabelObj = Label::create($LabelData);
Package::find($request->package_id)->update(['label_id' => $Label->id]);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Label $Label)
{
$Label->load('package');
dd($Label);
// $Packages = $Label->packages->pluck('id')->toArray();
// unset($Label->packages);
// $Label->package_id = $Label->package->id;
return \MessageResponse::data($Label);
}
public function update(Request $request, Label $Label)
{
$Label->update($request->except(['package_id']));
Package::find($request->package_id)->update(['label_id' => $Label->id]);
// $Label->package()->save($request->package_id);
// $Label->packages()->sync($request->packages);
$Label->update($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(Label $Label)
app/Http/Controllers/PackageController.php
+24 -7
View File
@@ -10,7 +10,21 @@ class PackageController extends Controller
{
public function index(Request $request)
{
$Packages = Package::when($request->has('name') && $request->name != '', function($query) use($request){
$user = auth('api')->user();
$Packages = Package::
when($user->cant('showAll'), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
if ($user->hasRole('User')) {
$query->where('user_id', $user->id);
}
})
->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('unique_id') && $request->unique_id != '', function($query) use($request){
@@ -19,6 +33,7 @@ class PackageController extends Controller
->with('user')->paginate(10);
return \MessageResponse::data($Packages);
}
public function create()
{
@@ -50,10 +65,12 @@ class PackageController extends Controller
$Items[$item['id']] = $count;
}
}
// dd($Items);
foreach ($Items as $Item => $Count) {
$Package->items()->attach(array($Item), ['count' => $Count]);
// dump($Item);
$PackageObj->items()->attach(array($Item), ['count' => $Count]);
}
$PackageObj->items()->attach($request->items);
// $PackageObj->items()->attach($request->items);
return \MessageResponse::success(trans('messages.success'));
}
public function edit(Package $Package)
@@ -72,7 +89,6 @@ class PackageController extends Controller
}
public function update(StorePackageRequest $request, Package $Package)
{
// dd($request->items);
$Package->update($request->except(['items']));
$Items = [];
$count = 1;
@@ -97,12 +113,13 @@ class PackageController extends Controller
$Items[$item['id']] = $count;
}
}
// dd($Items);
$Package->items()->detach();
// foreach ($Items as $Item) {
// $Package->items()->attach(array($Item['id']), ['count' => $Item['count']]);
// }
foreach ($Items as $Item => $Count) {
// dump($Item, array($Item));
$Package->items()->attach(array($Item), ['count' => $Count]);
}
// $Package->items()->sync($request->items);
@@ -117,9 +134,9 @@ class PackageController extends Controller
{
$Package->items()->detach();
}
if(count($Package->packs))
if(count($Package->labels))
{
$Package->packs()->detach();
$Package->labels()->delete();
}
$Package->delete();
return \MessageResponse::success(trans('messages.success'));
app/Http/Requests/StoreCycleRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class StoreCycleRequest extends FormRequest
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable',
'packs' => 'required',
'labels' => 'required',
];
break;
}
@@ -43,7 +43,7 @@ class StoreCycleRequest extends FormRequest
'sterilizer_id' => 'required',
'cycle_number' => 'required',
'note' => 'nullable',
'packs' => 'required',
'labels' => 'required',
];
break;
app/Item.php
+1 -1
View File
@@ -9,7 +9,7 @@ class Item extends Model
public $fillable = ['name', 'size', 'unique_id', 'specific', 'note', 'user_id'];
public function packages()
{
return $this->belongsToMany('App\Package', 'item_package');
return $this->belongsToMany('App\Package', 'item_package')->withPivot('count');
}
public function user()
{
app/Label.php
+2 -6
View File
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class Label extends Model
{
public $fillable = ['name', 'sterile_date', 'expire_date', 'sterilizer_id', 'cycle_number', 'lot_number', 'department', 'user_id', 'note'];
public $fillable = ['name', 'sterile_date', 'expire_date', 'sterilizer_id', 'cycle_number', 'lot_number', 'department', 'user_id', 'note', 'package_id'];
public function user()
{
return $this->belongsTo('App\User');
@@ -15,13 +15,9 @@ class Label extends Model
{
return $this->belongsTo('App\Package');
}
// public function packages()
// {
// return $this->belongsToMany('App\Package', 'pack_package');
// }
public function cycles()
{
return $this->belongsToMany('App\Cycle', 'cycle_pack');
return $this->belongsToMany('App\Cycle', 'cycle_label')->withPivot('count');
}
}
app/Package.php
+1 -1
View File
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class Package extends Model
{
public $fillable = ['name', 'unique_id', 'user_id', 'note', 'verified', 'label_id'];
public $fillable = ['name', 'unique_id', 'user_id', 'note', 'verified'];
public function user()
{
return $this->belongsTo('App\User');
app/Policies/CyclePolicy.php
+7 -3
View File
@@ -8,21 +8,25 @@ use Doctrine\Tests\Common\Inflector\InflectorTest;
class CyclePolicy
{
public function showAll(User $User)
{
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Cycle $Cycle)
{
// if($User->hasRole('Admin') && $Cycle->users->count() == 0)
if($User->hasRole('Admin') || $Cycle->user_id == $User->id)
return true;
}
public function update(User $User, Cycle $Cycle)
{
// if($User->hasRole('Admin'))
if($User->hasRole('Admin') || $Cycle->user_id == $User->id)
return true;
}
public function store(User $User)
{
// if($User->hasRole('Admin'))
return true;
}
public function verifyCycle(User $User, Cycle $Cycle)
app/Policies/ItemPolicy.php
+7 -3
View File
@@ -8,21 +8,25 @@ use Doctrine\Tests\Common\Inflector\InflectorTest;
class ItemPolicy
{
public function showAll(User $User)
{
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Item $Item)
{
// if($User->hasRole('Admin') && $Item->users->count() == 0)
if($User->hasRole('Admin') || $Item->user_id == $User->id)
return true;
}
public function update(User $User, Item $Item)
{
// if($User->hasRole('Admin'))
if($User->hasRole('Admin') || $Item->user_id == $User->id)
return true;
}
public function store(User $User)
{
// if($User->hasRole('Admin'))
return true;
}
app/Policies/LabelPolicy.php
+7 -3
View File
@@ -8,21 +8,25 @@ use Doctrine\Tests\Common\Inflector\InflectorTest;
class LabelPolicy
{
public function showAll(User $User)
{
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Label $Label)
{
// if($User->hasRole('Admin') && $Label->users->count() == 0)
if($User->hasRole('Admin') || $Label->user_id == $User->id)
return true;
}
public function update(User $User, Label $Label)
{
// if($User->hasRole('Admin'))
if($User->hasRole('Admin') || $Label->user_id == $User->id)
return true;
}
public function store(User $User)
{
// if($User->hasRole('Admin'))
return true;
}
app/Policies/PackagePolicy.php
+9 -5
View File
@@ -8,26 +8,30 @@ use Doctrine\Tests\Common\Inflector\InflectorTest;
class PackagePolicy
{
public function showAll(User $User)
{
if($User->hasRole('Admin'))
return true;
}
public function delete(User $User, Package $Package)
{
// if($User->hasRole('Admin') && $Package->users->count() == 0)
if($User->hasRole('Admin') || $Package->user_id == $User->id)
return true;
}
public function update(User $User, Package $Package)
{
// if($User->hasRole('Admin'))
if($User->hasRole('Admin') || $Package->user_id == $User->id)
return true;
}
public function store(User $User)
{
// if($User->hasRole('Admin'))
return true;
return true;
}
public function verifyPackage(User $User, Package $Package)
{
// if($User->hasRole('Admin'))
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))
return true;
}
app/Policies/TestResultPolicy.php
+1 -1
View File
@@ -11,7 +11,7 @@ class TestResultPolicy
public function delete(User $User, TestResult $TestResult)
{
if($User->hasRole('Admin') || ($User->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $User->id))
if($User->hasRole('Admin') || ($User->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $User->id))
return true;
}
resources/js/vue/components/modal/cycle/Show.vue
+40 -31
View File
@@ -47,44 +47,53 @@
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Packs</h3>
<h3 class="ml-3">Labels</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class v-for="(pack, key) in data.packs" :key="key">
<span class="headline ml-2" style="letter-spacing:0 !important">{{ key+1 + ": " + pack.name }}</span>
</div>
<template>
<v-expansion-panel v-for="(label, key) in data.labels" :key="key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ label.name }}</div>
</template>
<v-card>
<v-card-text>count : {{ label.pivot.count }}</v-card-text>
<v-card-text>note : {{ label.note }}</v-card-text>
<v-card-text> Package :
<v-expansion-panel>
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ label.package.name }}</div>
</template>
<v-card>
<v-card-text>note : {{ label.package.note }}</v-card-text>
<v-card-text>
Items :
<v-expansion-panel v-for="item in label.package.items" :key="item.key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ item.name }}</div>
</template>
<v-card>
<v-card-text>count : {{ item.pivot.count }}</v-card-text>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
<!-- <v-row justify="center mt-5">
<v-expansion-panels accordion class="WM-Relative WM-Panel">
<v-expansion-panel class="WM-PanelCategories"
v-for="(pack, key) in data.packs"
:key="key"
>
<v-expansion-panel-header>
<span class="headline ml-2">{{key+1}}</span>
<h2 style="margin-right:20px">{{ pack.name }}</h2>
<div class="ml-3" align="left">
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</div>
</v-expansion-panel-header>
<v-expansion-panel-content>
<v-card-text style="padding:5px 30px">
<producer-category-item v-if="pack.children" :items="pack.children" @clicked="onClickChild"/>
</v-card-text>
</v-expansion-panel-content>
</v-expansion-panel>
</v-expansion-panels>
</v-row> -->
</v-flex>
</v-layout>
</v-layout>
</material-card>
resources/js/vue/components/modal/label/Show.vue
+29 -6
View File
@@ -59,16 +59,39 @@
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Items</h3>
<h3 class="ml-3">Package</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="data.packages">
<div class v-for="(item, key) in data.packages" :key="key">
<span class="headline ml-2" style="letter-spacing:0 !important">{{ key+1 + ": " + item.name }}</span>
</div>
</v-flex>
<template>
<v-expansion-panel>
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ data.package.name }}</div>
</template>
<v-card>
<v-card-text>note : {{ data.package.note }}</v-card-text>
<v-card-text> Items :
<v-expansion-panel v-for="item in data.package.items" :key="item.key">
<v-expansion-panel-content>
<template v-slot:header>
<div>{{ item.name }}</div>
</template>
<v-card>
<v-card-text>count : {{ item.pivot.count }}</v-card-text>
<v-card-text>note : {{ item.note }}</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</v-card-text>
</v-card>
</v-expansion-panel-content>
</v-expansion-panel>
</template>
</v-layout>
</v-layout>
</material-card>
resources/js/vue/views/Cycle/AddEdit.vue
+46 -13
View File
@@ -34,7 +34,7 @@
class="py-3 pr-3"
></v-text-field>
</v-flex>
<v-flex xs12 sm6 md1 class="WM-FlexCenter">
<v-flex xs12 sm6 md4 class="WM-FlexCenter">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu
lazy
@@ -59,17 +59,37 @@
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md8 class="WM-FlexCenter pl-3">
<v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3" style="position: relative" v-for="(label, key) in formData.labels" :key="key">
<v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete
multiple
color="black"
:items="packs"
:items="labels"
item-text="name"
item-value="id"
v-model="formData.packs"
label="Select Labels For Cycle"
v-model="label.id"
label="Select Label For Cycle"
></v-autocomplete>
<v-btn
absolute
small
right
bottom
color="cyan"
@click="duplicateForm(key)"
>
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD
</v-btn>
<v-btn v-if="key > 0"
absolute
small
left
bottom
color="red"
@click="removeForm(key)"
>
<v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE
</v-btn>
</v-flex>
<v-spacer></v-spacer>
<v-flex xs12 sm12 md12 class="WM-FlexCenter">
@@ -117,9 +137,13 @@ export default {
formData: {
name: "",
note: "",
packs: []
labels: [
{
name:''
}
]
},
packs: [],
labels: [],
rules: {
required: value => !!value || "Required.",
counter: value =>
@@ -134,7 +158,7 @@ export default {
if (this.$route.params.cycle) {
this.load(this.$route.params.cycle);
}
this.loadPacks();
this.loadLabels();
},
methods: {
async load(id) {
@@ -143,10 +167,10 @@ export default {
this.formData = result.data.data;
}
},
async loadPacks() {
const result = await ApiService.get(urls.listAllPack());
async loadLabels() {
const result = await ApiService.get(urls.listAllLabel());
if (result.status == 200) {
this.packs = result.data.data;
this.labels = result.data.data;
}
},
async submitForm() {
@@ -166,7 +190,16 @@ export default {
if (result && result.status == 200) {
this.$router.push({ name: "AllCycle" });
}
}
},
duplicateForm(infoIndex) {
this.formData.labels.push({
name: "",
});
},
removeForm(infoIndex) {
this.formData.labels.splice(infoIndex, 1);
},
}
};
</script>
resources/js/vue/views/Label/List.vue
+14 -1
View File
@@ -94,6 +94,10 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.id)">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
</td>
</template>
</v-data-table>
@@ -220,7 +224,16 @@ export default {
}
}
}
}
},
async generateBarcode(code) {
const result = await ApiService.post(urls.Barcode(code));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result }
});
}
}
},
computed: {
...mapGetters("modal", ["getModalResult"])
resources/js/vue/views/Package/AddEdit.vue
+1 -1
View File
@@ -38,7 +38,7 @@
>
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD
</v-btn>
<v-btn
<v-btn v-if="key > 0"
absolute
small
left