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

pack && packages && items && cycle

Browse Source
This commit is contained in:
Saeid
2019-09-08 19:15:12 +04:30
parent e278b4e957
commit a665911d15
13 changed files with 617 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/core/Drawer.vue
+7 -4
View File
@@ -118,8 +118,7 @@ export default {
{ {
to: {name: 'AllItem'}, to: {name: 'AllItem'},
icon: 'done', icon: 'done',
text: 'Items', text: 'Items'
role: 'Admin'
}, },
{ {
to: {name: 'AllPackage'}, to: {name: 'AllPackage'},
@@ -127,11 +126,15 @@ export default {
text: 'Packages', text: 'Packages',
role: 'Admin' role: 'Admin'
}, },
{
to: {name: 'AllPack'},
icon: 'done',
text: 'Packs'
},
{ {
to: {name: 'AllCycle'}, to: {name: 'AllCycle'},
icon: 'done', icon: 'done',
text: 'Cycles', text: 'Cycles'
role: 'Admin'
}, },
{ {
to: {name: 'Statistics'}, to: {name: 'Statistics'},
resources/js/vue/components/modal/Pack/Show.vue
+110
View File
@@ -0,0 +1,110 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Package">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Info</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>
<span class="title">Name :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Hospital :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Cycle Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Lot Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Description :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.description }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Sterile Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Expire Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span>
</div>
</v-flex>
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Items</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>
</v-layout>
</v-layout>
</material-card>
</v-container>
</template>
<script>
export default {
data: () => ({
data: {}
})
};
</script>
<script>
import { mapGetters, mapMutations } from "vuex";
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
export default {
data: () => ({
data : {}
}),
methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]),
async verify(id) {
const result = await ApiService.post(urls.verifyPackage(id));
if (result && result.status == 200) {
this.setResultModal(result.data.data);
this.closeModal();
}
}
},
created() {
this.data = this.getModalProperties.result.data.data;
},
computed: {
...mapGetters("modal", ["getModalProperties"])
}
};
</script>
resources/js/vue/components/modal/cycle/Show.vue
+15 -48
View File
@@ -3,17 +3,11 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Cycle"> <material-card 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">Common Info</h3> <h3 class="ml-3">Info</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class>
<span class="title">UniqueId :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.unique_id }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Name :</span> <span class="title">Name :</span>
@@ -22,16 +16,20 @@
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Result :</span> <span class="title">Sterilizer ID :</span>
<v-icon v-if="data.result == 'Pass'" class="green--text ml-2 caption">fas fa-check</v-icon> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id }}</span>
<v-icon v-if="data.result == 'Fail'" class="pink--text ml-2 caption">fas fa-times</v-icon>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">verify :</span> <span class="title">Cycle Number :</span>
<v-icon v-if="data.verified == 'Verified'" class="green--text ml-2 caption">fas fa-check</v-icon> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
<v-icon v-if="data.verified == 'NotVerified'" class="pink--text ml-2 caption">fas fa-times</v-icon> </div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Description :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.description }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -43,48 +41,24 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Date :</span> <span class="title">Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<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">Packages</h3> <h3 class="ml-3">Packs</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class v-for="(packag, key) in data.packages" :key="key"> <div class v-for="(pack, key) in data.packs" :key="key">
<span class="headline ml-2" style="letter-spacing:0 !important">{{ key+1 + ": " + packag.name }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ key+1 + ": " + pack.name }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center v-if="$hasRole('Admin|Supervisor')">
<v-flex
class
xs12
md2
sm2
v-if="data.verified == 'NotVerified'"
@click="verify(data.id)"
>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Verify</span>
</v-btn>
</v-flex>
<v-flex class xs12 md2 sm2 v-else>
<v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="verify(data.id)"
>
<v-icon class="black--text mr-2 caption">fas fa-check</v-icon>
<span class="black--text">UnVerify</span>
</v-btn>
</v-flex>
</v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
@@ -105,13 +79,6 @@ export default {
}), }),
methods: { methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]), ...mapMutations("modal", ["closeModal", "setResultModal"]),
async verify(id) {
const result = await ApiService.post(urls.verifyCycle(id));
if (result && result.status == 200) {
this.setResultModal(result.data.data);
this.closeModal();
}
}
}, },
created() { created() {
this.data = this.getModalProperties.result.data.data; this.data = this.getModalProperties.result.data.data;
resources/js/vue/components/modal/item/show.vue
+16 -5
View File
@@ -3,11 +3,17 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Item"> <material-card color="black" title="Show Item">
<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">Common Info</h3> <h3 class="ml-3"> Info</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class>
<span class="title">ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Name :</span> <span class="title">Name :</span>
@@ -16,9 +22,14 @@
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Result :</span> <span class="title">Size :</span>
<v-icon v-if="data.result == 'Pass'" class="green--text ml-2 caption">fas fa-check</v-icon> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.size }}</span>
<v-icon v-if="data.result == 'Fail'" class="pink--text ml-2 caption">fas fa-times</v-icon> </div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Specific :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.specific }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -29,7 +40,7 @@
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Date :</span> <span class="title">Date Register:</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div> </div>
</v-flex> </v-flex>
resources/js/vue/components/modal/package/Show.vue
+3 -35
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 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">Common Info</h3> <h3 class="ml-3">Info</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -22,16 +22,8 @@
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title">Result :</span> <span class="title">Description :</span>
<v-icon v-if="data.result == 'Pass'" class="green--text ml-2 caption">fas fa-check</v-icon> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.description }}</span>
<v-icon v-if="data.result == 'Fail'" class="pink--text ml-2 caption">fas fa-times</v-icon>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">verify :</span>
<v-icon v-if="data.verified == 'Verified'" class="green--text ml-2 caption">fas fa-check</v-icon>
<v-icon v-if="data.verified == 'NotVerified'" class="pink--text ml-2 caption">fas fa-times</v-icon>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -61,30 +53,6 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center v-if="$hasRole('Admin|Supervisor')">
<v-flex
class
xs12
md2
sm2
v-if="data.verified == 'NotVerified'"
@click="verify(data.id)"
>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Verify</span>
</v-btn>
</v-flex>
<v-flex class xs12 md2 sm2 v-else>
<v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="verify(data.id)"
>
<v-icon class="black--text mr-2 caption">fas fa-check</v-icon>
<span class="black--text">UnVerify</span>
</v-btn>
</v-flex>
</v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
resources/js/vue/config/urls.js
Vendored
+18
View File
@@ -110,6 +110,21 @@ const urls = {
verifyPackage: function(id) { verifyPackage: function(id) {
return `/Package/Verify/${id}`; return `/Package/Verify/${id}`;
}, },
listPack: function(filter) {
return "/Packs" + filter;
},
showPack: function(id) {
return `/Packs/${id}`;
},
editPack: function(id) {
return `/Packs/${id}/edit`;
},
updatePack: function(id) {
return `/Packs/${id}`;
},
removePack: function(id) {
return `Packs/${id}`;
},
listCycle: function(filter) { listCycle: function(filter) {
return "/Cycles" + filter; return "/Cycles" + filter;
}, },
@@ -137,6 +152,9 @@ const urls = {
listAllPackage: function() { listAllPackage: function() {
return "/GetPackages"; return "/GetPackages";
}, },
listAllPack: function() {
return "/GetPacks";
},
showItem: function(id) { showItem: function(id) {
return `/Items/${id}`; return `/Items/${id}`;
}, },
resources/js/vue/router/paths.js
Vendored
+18 -3
View File
@@ -155,9 +155,24 @@ export default [
view: 'Package/List' view: 'Package/List'
}, },
{ {
path: '/package/:package/edit', path: '/pack/:pack/edit',
name: 'EditPackage', name: 'EditPack',
view: 'Package/AddEdit' view: 'Pack/AddEdit'
},
{
path: '/add-pack',
name: 'AddPack',
view: 'Pack/AddEdit'
},
{
path: '/packs',
name: 'AllPack',
view: 'Pack/List'
},
{
path: '/pack/:pack/edit',
name: 'EditPack',
view: 'Pack/AddEdit'
}, },
{ {
path: '/add-cycle', path: '/add-cycle',
resources/js/vue/views/Cycle/AddEdit.vue
+63 -25
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs fluid> <v-container grid-list-xs fluid>
<material-card color="black" title="Add Cycle"> <material-card color="black" title="Add Cycle">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm4 md4> <v-flex xs12 sm6 md4>
<v-text-field <v-text-field
name="name" name="name"
label="Name" label="Name"
@@ -13,30 +13,58 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm4 md4> <v-flex xs12 sm6 md4>
<v-select <v-text-field
:items="result" name="sterilizer_id"
label="Result" label="Sterilizer ID"
name="result"
v-model="formData.result"
single-line
:rules="[rules.required]"
class="pa-2"
color="black" color="black"
></v-select> v-model="formData.sterilizer_id"
class="pa-2"
></v-text-field>
</v-flex> </v-flex>
</v-layout> <v-flex xs12 sm6 md4>
<v-layout align-center justify-center wrap class="px-5 mb-3"> <v-text-field
<v-flex xs12 sm12 md12> name="cycle_number"
label="Cycle Number"
color="black"
v-model="formData.cycle_number"
class="pa-2"
></v-text-field>
</v-flex>
<v-flex xs12 sm6 md4>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="fromMenuDate"
>
<v-text-field required slot="activator" label="Date" v-model="formData.date"></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="formData.date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md8>
<v-autocomplete <v-autocomplete
multiple multiple
:items="packages" :items="packs"
item-text="name" item-text="name"
item-value="id" item-value="id"
v-model="formData.packages" v-model="formData.packs"
label="Select Packages For Cycle" label="Select Packs For Cycle"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 sm12 md12>
<v-textarea color="black" v-model="formData.description" class="pa-2" name="address">
<template v-slot:label>
<div>Description</div>
</template>
</v-textarea>
</v-flex>
</v-layout> </v-layout>
<v-layout row wrap justify-center align-center> <v-layout row wrap justify-center align-center>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center"> <v-flex xs12 md2 sm2 class="text-md-center text-xs-center">
@@ -70,14 +98,13 @@ import { mapMutations } from "vuex";
export default { export default {
data() { data() {
return { return {
fromMenuDate: false,
formData: { formData: {
name: "", name: "",
result: "",
description: "", description: "",
packages: [] packs: []
}, },
packages: [], packs: [],
result: ["Pass", "Fail"],
rules: { rules: {
required: value => !!value || "Required.", required: value => !!value || "Required.",
counter: value => counter: value =>
@@ -92,7 +119,7 @@ export default {
if (this.$route.params.cycle) { if (this.$route.params.cycle) {
this.load(this.$route.params.cycle); this.load(this.$route.params.cycle);
} }
this.loadPackages(); this.loadPacks();
}, },
methods: { methods: {
async load(id) { async load(id) {
@@ -101,10 +128,10 @@ export default {
this.formData = result.data.data; this.formData = result.data.data;
} }
}, },
async loadPackages() { async loadPacks() {
const result = await ApiService.get(urls.listAllPackage()); const result = await ApiService.get(urls.listAllPack());
if (result.status == 200) { if (result.status == 200) {
this.packages = result.data.data; this.packs = result.data.data;
} }
}, },
async submitForm() { async submitForm() {
@@ -128,3 +155,14 @@ export default {
} }
}; };
</script> </script>
<style>
.v-btn--floating {
padding: 0!important;
}
.theme--light.v-btn.v-btn--flat {
color: rgba(0,0,0,.87)!important;
}
.v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important;
}
</style>
resources/js/vue/views/Cycle/List.vue
+35 -46
View File
@@ -12,22 +12,38 @@
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-autocomplete <v-text-field
class="pa-2" class="pa-2"
v-model="filter.result" v-model="filter.sterilizer_id"
label="Result" label="Sterilizer ID"
color="black" color="black"
:items="result" ></v-text-field>
></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-2"
v-model="filter.unique_id" v-model="filter.cycle_number"
label="uniqueID" label="Cycle Number"
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="Menu"
>
<v-text-field required slot="activator" label="Date" v-model="filter.date"></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="filter.date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex class xs12 md2 sm3> <v-flex class xs12 md2 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon> <v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
@@ -55,10 +71,10 @@
/> />
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="headline font-weight-light">{{ item.unique_id }}</td> <td class="headline font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.name }}</td> <td class="title font-weight-light">{{ item.sterilizer_id }}</td>
<td class="title font-weight-light">{{ item.result }}</td> <td class="title font-weight-light">{{ item.cycle_number }}</td>
<td class="title font-weight-light">{{ item.created_at }}</td> <td class="title font-weight-light">{{ item.date }}</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)">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon> <v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
@@ -82,10 +98,6 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon> <v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span> <span>Remove</span>
</v-btn> </v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id)">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
@@ -117,18 +129,18 @@ export default {
headers: [ headers: [
{ {
sortable: true, sortable: true,
text: "Unique ID", text: "Name",
value: "Unique ID" value: "Name"
}, },
{ {
sortable: true, sortable: true,
text: "Name", text: "Sterilizer ID",
value: "name" value: "Sterilizer ID"
}, },
{ {
sortable: false, sortable: false,
text: "Result", text: "Cycle Number",
value: "result" value: "Cycle Number"
}, },
{ {
sortable: false, sortable: false,
@@ -142,12 +154,8 @@ export default {
align: "right" align: "right"
} }
], ],
filter: { filter: {},
unique_id: '', Menu: false,
name: '',
result: '',
},
result: ['Pass', 'Fail'],
packages: [], packages: [],
currentPage: 1, currentPage: 1,
lastPage: 1, lastPage: 1,
@@ -200,15 +208,6 @@ 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: { computed: {
...mapGetters("modal", ["getModalResult"]) ...mapGetters("modal", ["getModalResult"])
@@ -216,16 +215,6 @@ export default {
watch: { watch: {
currentPage(page) { currentPage(page) {
this.load(page); this.load(page);
},
getModalResult(testResult) {
for (const key in this.packages) {
if (
this.packages.hasOwnProperty(key) &&
this.packages[key].id == testResult.id
) {
this.packages[key] = testResult;
}
}
} }
} }
}; };
resources/js/vue/views/Item/List.vue
+14 -38
View File
@@ -12,13 +12,12 @@
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-autocomplete <v-text-field
class="pa-2" class="pa-2"
v-model="filter.result" v-model="filter.size"
label="Result" label="Size"
color="black" color="black"
:items="result" ></v-text-field>
></v-autocomplete>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm3> <v-flex class xs12 md2 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
@@ -47,9 +46,9 @@
/> />
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="title font-weight-light">{{ item.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.result }}</td> <td class="title font-weight-light">{{ item.size }}</td>
<td class="title font-weight-light">{{ item.created_at }}</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)">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon> <v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
@@ -104,18 +103,18 @@ export default {
headers: [ headers: [
{ {
sortable: true, sortable: true,
text: "ID",
value: "id"
},
{
sortable: false,
text: "Name", text: "Name",
value: "name" value: "name"
}, },
{ {
sortable: false, sortable: false,
text: "Result", text: "Size",
value: "result" value: "size"
},
{
sortable: false,
text: "Date",
value: "date"
}, },
{ {
sortable: false, sortable: false,
@@ -126,9 +125,8 @@ export default {
], ],
filter: { filter: {
name: '', name: '',
result: '', size: '',
}, },
result: ['Pass', 'Fail'],
items: [], items: [],
currentPage: 1, currentPage: 1,
lastPage: 1, lastPage: 1,
@@ -180,34 +178,12 @@ 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"])
}, },
watch: { watch: {
currentPage(page) { currentPage(page) {
this.load(page); this.load(page);
}, },
getModalResult(testResult) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == testResult.id
) {
this.items[key] = testResult;
}
}
}
} }
}; };
</script> </script>
resources/js/vue/views/Pack/AddEdit.vue
+81 -16
View File
@@ -1,9 +1,9 @@
<template> <template>
<v-form ref="form"> <v-form ref="form">
<v-container grid-list-xs fluid> <v-container grid-list-xs fluid>
<material-card color="black" title="Add Package"> <material-card color="black" title="Add Label on Set ">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm6 md4> <v-flex xs12 sm6 md3>
<v-text-field <v-text-field
name="name" name="name"
label="Name" label="Name"
@@ -13,7 +13,7 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4> <v-flex xs12 sm6 md3>
<v-text-field <v-text-field
name="sterilizerId" name="sterilizerId"
label="Sterilizer ID" label="Sterilizer ID"
@@ -22,7 +22,7 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4> <v-flex xs12 sm6 md3>
<v-text-field <v-text-field
name="cycle_number" name="cycle_number"
label="Cycle Number" label="Cycle Number"
@@ -31,7 +31,26 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4> <v-flex xs12 sm6 md3>
<v-text-field
name="lot_number"
label="Lot Number"
color="black"
v-model="formData.cycle_number"
class="pa-2"
></v-text-field>
</v-flex>
<v-flex xs12 sm6 md3>
<v-autocomplete
multiple
:items="items"
item-text="name"
v-model="formData.items"
item-value="id"
label="Select Package For Pack"
></v-autocomplete>
</v-flex>
<v-flex xs12 sm6 md3>
<v-text-field <v-text-field
name="department" name="department"
label="Department" label="Department"
@@ -40,12 +59,46 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="fromMenuSterile"
>
<v-text-field required slot="activator" label="Sterile Date" v-model="formData.sterile_date"></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="formData.sterile_date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md3>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="fromMenuExpire"
>
<v-text-field required slot="activator" label="Expire Date" v-model="formData.expire_date"></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="formData.expire_date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
</v-layout> </v-layout>
<v-layout align-center justify-center wrap class="px-5 mb-3"> <v-layout align-center justify-center wrap class="px-5 mb-3">
<v-flex xs12 sm12 md12> <v-flex xs12 sm12 md12>
<v-textarea color="black" v-model="formData.description" class="pa-2" name="address"> <v-textarea color="black" v-model="formData.description" class="pa-2" name="address">
<template v-slot:label> <template v-slot:label>
<div>description</div> <div>Description</div>
</template> </template>
</v-textarea> </v-textarea>
</v-flex> </v-flex>
@@ -58,7 +111,7 @@
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center"> <v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{name: 'AllPackage'}"> <router-link :to="{name: 'AllPack'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon> <v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
@@ -78,6 +131,8 @@ import { mapMutations } from "vuex";
export default { export default {
data() { data() {
return { return {
fromMenuSterile: false ,
fromMenuExpire: false,
formData: { formData: {
name: "", name: "",
result: "", result: "",
@@ -85,7 +140,6 @@ export default {
items: [] items: []
}, },
items: [], items: [],
result: ["Pass", "Fail"],
rules: { rules: {
required: value => !!value || "Required.", required: value => !!value || "Required.",
counter: value => counter: value =>
@@ -97,42 +151,53 @@ export default {
}; };
}, },
created() { created() {
if (this.$route.params.package) { if (this.$route.params.pack) {
this.load(this.$route.params.package); this.load(this.$route.params.pack);
} }
this.loadItems(); this.loadItems();
}, },
methods: { methods: {
async load(id) { async load(id) {
const result = await ApiService.get(urls.editPackage(id)); const result = await ApiService.get(urls.editPack(id));
if (result.status == 200) { if (result.status == 200) {
this.formData = result.data.data; this.formData = result.data.data;
} }
}, },
async loadItems() { async loadItems() {
const result = await ApiService.get(urls.listAllItem()); const result = await ApiService.get(urls.listAllPackage());
if (result.status == 200) { if (result.status == 200) {
this.items = result.data.data; this.items = result.data.data;
} }
}, },
async submitForm() { async submitForm() {
let result; let result;
if (this.$route.params.package) { if (this.$route.params.pack) {
result = await ApiService.put( result = await ApiService.put(
urls.updatePackage(this.$route.params.package), urls.updatePack(this.$route.params.pack),
this.formData this.formData
); );
} else { } else {
result = await ApiService.post( result = await ApiService.post(
urls.storePackage, urls.storePack,
this.formData this.formData
); );
} }
if (result && result.status == 200) { if (result && result.status == 200) {
this.$router.push({ name: "AllPackage" }); this.$router.push({ name: "AllPack" });
} }
} }
} }
}; };
</script> </script>
<style>
.v-btn--floating {
padding: 0!important;
}
.theme--light.v-btn.v-btn--flat {
color: rgba(0,0,0,.87)!important;
}
.v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important;
}
</style>
resources/js/vue/views/Pack/List.vue
+65 -61
View File
@@ -4,29 +4,32 @@
<material-card class color="black" title="All Labels" text> <material-card class color="black" title="All Labels" text>
<v-layout align-center wrap class="my-3"> <v-layout align-center wrap class="my-3">
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-text-field <v-text-field class="pa-2" v-model="filter.name" label="Name" color="black"></v-text-field>
class="pa-2"
v-model="filter.name"
label="Name"
color="black"
></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-autocomplete <v-autocomplete
class="pa-2" class="pa-2"
v-model="filter.result" v-model="filter.medical_center_id"
label="Result" @change="fillUsers"
label="Hospital"
color="black" color="black"
:items="result" :items="medicalCenters"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-text-field <v-autocomplete
class="pa-2" class="pa-2"
v-model="filter.unique_id" v-model="filter.user_id"
label="uniqueID" label="Users"
color="black" color="black"
></v-text-field> :items="users"
></v-autocomplete>
</v-flex>
<v-flex xs12 md3 sm3>
<v-text-field class="pa-2" v-model="filter.cycle_number" label="Cycle Number" color="black"></v-text-field>
</v-flex>
<v-flex xs12 md3 sm3>
<v-text-field class="pa-2" v-model="filter.department" label="Department" color="black"></v-text-field>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm3> <v-flex class xs12 md2 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
@@ -36,7 +39,7 @@
</v-flex> </v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-right"> <v-flex xs12 md2 sm2 class="text-xs-right">
<router-link :to="{name: 'AddPackage'}"> <router-link :to="{name: 'AddPack'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon> <v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
<span class="black--text">Add</span> <span class="black--text">Add</span>
@@ -49,16 +52,16 @@
<v-flex md12> <v-flex md12>
<v-data-table :headers="headers" :items="items" hide-actions> <v-data-table :headers="headers" :items="items" hide-actions>
<template slot="headerCell" slot-scope="{ header }"> <template slot="headerCell" slot-scope="{ header }">
<span <span class="subheading font-weight-light text-white text--darken-3" v-text="header.text" />
class="subheading font-weight-light text-white text--darken-3"
v-text="header.text"
/>
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="headline 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.result }}</td> <td
<td class="title font-weight-light">{{ item.created_at }}</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.cycle_number }}</td>
<td class="title font-weight-light">{{ item.department }}</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)">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon> <v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
@@ -66,7 +69,7 @@
</v-btn> </v-btn>
<router-link <router-link
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
:to="{name: 'EditPackage', params: {package: item.id}}" :to="{name: 'EditPack', params: {pack: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn color="orange" class="mr-2">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon> <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
@@ -82,10 +85,6 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon> <v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span> <span>Remove</span>
</v-btn> </v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id)">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
@@ -117,23 +116,28 @@ export default {
headers: [ headers: [
{ {
sortable: true, sortable: true,
text: "Unique ID", text: "Name",
value: "Unique ID" value: "Name"
}, },
{ {
sortable: true, sortable: true,
text: "Name", text: "Hospital",
value: "name" value: "Hospital"
}, },
{ {
sortable: false, sortable: false,
text: "Result", text: "User",
value: "result" value: "User"
}, },
{ {
sortable: false, sortable: false,
text: "Date", text: "Cycle Number",
value: "date" value: "Cycle Number"
},
{
sortable: false,
text: "Department",
value: "Department"
}, },
{ {
sortable: false, sortable: false,
@@ -142,15 +146,12 @@ export default {
align: "right" align: "right"
} }
], ],
filter: { filter: {},
unique_id: '',
name: '',
result: '',
},
result: ['Pass', 'Fail'],
items: [], items: [],
medicalCenters: [],
users: [],
currentPage: 1, currentPage: 1,
lastPage: 1, lastPage: 1
}), }),
created() { created() {
this.load(); this.load();
@@ -158,36 +159,47 @@ export default {
methods: { methods: {
...mapMutations("modal", ["changeCurrentModal"]), ...mapMutations("modal", ["changeCurrentModal"]),
async load(page = 1) { async load(page = 1) {
let filter = '?'; let filter = "?";
for (const key in this.filter) { for (const key in this.filter) {
if (this.filter.hasOwnProperty(key)) { if (this.filter.hasOwnProperty(key)) {
filter += `${key}=${this.filter[key]}&`; filter += `${key}=${this.filter[key]}&`;
} }
} }
filter += (page) ? `page=${page}` : `page=1`; filter += page ? `page=${page}` : `page=1`;
const result = await ApiService.get( const result = await ApiService.get(urls.listPack(filter));
urls.listPackage(filter)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.items = result.data.data.data; this.items = result.data.data.data;
this.currentPage = result.data.data.current_page; this.currentPage = result.data.data.current_page;
this.lastPage = result.data.data.last_page; this.lastPage = result.data.data.last_page;
} }
this.loadMedicalCenters();
}, },
async show(testResultId) { async loadMedicalCenters() {
const result = await ApiService.get(urls.listFilterItemsTestResult);
if (result && result.status == 200) {
this.medicalCenters = result.data.data.MedicalCenters;
}
},
async fillUsers() {
const result = await ApiService.get( const result = await ApiService.get(
urls.showPackage(testResultId) urls.listOpertorMedicalCenter(this.form.medicalCenterId)
); );
if (result && result.status == 200) {
this.users = result.data.data.users;
}
},
async show(testResultId) {
const result = await ApiService.get(urls.showPack(testResultId));
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-package-show", modal: "modal-pack-show",
properties: { result } properties: { result }
}); });
} }
}, },
async remove(testResultId) { async remove(testResultId) {
const result = await ApiService.delete( const result = await ApiService.delete(
urls.removePackage(testResultId) urls.removePack(testResultId)
); );
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
@@ -199,15 +211,6 @@ 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: { computed: {
@@ -235,9 +238,10 @@ export default {
padding: 0 !important; padding: 0 !important;
} }
.theme--light.v-btn.v-btn--flat { .theme--light.v-btn.v-btn--flat {
color: rgba(0,0,0,.87)!important; color: rgba(0, 0, 0, 0.87) !important;
} }
.v-btn--floating, .v-btn--icon:before { .v-btn--floating,
.v-btn--icon:before {
border-radius: 50% !important; border-radius: 50% !important;
} }
</style> </style>
resources/js/vue/views/Package/List.vue
+5 -20
View File
@@ -11,15 +11,6 @@
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3>
<v-autocomplete
class="pa-2"
v-model="filter.result"
label="Result"
color="black"
:items="result"
></v-autocomplete>
</v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-2"
@@ -55,10 +46,9 @@
/> />
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="headline 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.result }}</td> <td class="title font-weight-light">{{ item.description }}</td>
<td class="title font-weight-light">{{ item.created_at }}</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)">
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon> <v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
@@ -126,14 +116,9 @@ export default {
value: "name" value: "name"
}, },
{ {
sortable: false, sortable: true,
text: "Result", text: "Description",
value: "result" value: "description"
},
{
sortable: false,
text: "Date",
value: "date"
}, },
{ {
sortable: false, sortable: false,