From 41b3dc2fcd345cbe0e2380281258a451fce0cbc4 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 13 Nov 2022 23:02:03 +0100 Subject: [PATCH 1/3] Wersja 1.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 221ac16..c0473b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "genera-tor", - "version": "1.0.0", + "version": "1.0.1", "private": true, "scripts": { "dev": "vite --port 8080", From ad0175c82333611ebb3a8f9044a3ae4646a55390 Mon Sep 17 00:00:00 2001 From: Spythere Date: Mon, 14 Nov 2022 14:08:39 +0100 Subject: [PATCH 2/3] Wersja 1.0.2 --- .firebase/hosting.ZGlzdA.cache | 38 ++++++++++++++-------------- package.json | 2 +- public/manifest.json | 2 +- src/App.vue | 4 +++ src/components/Order.vue | 6 +++++ src/components/OrderO.vue | 45 ++++++++++++++++++++-------------- 6 files changed, 58 insertions(+), 39 deletions(-) diff --git a/.firebase/hosting.ZGlzdA.cache b/.firebase/hosting.ZGlzdA.cache index 3b9a050..4c7566f 100644 --- a/.firebase/hosting.ZGlzdA.cache +++ b/.firebase/hosting.ZGlzdA.cache @@ -1,19 +1,19 @@ -android-chrome-192x192.png,1667751601703,d8371f57308034713d904167a59e32a432a5f6b1b49574713c2a1da00d4c2e84 -browserconfig.xml,1667751601704,5032f08c233ca59d451d9cc2242946c654bd2293f913d2c467642cd378aa1254 -apple-touch-icon.png,1667751601703,aa303db393c592e6e012b3c2869020e10eb3b6d3ad2a3c90994192d44b8598e2 -favicon-16x16.png,1667751601704,5995dd54b3476a3213a324c2a4d00aacf0acd5ffcc583ba193713141bf3d1087 -favicon-32x32.png,1667751601704,7ea29a77dd16719739b086ed4fe5c50f5db3f46688c6d880fbdae080a340a375 -index.html,1667751601881,bfc890bbfa043c4a8f3fc30fad6fb3c25f3efd53cd938b2e8a555b6ab07ccb95 -manifest.json,1667751601705,e451717ede04bc18dd4e8dc66c4d612ed73dac6bcf9ca7152f8fda2bf9415557 -manifest.webmanifest,1667751601881,eae72ad93d4e4936b5346e88ccc20c917594794ced77c06b17f46bb4a730622f -mstile-150x150.png,1667751601705,bfd3cc2346286a827a850c21157e21c30debae6a38ac1750ebe2bd0212cf14e2 -registerSW.js,1667751601881,cffcd66cea54ba3f643931972304147da9b9e11da6411f809b0c540221cffb5e -safari-pinned-tab.svg,1667751601705,25933fb1b14e266a77a75af8b3858d38947682b15fa8436e13a16e933d357873 -site.webmanifest,1667751601706,27a49e20157daf138ed30ee09bf68686d8474365251cd88fb69e94f925eb52c4 -sw.js,1667751604119,b1aaec5f514a33ba2dea65c455848f5bf5b69449c85dca13d9f4776edbf1e836 -assets/icon-save.5a12487e.svg,1667751601881,4814ee28b64ed5018867301fd446c33cda4dc71ed60b2b31dbee1717222ecaf7 -workbox-3625d7b0.js,1667751604121,27de084d9271eef325a4a5a93e0ae45626d67b7cc39b579163518eabdebe0ce3 -assets/index.79e1bd9a.css,1667751601881,2fd75c37b0d998bc77524a78528061468108168b32cc5e897968ae08e3baddc0 -favicon.ico,1667751601705,c9fdf13279b541c384690155ee01ec6376d102b828041172f83234cfd1695005 -android-chrome-512x512.png,1667751601703,bb8414bd4003b6976c2aea38e21db28aad230f5c183fea00416d29335a786879 -assets/index.bc6bcb24.js,1667751601882,b72d2fdf8bf388454eaeaedd62551cba095a853f1bcf500ba39f437f139b716b +android-chrome-192x192.png,1668376934777,d8371f57308034713d904167a59e32a432a5f6b1b49574713c2a1da00d4c2e84 +favicon-16x16.png,1668376934779,5995dd54b3476a3213a324c2a4d00aacf0acd5ffcc583ba193713141bf3d1087 +apple-touch-icon.png,1668376934778,aa303db393c592e6e012b3c2869020e10eb3b6d3ad2a3c90994192d44b8598e2 +browserconfig.xml,1668376934779,5032f08c233ca59d451d9cc2242946c654bd2293f913d2c467642cd378aa1254 +favicon-32x32.png,1668376934779,7ea29a77dd16719739b086ed4fe5c50f5db3f46688c6d880fbdae080a340a375 +index.html,1668376934931,6a5dfafa3f7698800d7f1fe779665ba394668c9d3064015c424a6c01095b404d +manifest.json,1668376934780,e451717ede04bc18dd4e8dc66c4d612ed73dac6bcf9ca7152f8fda2bf9415557 +manifest.webmanifest,1668376934931,eae72ad93d4e4936b5346e88ccc20c917594794ced77c06b17f46bb4a730622f +registerSW.js,1668376934931,cffcd66cea54ba3f643931972304147da9b9e11da6411f809b0c540221cffb5e +mstile-150x150.png,1668376934781,bfd3cc2346286a827a850c21157e21c30debae6a38ac1750ebe2bd0212cf14e2 +safari-pinned-tab.svg,1668376934781,25933fb1b14e266a77a75af8b3858d38947682b15fa8436e13a16e933d357873 +site.webmanifest,1668376934781,27a49e20157daf138ed30ee09bf68686d8474365251cd88fb69e94f925eb52c4 +sw.js,1668376937310,642f7ccb041657488ff91f1ea0044e04f34a55310ea4379bc34984e0908d952e +assets/icon-save.5a12487e.svg,1668376934931,4814ee28b64ed5018867301fd446c33cda4dc71ed60b2b31dbee1717222ecaf7 +assets/index.e638c30f.css,1668376934931,c56cb29d6d8f91de6667c829481c4353a1268348760789a66ab218fa92221d51 +workbox-3625d7b0.js,1668376937314,27de084d9271eef325a4a5a93e0ae45626d67b7cc39b579163518eabdebe0ce3 +android-chrome-512x512.png,1668376934778,bb8414bd4003b6976c2aea38e21db28aad230f5c183fea00416d29335a786879 +favicon.ico,1668376934780,c9fdf13279b541c384690155ee01ec6376d102b828041172f83234cfd1695005 +assets/index.fd839ec2.js,1668376934932,fde96175e2c19b049c43fb1a94772b461dd421e97993bf244cddd2441c6913a2 diff --git a/package.json b/package.json index c0473b3..32ae3f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "genera-tor", - "version": "1.0.1", + "version": "1.0.2", "private": true, "scripts": { "dev": "vite --port 8080", diff --git a/public/manifest.json b/public/manifest.json index 1901239..73deb3a 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,5 +1,5 @@ { - "name": "GeneraTOR TD2", + "name": "GeneraTOR", "short_name": "GeneraTOR", "start_url": ".", "display": "standalone", diff --git a/src/App.vue b/src/App.vue index bfa7798..4a35b5d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,6 +20,10 @@ export default defineComponent({ appVersion: packageInfo.version, }; }, + + created() { + document.title = `GeneraTOR ${this.appVersion}` + } }); diff --git a/src/components/Order.vue b/src/components/Order.vue index 1b6599e..11dcce7 100644 --- a/src/components/Order.vue +++ b/src/components/Order.vue @@ -98,6 +98,12 @@ export default defineComponent({ display: flex; justify-content: space-between; align-items: flex-end; + + margin-top: 0.5em; + + input { + max-width: 10em; + } } .flex-center { diff --git a/src/components/OrderO.vue b/src/components/OrderO.vue index f4d7bad..18def39 100644 --- a/src/components/OrderO.vue +++ b/src/components/OrderO.vue @@ -26,15 +26,15 @@ - - - - - - + + + + + @@ -43,13 +43,13 @@
+ Na posterunku,
na szlaku 		oddo1) prędkość najwyżej km/h2) jechać ostrożniez powoduoddo1) prędkość najwyżej km/h2) j.o.z powodu
- + - + - + @@ -65,7 +65,7 @@
- Inne: + 2. Inne:
@@ -90,7 +90,7 @@ export default defineComponent({ return `Rozkaz pisemny "O" nr ${header.orderNo || '_'} dla pociągu nr ${header.trainNo || '_'} dnia ${ header.date || '_' - } [ 1 ] 1) zmniejszyć prędkość jazdy i zachować ostrożność, 2) jechać ostrożnie (j.o.)`; + }`; }, ]; @@ -118,20 +118,28 @@ export default defineComponent({ generateMessage() { let message = this.rowMethods[0](); + if (this.order.orderList.some((row) => row.name)) message += ` [ 1 ] `; + + const rowsMessageList = []; + for (let i = 0; i < this.order.orderList.length; i++) { const row = this.order.orderList[i]; + if (!row.name) continue; - if (row.name) { - message += `; ${row.name || '_'} od ${row.from || '_'} do ${row.to || '_'} kilometra`; + let rowMessage = ''; + rowMessage += ` ${row.name || '_'} od ${row.from || '_'} do ${row.to || '_'} kilometra`; - if (row.vmax) message += ` prędkość najwyżej ${row.vmax} km/h`; - if (row.jo) message += ` jechać ostrożnie`; + if (row.vmax) rowMessage += ` prędkość najwyżej ${row.vmax} km/h`; + if (row.jo) rowMessage += ` jechać ostrożnie`; - message += ` z powodu: ${row.reason || '_'}`; - } + rowMessage += ` z powodu: ${row.reason || '_'}`; + + rowsMessageList.push(rowMessage); } - if (this.order.other) message += `; ${this.order.other}`; + message += rowsMessageList.join("; "); + + if (this.order.other) message += ` [ 2 ] Inne: ${this.order.other}`; this.store.orderMessage = message; }, @@ -204,3 +212,4 @@ th { } } + From 53771c614ab8d59956084c87ef3931158ae0942a Mon Sep 17 00:00:00 2001 From: Spythere Date: Mon, 14 Nov 2022 17:01:41 +0100 Subject: [PATCH 3/3] gitignore --- .firebase/hosting.ZGlzdA.cache | 19 ------------------- .gitignore | 3 +++ tsconfig.json | 5 ++++- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 .firebase/hosting.ZGlzdA.cache diff --git a/.firebase/hosting.ZGlzdA.cache b/.firebase/hosting.ZGlzdA.cache deleted file mode 100644 index 4c7566f..0000000 --- a/.firebase/hosting.ZGlzdA.cache +++ /dev/null @@ -1,19 +0,0 @@ -android-chrome-192x192.png,1668376934777,d8371f57308034713d904167a59e32a432a5f6b1b49574713c2a1da00d4c2e84 -favicon-16x16.png,1668376934779,5995dd54b3476a3213a324c2a4d00aacf0acd5ffcc583ba193713141bf3d1087 -apple-touch-icon.png,1668376934778,aa303db393c592e6e012b3c2869020e10eb3b6d3ad2a3c90994192d44b8598e2 -browserconfig.xml,1668376934779,5032f08c233ca59d451d9cc2242946c654bd2293f913d2c467642cd378aa1254 -favicon-32x32.png,1668376934779,7ea29a77dd16719739b086ed4fe5c50f5db3f46688c6d880fbdae080a340a375 -index.html,1668376934931,6a5dfafa3f7698800d7f1fe779665ba394668c9d3064015c424a6c01095b404d -manifest.json,1668376934780,e451717ede04bc18dd4e8dc66c4d612ed73dac6bcf9ca7152f8fda2bf9415557 -manifest.webmanifest,1668376934931,eae72ad93d4e4936b5346e88ccc20c917594794ced77c06b17f46bb4a730622f -registerSW.js,1668376934931,cffcd66cea54ba3f643931972304147da9b9e11da6411f809b0c540221cffb5e -mstile-150x150.png,1668376934781,bfd3cc2346286a827a850c21157e21c30debae6a38ac1750ebe2bd0212cf14e2 -safari-pinned-tab.svg,1668376934781,25933fb1b14e266a77a75af8b3858d38947682b15fa8436e13a16e933d357873 -site.webmanifest,1668376934781,27a49e20157daf138ed30ee09bf68686d8474365251cd88fb69e94f925eb52c4 -sw.js,1668376937310,642f7ccb041657488ff91f1ea0044e04f34a55310ea4379bc34984e0908d952e -assets/icon-save.5a12487e.svg,1668376934931,4814ee28b64ed5018867301fd446c33cda4dc71ed60b2b31dbee1717222ecaf7 -assets/index.e638c30f.css,1668376934931,c56cb29d6d8f91de6667c829481c4353a1268348760789a66ab218fa92221d51 -workbox-3625d7b0.js,1668376937314,27de084d9271eef325a4a5a93e0ae45626d67b7cc39b579163518eabdebe0ce3 -android-chrome-512x512.png,1668376934778,bb8414bd4003b6976c2aea38e21db28aad230f5c183fea00416d29335a786879 -favicon.ico,1668376934780,c9fdf13279b541c384690155ee01ec6376d102b828041172f83234cfd1695005 -assets/index.fd839ec2.js,1668376934932,fde96175e2c19b049c43fb1a94772b461dd421e97993bf244cddd2441c6913a2 diff --git a/.gitignore b/.gitignore index cd519b9..c0c01b6 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ pnpm-debug.log* *.njsproj *.sln *.sw? + +# Firebase +.firebase \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index d4aefa2..3d125f6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,10 @@ "isolatedModules": true, "esModuleInterop": true, "lib": ["ESNext", "DOM"], - "skipLibCheck": true + "skipLibCheck": true, + "types": [ + "vite-plugin-pwa/client" + ] }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"], "references": [{ "path": "./tsconfig.node.json" }]