Spythere/genera-tor
1
0
Fork 0
mirror of https://github.com/Spythere/genera-tor.git synced 2026-05-03 05:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Poprawki zapisywania rozkazów i listy

Browse Source
This commit is contained in:
Spythere
2022-10-28 12:53:47 +02:00
parent 20e5df3290
commit 190cedff0e
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.firebase/hosting.ZGlzdA.cache
+4 -4
View File
@@ -25,7 +25,7 @@ ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713
ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234 ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234
ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3 ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3
ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a
index.html,1666810286156,89deda4447e48e5633c80ff58647b5285dea60771814bad3a10251640795f62c index.html,1666893470579,06fd310d64b261a95947443001d97eb5ed6e83ef0a6256ca64bec6dfcc230bc2
assets/icon-save.5a12487e.svg,1666810286155,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c assets/icon-save.5a12487e.svg,1666893470579,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c
assets/index.f04e20fa.css,1666810286162,f6b429354ceb854e2194d03ab61a9849d1d7c18093e455a181d4ea266aef79d3 assets/index.aea6e45f.css,1666893470585,11f5ec471f15aa558346c56f32c264cacda9682ab977d7f0bda937a655240eb5
assets/index.94c91b26.js,1666810286156,f02ea5c814ca05573d7951ec52ffa2bb97c4c134aa6963ac01178ecb34116606 assets/index.93a62879.js,1666893470579,107435fdcc21aa0c0e827f6957d987da5e0f03950af198257a904eb04912aa6f
src/components/OrderList.vue
+7 -3
View File
@@ -5,8 +5,8 @@
<transition-group name="list" tag="ul"> <transition-group name="list" tag="ul">
<li class="no-orders-warning" v-if="sortedOrderList.length == 0" :key="-1">Brak zapisanych rozkazów!</li> <li class="no-orders-warning" v-if="sortedOrderList.length == 0" :key="-1">Brak zapisanych rozkazów!</li>
<li v-for="(order, i) in sortedOrderList" :key="order.id"> <li v-for="order in sortedOrderList" :selected="order.id == store.chosenLocalOrderId" :key="order.id">
<b class="text--accent">#{{ sortedOrderList.length - i }}&nbsp;</b> <b class="text--accent">#{{ order.id.split('-')[1] }}&nbsp;</b>
<b> <b>
{{ getOrderName(order.orderType) }} nr {{ order.orderBody['header']['orderNo'] }} dla pociągu nr {{ getOrderName(order.orderType) }} nr {{ order.orderBody['header']['orderNo'] }} dla pociągu nr
{{ order.orderBody['header']['trainNo'] }} {{ order.orderBody['header']['trainNo'] }}
@@ -84,6 +84,8 @@ export default defineComponent({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../styles/global.scss';
.list { .list {
&-move, &-move,
&-enter-active, &-enter-active,
@@ -125,7 +127,6 @@ li {
padding: 1em; padding: 1em;
margin: 0.5em; margin: 0.5em;
background-color: #222; background-color: #222;
width: 100%;
cursor: pointer; cursor: pointer;
@@ -133,6 +134,9 @@ li {
margin: 1em 1em 0 0; margin: 1em 1em 0 0;
} }
&[selected='true'] {
outline: 1px solid $accentCol;
}
&.no-orders-warning { &.no-orders-warning {
text-align: center; text-align: center;
font-size: 1.2em; font-size: 1.2em;
src/components/OrderMessage.vue
+2 -2
View File
@@ -11,7 +11,8 @@
<button class="g-button action" @click="saveOrder">Zapisz nowy rozkaz</button> <button class="g-button action" @click="saveOrder">Zapisz nowy rozkaz</button>
<button class="g-button action" @click="copyMessage">Kopiuj treść rozkazu</button> <button class="g-button action" @click="copyMessage">Kopiuj treść rozkazu</button>
<button class="g-button action" :data-disabled="!store.chosenLocalOrderId" @click="updateOrder"> <button class="g-button action" :data-disabled="!store.chosenLocalOrderId" @click="updateOrder">
Zaktualizuj ten rozkaz Zaktualizuj rozkaz
<span class="text--accent">{{ store.chosenLocalOrderId && `#${store.chosenLocalOrderId.split('-')[1]}` }} </span>
</button> </button>
</div> </div>
@@ -27,7 +28,6 @@ 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';
import orderValidationMixin from '../mixins/orderValidationMixin'; import orderValidationMixin from '../mixins/orderValidationMixin';
export default defineComponent({ export default defineComponent({
src/mixins/orderStorageMixin.ts
+3 -3
View File
@@ -67,7 +67,9 @@ export default defineComponent({
removeLocalOrder(order: LocalStorageOrder) { removeLocalOrder(order: LocalStorageOrder) {
localStorage.removeItem(order.id); localStorage.removeItem(order.id);
localStorage.setItem('orderCount', (Number(localStorage.getItem('orderCount')) - 1).toString());
if (this.store.chosenLocalOrderId == order.id) this.store.chosenLocalOrderId = '';
// localStorage.setItem('orderCount', (Number(localStorage.getItem('orderCount')) - 1).toString());
}, },
selectLocalOrder(order: LocalStorageOrder) { selectLocalOrder(order: LocalStorageOrder) {
@@ -114,8 +116,6 @@ export default defineComponent({
(this.store.orderFooter as any)[key] = localOrderFooter[key]; (this.store.orderFooter as any)[key] = localOrderFooter[key];
} }
console.log(this.store[this.store.chosenOrderType]);
this.store.orderMode = 'OrderMessage'; this.store.orderMode = 'OrderMessage';
}, },
}, },
src/styles/global.scss
-4
View File
@@ -94,10 +94,6 @@ ul {
list-style: none; list-style: none;
text-align: center; text-align: center;
li {
padding: 0.5em;
}
} }
// Global scrollbar style // Global scrollbar style