diff --git a/src/components/core/View.vue b/src/components/core/View.vue
index e2f6fc1..b99f06e 100644
--- a/src/components/core/View.vue
+++ b/src/components/core/View.vue
@@ -11,11 +11,7 @@
diff --git a/src/router/index.js b/src/router/index.js
index 950b700..b9cc42f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -59,7 +59,9 @@ router.beforeEach((to, from, next) => {
const onlyWhenLoggedOut = to.matched.some(record => record.meta.onlyWhenLoggedOut);
const loggedIn = !!TokenService.getToken();
const roles = (to.meta && to.meta.roles) ? to.meta.roles : null;
-
+ if (to.meta.title) {
+ document.title = to.meta.title;
+ }
if (!isPublic && !loggedIn) {
return next({
path:'/login',
diff --git a/src/router/paths.js b/src/router/paths.js
index c0be2e0..3c63ed0 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -8,31 +8,42 @@ export default [
path: '/dashboard',
name: 'Dashboard',
view: 'Dashboard',
+ meta: {
+ title:'CSSD Dashboard'
+ }
},
{
path: '/my-info',
name: 'MyInfo',
- view: 'User/MyInfo'
+ view: 'User/MyInfo',
+ meta: {
+ title:'My Inf | CSSD Dashboard'
+ }
},
{
path: '/manage-users',
name: 'ManageUsers',
view: 'User/List',
meta: {
- roles: 'Admin|Supervisor'
+ roles: 'Admin|Supervisor',
+ title:'Manage User | CSSD Dashboard'
}
},
{
path: '/test-type/create',
name: 'AddTestType',
- view: 'TestType/AddEdit'
+ view: 'TestType/AddEdit',
+ meta: {
+ title:'Add Test Typ | CSSD Dashboard'
+ }
},
{
path: '/test-type/:testType/edit',
name: 'EditTestType',
view: 'TestType/AddEdit',
meta: {
- roles: 'Admin'
+ roles: 'Admin',
+ title:'Edit Test Typ | CSSD Dashboard'
}
},
{
@@ -40,7 +51,8 @@ export default [
name: 'ListTestType',
view: 'TestType/List',
meta: {
- roles: 'Admin'
+ roles: 'Admin',
+ title:'List Test Typ | CSSD Dashboard'
}
},
{
@@ -48,6 +60,7 @@ export default [
name: 'ManageMedicalCenter',
view: 'MedicalCenter/List',
meta: {
+ title:'Manage Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -56,6 +69,7 @@ export default [
name: 'AddMedicalCenter',
view: 'MedicalCenter/AddEdit',
meta: {
+ title:'Add Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -64,6 +78,7 @@ export default [
name: 'EditMedicalCenter',
view: 'MedicalCenter/AddEdit',
meta: {
+ title:'Edit Medical Center | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -72,6 +87,7 @@ export default [
name: 'AddOperator',
view: 'Auth/Register',
meta: {
+ title:'Add Operator | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -80,6 +96,7 @@ export default [
name: 'OperatorList',
view: 'MedicalCenter/OperatorList',
meta: {
+ title:'Operator List | CSSD Dashboard',
roles: 'Admin'
}
},
@@ -88,6 +105,7 @@ export default [
name: 'Login',
view: 'Auth/Login',
meta: {
+ title:'Login | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true
}
@@ -97,6 +115,7 @@ export default [
name: 'Register',
view: 'Auth/Register',
meta: {
+ title:'Register | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true,
roles: 'Admin'
@@ -107,6 +126,7 @@ export default [
name: 'ForgotPassword',
view: 'Auth/ForgotPassword',
meta: {
+ title:'Forgot Password | CSSD Dashboard',
public: true, // Allow access to even if not logged in
onlyWhenLoggedOut: true
},
@@ -116,112 +136,176 @@ export default [
name: 'ShowTestResult',
view: 'TestResult/Show',
meta: {
+ title:'Show Test Result | CSSD Dashboard',
public: true,
},
},
{
path: '/resualt-test',
name: 'AllResultTest',
- view: 'TestResult/List'
+ view: 'TestResult/List',
+ meta:{
+ title:'All Result Test | CSSD Dashboard',
+ }
},
{
path: '/add-test-result',
name: 'SubmitTestResult',
- view: 'TestResult/AddEdit'
+ view: 'TestResult/AddEdit',
+ meta:{
+ title:'Submit Test Result | CSSD Dashboard',
+ }
},
{
path: '/test-result/:testResult/edit',
name: 'EditTestResult',
- view: 'TestResult/AddEdit'
+ view: 'TestResult/AddEdit',
+ meta:{
+ title:'Edit Test Result | CSSD Dashboard',
+ }
},
{
path: '/test-result/NotVerified',
name: 'NotVerifyTestResult',
- view: 'TestResult/List'
+ view: 'TestResult/List',
+ meta:{
+ title:'Not Verify Test Resul | CSSD Dashboard'
+ }
},
{
path: '/statistics',
name: 'Statistics',
- view: 'Statistics/Chart'
+ view: 'Statistics/Chart',
+ meta:{
+ title:'Statistics | CSSD Dashboard',
+ }
},
{
path: '/add-package',
name: 'AddPackage',
- view: 'Package/AddEdit'
+ view: 'Package/AddEdit',
+ meta:{
+ title:'Add Package | CSSD Dashboard',
+ }
},
{
path: '/packages',
name: 'AllPackage',
- view: 'Package/List'
+ view: 'Package/List',
+ meta:{
+ title:'All Package | CSSD Dashboard',
+ }
},
{
path: '/packages/:package/edit',
name: 'EditPackage',
- view: 'Package/AddEdit'
+ view: 'Package/AddEdit',
+ meta:{
+ title:'Edit Package | CSSD Dashboard',
+ }
},
{
path: '/add-label',
name: 'AddLabel',
- view: 'Label/AddEdit'
+ view: 'Label/AddEdit',
+ meta:{
+ title:'Add Label | CSSD Dashboard',
+ }
},
{
path: '/labels',
name: 'AllLabels',
- view: 'Label/List'
+ view: 'Label/List',
+ meta:{
+ title:'All Labels | CSSD Dashboard',
+ }
},
{
path: '/label/:label/edit',
name: 'EditLabel',
- view: 'Label/AddEdit'
+ view: 'Label/AddEdit',
+ meta:{
+ title:'Edit Label | CSSD Dashboard',
+ }
},
{
path: '/add-cycle',
name: 'AddCycle',
- view: 'Cycle/AddEdit'
+ view: 'Cycle/AddEdit',
+ meta:{
+ title:'Add Cycle | CSSD Dashboard',
+ }
},
{
path: '/cycles',
name: 'AllCycle',
- view: 'Cycle/List'
+ view: 'Cycle/List',
+ meta:{
+ title:'All Cycle | CSSD Dashboard',
+ }
},
{
path: '/cycle/:cycle/edit',
name: 'EditCycle',
- view: 'Cycle/AddEdit'
+ view: 'Cycle/AddEdit',
+ meta:{
+ title:'Edit Cycle | CSSD Dashboard',
+ }
},
{
path: '/add-Item',
name: 'AddItem',
- view: 'Item/AddEdit'
+ view: 'Item/AddEdit',
+ meta:{
+ title:'Add Item | CSSD Dashboard',
+ }
},
{
path: '/Items',
name: 'AllItem',
- view: 'Item/List'
+ view: 'Item/List',
+ meta:{
+ title:'All Item | CSSD Dashboard',
+ }
},
{
path: '/Item/:Item/edit',
name: 'EditItem',
- view: 'Item/AddEdit'
+ view: 'Item/AddEdit',
+ meta:{
+ title:'Edit Item | CSSD Dashboard',
+ }
},
{
path: '/my-Items',
name: 'MyItem',
- view: 'MyItem/List'
+ view: 'MyItem/List',
+ meta:{
+ title:'My Item | CSSD Dashboard',
+ }
},
{
path: '/tickets',
name: 'Tickets',
- view: 'Tickets/List'
+ view: 'Tickets/List',
+ meta:{
+ title:'Tickets | CSSD Dashboard',
+ }
},
{
path: '/ShowPackage/:package',
name: 'ShowPackage',
- view: 'Package/ShowPackage'
+ view: 'Package/ShowPackage',
+ meta:{
+ title:'Show Package | CSSD Dashboard',
+ }
},
{
path: '/Intro',
name: 'Intro',
- view: 'Intro/Intro'
+ view: 'Intro/Intro',
+ meta:{
+ title:'Intro | CSSD Dashboard',
+ }
},
]
diff --git a/src/views/Item/List.vue b/src/views/Item/List.vue
index 81e2e99..a822eae 100644
--- a/src/views/Item/List.vue
+++ b/src/views/Item/List.vue
@@ -3,40 +3,38 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
fas fa-search
Filter
-
+
fas fa-plus
diff --git a/src/views/Label/AddEdit.vue b/src/views/Label/AddEdit.vue
index 438238f..59e243b 100644
--- a/src/views/Label/AddEdit.vue
+++ b/src/views/Label/AddEdit.vue
@@ -4,24 +4,24 @@
-
-
+
+
+ v-model="formData.sterilizer_id" class="py-3 pr-3"/>
-
-
-
+
+
+
-
-
+
+
+ class="py-3 pr-3"/>
-
-
-
+
+
+
@@ -33,46 +33,44 @@
-
-
+
+
+ v-model="fromMenuSterile" style="width: 100%">
-
-
+ v-model="formData.sterile_date"/>
+
-
-
+
+
+ v-model="fromMenuExpire" style="width: 100%">
-
-
+
+ :date-format="date => new Date(date).toDateString()"/>
-
+
+
+
+ keyboard_arrow_left
+ Back
+
+
+
+
fas fa-check
SAVE
-
-
-
- keyboard_arrow_left
- Back
-
-
-
@@ -89,10 +87,11 @@ export default {
showCurrent: false,
fromMenuSterile: false,
fromMenuExpire: false,
+ today: new Date().toISOString().split("T")[0],
formData: {
result: "",
package_id: "",
- expire_date: "2020-01-01",
+ expire_date: null,
sterilizer_id: '',
cycle_number: '',
sterile_date: new Date().toISOString().substr(0, 10)