diff --git a/.firebase/hosting.ZGlzdA.cache b/.firebase/hosting.ZGlzdA.cache index 46bbd9d..3f9da09 100644 --- a/.firebase/hosting.ZGlzdA.cache +++ b/.firebase/hosting.ZGlzdA.cache @@ -25,7 +25,7 @@ ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713 ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234 ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3 ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a -index.html,1666561621786,36e822f3ffb70e1a608d6164ed984211da7531bbf07224ffa38d2dc701c7ca49 -assets/icon-save.5a12487e.svg,1666561621785,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c -assets/index.fd5b13f0.css,1666561621786,a884024f41b950250886378f2d0f739d35a511cc0e5be1ee14a1cce97bb5c50a -assets/index.62948ee3.js,1666561621786,d3290e5f59b80ea4a97d83ad1453f96ac6b136c2e66941d0aee3ee9ddc765012 +index.html,1666564269542,70d2f2079501d80e601fb45c73b19c76e5045940ac64e346376c6551b644b851 +assets/icon-save.5a12487e.svg,1666564269543,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c +assets/index.c14514ca.css,1666564269543,584a9268e2ca5f0c8bbb8912cfe018dd5e249a16cadacccf3f96dd60db73e221 +assets/index.72b72171.js,1666564269543,654c54634cbe11c57aa1d03001d33e3cde14fa2a56516f0b3816c92920cad2c2 diff --git a/package.json b/package.json index dd9c986..a2b9d05 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "pinia": "^2.0.14", "vue": "^3.2.37", "vue-router": "^4.0.0-0", - "vue-tsc": "^1.0.8" + "vue-tsc": "^1.0.9" }, "devDependencies": { "@vitejs/plugin-vue": "^3.0.0", diff --git a/src/components/Order.vue b/src/components/Order.vue index afdef0e..3ab6672 100644 --- a/src/components/Order.vue +++ b/src/components/Order.vue @@ -68,13 +68,12 @@ export default defineComponent({ background-color: white; color: black; + height: 925px; max-height: 95vh; overflow: auto; font-size: 15px; - box-shadow: 0 0 15px 2px white; - h2 { margin: 0; padding: 0; diff --git a/src/components/OrderMessage.vue b/src/components/OrderMessage.vue index 2793031..fcf05f2 100644 --- a/src/components/OrderMessage.vue +++ b/src/components/OrderMessage.vue @@ -28,11 +28,12 @@ import { useStore } from '../store/store'; import saveIcon from '../assets/icon-save.svg'; import orderStorageMixin from '../mixins/orderStorageMixin'; import orderFooterMixin from '../mixins/orderFooterMixin'; +import orderValidationMixin from '../mixins/orderValidationMixin'; export default defineComponent({ name: 'OrderMessage', - mixins: [orderStorageMixin, orderFooterMixin], + mixins: [orderStorageMixin, orderValidationMixin], data() { return { @@ -78,26 +79,13 @@ export default defineComponent({ }, 5000); }, - verifyHeader() { - const header = this.store[this.store.chosenOrderType].header; - const fieldsToCorrect = []; - - if (!header.orderNo) fieldsToCorrect.push('numer rozkazu'); - if (!header.trainNo) fieldsToCorrect.push('numer pociągu / manewru'); - if (!header.date) fieldsToCorrect.push('data'); - - return fieldsToCorrect; - }, - copyMessage() { if (!navigator.clipboard) return this.showActionMonit( 'Ups! Twoja przeglądarka musi być dosyć przestarzała, ponieważ nie obsługuje zapisu do schowka! :/' ); - const headerFieldsToCorrect = this.verifyHeader(); - const footerFieldsToCorrect = this.verifyFooter(); - const fieldsToCorrect = [...headerFieldsToCorrect, ...footerFieldsToCorrect]; + const fieldsToCorrect = this.verifyOrderFields(); if (fieldsToCorrect.length > 0) return this.showActionMonit( diff --git a/src/components/OrderO.vue b/src/components/OrderO.vue index 76ae5f0..c9aa5da 100644 --- a/src/components/OrderO.vue +++ b/src/components/OrderO.vue @@ -193,7 +193,7 @@ th { display: flex; flex-direction: column; - height: 250px; + height: 285px; padding: 0.5em; diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue index 9a67ce1..cd05d13 100644 --- a/src/components/SideBar.vue +++ b/src/components/SideBar.vue @@ -64,13 +64,13 @@ export default defineComponent({ @import '../styles/global.scss'; .sidebar { - position: fixed; - top: 50%; + position: absolute; + top: 0; left: 0; z-index: 999; - transform: translateY(-50%); + transform: translate(-100%, 0); } .sidebar_content { @@ -91,14 +91,14 @@ export default defineComponent({ align-items: center; color: white; - background-color: #00000073; + background-color: #1d1d1d; width: 50px; height: 85px; .bar { position: absolute; top: 0; - right: 0; + left: 0; height: 100%; width: 4px; @@ -118,7 +118,7 @@ export default defineComponent({ } &:focus-visible { - background-color: #6d6d6d73; + background-color: #6d6d6d; } } } @@ -140,17 +140,18 @@ button.option-save { .sidebar { left: 50%; top: 0; + width: 100%; - transform: translate(-50%, 0); + transform: translate(-50%, -100%); } .sidebar_content { - grid-template-rows: 1fr; - grid-template-columns: repeat(3, 1fr); + display: flex; + justify-content: space-between; & > button { - height: 60px; - width: 60px; + height: 40px; + width: 100px; .bar { width: 100%; @@ -160,3 +161,4 @@ button.option-save { } } + diff --git a/src/mixins/orderFooterMixin.ts b/src/mixins/orderFooterMixin.ts index ecd5b9b..ba1e043 100644 --- a/src/mixins/orderFooterMixin.ts +++ b/src/mixins/orderFooterMixin.ts @@ -9,21 +9,6 @@ export default defineComponent({ }, methods: { - verifyFooter() { - const footer = this.store.orderFooter; - - const fieldsToCorrect = []; - - if (!footer.stationName) fieldsToCorrect.push('stacja'); - if (!footer.checkpointName) fieldsToCorrect.push('posterunek'); - if (!footer.hour) fieldsToCorrect.push('godzina'); - if (!footer.minutes) fieldsToCorrect.push('minuta'); - if (!footer.dispatcherName && !footer.secondaryDispatcherName) - fieldsToCorrect.push('dyżurny ruchu (lub z polecenia dyżurnego ruchu)'); - - return fieldsToCorrect; - }, - generateFooter() { const footer = this.store.orderFooter; diff --git a/src/mixins/orderValidationMixin.ts b/src/mixins/orderValidationMixin.ts new file mode 100644 index 0000000..85e93a1 --- /dev/null +++ b/src/mixins/orderValidationMixin.ts @@ -0,0 +1,32 @@ +import { defineComponent } from 'vue'; +import { useStore } from '../store/store'; + +export default defineComponent({ + setup() { + return { + store: useStore(), + }; + }, + + methods: { + verifyOrderFields() { + const header = this.store[this.store.chosenOrderType].header; + const footer = this.store.orderFooter; + + const fieldsToCorrect = []; + + if (!header.orderNo) fieldsToCorrect.push('numer rozkazu'); + if (!header.trainNo) fieldsToCorrect.push('numer pociągu / manewru'); + if (!header.date) fieldsToCorrect.push('data'); + + if (!footer.stationName) fieldsToCorrect.push('stacja'); + if (!footer.checkpointName) fieldsToCorrect.push('posterunek'); + if (!footer.hour) fieldsToCorrect.push('godzina'); + if (!footer.minutes) fieldsToCorrect.push('minuta'); + if (!footer.dispatcherName && !footer.secondaryDispatcherName) + fieldsToCorrect.push('dyżurny ruchu (lub z polecenia dyżurnego ruchu)'); + + return fieldsToCorrect; + }, + }, +}); diff --git a/src/views/Home.vue b/src/views/Home.vue index 6bf808e..32675c3 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,10 +1,10 @@