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

responsive

Browse Source
This commit is contained in:
shokouhi
2020-07-04 13:48:53 +04:30
parent a74e49af6f
commit 7918610072
17 changed files with 517 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.rnd
BIN
View File
Binary file not shown.
package.json
+4 -1
View File
@@ -61,7 +61,10 @@
"vuelidate": "^0.7.4", "vuelidate": "^0.7.4",
"vuetify": "^1.2.5", "vuetify": "^1.2.5",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"vuex-router-sync": "^5.0.0" "vuex-router-sync": "^5.0.0",
"vue2-dropzone": "^3.6.0",
"vue-image-lightbox": "^7.1.0",
"vue-lazyload": "^1.3.3"
}, },
"dependencies": { "dependencies": {
"vue-html-to-paper": "^1.1.0", "vue-html-to-paper": "^1.1.0",
resources/js/show/views/TestResult/ShowTestResult.vue
+9 -11
View File
@@ -8,7 +8,7 @@
<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 md12 sm12>
<div class> <div class>
<span class="title">{{ data.device_label || 'AutoclaveID' }} :</span> <span class="title">{{ data.device_label || 'AutoclaveID' }} :</span>
<span <span
@@ -17,7 +17,7 @@
>{{ data.device_id }}</span> >{{ data.device_id }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">Result :</span> <span class="title">Result :</span>
<v-icon class="green--text ml-2 caption">fas fa-check</v-icon> <v-icon class="green--text ml-2 caption">fas fa-check</v-icon>
@@ -27,7 +27,7 @@
>{{ data.result }}</span> >{{ data.result }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">verify :</span> <span class="title">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>
@@ -37,7 +37,7 @@
>{{ data.verified }}</span> >{{ data.verified }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">Register User :</span> <span class="title">Register User :</span>
<span <span
@@ -46,7 +46,7 @@
>{{ User }}</span> >{{ User }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">Date :</span> <span class="title">Date :</span>
<span <span
@@ -55,7 +55,7 @@
>{{ data.created_at }}</span> >{{ data.created_at }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm12>
<div class> <div class>
<span class="title">Medical Center :</span> <span class="title">Medical Center :</span>
<span <span
@@ -139,14 +139,13 @@
<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-for="(img, key) in data.title_image" :key="key"> <v-flex xs6 md2 sm2 v-for="(img, key) in data.title_image" :key="key">
<img :src="'/'+img.path" style="width: 100%" /> <img :src="'/'+img.path" style="width: 100%" />
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap style="text-align:center">
<v-layout row wrap align-center justify-center> <v-flex class xs12 md2 sm12>
<v-flex class xs12 md2 sm2>
<v-btn <v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray" class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="print" @click="print"
@@ -221,7 +220,6 @@ export default {
if (this.$route.params.id) { if (this.$route.params.id) {
this.load(this.$route.params.id); this.load(this.$route.params.id);
} }
}, },
}; };
resources/js/vue/components/modal/cycle/Show.vue
+9 -10
View File
@@ -8,39 +8,38 @@
<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 md3 sm3>
<div class="WM-d-flex"> <!-- class="WM-d-flex" -->
<div>
<span class="title">Cycle ID :</span> <span class="title">Cycle ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3>
<v-flex xs12 md6 sm6>
<div> <div>
<span class="title">Sterilizer ID :</span> <span class="title">Sterilizer ID :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md3 sm3>
<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">{{ data.user ? 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 md3 sm3>
<div class="WM-d-flex"> <div>
<span class="title">Cycle Number :</span> <span class="title">Cycle Number :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md3 sm3>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon> <v-icon class="WMi-Industry"></v-icon>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span> <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md3 sm3>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon> <v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
resources/js/vue/components/modal/package/Show.vue
+4 -4
View File
@@ -8,25 +8,25 @@
<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 md3 sm3>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-info"></v-icon> <v-icon class="WMi-info"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md3 sm3>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon> <v-icon class="WMi-Industry"></v-icon>
<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>
<v-flex xs12 md6 sm6> <v-flex xs12 md3 sm3>
<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">{{ data.user ? 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 md3 sm3>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon> <v-icon class="WMi-pencil"></v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span> <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
resources/js/vue/components/modal/testresult/Show.vue
+48 -24
View File
@@ -17,7 +17,7 @@
>{{ data.device_id }}</span> >{{ data.device_id }}</span>
</div> </div>
</v-flex> --> </v-flex> -->
<v-flex xs6 md6 sm6> <v-flex xs3 md3 sm3>
<div class> <div class>
<span class="subtitle-1">Result :</span> <span class="subtitle-1">Result :</span>
<v-icon class="green--text ml-2 caption">fas fa-check</v-icon> <v-icon class="green--text ml-2 caption">fas fa-check</v-icon>
@@ -27,7 +27,7 @@
>{{ data.result }}</span> >{{ data.result }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs6 md6 sm6> <v-flex xs3 md3 sm3>
<div class> <div class>
<span class="subtitle-1">verify :</span> <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>
@@ -37,7 +37,7 @@
>{{ data.verified }}</span> >{{ data.verified }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs6 md6 sm6> <v-flex xs3 md3 sm3>
<div class> <div class>
<span class="subtitle-1">Register User :</span> <span class="subtitle-1">Register User :</span>
<span <span
@@ -46,7 +46,7 @@
>{{ data.user.name }}</span> >{{ data.user.name }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs6 md6 sm6> <v-flex xs3 md3 sm3>
<div class> <div class>
<span class="subtitle-1">Date :</span> <span class="subtitle-1">Date :</span>
<span <span
@@ -55,7 +55,7 @@
>{{ data.created_at }}</span> >{{ data.created_at }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs6 md6 sm6> <v-flex xs3 md3 sm3>
<div class> <div class>
<span class="subtitle-1">Medical Center :</span> <span class="subtitle-1">Medical Center :</span>
<span <span
@@ -74,9 +74,9 @@
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<template v-if="data.inputs"> <template v-if="data.inputs">
<v-flex <v-flex
xs12 xs3
md12 md3
sm12 sm3
v-for="(inputData, keyInputs) in data.inputs" v-for="(inputData, keyInputs) in data.inputs"
:key="keyInputs" :key="keyInputs"
> >
@@ -89,9 +89,9 @@
</template> </template>
<template v-if="data.options"> <template v-if="data.options">
<v-flex <v-flex
xs6 xs3
md6 md3
sm6 sm3
v-for="(optionData, keyOptions) in data.options" v-for="(optionData, keyOptions) in data.options"
:key="keyOptions" :key="keyOptions"
> >
@@ -105,16 +105,22 @@
</v-flex> </v-flex>
</template> </template>
<template v-if="data.children"> <template v-if="data.children">
<v-layout row wrap class="WM-Width-Full">
<v-flex class="mt-4 pb-4" style="border-left:3px solid #32c5d2;border-bottom:1px solid #ddd" <v-flex class="mt-4 pb-4" style="border-left:3px solid #32c5d2;border-bottom:1px solid #ddd"
xs6 xs3
md6 md6
sm6 sm6
v-for="(formData, keyForm) in data.children" v-for="(formData, keyForm) in data.children"
:key="keyForm" :key="keyForm"
> >
<h4 class="ml-3 headline font-weight-bold">{{keyForm}}</h4> <h4 class="ml-3 headline font-weight-bold">{{keyForm}}</h4>
<div v-for="(childData, keyChild) in formData" :key="keyChild"> <v-layout row wrap>
<div class="ml-4"> <v-layout row wrap v-for="(childData, keyChild) in formData" :key="keyChild">
<v-flex
xs12
md12
sm12
class="ml-4">
<span class="subtitle-1">{{keyChild}} :</span> <span class="subtitle-1">{{keyChild}} :</span>
<template v-if="Array.isArray(childData)"> <template v-if="Array.isArray(childData)">
<span <span
@@ -127,9 +133,11 @@
<template v-else> <template v-else>
<span class="headline ml-2">{{childData}}</span> <span class="headline ml-2">{{childData}}</span>
</template> </template>
</div> </v-flex>
</div> </v-layout>
</v-layout>
</v-flex> </v-flex>
</v-layout>
</template> </template>
</v-layout> </v-layout>
</v-layout> </v-layout>
@@ -139,7 +147,8 @@
<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-for="(img, key) in data.images" :key="key"> <!-- <LightBox :media="data.images.map(img => ({thumb: img.path, src: img.path}))" style="width: 20%"></LightBox> -->
<v-flex xs6 md2 sm2 v-for="(img, key) in data.images" :key="key">
<img :src="'/'+img.path" style="width: 100%" /> <img :src="'/'+img.path" style="width: 100%" />
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -148,10 +157,10 @@
<material-card> --> <material-card> -->
<v-layout row wrap align-center justify-center class="px-5 my-3" v-if="$hasRole('Admin|Supervisor')"> <v-layout row wrap align-center justify-center class="px-5 my-3" v-if="$hasRole('Admin|Supervisor')">
<v-flex <v-flex
class="mr-4" class="WM-Align-R mr-1"
xs12 xs12
md2 md3
sm2 sm3
v-if="data.verified == 'NotVerified'" v-if="data.verified == 'NotVerified'"
@click="verify(data.id)" @click="verify(data.id)"
> >
@@ -160,7 +169,7 @@
<span class="white--text">Verify</span> <span class="white--text">Verify</span>
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm2 v-else> <v-flex class="WM-Align-R" xs6 md3 sm3 v-else>
<v-btn <v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray" class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="verify(data.id)" @click="verify(data.id)"
@@ -170,9 +179,19 @@
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-flex xs6 md2 sm2>
<a :href="'/Show/TestResult/'+data.id">
<v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
>
<v-icon class="black--text mr-2 caption">fas fa-print</v-icon>
<span class="black--text">Go to Print Page</span>
</v-btn>
</a>
</v-flex>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center class="px-5 my-3" > <v-layout row wrap align-center justify-center class="px-5 my-3" >
<v-flex class xs12 md2 sm2> <!-- <v-flex class xs6 md2 sm2>
<v-btn <v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray" class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="print" @click="print"
@@ -180,7 +199,7 @@
<v-icon class="black--text mr-2 caption">fas fa-print</v-icon> <v-icon class="black--text mr-2 caption">fas fa-print</v-icon>
<span class="black--text">Print</span> <span class="black--text">Print</span>
</v-btn> </v-btn>
</v-flex> </v-flex> -->
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -196,8 +215,13 @@ export default {
import { mapGetters, mapMutations } from "vuex"; import { mapGetters, mapMutations } from "vuex";
import { ApiService } from "@/services"; import { ApiService } from "@/services";
import { urls } from "@/config/urls"; import { urls } from "@/config/urls";
import LightBox from 'vue-image-lightbox';
import 'vue-image-lightbox/dist/vue-image-lightbox.min.css'
export default { export default {
data: () => ({}), data: () => ({}),
components:{
LightBox
},
methods: { methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]), ...mapMutations("modal", ["closeModal", "setResultModal"]),
async verify(id) { async verify(id) {
@@ -243,7 +267,7 @@ export default {
}, },
created() { created() {
this.data = this.getModalProperties.result.data.data; this.data = this.getModalProperties.result.data.data;
console.log(this.data); console.log(this.data.images.map(img => img.path));
}, },
computed: { computed: {
resources/js/vue/main.js
Vendored
+3 -2
View File
@@ -1,5 +1,6 @@
import 'font-awesome/css/font-awesome.min.css' import 'font-awesome/css/font-awesome.min.css'
import Vue from 'vue' import Vue from 'vue'
// Components // Components
import './components' import './components'
@@ -17,8 +18,8 @@ import App from './App.vue'
import i18n from '@/i18n' import i18n from '@/i18n'
import router from '@/router' import router from '@/router'
import store from '@/store' import store from '@/store'
import VueLazyLoad from 'vue-lazyload';
Vue.use(VueLazyLoad)
import { ApiService, TokenService } from '@/services' import { ApiService, TokenService } from '@/services'
// Sync store with router // Sync store with router
sync(store, router) sync(store, router)
resources/js/vue/styles/css/Assets/Main.scss
Vendored
+146 -4
View File
@@ -124,12 +124,154 @@
.theme--light.v-pagination .v-pagination__item:focus { .theme--light.v-pagination .v-pagination__item:focus {
outline: 0 !important; outline: 0 !important;
} }
@media screen and(max-width : 1536px) { table.v-table tbody td.Height-MD-60 {
.WM-WidthScreen-SM { height: 60px;
flex-basis:35% !important; }
max-width: 35% !important; table.v-table tbody td.Height-MD-80 {
height: 80px;
}
.FlexBtn {
display: flex;
flex-wrap: nowrap;
padding: 10px 8px !important;
justify-content: flex-start;
}
td.FlexBtn .theme--light.v-btn {
padding: 21px 20px;
}
td.FlexBtn a.LinkBtn .theme--light.v-btn {
padding: 12px 10px;
}
.ResultMsg {
font-size: 10px;
color: #fff;
padding: 3px 10px;
border-radius: 5px;
}
.ResultMsg.Reject{
background: #ee3552;
}
.ResultMsg.Accept{
background: #1DE6B8;;
}
.theme--light.v-icon.Verified {
font-size: 15px !important;
color: #1DE6B8;
}
.theme--light.v-icon.NotVerified {
font-size: 15px !important;
color: #ee3552;
}
table.v-table tbody td.FlexBtn:not(:first-child) {
padding: 12px 8px;
}
td.FlexBtn .v-btn {
margin-top: 5px;
}
.WM-WidthScreen-SM {
flex-basis:35% !important;
max-width: 35% !important;
}
table.v-table tbody td.Height-SM-48 {
height: 48px;
}
.v-card .title {
font-size: .9rem !important;
}
.headline {
font-size: .9rem !important;
}
.FlexBtn {
padding: 10px 8px !important;
}
td.FlexBtn span {
display: none;
}
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;
}
td.FlexBtn .theme--light.v-icon {
margin-right: 0 !important;
}
@media screen and (min-width : 1900px) {
.WM-XL-Align-L {
text-align: left !important;
} }
} }
@media screen and(max-width : 1536px) {
// table.v-table tbody td.FlexBtn:not(:first-child) {
// padding: 12px 8px;
// }
// td.FlexBtn .v-btn {
// margin-top: 5px;
// }
// .WM-WidthScreen-SM {
// flex-basis:35% !important;
// max-width: 35% !important;
// }
// .theme--light.v-btn.WM-ActBtn:not(.v-btn--icon):not(.v-btn--flat) {
// margin: 5px;
// padding: 10px;
// min-width: 30px;
// display: inline-block;
// }
// .theme--light.v-btn.WM-ActBtn:not(.v-btn--icon):not(.v-btn--flat) span {
// display: none;
// }
// .v-btn.WM-ActBtn__content .v-icon.mr-2 {
// margin-right: 0 !important;
// }
table.v-table tbody td.Height-SM-48 {
height: 48px;
}
.v-card .title {
font-size: .9rem !important;
}
.headline {
font-size: .9rem !important;
}
.FlexBtn {
padding: 10px 8px !important;
}
td.FlexBtn span {
display: none;
}
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;
}
td.FlexBtn .theme--light.v-icon {
margin-right: 0 !important;
}
}
@media screen and(max-width : 1366px) {
.FlexBtn {
// padding: 10px 8px !important;
padding: 20px 8px !important;
}
td.FlexBtn .v-btn {
margin-top: -5px;
}
}
@media screen and(max-width : 1024px) { @media screen and(max-width : 1024px) {
.WM-WidthScreen-XS { .WM-WidthScreen-XS {
flex-basis:60% !important; flex-basis:60% !important;
resources/js/vue/views/Cycle/List.vue
+30 -5
View File
@@ -98,33 +98,58 @@
<td class="title font-weight-light">{{ item.sterilizer_id }}</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.cycle_number }}</td>
<td class="title font-weight-light">{{ item.date }}</td> <td class="title font-weight-light">{{ item.date }}</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" 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>
<span>Show</span> <span>Show</span>
</v-btn> </v-btn>
</template>
<span>Show</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link <router-link
class="LinkBtn"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
:to="{name: 'EditCycle', params: {cycle: item.id}}" :to="{name: 'EditCycle', params: {cycle: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn v-bind="attrs" v-on="on" 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>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
</template>
<span>Edit</span>
</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" color="pink"
class="WM-ActionButton" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="remove(item.id)"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
> >
<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.id, 'Cycle')"> </template>
<span>Remove</span>
</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"
@click="generateBarcode(item.id, 'Cycle')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon> <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span> <span>Generate Barcode</span>
</v-btn> </v-btn>
</template>
<span>Generate Barcode</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/Item/List.vue
+28 -7
View File
@@ -73,33 +73,54 @@
<!-- <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.size }}</td> <td class="title font-weight-light">{{ item.size }}</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" 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>
<span>Show</span> <span>Show</span>
</v-btn> </v-btn>
<router-link </template>
<span>Show</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
:to="{name: 'EditItem', params: {Item: item.id}}" :to="{name: 'EditItem', params: {Item: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn v-bind="attrs" v-on="on" 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>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
</template>
<span>Edit</span>
</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" color="pink"
class="WM-ActionButton" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="remove(item.id)"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
> >
<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.id, 'Item')"> </template>
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon> <span>Remove</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn class="mr-2" v-bind="attrs" v-on="on" color="orange darken-1" @click="generateBarcode(item.id, 'Item')">
<v-icon class="white--text mr-2 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span> <span>Generate Barcode</span>
</v-btn> </v-btn>
</template>
<span>Generate Barcode</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/Label/List.vue
+28 -6
View File
@@ -38,7 +38,7 @@
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field class="py-3" v-model="filter.cycle_number" label="Cycle Number" color="black"></v-text-field> <v-text-field class="py-3" v-model="filter.cycle_number" label="Cycle Number" color="black"></v-text-field>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm3> <v-flex xs12 md2 sm3 class="ml-3">
<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>
<span class="white--text">Filter</span> <span class="white--text">Filter</span>
@@ -69,33 +69,55 @@
<td class="title font-weight-light">{{ item.user ? item.user.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.cycle_number }}</td>
<td class="title font-weight-light">{{ item.sterilizer_id }}</td> <td class="title font-weight-light">{{ item.sterilizer_id }}</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" 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>
<span>Show</span> <span>Show</span>
</v-btn> </v-btn>
</template>
<span>Show</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link <router-link
class="LinkBtn"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
:to="{name: 'EditLabel', params: {label: item.id}}" :to="{name: 'EditLabel', params: {label: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn v-bind="attrs" v-on="on" 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>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
</template>
<span>Edit</span>
</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" color="pink"
class="WM-ActionButton" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="remove(item.id)"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
> >
<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.id, 'Label')"> </template>
<span>Remove</span>
</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 mr-2" @click="generateBarcode(item.id, 'Label')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon> <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span> <span>Generate Barcode</span>
</v-btn> </v-btn>
</template>
<span>Generate Barcode</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/MedicalCenter/List.vue
+21 -6
View File
@@ -37,23 +37,38 @@
<td class="headline font-weight-light WM-NoLetterSpacing">{{ item.name }}</td> <td class="headline font-weight-light WM-NoLetterSpacing">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.created_at }}</td> <td class="title font-weight-light">{{ item.created_at }}</td>
<td class="title font-weight-light">{{ item.users_count }} Operator</td> <td class="title font-weight-light">{{ item.users_count }} Operator</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn Height-MD-80 Height-SM-48">
<router-link :to="{name : 'EditMedicalCenter', params : {medicalCenter : item.id}}"> <v-tooltip bottom open-on-hover>
<v-btn color="cyan" class="mr-2 WM-ActionButton"> <template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn" :to="{name : 'EditMedicalCenter', params : {medicalCenter : item.id}}">
<v-btn v-bind="attrs" v-on="on" color="cyan" class="mr-2 WM-ActionButton">
<v-icon class="white--text mr-2 caption">fas fa-pen</v-icon> <v-icon class="white--text mr-2 caption">fas fa-pen</v-icon>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
<router-link :to="{name : 'OperatorList', params : {medicalCenter : item.id}}"> </template>
<v-btn color="orange darken-1" class="mr-2 WM-ActionButton"> <span>Edit</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn" :to="{name : 'OperatorList', params : {medicalCenter : item.id}}">
<v-btn v-bind="attrs" v-on="on" color="orange darken-1" class="mr-2 WM-ActionButton">
<v-icon class="white--text mr-2 caption">fas fa-user</v-icon> <v-icon class="white--text mr-2 caption">fas fa-user</v-icon>
<span>Operator</span> <span>Operator</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-btn color="pink" @click="remove(item.id)" class="WM-ActionButton"> </template>
<span>Operator</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" @click="remove(item.id)" class="WM-ActionButton">
<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>
</template>
<span>Remove</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/Package/List.vue
+30 -8
View File
@@ -33,7 +33,6 @@
:items="medicalCenters" :items="medicalCenters"
></v-autocomplete> ></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()">
<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>
@@ -41,7 +40,7 @@
</v-btn> </v-btn>
</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-left ml-3">
<router-link :to="{name: 'AddPackage'}"> <router-link :to="{name: 'AddPackage'}">
<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>
@@ -49,6 +48,7 @@
</v-btn> </v-btn>
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-divider></v-divider> <v-divider></v-divider>
<v-layout align-center wrap class="my-3"> <v-layout align-center wrap class="my-3">
@@ -66,33 +66,55 @@
<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 ? 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 FlexBtn Height-MD-60">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" 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>
<span>Show</span> <span>Show</span>
</v-btn> </v-btn>
</template>
<span>Show</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link <router-link
class="LinkBtn"
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: 'EditPackage', params: {package: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn v-bind="attrs" v-on="on" 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>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-btn </template>
<span>Edit</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn
v-bind="attrs" v-on="on"
color="pink" color="pink"
class="WM-ActionButton" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="remove(item.id)"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
> >
<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.id, 'Package')"> </template>
<span>Remove</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn class="mr-2" v-bind="attrs" v-on="on" color="orange darken-1" @click="generateBarcode(item.id, 'Package')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon> <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span> <span>Generate Barcode</span>
</v-btn> </v-btn>
</template>
<span>Generate Barcode</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/TestResult/List.vue
+96 -13
View File
@@ -48,7 +48,7 @@
item-value="id" item-value="id"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 md2 sm3 class="WM-FlexCenter pl-3"> <v-flex xs12 md2 sm3 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field
class="py-3 pr-3" class="py-3 pr-3"
@@ -107,15 +107,15 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-spacer></v-spacer> <!-- <v-spacer></v-spacer> -->
<v-flex class xs12 md2 sm2 class="WM-Align-R"> <v-flex class xs12 md3 sm3 class="WM-XL-Align-L text-lg-center">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)">
<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>
<span class="white--text">Filter</span> <span class="white--text">Filter</span>
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex wrap xs12 md2 sm2 class="WM-Align-R"> <v-flex wrap xs12 md1 sm1 class="WM-Align-R">
<router-link :to="{name: 'SubmitTestResult'}"> <router-link :to="{name: 'SubmitTestResult'}">
<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>
@@ -127,6 +127,17 @@
<v-layout class="px-4 my-3"> <v-layout class="px-4 my-3">
<v-divider></v-divider> <v-divider></v-divider>
</v-layout> </v-layout>
<!-- <v-tooltip bottom open-on-hover>
<template #activator>
<v-btn
color="primary"
dark
v-bind="attrs"
v-on="on"
>Button</v-btn>
</template>
<span>Tooltip</span>
</v-tooltip> -->
<v-layout align-center wrap class="px-5 my-2"> <v-layout align-center wrap class="px-5 my-2">
<v-flex md12> <v-flex md12>
<v-data-table :headers="headers" :items="items" hide-actions> <v-data-table :headers="headers" :items="items" hide-actions>
@@ -145,36 +156,76 @@
class="title font-weight-light" class="title font-weight-light"
>{{ item.user.medical_center.name }}</td> >{{ item.user.medical_center.name }}</td>
<td class="title font-weight-light">{{ item.user.name }}</td> <td class="title font-weight-light">{{ item.user.name }}</td>
<td class="title font-weight-light">{{ item.result }}</td> <td class="title font-weight-light">
<span v-if="item.result == 'Reject'" class="ResultMsg Reject">
{{ item.result }}
</span>
<span v-else-if="item.result == 'Accept'" class="ResultMsg Accept">
{{ item.result }}
</span>
</td>
<td class="title font-weight-light">{{ item.created_at }}</td> <td class="title font-weight-light">{{ item.created_at }}</td>
<td class="title font-weight-light">{{ item.verified }}</td> <td class="title font-weight-light">
<td class="text-xs-right"> <span v-if="item.verified == 'NotVerified'" class="NotVerified">
<v-btn color="cyan" class="mr-2" @click="show(item.id)"> <v-icon class="caption fa fa-times NotVerified"></v-icon>
</span>
<span v-if="item.verified == 'Verified'" class="">
<v-icon class="caption fa fa-check Verified"></v-icon>
</span>
<!-- {{ item.verified }} -->
</td>
<td class="text-xs-right FlexBtn">
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="cyan" class="mr-2" @click="show(item.id)" v-bind="attrs"
v-on="on">
<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>
<span>Show</span> <span>Show</span>
</v-btn> </v-btn>
<v-btn color="orange" class="mr-2" @click="generateBarcode(item.id, 'TestResult')"> </template>
<v-icon class="white--text mr-1 caption">fas fa-eye</v-icon> <span>Show</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="orange" class="mr-2" @click="generateBarcode(item.id, 'TestResult')" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fa fa-bars</v-icon>
<span>generate Barcode</span> <span>generate Barcode</span>
</v-btn> </v-btn>
<router-link </template>
<span>generate Barcode</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
:to="{name: 'EditTestResult', params: {testResult: item.id}}" :to="{name: 'EditTestResult', params: {testResult: item.id}}"
> >
<v-btn color="orange" class="mr-2"> <v-btn color="orange" class="mr-2" v-bind="attrs"
v-on="on">
<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>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
</template>
<span>Edit</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn <v-btn
color="pink" color="pink"
class="WM-ActionButton" class="WM-ActionButton"
@click="remove(item.id)" @click="remove(item.id)"
v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
v-bind="attrs"
v-on="on"
> >
<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>
</template>
<span>Remove</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
@@ -380,4 +431,36 @@ export default {
.v-btn--floating, .v-btn--icon:before { .v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important; border-radius: 50%!important;
} }
/* .FlexBtn {
display: flex;
flex-wrap: nowrap;
padding: 10px 8px !important;
}
td.FlexBtn .theme--light.v-btn {
padding: 21px 20px;
}
td.FlexBtn a.LinkBtn .theme--light.v-btn {
padding: 12px 10px;
}
@media screen and (max-width:1536px) {
.FlexBtn {
padding: 30px 8px !important;
}
td.FlexBtn span {
display: none;
}
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;
}
td.FlexBtn .theme--light.v-icon {
margin-right: 0 !important;
}
} */
</style> </style>
resources/js/vue/views/TestResult/Show.vue
+4 -10
View File
@@ -102,9 +102,10 @@
<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-for="(img, key) in data.title_image" :key="key"> <!-- <LightBox :media="data.title_image.map(img => img.path)"></LightBox> -->
<img :src="'/'+img.path" style="width: 100%" /> <!-- <v-flex xs12 md6 sm6 v-for="(img, key) in data.title_image" :key="key">
</v-flex> <img :src="'/'+img.path" style="width: 20%;height:auto" />
</v-flex> -->
</v-layout> </v-layout>
</v-layout> </v-layout>
</material-card> </material-card>
@@ -121,13 +122,6 @@
</v-container> </v-container>
</template> </template>
<script> <script>
export default {
data: () => ({
data: {}
})
};
</script>
<script>
import { mapGetters, mapMutations } from "vuex"; import { mapGetters, mapMutations } from "vuex";
import { ApiService } from "@/services"; import { ApiService } from "@/services";
import { urls } from "@/config/urls"; import { urls } from "@/config/urls";
resources/js/vue/views/TestType/List.vue
+23 -5
View File
@@ -102,24 +102,42 @@
<td class="title font-weight-light">{{ item.unique_code }}</td> <td class="title font-weight-light">{{ item.unique_code }}</td>
<td class="title font-weight-light">{{ item.user.name }}</td> <td class="title font-weight-light">{{ item.user.name }}</td>
<td class="title font-weight-light">{{ item.created_at }}</td> <td class="title font-weight-light">{{ item.created_at }}</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn">
<router-link <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<router-link class="LinkBtn"
v-if="item.test_results_count == 0" v-if="item.test_results_count == 0"
:to="{name : 'EditTestType', params : {testType : item.id}}" :to="{name : 'EditTestType', params : {testType : item.id}}"
> >
<v-btn color="cyan" class="mr-2 WM-ActionButton"> <v-btn color="cyan" class="mr-2 WM-ActionButton" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-2 caption">fas fa-pen</v-icon> <v-icon class="white--text mr-2 caption">fas fa-pen</v-icon>
<span>Edit</span> <span>Edit</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-btn color="black" class="mr-2" @click="remove(item.id)"> </template>
<span>Edit</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="black" class="mr-2" @click="remove(item.id)" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fas fa-folder</v-icon> <v-icon class="white--text mr-1 caption">fas fa-folder</v-icon>
<span>Archive</span> <span>Archive</span>
</v-btn> </v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_code, 'TestType')"> </template>
<span>Archive</span>
</v-tooltip>
<v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }">
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_code, 'TestType')" v-bind="attrs"
v-on="on">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon> <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span> <span>Generate Barcode</span>
</v-btn> </v-btn>
</template>
<span>Generate Barcode</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
resources/js/vue/views/User/List.vue
+34 -16
View File
@@ -132,23 +132,32 @@
<span v-for="(role, key) in item.roles" :key="key">{{ role.name }}</span> <span v-for="(role, key) in item.roles" :key="key">{{ role.name }}</span>
</td> </td>
<td class="title font-weight-light">{{item.medical_center.name}}</td> <td class="title font-weight-light">{{item.medical_center.name}}</td>
<td class="text-xs-right"> <td class="text-xs-right FlexBtn">
<v-btn <v-tooltip bottom open-on-hover>
:color="item.status == 'Active' ? 'red' : 'green'" <template v-slot:activator="{ on, attrs }">
@click="changeStatus(item.id)" <v-btn
class="mr-2 WM-ActionButton" v-bind="attrs" v-on="on"
v-if="$hasRole('Admin|Supervisor')" :color="item.status == 'Active' ? 'red' : 'green'"
> @click="changeStatus(item.id)"
<template v-if="item.status == 'Active'"> class="mr-2 WM-ActionButton"
<v-icon class="white--text mr-2 caption">fas fa-user-tag</v-icon> v-if="$hasRole('Admin|Supervisor')"
<span v-if="item.status == 'Active'">Susspended</span> >
</template> <template v-if="item.status == 'Active'">
<template v-else> <v-icon class="white--text mr-2 caption">fa fa-pause</v-icon>
<v-icon class="white--text mr-2 caption">fas fa-user-tag</v-icon> <span v-if="item.status == 'Active'">Susspended</span>
<span>Active</span> </template>
</template> <template v-else>
</v-btn> <v-icon class="white--text mr-2 caption">fa fa-pause</v-icon>
<span>Active</span>
</template>
</v-btn>
</template>
<span>Active</span>
</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="orange darken-1" color="orange darken-1"
@click="changeRoleModal(item)" @click="changeRoleModal(item)"
class="mr-2 WM-ActionButton" class="mr-2 WM-ActionButton"
@@ -157,7 +166,13 @@
<v-icon class="white--text mr-2 caption">fas fa-user-tag</v-icon> <v-icon class="white--text mr-2 caption">fas fa-user-tag</v-icon>
<span>Role</span> <span>Role</span>
</v-btn> </v-btn>
</template>
<span>Role</span>
</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" color="pink"
v-if="$hasRole('Admin')" v-if="$hasRole('Admin')"
class="WM-ActionButton" class="WM-ActionButton"
@@ -166,6 +181,9 @@
<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>
</template>
<span>Remove</span>
</v-tooltip>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>