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

fix : delete confirm modal and style

Browse Source
This commit is contained in:
Ashrafi
2025-04-12 14:30:59 +03:30
parent 47d81a2aa6
commit 90b0e0dc65
25 changed files with 782 additions and 12074 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
-11384
View File
File diff suppressed because it is too large Load Diff
src/components/modal/barcode/Barcode.vue
+7 -11
View File
@@ -1,20 +1,18 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Barcode Image"> <material-card color="black" title="Barcode Image">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3"> <v-layout id="printMe" align-left justify-left wrap class="px-3 my-3">
<!-- <h3 class="ml-3">Barcode And QRCode Image</h3> <!-- <h3 class="ml-3">Barcode And QRCode Image</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="">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span v-if="Type != 'TestType'">{{ `${Type} UDI : ${ID}` }}</span> <span v-if="Type != 'TestType'">{{ `${Type} UDI : ${ID}` }}</span>
<span v-else>{{ Type + ':' + ID }}</span> <span v-else>{{ Type + ':' + ID }}</span>
</v-flex> </v-flex>
</v-layout> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<a v-if="Type != 'TestType'" :href="ShowLink" target="_blank"><img :src="QRCodeimg" <a v-if="Type != 'TestType'" :href="ShowLink" target="_blank"><img :src="QRCodeimg"
class="WM-Width-150"></a> class="WM-Width-150"></a>
<img v-else :src="QRCodeimg" class="WM-Width-150"> <img v-else :src="QRCodeimg" class="WM-Width-150">
@@ -22,25 +20,23 @@
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center> <v-layout row wrap align-center justify-center>
<v-flex xs12 sm6 md6 lg3 class="text-center">
<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"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex class xs12 md2 sm2 @click="print"> <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span> <span class="white--text">Print</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
<script> <script>
import {mapGetters, mapMutations} from "vuex"; import {mapGetters, mapMutations} from "vuex";
export default { export default {
data: () => ({ data: () => ({
barcodeimg: null, barcodeimg: null,
src/components/modal/cycle/Show.vue
+59 -55
View File
@@ -1,77 +1,82 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card id="printMe" color="black" title="Show Cycle"> <material-card id="printMe" color="black" title="Show Cycle">
<v-layout align-left justify-left wrap class="px-5 my-3"> <v-layout align-left justify-left wrap class="px-3 my-3">
<h3 class="ml-3">Cycle - {{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</h3> <h3 class="mt-0">Cycle - {{
(data.user && data.user.medical_center) ? data.user.medical_center.name : ""
}}</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="">
<v-flex xs12 md3 sm3> <v-flex xs12 sm6 md4>
<!-- class="WM-d-flex" -->
<div> <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 sm6 md4>
<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 md3 sm3> <v-flex xs12 sm6 md4>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"/>
<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 md3 sm3> <v-flex xs12 sm6 md4>
<div> <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 md3 sm3> <v-flex xs12 sm6 md4>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-Industry"></v-icon> <v-icon class="WMi-Industry"/>
<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 md3 sm3> <v-flex xs12 sm6 md4>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-pencil"></v-icon> <v-icon class="WMi-pencil"/>
<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>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout align-left justify-left wrap class="my-3"> <v-layout align-left justify-left wrap class="my-3">
<h3 class="ml-3">Barcode And QRCode Image</h3> <h3 class="mt-0">Barcode And QRCode Image</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="align-center mt-3">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span>Cycle ID : {{data.id}}</span> <span>Cycle ID : {{ data.id }}</span>
</v-flex> </v-flex>
</v-layout>
<v-layout row wrap class="ml-4"> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<v-flex xs12 md6 sm6 v-if="QRCodeimg"> <a :href="'https://www.cssd-doc.com/Show/Cycle/'+data.id+''" target="_blank">
<a :href="'https://www.cssd-doc.com/Show/Cycle/'+data.id+''" target="_blank"><img :src="QRCodeimg" class="WM-Width-150"></a> <img :src="QRCodeimg" class="WM-Width-150">
</a>
</v-flex> </v-flex>
</v-layout> </v-layout>
</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-3 my-3">
<h3 class="ml-3">Labels</h3> <h3 class="mt-0">Labels</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 style="margin-left: 20px !important;"> <v-layout row wrap style="margin-left: 20px !important;">
<template> <template>
<v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key"> <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
<v-expansion-panel-content> <v-expansion-panel-content>
@@ -83,13 +88,15 @@
<v-expansion-panel class="WM-Panel"> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ label.package.name }} </div> <div>{{ label.package.name }}</div>
</template> </template>
<v-card> <v-card>
<v-card-text>note : {{ label.package.note }}</v-card-text> <v-card-text>note : {{ label.package.note }}</v-card-text>
<v-card-text> <v-card-text>
Items : Items :
<v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key"> <v-expansion-panel class="WM-Panel"
v-for="item in label.package.items"
:key="item.key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div> <div>{{ item.name }} ({{ item.pivot.count }})</div>
@@ -109,27 +116,20 @@
</v-expansion-panel-content> </v-expansion-panel-content>
</v-expansion-panel> </v-expansion-panel>
</template> </template>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center class="px-3">
<v-layout row wrap align-center justify-center>
<v-flex xs12 md2 sm2 class="text-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px" <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex class xs12 md2 sm2 @click="print" > <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span> <span class="white--text">Print</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
@@ -141,14 +141,15 @@ export default {
}; };
</script> </script>
<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";
export default { export default {
data: () => ({ data: () => ({
data : {}, data: {},
barcodeimg : '', barcodeimg: '',
QRCodeimg : '' QRCodeimg: ''
}), }),
methods: { methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]), ...mapMutations("modal", ["closeModal", "setResultModal"]),
@@ -203,7 +204,7 @@ export default {
}; };
</script> </script>
<style media="screen"> <style media="screen">
.v-expansion-panel.WM-Panel { .v-expansion-panel.WM-Panel {
box-shadow: none; box-shadow: none;
border-top: 1px solid #aaa; border-top: 1px solid #aaa;
border-right: 1px solid #aaa; border-right: 1px solid #aaa;
@@ -211,19 +212,22 @@ export default {
border-left: 4px solid #e91e63; border-left: 4px solid #e91e63;
padding: 5px 10px; padding: 5px 10px;
margin: 10px 0; margin: 10px 0;
} }
.v-expansion-panel.WM-Panel .v-expansion-panel__header {
font-weight:300; .v-expansion-panel.WM-Panel .v-expansion-panel__header {
font-weight: 300;
font-size: 24px; font-size: 24px;
padding: 5px 10px; padding: 5px 10px;
margin: 7px 0; margin: 7px 0;
} }
.v-expansion-panel.WM-Panel .v-card__text {
.v-expansion-panel.WM-Panel .v-card__text {
padding: 0 0 0 30px; padding: 0 0 0 30px;
font-weight: 600; font-weight: 600;
font-size: 18px; font-size: 18px;
} }
.v-expansion-panel.WM-Panel .v-expansion-panel__body>.v-card {
.v-expansion-panel.WM-Panel .v-expansion-panel__body > .v-card {
margin: 5px 0 8px 0 !important; margin: 5px 0 8px 0 !important;
} }
</style> </style>
src/components/modal/delete/Delete.vue
+57
View File
@@ -0,0 +1,57 @@
<template>
<v-container grid-list-xs>
<material-card color="black" :title="modalProps.title">
<v-layout id="printMe" align-left justify-left wrap class="px-3 my-3">
<div class="WM-Align-L">
{{ modalProps.message }}
</div>
</v-layout>
<v-card-actions>
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="handleCancel">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span>
</v-btn>
<v-spacer/>
<v-btn class="WM-CyanBlueGradient-BG" @click="handleConfirm" style="padding: 10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Confirm</span>
</v-btn>
</v-card-actions>
</material-card>
</v-container>
</template>
<script>
import {mapGetters, mapMutations} from "vuex";
export default {
computed: {
...mapGetters("modal", ["getModalProperties"]),
modalProps() {
return {
title: this.getModalProperties.title || "Confirm deletion",
message: this.getModalProperties.message ||
"Are you sure you want to delete the item? \n There will be no way to undo it.",
onConfirm: this.getModalProperties.success || (() => {
}),
onCancel: this.getModalProperties.close || (() => {
})
};
}
},
methods: {
...mapMutations("modal", ["closeModal"]),
async handleConfirm() {
await this.modalProps.onConfirm();
this.closeModal();
},
async handleCancel() {
await this.modalProps.onCancel();
this.closeModal();
}
}
};
</script>
src/components/modal/item/show.vue
+30 -27
View File
@@ -1,34 +1,41 @@
<template> <template>
<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 id="printMe" justify-left wrap class="px-5 my-3"> <v-layout align-left id="printMe" justify-left wrap class="px-3">
<h3 class="ml-3 CSSD-font"> Item - {{ data.user.medical_center.name }}</h3> <h3 class="CSSD-font mt-0"> Item - {{ data.user.medical_center.name }}</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="">
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title CSSD-font">Item ID :</span> <span class="title CSSD-font">Item ID :</span>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ data.id }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.id
}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title CSSD-font">Name :</span> <span class="title CSSD-font">Name :</span>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ data.name }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.name
}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title CSSD-font">Size :</span> <span class="title CSSD-font">Size :</span>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ data.size }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.size
}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title CSSD-font">Specific :</span> <span class="title CSSD-font">Specific :</span>
<span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{ data.specific}}</span> <span class="headline ml-1 CSSD-font"
style="letter-spacing:0 !important">{{ data.specific }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
@@ -42,24 +49,23 @@
<v-flex xs12 md6 sm6> <v-flex xs12 md6 sm6>
<div class> <div class>
<span class="title CSSD-font">Date Register:</span> <span class="title CSSD-font">Date Register:</span>
<span class="headline ml-2 CSSD-font" style="letter-spacing:0 !important">{{ $d(new Date(data.created_at), 'long') }}</span> <span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ $d(new Date(data.created_at), 'long') }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout align-left justify-left wrap class="my-3"> <v-layout align-left justify-left wrap class="my-3">
<h3 class="ml-3 CSSD-font">Barcode And QRCode Image</h3> <h3 class="CSSD-font">Barcode And QRCode Image</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="align-center mt-3">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span class="CSSD-font">Item ID : {{ data.id }}</span> <span class="CSSD-font">Item ID : {{ data.id }}</span>
</v-flex> </v-flex>
</v-layout> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6 v-if="QRCodeimg">
<a :href="'https://www.cssd-doc.com/Show/Item/' + data.id + ''" target="_blank"> <a :href="'https://www.cssd-doc.com/Show/Item/' + data.id + ''" target="_blank">
<img :src="QRCodeimg" class="WM-Width-150"> <img :src="QRCodeimg" class="WM-Width-150">
</a> </a>
@@ -67,38 +73,35 @@
</v-layout> </v-layout>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center> <v-layout row wrap align-center justify-center class="px-3">
<v-flex xs12 md2 sm2 class="text-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px" <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex xs12 md2 sm2 @click="print"> <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<!-- <v-icon class="white--text mr-2 caption">fas fa-print</v-icon> --> <!-- <v-icon class="white--text mr-2 caption">fas fa-print</v-icon> -->
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text CSSD-font">Print</span> <span class="white--text CSSD-font">Print</span>
</v-btn> </v-btn>
</v-flex> <v-btn class="WM-CyanBlueGradient-BG"
<v-flex class xs12 md2 sm2 @click="changeCurrentModal({modal: 'modal-user-list', properties: { data }})"
@click="changeCurrentModal({modal: 'modal-user-list', properties: { data }})"> style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<!-- <v-icon class="white--text mr-2 caption">fas fa-print</v-icon> --> <!-- <v-icon class="white--text mr-2 caption">fas fa-print</v-icon> -->
<v-icon class="white--text mr-2 caption">fas fa-rocket</v-icon> <v-icon class="white--text mr-2 caption">fas fa-rocket</v-icon>
<span class="white--text CSSD-font">Transfer</span> <span class="white--text CSSD-font">Transfer</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
<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";
export default { export default {
data: () => ({ data: () => ({
data: {}, data: {},
src/components/modal/label/Show.vue
+41 -36
View File
@@ -1,8 +1,8 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Label"> <material-card color="black" title="Show Label">
<v-layout align-left justify-left wrap class="px-2 my-3"> <v-layout align-left justify-left wrap class="px-3 my-3">
<h3 class="ml-3">Label</h3> <h3 class="mt-0">Label</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -12,34 +12,41 @@
<v-layout row wrap> <v-layout row wrap>
<!-- ________ Column1::Begin ________ --> <!-- ________ Column1::Begin ________ -->
<v-flex xs6 md6 sm6> <v-flex xs6 md6 sm6>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="">
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<span class="headline ml-1 mb-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span> <span class="headline ml-1 mb-1" style="letter-spacing:0 !important">{{
(data.user && data.user.medical_center) ? data.user.medical_center.name : ""
}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12 class=""> <v-flex xs12 md12 sm12 class="">
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-location"></v-icon> <v-icon class="WMi-location"></v-icon>
<span class="headline ml-1 mb-1" style="letter-spacing:0 !important">{{data.package.name}}</span> <span class="headline ml-1 mb-1"
style="letter-spacing:0 !important">{{ data.package.name }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<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 mb-1" style="letter-spacing:0 !important">{{ data.sterile_date }}</span> <span class="headline ml-2 mb-1"
style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-hourglass"></v-icon> <v-icon class="WMi-hourglass"></v-icon>
<span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.expire_date }}</span> <span class="headline ml-2 mb-1"
style="letter-spacing:0 !important">{{ data.expire_date }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class="WM-d-flex"> <div class="WM-d-flex">
<v-icon class="WMi-user"></v-icon> <v-icon class="WMi-user"></v-icon>
<span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span> <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{
data.user ? data.user.name : ''
}}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -47,24 +54,23 @@
<!-- ________ Column1::End ________ --> <!-- ________ Column1::End ________ -->
<!-- ________ Column2::Begin ________ --> <!-- ________ Column2::Begin ________ -->
<v-flex xs6 md6 sm6> <v-flex xs6 md6 sm6>
<v-layout row wrap class=""> <v-layout row wrap class="WM-Align-R mt-2">
<v-flex xs12 md12 sm12> <v-flex xs12 v-if="QRCodeimg">
<div> <a :href="'https://www.cssd-doc.com/Show/Label/'+data.id+''"
<v-flex xs6 md6 sm6 v-if="QRCodeimg"> target="_blank"><img :src="QRCodeimg" class="WM-Width-120"></a>
<a :href="'https://www.cssd-doc.com/Show/Label/'+data.id+''" target="_blank"><img :src="QRCodeimg" class="WM-Width-120"></a>
</v-flex>
</div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">Sterilizer ID :</span> <span class="title">Sterilizer ID :</span>
<span class="headline ml-1 mb-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span> <span class="headline ml-1 mb-1"
style="letter-spacing:0 !important">{{ data.sterilizer_id }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<div class> <div class>
<span class="title">Cycle No :</span> <span class="title">Cycle No :</span>
<span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.cycle_number }}</span> <span class="headline ml-2 mb-1"
style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
@@ -80,8 +86,8 @@
<div class="mt-4" style="text-align:center"> <div class="mt-4" style="text-align:center">
<v-layout row wrap> <v-layout row wrap>
<v-flex xs6 md12 sm12 v-if="barcodeimg"> <v-flex xs6 md12 sm12 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span>{{data.id}}</span> <span>{{ data.id }}</span>
</v-flex> </v-flex>
</v-layout> </v-layout>
</div> </div>
@@ -91,7 +97,7 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout align-left justify-left wrap class="px-2 my-3"> <v-layout align-left justify-left wrap class="px-3 my-3">
<h3 class="ml-3">Package</h3> <h3 class="ml-3">Package</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
@@ -106,7 +112,8 @@
<v-card> <v-card>
<v-card-text>note : {{ data.package.note }}</v-card-text> <v-card-text>note : {{ data.package.note }}</v-card-text>
<v-card-text> Items : <v-card-text> Items :
<v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key"> <v-expansion-panel class="WM-Panel" v-for="item in data.package.items"
:key="item.key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ item.name }} ({{ item.pivot.count }})</div> <div>{{ item.name }} ({{ item.pivot.count }})</div>
@@ -123,38 +130,36 @@
</template> </template>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center> <v-layout row wrap align-center justify-center class="px-3">
<v-flex xs12 sm6 md4 class="text-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px" <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex class xs12 sm6 md4 @click="print" > <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span> <span class="white--text">Print</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
<style media="screen"> <style media="screen">
.WM-d-flex{ .WM-d-flex {
display: flex; display: flex;
} }
</style> </style>
<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";
export default { export default {
data: () => ({ data: () => ({
data : {}, data: {},
QRCodeimg : '', QRCodeimg: '',
barcodeimg : '' barcodeimg: ''
}), }),
methods: { methods: {
@@ -220,5 +225,5 @@ export default {
computed: { computed: {
...mapGetters("modal", ["getModalProperties"]) ...mapGetters("modal", ["getModalProperties"])
} }
}; };
</script> </script>
src/components/modal/package/Show.vue
+38 -36
View File
@@ -1,59 +1,65 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Show Package"> <material-card color="black" title="Show Package">
<v-layout id="printMe" align-left justify-left wrap class="px-5 my-3"> <v-layout id="printMe" align-left justify-left wrap class="px-3 mb-3">
<h3 class="ml-3 CSSD-font">{{ data.name }} - MC {{ (data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : ''}}</h3> <h3 class="CSSD-font mt-0">
{{ data.name }} - MC {{(data.user != null && data.user.medical_center != null) ? data.user.medical_center.name : ''}}
</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="">
<v-flex xs12 md3 sm3> <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 CSSD-font" style="letter-spacing:0 !important">{{ data.name }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.name
}}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <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 CSSD-font" style="letter-spacing:0 !important">{{ $d(new Date(data.created_at), 'long') }}</span> <span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ $d(new Date(data.created_at), 'long') }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <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 CSSD-font" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span> <span class="headline ml-2 CSSD-font"
style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
</div> </div>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <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 CSSD-font" style="letter-spacing:0 !important">{{ data.note }}</span> <span class="headline ml-1 CSSD-font" style="letter-spacing:0 !important">{{
data.note
}}</span>
</div> </div>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout align-left justify-left wrap class="my-3"> <v-layout align-left justify-left wrap class="mt-3">
<h3 class="ml-3 CSSD-font">Barcode And QRCode Image</h3> <h3 class="CSSD-font">Barcode And QRCode Image</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="align-center mt-2">
<v-flex xs12 md6 sm6 v-if="barcodeimg"> <v-flex xs12 md6 sm6 v-if="barcodeimg">
<img :src="barcodeimg" class="WM-Width-350"><br /> <img :src="barcodeimg" class="WM-Width-350"><br/>
<span class="CSSD-font">Package ID : {{data.id}}</span> <span class="CSSD-font">Package ID : {{ data.id }}</span>
</v-flex> </v-flex>
</v-layout> <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
<v-layout row wrap class="ml-4"> <a :href="'https://www.cssd-doc.com/Show/Package/'+data.id+''" target="_blank">
<v-flex xs12 md6 sm6 v-if="QRCodeimg"> <img :src="QRCodeimg" class="WM-Width-150">
<a :href="'https://www.cssd-doc.com/Show/Package/'+data.id+''" target="_blank"><img :src="QRCodeimg" class="WM-Width-150"></a> </a>
</v-flex> </v-flex>
</v-layout> </v-layout>
</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-3 mb-3">
<h3 class="ml-3 CSSD-font">Items</h3> <h3 class="CSSD-font mt-0">Items</h3>
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
@@ -62,7 +68,8 @@
<v-expansion-panel class="WM-Panel"> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content v-for="(item, key) in data.items" :key="key"> <v-expansion-panel-content v-for="(item, key) in data.items" :key="key">
<template v-slot:header> <template v-slot:header>
<div class="CSSD-font">{{ key+1 + ": " + item.name }} <span v-if="item.pivot">({{ item.pivot.count }})</span></div> <div class="CSSD-font">{{ key + 1 + ": " + item.name }} <span
v-if="item.pivot">({{ item.pivot.count }})</span></div>
</template> </template>
<v-card> <v-card>
<v-card-text>note : {{ item.note }}</v-card-text> <v-card-text>note : {{ item.note }}</v-card-text>
@@ -73,39 +80,34 @@
<template v-else> <template v-else>
<p class="mt-3" style="width: 100%;"> No Item Has Been Selected</p> <p class="mt-3" style="width: 100%;"> No Item Has Been Selected</p>
</template> </template>
</v-layout> </v-layout>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center class="px-3">
<v-layout row wrap align-center justify-center>
<v-flex xs12 md2 sm2 class="text-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px" <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex xs12 md2 sm2 @click="print" > <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-print</v-icon> <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
<span class="white--text">Print</span> <span class="white--text">Print</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</template> </template>
<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";
export default { export default {
data: () => ({ data: () => ({
data : {}, data: {},
barcodeimg : '', barcodeimg: '',
QRCodeimg : '' QRCodeimg: ''
}), }),
methods: { methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]), ...mapMutations("modal", ["closeModal", "setResultModal"]),
src/components/modal/testresult/Show.vue
+4 -13
View File
@@ -144,38 +144,29 @@
<!-- </material-card> <!-- </material-card>
<material-card> --> <material-card> -->
<v-layout row wrap align-center justify-center class="my-3" v-if="$hasRole('Admin|Supervisor')"> <v-layout row wrap align-center justify-center class="my-3" v-if="$hasRole('Admin|Supervisor')">
<v-flex xs12 md2 sm2 class="text-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px" <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" style="padding:10px 60px"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex>
<v-spacer/> <v-spacer/>
<v-flex class="WM-Align-R mr-1" xs12 sm6 md4 lg3 <v-btn class="WM-CyanBlueGradient-BG" v-if="data.verified == 'None' || (data.verified == 'NotVerified' && $hasRole('Admin'))"
v-if="data.verified == 'None' || (data.verified == 'NotVerified' && $hasRole('Admin'))" @click="verify(data.id, 'Verified')" style="padding:10px 60px">
@click="verify(data.id, 'Verified')">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon> <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Verify</span> <span class="white--text">Verify</span>
</v-btn> </v-btn>
</v-flex> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray" v-if="data.verified == 'None' || (data.verified == 'Verified' && $hasRole('Admin'))"
<v-flex class="WM-Align-C" xs12 sm6 md3 lg2
v-if="data.verified == 'None' || (data.verified == 'Verified' && $hasRole('Admin'))">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"
@click="verify(data.id, 'NotVerified')"> @click="verify(data.id, 'NotVerified')">
<v-icon class="black--text mr-2 caption">fas fa-check</v-icon> <v-icon class="black--text mr-2 caption">fas fa-check</v-icon>
<span class="black--text">UnVerify</span> <span class="black--text">UnVerify</span>
</v-btn> </v-btn>
</v-flex>
<v-flex xs6 md2 sm2>
<a :href="'https://www.cssd-doc.com/Show/TestResult/'+data.id"> <a :href="'https://www.cssd-doc.com/Show/TestResult/'+data.id">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Gray"> <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> <v-icon class="black--text mr-2 caption">fas fa-print</v-icon>
<span class="black--text">Go to Print Page</span> <span class="black--text">Go to Print Page</span>
</v-btn> </v-btn>
</a> </a>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/components/modal/user/List.vue
+10 -9
View File
@@ -2,7 +2,7 @@
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Users List"> <material-card color="black" title="Users List">
<v-form @submit.prevent="transfer"> <v-form @submit.prevent="transfer">
<v-layout align-center justify-center wrap class="px-5 my-2"> <v-layout align-center justify-center wrap class="px-3 my-2">
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<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 }">
@@ -29,20 +29,21 @@
</v-data-table> </v-data-table>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<div class="text-xs-center mt-2" v-if="lastPage > 1"> <div class="text-xs-center px-3 mt-2" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/> <v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center class="mt-3 justify-end mr-5"> <v-layout row wrap align-center class="mt-3 px-3 justify-end">
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center"> <v-flex xs12 sm6 md4 lg3 class="">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="closeModal()"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="closeModal()">
<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>
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center"> <v-spacer/>
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-xs-center">
<v-btn type="submit" class="WM-CyanBlueGradient-BG ml-5 px-5"> <v-btn type="submit" class="WM-CyanBlueGradient-BG ml-5 px-5">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon> <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Submit</span> <span class="white--text">Submit</span>
@@ -116,7 +117,7 @@ export default {
const result = await this.transferItem({ const result = await this.transferItem({
itemId: this.getModalProperties.data.id, itemId: this.getModalProperties.data.id,
userId: this.selected.id, userId: this.selected.id,
isUser:this.$hasRole('User') isUser: this.$hasRole('User')
}); });
this.setResultModal(result); this.setResultModal(result);
this.closeModal(); this.closeModal();
@@ -139,7 +140,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.headline{ .headline {
font-size: 16px !important; font-size: 16px !important;
line-height: 22px !important; line-height: 22px !important;
font-family: "Montserrat-regular" !important; font-family: "Montserrat-regular" !important;
@@ -148,7 +149,7 @@ export default {
.user-number { .user-number {
line-height: 12px; line-height: 12px;
font-size: 12px !important; font-size: 12px !important;
margin: 0!important; margin: 0 !important;
font-weight: 300; font-weight: 300;
font-family: 'Montserrat-light' !important; font-family: 'Montserrat-light' !important;
} }
src/components/modal/user/Role.vue
+5 -9
View File
@@ -1,28 +1,24 @@
<template> <template>
<v-form> <v-form>
<v-container grid-list-xs fluid> <v-container grid-list-xs>
<material-card class color="black" title="Role"> <material-card class color="black" title="Role">
<v-layout row align-center justify-center wrap class="px-5 mb-3"> <v-layout row align-center justify-center wrap class="px-3 mb-3">
<v-flex xs12 md3 sm3> <v-flex xs12 md3 sm3>
<v-select :items="items" v-model="data.roles" label="Roles" color="black"></v-select> <v-select :items="items" v-model="data.roles" label="Roles" color="black"></v-select>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap> <v-layout row align-center justify-center wrap class="px-3 mt-2">
<v-layout align-center justify-center wrap class="px-5 mt-2">
<v-flex xs12 sm6 md6 lg3 class="text-center">
<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"
@click="closeModal"> @click="closeModal">
<v-icon class="black--text mr-2 caption">fas fa-times</v-icon> <v-icon class="black--text mr-2 caption">fas fa-times</v-icon>
<span class="black--text">Close</span> <span class="black--text">Close</span>
</v-btn> </v-btn>
</v-flex> <v-spacer/>
<v-flex xs12 sm6 md6 lg3 class="text-center">
<v-btn @click="changeRole" class="WM-CyanBlueGradient-BG" style="padding:10px 60px"> <v-btn @click="changeRole" class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon> <v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>
<span class="white--text">Add</span> <span class="white--text">Add</span>
</v-btn> </v-btn>
</v-flex>
</v-layout>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/views/Cycle/AddEdit.vue
+8 -11
View File
@@ -2,8 +2,8 @@
<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 Cycle"> <material-card color="black" title="Add Cycle">
<v-layout wrap class="px-5 my-3"> <v-layout wrap class="px-3 my-3">
<v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md4 class="WM-FlexCenter ">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field <v-text-field
name="sterilizer_id" name="sterilizer_id"
@@ -12,7 +12,7 @@
v-model="formData.sterilizer_id" v-model="formData.sterilizer_id"
class="py-3 pr-3"/> class="py-3 pr-3"/>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md4 class="WM-FlexCenter ">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field <v-text-field
name="cycle_number" name="cycle_number"
@@ -85,20 +85,17 @@
</v-flex> </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-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
</v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{name: 'AllCycle'}"> <router-link :to="{name: 'AllCycle'}">
<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>
</v-btn> </v-btn>
</router-link> </router-link>
</v-flex> <v-spacer/>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/views/Cycle/List.vue
+22 -18
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Cycles" text> <material-card class color="black" title="All Cycles" text>
<v-layout align-center wrap class="px-5 my-3"> <v-layout align-center wrap class="px-3 my-3">
<v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.cycle_id" label="Cycle ID" <v-text-field class="py-3 pr-3" v-model="filter.cycle_id" label="Cycle ID"
@@ -51,10 +51,10 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="px-5 my-3"> <v-layout align-center wrap class="px-3 my-3">
<v-flex md12> <v-flex md12>
<v-data-table :headers="headers" :items="packages" hide-actions> <v-data-table :headers="headers" :items="packages" hide-actions>
<template slot="headerCell" slot-scope="{ header }"> <template slot="headerCell" slot-scope="{ header }">
@@ -96,7 +96,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2" <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(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-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -124,13 +124,14 @@
<v-pagination color="black" v-model="currentPage" :length="lastPage" <v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"/> :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="px-3 mt-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -189,10 +190,8 @@ export default {
} }
this.loadMedicalCenters(); this.loadMedicalCenters();
}, },
async show(testResultId) { async show(id) {
const result = await ApiService.get( const result = await ApiService.get(urls.showCycle(id));
urls.showCycle(testResultId)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-cycle-show", modal: "modal-cycle-show",
@@ -209,16 +208,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete( this.changeCurrentModal({
urls.removeCycle(testResultId) modal: "modal-delete-delete",
); properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removeCycle(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.packages) { for (const key in this.packages) {
if ( if (this.packages.hasOwnProperty(key) && this.packages[key].id == id) {
this.packages.hasOwnProperty(key) &&
this.packages[key].id == testResultId
) {
this.packages.splice(key, 1); this.packages.splice(key, 1);
} }
} }
src/views/Item/AddEdit.vue
+6 -5
View File
@@ -2,7 +2,7 @@
<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 Instrument"> <material-card color="black" title="Add Instrument">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout align-center justify-center wrap class="px-3 mb-3">
<v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter"> <v-flex xs12 sm6 md6 lg3 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field name="name" label="Name" color="black" v-model="formData.name" <v-text-field name="name" label="Name" color="black" v-model="formData.name"
@@ -42,7 +42,7 @@
ModelType="Item"/> ModelType="Item"/>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout align-center wrap class="px-5 mb-3"> <v-layout align-center wrap class="px-3 mb-3">
<v-flex xs12 sm12 md12> <v-flex xs12 sm12 md12>
<v-textarea color="black" v-model="formData.note" class="pa-2" name="address"> <v-textarea color="black" v-model="formData.note" class="pa-2" name="address">
<template v-slot:label> <template v-slot:label>
@@ -51,8 +51,8 @@
</v-textarea> </v-textarea>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap justify-center align-center> <v-layout row wrap justify-center align-center class="px-3">
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center"> <v-flex xs12 md2 sm2 class="">
<router-link :to="{ name: 'AllItem' }"> <router-link :to="{ name: 'AllItem' }">
<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>
@@ -60,7 +60,8 @@
</v-btn> </v-btn>
</router-link> </router-link>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center"> <v-spacer/>
<v-flex xs12 md2 sm2 class="">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon> <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span> <span class="white--text">SAVE</span>
src/views/Item/List.vue
+21 -20
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Items" text> <material-card class color="black" title="All Items" text>
<v-layout align-center wrap class="my-3 px-5"> <v-layout align-center wrap class="my-3 px-3">
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter"> <v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.item_id" label="Item ID" <v-text-field class="py-3 pr-3" v-model="filter.item_id" label="Item ID"
@@ -43,10 +43,10 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="my-3 px-5"> <v-layout align-center wrap class="my-3 px-3">
<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 }">
@@ -109,7 +109,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2" <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(item.id)"
v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))"> v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -137,7 +137,7 @@
<v-pagination color="black" v-model="currentPage" :length="lastPage" <v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"/> :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="mt-3 px-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
@@ -200,9 +200,7 @@ export default {
} }
} }
filter += (page) ? `page=${page}` : `page=1`; filter += (page) ? `page=${page}` : `page=1`;
const result = await ApiService.get( const result = await ApiService.get(urls.listItem(filter));
urls.listItem(filter)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.items = result.data.data; this.items = result.data.data;
this.currentPage = result.data.meta.current_page; this.currentPage = result.data.meta.current_page;
@@ -219,10 +217,8 @@ export default {
}); });
} }
}, },
async show(testResultId) { async show(id) {
const result = await ApiService.get( const result = await ApiService.get(urls.showItem(id));
urls.showItem(testResultId)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-item-show", modal: "modal-item-show",
@@ -230,16 +226,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete( this.changeCurrentModal({
urls.removeItem(testResultId) modal: "modal-delete-delete",
); properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removeItem(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == id) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
src/views/Label/AddEdit.vue
+4 -6
View File
@@ -2,7 +2,7 @@
<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 Label on Set "> <material-card color="black" title="Add Label on Set ">
<v-layout wrap class="px-5 my-3"> <v-layout wrap class="px-3 my-3">
<v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md4 lg3 class="WM-FlexCenter pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field name="sterilizerId" label="Sterilizer ID" color="black" <v-text-field name="sterilizerId" label="Sterilizer ID" color="black"
@@ -57,21 +57,19 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap justify-center align-center> <v-layout row wrap justify-center align-center class="px-3">
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{ name: 'AllLabels' }"> <router-link :to="{ name: 'AllLabels' }">
<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>
</v-btn> </v-btn>
</router-link> </router-link>
</v-flex> <v-spacer/>
<v-flex xs12 sm6 md4 lg3 class="text-md-center text-xs-center">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon> <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span> <span class="white--text">SAVE</span>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/views/Label/List.vue
+24 -23
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Labels" text> <material-card class color="black" title="All Labels" text>
<v-layout align-center wrap class="px-5 my-3"> <v-layout align-center wrap class="px-3 my-3">
<v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3" v-model="filter.label_id" label="Label ID" <v-text-field class="py-3" v-model="filter.label_id" label="Label ID"
@@ -49,10 +49,10 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="px-5 my-3"> <v-layout align-center wrap class="px-3 my-3">
<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 }">
@@ -98,7 +98,7 @@
v-bind="attrs" v-on="on" v-bind="attrs" v-on="on"
color="pink" color="pink"
class="WM-ActionButton mr-2" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(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-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -126,13 +126,14 @@
<v-pagination color="black" v-model="currentPage" :length="lastPage" <v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"/> :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="px-3 mt-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -196,15 +197,13 @@ export default {
} }
}, },
async fillUsers() { async fillUsers() {
const result = await ApiService.get( const result = await ApiService.get(urls.listOpertorMedicalCenter(this.form.medicalCenterId));
urls.listOpertorMedicalCenter(this.form.medicalCenterId)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.users = result.data.data.users; this.users = result.data.data.users;
} }
}, },
async show(testResultId) { async show(id) {
const result = await ApiService.get(urls.showLabel(testResultId)); const result = await ApiService.get(urls.showLabel(id));
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-label-show", modal: "modal-label-show",
@@ -212,16 +211,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete( this.changeCurrentModal({
urls.removeLabel(testResultId) modal: "modal-delete-delete",
); properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removeLabel(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == id) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
@@ -246,10 +250,7 @@ export default {
}, },
getModalResult(testResult) { getModalResult(testResult) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == testResult.id) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResult.id
) {
this.items[key] = testResult; this.items[key] = testResult;
} }
} }
src/views/MedicalCenter/AddEdit.vue
+4 -6
View File
@@ -2,7 +2,7 @@
<v-form ref="form"> <v-form ref="form">
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card class color="black" title="Add Medical Center" text> <material-card class color="black" title="Add Medical Center" text>
<v-layout row wrap class="px-5 mb-3"> <v-layout row wrap class="px-3 mb-3">
<v-flex xs12 sm6 md6 lg3> <v-flex xs12 sm6 md6 lg3>
<v-text-field <v-text-field
v-model="medicalCenter.name" v-model="medicalCenter.name"
@@ -40,16 +40,15 @@
/> />
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="mt-3 px-3">
<v-flex xs12 sm6 md6 lg3 class="text-center">
<router-link :to="{name:'ManageMedicalCenter'}"> <router-link :to="{name:'ManageMedicalCenter'}">
<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-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
</v-flex> <v-spacer/>
<v-flex xs12 sm6 md6 lg3 class="text-center">
<v-btn class="WM-CyanBlueGradient-BG" @click="AddMedicalCenter" style="padding:10px 60px"> <v-btn class="WM-CyanBlueGradient-BG" @click="AddMedicalCenter" style="padding:10px 60px">
<template v-if="$route.params.medicalCenter"> <template v-if="$route.params.medicalCenter">
<v-icon class="white--text mr-2 caption">fas fa-edit</v-icon> <v-icon class="white--text mr-2 caption">fas fa-edit</v-icon>
@@ -60,7 +59,6 @@
<span class="white--text">Add</span> <span class="white--text">Add</span>
</template> </template>
</v-btn> </v-btn>
</v-flex>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/views/MedicalCenter/List.vue
+13 -5
View File
@@ -62,7 +62,7 @@
</v-tooltip> </v-tooltip>
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" @click="remove(item.id)" <v-btn v-bind="attrs" v-on="on" color="pink" @click="removeModal(item.id)"
class="WM-ActionButton"> class="WM-ActionButton">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -77,7 +77,7 @@
</v-layout> </v-layout>
<v-divider/> <v-divider/>
<div class="text-xs-center mt-2" v-if="lastPage > 1"> <div class="text-xs-center mt-2" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"></v-pagination> <v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="mt-3">
<router-link :to="{ name: 'Dashboard' }"> <router-link :to="{ name: 'Dashboard' }">
@@ -129,12 +129,20 @@ export default {
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;
}, },
removeModal(id) {
this.changeCurrentModal({
modal: "modal-delete-delete",
properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) { async remove(id) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-user-confirmation", modal: "modal-user-confirmation",
properties: { properties: {width: '30'},
width: '30'
},
success: async () => { success: async () => {
const result = await ApiService.delete(urls.deleteMedicalCenter(id)); const result = await ApiService.delete(urls.deleteMedicalCenter(id));
this.closeModal(); this.closeModal();
src/views/MedicalCenter/OperatorList.vue
+7 -11
View File
@@ -4,15 +4,15 @@
<v-layout row wrap class="px-5 mb-3"> <v-layout row wrap class="px-5 mb-3">
<v-flex xs12 md3 xs3> <v-flex xs12 md3 xs3>
<v-text-field name="Name" v-model="filter.name" label="Name" class="pa-2" <v-text-field name="Name" v-model="filter.name" label="Name" class="pa-2"
color="black"></v-text-field> color="black"/>
</v-flex> </v-flex>
<v-flex xs12 md3 xs3> <v-flex xs12 md3 xs3>
<v-text-field name="cell_number" v-model="filter.cell_number" label="Cell Number" class="pa-2" <v-text-field name="cell_number" v-model="filter.cell_number" label="Cell Number" class="pa-2"
color="black"></v-text-field> color="black"/>
</v-flex> </v-flex>
<v-flex xs12 md2 xs3> <v-flex xs12 md2 xs3>
<v-select :items="roles" name="roles" v-model="filter.role" label="Roles" class="pa-2" <v-select :items="roles" name="roles" v-model="filter.role" label="Roles" class="pa-2"
color="black"></v-select> color="black"/>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-xs-right"> <v-flex xs12 md2 sm2 class="text-xs-right">
<v-btn class="WM-CyanBlueGradient-BG" @click="load" style="padding:10px 30px"> <v-btn class="WM-CyanBlueGradient-BG" @click="load" style="padding:10px 30px">
@@ -47,11 +47,9 @@
<td class="title font-weight-light">{{ item.cell_number }}</td> <td class="title font-weight-light">{{ item.cell_number }}</td>
<td class="title font-weight-light">{{ item.status }}</td> <td class="title font-weight-light">{{ item.status }}</td>
<td class="text-xs-right justify-self-end"> <td class="text-xs-right justify-self-end">
<v-btn <v-btn :color="item.status == 'Active' ? 'red' : 'green'"
:color="item.status == 'Active' ? 'red' : 'green'"
@click="changeStatus(item.id)" @click="changeStatus(item.id)"
class="mr-2 WM-ActionButton" class="mr-2 WM-ActionButton">
>
<template v-if="item.status == 'Active'"> <template v-if="item.status == 'Active'">
<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 v-if="item.status == 'Active'">Suspended</span> <span v-if="item.status == 'Active'">Suspended</span>
@@ -61,11 +59,9 @@
<span>Active</span> <span>Active</span>
</template> </template>
</v-btn> </v-btn>
<v-btn <v-btn color="orange darken-1"
color="orange darken-1"
@click="changeRoleModal(item)" @click="changeRoleModal(item)"
class="mr-2 WM-ActionButton" class="mr-2 WM-ActionButton">
>
<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>
src/views/MyItem/List.vue
+20 -14
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="My Items" text> <material-card class color="black" title="My Items" text>
<v-layout align-center wrap class="my-3 px-5"> <v-layout align-center wrap class="my-3 px-3">
<v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter"> <v-flex xs12 sm4 md4 lg2 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="getFilters.item_id" <v-text-field class="py-3 pr-3" v-model="getFilters.item_id"
@@ -47,10 +47,10 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="my-3 px-5" v-if="getMyItems"> <v-layout align-center wrap class="my-3 px-3" v-if="getMyItems">
<v-flex md12> <v-flex md12>
<v-data-table :headers="headers" :items="getMyItems" hide-actions> <v-data-table :headers="headers" :items="getMyItems" hide-actions>
<template slot="headerCell" slot-scope="{ header }"> <template slot="headerCell" slot-scope="{ header }">
@@ -110,7 +110,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2" <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(item.id)"
v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))"> v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -148,13 +148,14 @@
<div class="text-xs-center" v-if="lastPage > 1"> <div class="text-xs-center" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/> <v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center class="px-3 mt-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text CSSD-font">Back</span> <span class="black--text CSSD-font">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -244,16 +245,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete( this.changeCurrentModal({
urls.removeItem(testResultId) modal: "modal-delete-delete",
); properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removeItem(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == id) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
src/views/MyPackage/List.vue
+23 -14
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="My Packages" text> <material-card class color="black" title="My Packages" text>
<v-layout align-center wrap class="mt-3 px-5"> <v-layout align-center wrap class="mt-3 px-3">
<v-flex xs12 sm6 md4 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md4 lg3 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.package_id" label="Package ID" <v-text-field class="py-3 pr-3" v-model="filter.package_id" label="Package ID"
@@ -35,10 +35,10 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="my-3 px-5"> <v-layout align-center wrap class="my-3 px-3">
<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 }">
@@ -62,9 +62,7 @@
<v-btn :color="status.color" class="mr-2" <v-btn :color="status.color" class="mr-2"
@click="changeStatus(item, status.status)" v-bind="attrs" @click="changeStatus(item, status.status)" v-bind="attrs"
v-on="on"> v-on="on">
<v-icon class="white--text mr-1 caption">fas {{ <v-icon class="white--text mr-1 caption">fas {{ status.icon }}
status.icon
}}
</v-icon> </v-icon>
<span>{{ status.label }}</span> <span>{{ status.label }}</span>
</v-btn> </v-btn>
@@ -101,7 +99,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2" <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(item.id)"
v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))"> v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -140,13 +138,14 @@
<v-pagination color="black" v-model="currentPage" :length="lastPage" <v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"/> :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="mt-3 px-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -208,8 +207,8 @@ export default {
} }
this.loadMedicalCenters(); this.loadMedicalCenters();
}, },
async show(testResultId) { async show(id) {
const result = await ApiService.get(urls.showPackage(testResultId)); const result = await ApiService.get(urls.showPackage(id));
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-package-show", modal: "modal-package-show",
@@ -217,11 +216,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete(urls.removePackage(testResultId)); this.changeCurrentModal({
modal: "modal-delete-delete",
properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removePackage(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if (this.items.hasOwnProperty(key) && this.items[key].id == testResultId) { if (this.items.hasOwnProperty(key) && this.items[key].id == id) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
src/views/Package/List.vue
+19 -13
View File
@@ -2,7 +2,7 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Packages" text> <material-card class color="black" title="All Packages" text>
<v-layout align-center wrap class="mt-3 px-5"> <v-layout align-center wrap class="mt-3 px-3">
<v-flex xs12 sm6 md4 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md4 lg3 xl2 class="WM-FlexCenter">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/> <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" v-model="filter.package_id" label="Package ID" <v-text-field class="py-3 pr-3" v-model="filter.package_id" label="Package ID"
@@ -43,10 +43,10 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center wrap class="my-3 px-5"> <v-layout align-center wrap class="my-3 px-3">
<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 }">
@@ -112,7 +112,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2" <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
@click="remove(item.id)" @click="removeModal(item.id)"
v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))"> v-if="$hasRole('Admin|Supervisor') ||( item.user_id == $store.state.user.id && !['approved', 'rejected'].includes(item.status))">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
@@ -140,13 +140,14 @@
<v-pagination color="black" v-model="currentPage" :length="lastPage" <v-pagination color="black" v-model="currentPage" :length="lastPage"
:total-visible="6"></v-pagination> :total-visible="6"></v-pagination>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="mt-3 px-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -220,16 +221,21 @@ export default {
}); });
} }
}, },
removeModal(id) {
this.changeCurrentModal({
modal: "modal-delete-delete",
properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(testResultId) { async remove(testResultId) {
const result = await ApiService.delete( const result = await ApiService.delete(urls.removePackage(testResultId));
urls.removePackage(testResultId)
);
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == testResultId) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
src/views/TestResult/List.vue
+22 -20
View File
@@ -75,6 +75,7 @@
<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 class="subheading font-weight-light text-white text--darken-3" <span class="subheading font-weight-light text-white text--darken-3"
style="border-radius: 5px;"
v-text="header.text"/> v-text="header.text"/>
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
@@ -86,10 +87,10 @@
<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"> <td class="title font-weight-light">
<span v-if="item.result == 'Reject'" class="ResultMsg Reject"> <span v-if="item.result == 'Reject'" class="ResultMsg Reject">
{{item.result}} {{ item.result }}
</span> </span>
<span v-else-if="item.result == 'Accept'" class="ResultMsg Accept"> <span v-else-if="item.result == 'Accept'" class="ResultMsg Accept">
{{item.result}} {{ item.result }}
</span> </span>
</td> </td>
<td class="title font-weight-light">{{ $d(new Date(item.created_at), 'long') }}</td> <td class="title font-weight-light">{{ $d(new Date(item.created_at), 'long') }}</td>
@@ -141,7 +142,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" --> <!-- v-if="$hasRole('Admin') || item.user_id == $store.state.user.id" -->
<v-btn color="pink" class="WM-ActionButton" @click="remove(item.id)" <v-btn color="pink" class="WM-ActionButton" @click="removeModal(item.id)"
v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')" v-if="$hasRole('Admin') || (item.user_id == $store.state.user.id && item.verified == 'None')"
v-bind="attrs" v-on="on"> v-bind="attrs" v-on="on">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
@@ -199,9 +200,9 @@ export default {
{sortable: false, text: "Test Type", value: "TestType"}, {sortable: false, text: "Test Type", value: "TestType"},
{sortable: false, text: "Hospital", value: "Hospital"}, {sortable: false, text: "Hospital", value: "Hospital"},
{sortable: false, text: "User", value: "Users"}, {sortable: false, text: "User", value: "Users"},
{sortable: false, text: "Result", value: "result",width:'5%'}, {sortable: false, text: "Result", value: "result", width: '5%'},
{sortable: false, text: "Date", value: "date"}, {sortable: false, text: "Date", value: "date"},
{sortable: false, text: "Verify", value: "verify",width:'5%'}, {sortable: false, text: "Verify", value: "verify", width: '5%'},
{sortable: false, text: "Action", value: "action", align: "center",} {sortable: false, text: "Action", value: "action", align: "center",}
], ],
filter: { filter: {
@@ -291,9 +292,7 @@ export default {
filter += `verified=${verified}&`; filter += `verified=${verified}&`;
} }
filter += (page) ? `page=${page}` : `page=1`; filter += (page) ? `page=${page}` : `page=1`;
const result = await ApiService.get( const result = await ApiService.get(urls.listTestResult(filter));
urls.listTestResult(filter)
);
if (result && result.status == 200) { if (result && result.status == 200) {
const {data, meta} = result.data; const {data, meta} = result.data;
this.items = data; this.items = data;
@@ -301,10 +300,8 @@ export default {
this.lastPage = meta.last_page; this.lastPage = meta.last_page;
} }
}, },
async show(testResultId) { async show(id) {
const result = await ApiService.get( const result = await ApiService.get(urls.showTestResult(id));
urls.showTestResult(testResultId)
);
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-testresult-show", modal: "modal-testresult-show",
@@ -314,16 +311,21 @@ export default {
}); });
} }
}, },
async remove(testResultId) { removeModal(id) {
const result = await ApiService.delete( this.changeCurrentModal({
urls.removeTestResult(testResultId) modal: "modal-delete-delete",
); properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(id) {
const result = await ApiService.delete(urls.removeTestResult(id));
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items.hasOwnProperty(key) && this.items[key].id == id) {
this.items.hasOwnProperty(key) &&
this.items[key].id == testResultId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
src/views/TestType/List.vue
+6 -5
View File
@@ -1,7 +1,7 @@
<template> <template>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="TestType List" text> <material-card class color="black" title="TestType List" text>
<v-layout wrap class="px-5 mb-3"> <v-layout wrap class="px-3 mb-3">
<v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3"> <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" label="Name" v-model="filter.name" color="black"/> <v-text-field class="py-3 pr-3" label="Name" v-model="filter.name" color="black"/>
@@ -73,10 +73,10 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center justify-center wrap class="px-5 mt-3"> <v-layout align-center justify-center wrap class="px-3 mt-3">
<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 }">
@@ -132,13 +132,14 @@
<div class="text-xs-center mt-2" v-if="lastPage > 1"> <div class="text-xs-center mt-2" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/> <v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="px-3 mt-3">
<router-link to="/dashboard"> <router-link to="/dashboard">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
src/views/User/List.vue
+20 -11
View File
@@ -1,7 +1,7 @@
<template> <template>
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Member List"> <material-card color="black" title="Member List">
<v-layout align-center justify-center wrap class="px-5 mb-3"> <v-layout align-center justify-center wrap class="px-3 mb-3">
<v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
<v-text-field class="py-3 pr-3" color="black" name="name" label="Name" <v-text-field class="py-3 pr-3" color="black" name="name" label="Name"
@@ -22,7 +22,7 @@
<v-select class="py-3 pr-3" color="black" name="role" label="Role" :items="roles" <v-select class="py-3 pr-3" color="black" name="role" label="Role" :items="roles"
v-model="filter.role"/> v-model="filter.role"/>
</v-flex> </v-flex>
<!-- </v-layout> <!-- </v-layout>
<v-layout class="px-5 mb-3">--> <v-layout class="px-5 mb-3">-->
<v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter"> <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
<v-icon class="far fa-calendar-alt mr-2"/> <v-icon class="far fa-calendar-alt mr-2"/>
@@ -53,10 +53,10 @@
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<v-layout align-center justify-center wrap class="px-5 my-2"> <v-layout align-center justify-center wrap class="px-3 my-2">
<v-flex xs12 md12 sm12> <v-flex xs12 md12 sm12>
<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 }">
@@ -107,7 +107,7 @@
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn v-bind="attrs" v-on="on" color="pink" v-if="$hasRole('Admin')" <v-btn v-bind="attrs" v-on="on" color="pink" v-if="$hasRole('Admin')"
class="WM-ActionButton" @click="remove(item.id)"> class="WM-ActionButton" @click="removeModal(item.id)">
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon> <v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>Remove</span> <span>Remove</span>
</v-btn> </v-btn>
@@ -119,19 +119,20 @@
</v-data-table> </v-data-table>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-3 my-3">
<v-divider/> <v-divider/>
</v-layout> </v-layout>
<div class="text-xs-center mt-2" v-if="lastPage > 1"> <div class="text-xs-center mt-2" v-if="lastPage > 1">
<v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/> <v-pagination color="black" v-model="currentPage" :length="lastPage" :total-visible="6"/>
</div> </div>
<v-layout row wrap align-center justify-center class="mt-3"> <v-layout row wrap align-center justify-center class="px-3 mt-3">
<router-link :to="{ name: 'Dashboard' }"> <router-link :to="{ name: 'Dashboard' }">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon> <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span> <span class="black--text">Back</span>
</v-btn> </v-btn>
</router-link> </router-link>
<v-spacer/>
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
@@ -236,6 +237,16 @@ export default {
properties: {user} properties: {user}
}); });
}, },
removeModal(id) {
this.changeCurrentModal({
modal: "modal-delete-delete",
properties: {
success: () => {
this.remove(id);
},
}
});
},
async remove(userId) { async remove(userId) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-user-confirmation", modal: "modal-user-confirmation",
@@ -248,9 +259,7 @@ export default {
this.closeModal(); this.closeModal();
if (result && result.status == 200) { if (result && result.status == 200) {
for (const key in this.items) { for (const key in this.items) {
if ( if (this.items[key].id == userId) {
this.items[key].id == userId
) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }