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

new changes

Browse Source
This commit is contained in:
shokouhi
2020-07-21 10:41:40 +04:30
parent 6b624d3e63
commit 7e000bf00d
18 changed files with 174 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/views/TestResult/List.vue
+23 -7
View File
@@ -58,9 +58,7 @@
color="black"
></v-text-field>
</v-flex>
</v-layout>
<v-layout wrap class="px-5 mb-3 my-3">
<v-flex xs12 sm6 md2 class="WM-FlexCenter">
<v-flex xs12 sm6 md2 pl-3 class="WM-FlexCenter">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu
lazy
@@ -70,6 +68,7 @@
v-model="fromMenu"
>
<v-text-field
class="py-3 pr-3"
required
slot="activator"
label="FromDate"
@@ -84,7 +83,7 @@
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md2 style="display: flex;align-items: center;">
<v-flex xs12 sm6 md2 pl-3 style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu
lazy
@@ -94,6 +93,7 @@
v-model="upToMenu"
>
<v-text-field
class="py-3 pr-3"
required
slot="activator"
label="UpToDate"
@@ -108,15 +108,14 @@
></v-date-picker>
</v-menu>
</v-flex>
<!-- <v-spacer></v-spacer> -->
<v-flex class xs12 md3 sm3 class="WM-XL-Align-L text-lg-center">
<v-flex class xs12 md3 sm3 class="WM-XL-Align-L text-lg-left">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
</v-flex>
<v-spacer></v-spacer>
<v-flex wrap xs12 md1 sm1 class="WM-Align-R">
<v-flex wrap xs12 md2 sm2 class="WM-Align-R">
<router-link :to="{name: 'SubmitTestResult'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
@@ -125,6 +124,23 @@
</router-link>
</v-flex>
</v-layout>
<v-layout wrap class="px-5 mb-3 my-3">
<!-- <v-flex class xs12 md3 sm3 class="WM-XL-Align-L text-lg-left">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
</v-flex>
<v-spacer></v-spacer>
<v-flex wrap xs12 md2 sm2 class="WM-Align-R">
<router-link :to="{name: 'SubmitTestResult'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
<span class="black--text">Add</span>
</v-btn>
</router-link>
</v-flex> -->
</v-layout>
<v-layout class="px-4 my-3">
<v-divider></v-divider>
</v-layout>
resources/js/vue/views/TestResult/Show.vue
+10 -10
View File
@@ -10,40 +10,40 @@
<v-flex xs12 md6 sm6>
<div class>
<span class="title">{{ data.device_label || 'AutoclaveID' }} :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.device_id }}</span>
<span class="headline SCCD-font ml-2" style="letter-spacing:0 !important">{{ data.device_id }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Result :</span>
<v-icon class="green--text ml-2 caption">fas fa-check</v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.result }}</span>
<span class="headline SCCD-font ml-1" style="letter-spacing:0 !important">{{ data.result }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">verify :</span>
<v-icon class="pink--text ml-2 caption">fas fa-times</v-icon>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.verified }}</span>
<span class="headline SCCD-font ml-1" style="letter-spacing:0 !important">{{ data.verified }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user.name }}</span>
<span class="headline SCCD-font ml-2" style="letter-spacing:0 !important">{{ data.user.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
<span class="headline SCCD-font ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Medical Center :</span>
<span
class="headline ml-2"
class="headline SCCD-font ml-2"
style="letter-spacing:0 !important"
>{{ data.user.medical_center.name }}</span>
</div>
@@ -59,7 +59,7 @@
<template v-if="data.inputs">
<v-flex xs12 md6 sm6 v-for="(inputData, keyInputs) in data.inputs" :key="keyInputs">
<span class="title">{{keyInputs}} :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{inputData}}</span>
<span class="headline SCCD-font ml-2" style="letter-spacing:0 !important">{{inputData}}</span>
</v-flex>
</template>
<template v-if="data.options">
@@ -67,7 +67,7 @@
<span class="title">{{keyOptions}} :</span>
<span
style="letter-spacing:0 !important"
class="headline ml-2"
class="headline SCCD-font ml-2"
v-for="(data, dataKey) in optionData"
:key="dataKey"
>{{data}},</span>
@@ -82,13 +82,13 @@
<template v-if="Array.isArray(childData)">
<span
style="letter-spacing:0 !important"
class="headline ml-2"
class="headline SCCD-font ml-2"
v-for="(data, dataKey) in childData"
:key="dataKey"
>{{data}},</span>
</template>
<template v-else>
<span class="headline ml-2">{{childData}}</span>
<span class="headline SCCD-font ml-2">{{childData}}</span>
</template>
</div>
</div>