Merge branch 'main' into feature/train-picker

.firebase/hosting.ZGlzdA.cache

@@ -1,19 +0,0 @@
-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

.gitignore

@@ -22,3 +22,6 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+# Firebase
+.firebase

package.json

@@ -1,6 +1,6 @@
 {
   "name": "genera-tor",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "private": true,
   "scripts": {
     "dev": "vite --port 8080",

public/manifest.json

@@ -1,5 +1,5 @@
 {
-  "name": "GeneraTOR TD2",
+  "name": "GeneraTOR",
   "short_name": "GeneraTOR",
   "start_url": ".",
   "display": "standalone",

src/App.vue

@@ -20,6 +20,10 @@ export default defineComponent({
       appVersion: packageInfo.version,
     };
   },
+
+  created() {
+    document.title = `GeneraTOR ${this.appVersion}`
+  }
 });
 </script>
 

src/components/Order.vue

@@ -98,6 +98,12 @@ export default defineComponent({
   display: flex;
   justify-content: space-around;
   align-items: flex-end;
+
+  margin-top: 0.5em;
+
+  input {
+    max-width: 10em;
+  }
 }
 
 .flex-center {

src/components/OrderO.vue

@@ -26,15 +26,15 @@
       <table cellborder="1">
         <tbody>
           <tr class="tr-header">
-            <td width="25%" rowspan="2">
+            <td rowspan="2" width="35%">
               Na posterunku, <br />
               na szlaku
             </td>
-            <td>od</td>
-            <td>do</td>
-            <td width="10%" rowspan="2">1) prędkość najwyżej km/h</td>
-            <td width="10%" rowspan="2">2) jechać ostrożnie</td>
-            <td width="35%" rowspan="2">z powodu</td>
+            <td width="20%">od</td>
+            <td width="20%">do</td>
+            <td rowspan="2">1) prędkość najwyżej km/h</td>
+            <td rowspan="2">2) j.o.</td>
+            <td rowspan="2" width="35%">z powodu</td>
           </tr>
 
           <tr class="tr-header">
@@ -43,13 +43,13 @@
 
           <tr v-for="row in order.orderList" class="tr-data">
             <td>
-              <input type="text" v-model="row.name" />
+              <textarea v-model="row.name"></textarea>
             </td>
             <td>
-              <input type="text" v-model="row.from" />
+              <textarea v-model="row.from"></textarea>
             </td>
             <td>
-              <input type="text" v-model="row.to" />
+              <textarea v-model="row.to"></textarea>
             </td>
             <td>
               <input type="text" v-model="row.vmax" />
@@ -65,7 +65,7 @@
       </table>
 
       <div class="order_other">
-        Inne:
+        <span><b>2.</b> Inne:</span>
         <br />
         <textarea v-model="order.other"></textarea>
       </div>
@@ -90,7 +90,7 @@ export default defineComponent({
 
         return `<i>Rozkaz pisemny "O" nr ${header.orderNo || '_'} dla pociągu nr ${header.trainNo || '_'} dnia ${
           header.date || '_'
-        }</i> <b> [ 1 ] </b> 1) zmniejszyć prędkość jazdy i zachować ostrożność, 2) jechać ostrożnie (j.o.)`;
+        }</i>`;
       },
     ];
 
@@ -118,20 +118,28 @@ export default defineComponent({
     generateMessage() {
       let message = this.rowMethods[0]();
 
+      if (this.order.orderList.some((row) => row.name)) message += `<b> [ 1 ] </b>`;
+
+      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 += ` <b> [ 2 ] </b> Inne: ${this.order.other}`;
 
       this.store.orderMessage = message;
     },
@@ -204,3 +212,4 @@ th {
   }
 }
 </style>
+

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" }]