mirror of
https://github.com/Spythere/genera-tor.git
synced 2026-05-03 13:38:12 +00:00
Poprawki designu
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
android-icon-144x144.png,1658609936712,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
android-icon-144x144.png,1658609936712,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
||||||
android-icon-36x36.png,1658609936631,2c7bfa33d306a96824a570be7bf125dc71a9a47675a3b6796957d52f325b41e1
|
|
||||||
android-icon-192x192.png,1658609936732,9638f0d6d0dfe1fab2fb6f2dd132626d44010adbf7c06aad3b1244a1e3cfe906
|
android-icon-192x192.png,1658609936732,9638f0d6d0dfe1fab2fb6f2dd132626d44010adbf7c06aad3b1244a1e3cfe906
|
||||||
|
android-icon-36x36.png,1658609936631,2c7bfa33d306a96824a570be7bf125dc71a9a47675a3b6796957d52f325b41e1
|
||||||
android-icon-48x48.png,1658609936652,8819d530581ce67a5b4dd77cbb7444a3cb30e358af1af37ad82cfa36c08b5ebd
|
android-icon-48x48.png,1658609936652,8819d530581ce67a5b4dd77cbb7444a3cb30e358af1af37ad82cfa36c08b5ebd
|
||||||
android-icon-72x72.png,1658609936672,041b7fbd037073a949111199dd62a417249e50b3b5d2ced8eb6825c223498d30
|
android-icon-72x72.png,1658609936672,041b7fbd037073a949111199dd62a417249e50b3b5d2ced8eb6825c223498d30
|
||||||
android-icon-96x96.png,1658609936692,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
|
android-icon-96x96.png,1658609936692,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
|
||||||
|
apple-icon-114x114.png,1658609936834,cc38f2ff66144e1f036f3bd08b675ad05f53feed4d663e81f9814d605636cbd3
|
||||||
apple-icon-120x120.png,1658609936854,67b1201208ff3fb541590d7a29da605c9fe8a2a8b3c36879603c13a9bbfad162
|
apple-icon-120x120.png,1658609936854,67b1201208ff3fb541590d7a29da605c9fe8a2a8b3c36879603c13a9bbfad162
|
||||||
apple-icon-144x144.png,1658609936874,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
apple-icon-144x144.png,1658609936874,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
||||||
apple-icon-114x114.png,1658609936834,cc38f2ff66144e1f036f3bd08b675ad05f53feed4d663e81f9814d605636cbd3
|
|
||||||
apple-icon-152x152.png,1658609936896,46ae5f5f9df50c4c25370a3d2f0d42a92fd9f1361589417dd0fe71a7eee4dc60
|
apple-icon-152x152.png,1658609936896,46ae5f5f9df50c4c25370a3d2f0d42a92fd9f1361589417dd0fe71a7eee4dc60
|
||||||
apple-icon-180x180.png,1658609936917,8692818f09315e37c1ba6f1009cd1a1be16f4cbb163947e08d326e80e7ff1504
|
apple-icon-180x180.png,1658609936917,8692818f09315e37c1ba6f1009cd1a1be16f4cbb163947e08d326e80e7ff1504
|
||||||
apple-icon-57x57.png,1658609936753,9c0134415ddca313dea44cae62bb3bba802b27a4b4d1bd68c7dbe756eb9e9fe9
|
apple-icon-57x57.png,1658609936753,9c0134415ddca313dea44cae62bb3bba802b27a4b4d1bd68c7dbe756eb9e9fe9
|
||||||
@@ -18,14 +18,14 @@ apple-icon.png,1658609936960,ef8b2aa4473012f6cbf0eab9aff385a16dcfab72bb340b8b0f3
|
|||||||
browserconfig.xml,1658609936584,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
|
browserconfig.xml,1658609936584,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
|
||||||
favicon-16x16.png,1658609937063,901b523b550a6b6c06fdaab794312df23540a73aa21f8362adeb3612b977ad7b
|
favicon-16x16.png,1658609937063,901b523b550a6b6c06fdaab794312df23540a73aa21f8362adeb3612b977ad7b
|
||||||
favicon-32x32.png,1658609937085,dc28bc1572c28dc3ac9aa81d38e1ec60d493519e7d62ebdb51e46d2373f66991
|
favicon-32x32.png,1658609937085,dc28bc1572c28dc3ac9aa81d38e1ec60d493519e7d62ebdb51e46d2373f66991
|
||||||
favicon.ico,1658609936555,430715a10935493850fedc5c8d16aef816fa97a16fdaca89f0ec0c4eefe28a78
|
|
||||||
favicon-96x96.png,1658609937106,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
|
favicon-96x96.png,1658609937106,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
|
||||||
index.html,1666364202599,8853620e894b9344fda372d5e86c903dc6ba1f1477a46d8fe99adf16cefd72a1
|
favicon.ico,1658609936555,430715a10935493850fedc5c8d16aef816fa97a16fdaca89f0ec0c4eefe28a78
|
||||||
manifest.json,1658609936611,46e7f5e409f1e10cb0007bcdd51eb6031ff1bd4a61d07513a4d2b80f6cc5381f
|
manifest.json,1658609936611,46e7f5e409f1e10cb0007bcdd51eb6031ff1bd4a61d07513a4d2b80f6cc5381f
|
||||||
ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
|
||||||
ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a
|
|
||||||
ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234
|
ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234
|
||||||
assets/icon-save.5a12487e.svg,1666364202599,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c
|
|
||||||
assets/index.4785c605.css,1666364202599,54d582b36380fcf2b8d5342f2d6831c8b7b5490e490c512f27216e6507b9053d
|
|
||||||
ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3
|
ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3
|
||||||
assets/index.d0f8d15f.js,1666364202599,788b8e9fab4a1047223de761bb2167000a04c101d9d464ef4ed0cb5fe5667950
|
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
|
||||||
|
|||||||
@@ -106,9 +106,11 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
|
|
||||||
ul {
|
ul {
|
||||||
|
max-height: 750px;
|
||||||
|
height: 80vh;
|
||||||
|
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
height: 60vh;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
<h3>Wiadomość do wyświetlenia na czacie symulatora:</h3>
|
<h3>Wiadomość do wyświetlenia na czacie symulatora:</h3>
|
||||||
|
|
||||||
<div class="message_body" v-html="fullOrderMessage"></div>
|
<div class="message_body" v-html="fullOrderMessage"></div>
|
||||||
<p class="message_info">Po wygenerowaniu rozkazu skopiuj jego treść lub zapisz w pamięci przeglądarki za pomocą przycisków poniżej</p>
|
<p class="message_info">
|
||||||
|
Po wygenerowaniu rozkazu skopiuj jego treść lub zapisz w pamięci przeglądarki za pomocą przycisków poniżej
|
||||||
|
</p>
|
||||||
|
|
||||||
<div class="message_actions">
|
<div class="message_actions">
|
||||||
<button class="g-button action" @click="saveOrder">Zapisz nowy rozkaz</button>
|
<button class="g-button action" @click="saveOrder">Zapisz nowy rozkaz</button>
|
||||||
@@ -25,11 +27,12 @@ import { useStore } from '../store/store';
|
|||||||
|
|
||||||
import saveIcon from '../assets/icon-save.svg';
|
import saveIcon from '../assets/icon-save.svg';
|
||||||
import orderStorageMixin from '../mixins/orderStorageMixin';
|
import orderStorageMixin from '../mixins/orderStorageMixin';
|
||||||
|
import orderFooterMixin from '../mixins/orderFooterMixin';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'OrderMessage',
|
name: 'OrderMessage',
|
||||||
|
|
||||||
mixins: [orderStorageMixin],
|
mixins: [orderStorageMixin, orderFooterMixin],
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -75,12 +78,34 @@ export default defineComponent({
|
|||||||
}, 5000);
|
}, 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() {
|
copyMessage() {
|
||||||
if (!navigator.clipboard)
|
if (!navigator.clipboard)
|
||||||
return this.showActionMonit(
|
return this.showActionMonit(
|
||||||
'Ups! Twoja przeglądarka musi być dosyć przestarzała, ponieważ nie obsługuje zapisu do schowka! :/'
|
'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];
|
||||||
|
|
||||||
|
if (fieldsToCorrect.length > 0)
|
||||||
|
return this.showActionMonit(
|
||||||
|
`<span class="text--warn">Przed skopiowaniem wiadomości uzupełnij rubryki: ${fieldsToCorrect.join(
|
||||||
|
', '
|
||||||
|
)}</span>`
|
||||||
|
);
|
||||||
|
|
||||||
navigator.clipboard.writeText(this.fullOrderMessage);
|
navigator.clipboard.writeText(this.fullOrderMessage);
|
||||||
|
|
||||||
this.showActionMonit(
|
this.showActionMonit(
|
||||||
|
|||||||
@@ -9,6 +9,21 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
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() {
|
generateFooter() {
|
||||||
const footer = this.store.orderFooter;
|
const footer = this.store.orderFooter;
|
||||||
|
|
||||||
@@ -22,9 +37,10 @@ export default defineComponent({
|
|||||||
if (footer.secondaryDispatcherName)
|
if (footer.secondaryDispatcherName)
|
||||||
messageArray.push(`z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`);
|
messageArray.push(`z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`);
|
||||||
|
|
||||||
this.store.footerMessage = ` <b>|</b> ${messageArray.join(', ')} <b>|</b> Rozkaz otrzymałem, maszynista: (potwierdzić otrzymanie rozkazu)`;
|
this.store.footerMessage = ` <b>|</b> ${messageArray.join(
|
||||||
|
', '
|
||||||
|
)} <b>|</b> Rozkaz otrzymałem, maszynista: (potwierdzić otrzymanie rozkazu)`;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user