From 2f9e9ccefe6baa55f5e46ba379d432a318721b0d Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 16 Feb 2023 01:18:51 +0100
Subject: [PATCH] =?UTF-8?q?poprawki=20wczytywania=20sk=C5=82ad=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tabs/StockListTab.vue | 3 ++-
 src/mixins/stockMixin.ts             | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/tabs/StockListTab.vue b/src/components/tabs/StockListTab.vue
index f0a20ce..fb33e36 100644
--- a/src/components/tabs/StockListTab.vue
+++ b/src/components/tabs/StockListTab.vue
@@ -36,7 +36,7 @@
     <div class="stock_actions">
       <label class="file-label">
         <div class="btn">WCZYTAJ</div>
-        <input type="file" @change="uploadStock" ref="conFile" />
+        <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
       </label>
 
       <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="downloadStock">POBIERZ</button>
@@ -349,6 +349,7 @@ export default defineComponent({
       const files = inputEl.files;
 
       if (files?.length != 1) return;
+      if (!/\.con$/.test(files[0].name)) return;
 
       const reader = new FileReader();
       reader.readAsText(files[0]);
diff --git a/src/mixins/stockMixin.ts b/src/mixins/stockMixin.ts
index 1b023ef..0e3de8c 100644
--- a/src/mixins/stockMixin.ts
+++ b/src/mixins/stockMixin.ts
@@ -72,7 +72,7 @@ export default defineComponent({
     },
 
     loadStockFromString(stockString: string) {
-      const stockArray = stockString.split(';');
+      const stockArray = stockString.trim().split(';');
 
       this.store.stockList.length = 0;
       this.store.chosenVehicle = null;
@@ -83,7 +83,7 @@ export default defineComponent({
 
       this.store.swapVehicles = false;
 
-      stockArray.forEach((type, i) => {
+      stockArray.forEach((type) => {
         let vehicle: Vehicle | null = null;
         let vehicleCargo: ICargo | null = null;
 
@@ -96,6 +96,8 @@ export default defineComponent({
           if (cargo) vehicleCargo = vehicle?.cargoList.find((c) => c.id == cargo) || null;
         }
 
+        if (!vehicle) console.log('Brak pojazdu:', type);
+
         this.addVehicle(vehicle, vehicleCargo);
       });
     },