fix : title page test result

This commit is contained in:
zeinab.ashrafi
2025-05-17 14:26:47 +03:30
parent 4d9d4928f3
commit 3610d97cec
4 changed files with 320 additions and 353 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<modal-base :show="getCurrentModal" :width="getModalProperties.width ? getModalProperties.width + '%': '70%'" @close="closeModal"> <modal-base :show="getCurrentModal" :width="getModalProperties.width ? getModalProperties.width + '%': '70%'" @close="closeModal">
<component :is="getCurrentModal" v-bind="getModalProperties"></component> <component :is="getCurrentModal" v-bind="getModalProperties"/>
</modal-base> </modal-base>
</div> </div>
</template> </template>
+2 -1
View File
@@ -95,7 +95,8 @@ export default {
watch: { watch: {
'$route'(val) { '$route'(val) {
// this.title = val.name // this.title = val.name
this.title = val.name.replace(/([A-Z])/g, ' $1').trim() !== 'Dashboard' ? val.name.replace(/([A-Z])/g, ' $1').trim() : 'home' // this.title = val.name.replace(/([A-Z])/g, ' $1').trim() !== 'Dashboard' ? val.name.replace(/([A-Z])/g, ' $1').trim() : 'home'
this.title = val.meta.title.split('|')[0].trim();
} }
}, },
+1 -1
View File
@@ -169,7 +169,7 @@ export default [
name: 'NotVerifyTestResult', name: 'NotVerifyTestResult',
view: 'TestResult/List', view: 'TestResult/List',
meta: { meta: {
title: 'Verify Test Resul | CSSD Dashboard' title: 'Verify Test Result | CSSD Dashboard'
} }
}, },
{ {
+7 -41
View File
@@ -1,5 +1,4 @@
<template> <template>
<div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Test Result" text> <material-card class color="black" title="All Test Result" text>
<v-layout align-center wrap class="px-3"> <v-layout align-center wrap class="px-3">
@@ -178,7 +177,6 @@
</v-layout> </v-layout>
</material-card> </material-card>
</v-container> </v-container>
</div>
</template> </template>
<script> <script>
@@ -264,7 +262,7 @@ export default {
} }
filter += (page) ? `page=${page}` : `page=1`; filter += (page) ? `page=${page}` : `page=1`;
const result = await ApiService.get(urls.listTestResult(filter)); const result = await ApiService.get(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;
this.currentPage = meta.current_page; this.currentPage = meta.current_page;
@@ -273,7 +271,7 @@ export default {
}, },
async show(id) { async show(id) {
const result = await ApiService.get(urls.showTestResult(id)); const result = await ApiService.get(urls.showTestResult(id));
if (result && result.status == 200) { if (result && result.status === 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-testresult-show", modal: "modal-testresult-show",
properties: { properties: {
@@ -288,9 +286,9 @@ export default {
properties: {width: '30'}, properties: {width: '30'},
success: async () => { success: async () => {
const result = await ApiService.delete(urls.removeTestResult(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 (this.items.hasOwnProperty(key) && this.items[key].id == id) { if (this.items.hasOwnProperty(key) && this.items[key].id === id) {
this.items.splice(key, 1); this.items.splice(key, 1);
} }
} }
@@ -301,14 +299,14 @@ export default {
}, },
async fillSelectFilter() { async fillSelectFilter() {
const result = await ApiService.get(urls.listFilterItemsTestResult); const result = await ApiService.get(urls.listFilterItemsTestResult);
if (result && result.status == 200) { if (result && result.status === 200) {
this.medicalCenters = result.data.data.MedicalCenters; this.medicalCenters = result.data.data.MedicalCenters;
this.testTypes = result.data.data.TestTypes; this.testTypes = result.data.data.TestTypes;
} }
}, },
async generateBarcode(id, type) { async generateBarcode(id, type) {
const result = await ApiService.post(urls.Barcode(id, type)); const result = await ApiService.post(urls.Barcode(id, type));
if (result && result.status == 200) { if (result && result.status === 200) {
this.changeCurrentModal({ this.changeCurrentModal({
modal: "modal-barcode-barcode", modal: "modal-barcode-barcode",
properties: { properties: {
@@ -332,7 +330,7 @@ export default {
}, },
getModalResult(testResult) { getModalResult(testResult) {
for (const key in this.items) { for (const key in this.items) {
if (this.items.hasOwnProperty(key) && this.items[key].id == testResult.id) { if (this.items.hasOwnProperty(key) && this.items[key].id === testResult.id) {
this.items[key].verified = testResult.verified; this.items[key].verified = testResult.verified;
} }
} }
@@ -364,36 +362,4 @@ export default {
} }
} }
/* .FlexBtn {
display: flex;
flex-wrap: nowrap;
padding: 10px 8px !important;
}
td.FlexBtn .theme--light.v-btn {
padding: 21px 20px;
}
td.FlexBtn a.LinkBtn .theme--light.v-btn {
padding: 12px 10px;
}
@media screen and (max-width:1536px) {
.FlexBtn {
padding: 30px 8px !important;
}
td.FlexBtn span {
display: none;
}
td.FlexBtn .theme--light.v-btn {
min-width: 30px;
padding: 15px 10px;
margin-right: 1 !important;
}
td.FlexBtn a.LinkBtn .theme--light.v-btn {
padding: 9px 10px;
}
td.FlexBtn .theme--light.v-icon {
margin-right: 0 !important;
}
} */
</style> </style>