From 0922e6fb87cc79e2270705e3f006f9f2c03e8260 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Wed, 9 Nov 2022 14:02:26 +0100
Subject: [PATCH] =?UTF-8?q?Generowanie=20pr=C3=B3=C5=BCnych=20wagon=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StockGeneratorTab.vue | 18 ++++++++++--------
 src/components/StockSection.vue      | 10 +++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/StockGeneratorTab.vue b/src/components/StockGeneratorTab.vue
index e300b61..0995b4f 100644
--- a/src/components/StockGeneratorTab.vue
+++ b/src/components/StockGeneratorTab.vue
@@ -72,8 +72,8 @@
       <hr />
 
       <div class="generator_actions">
-        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="generateStock">WYGENERUJ</button>
-        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0">WYGENERUJ PRÓŻNE WAGONY</button>
+        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="generateStock()">WYGENERUJ</button>
+        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="generateStock(true)">WYGENERUJ PRÓŻNE WAGONY</button>
 
         <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="resetChosenCargo">
           ZRESETUJ ŁADUNKI
@@ -143,7 +143,7 @@ export default defineComponent({
       this.excludedCarTypes.length = 0;
     },
 
-    generateStock() {
+    generateStock(empty = false) {
       const generatedChosenStockList = this.chosenCargoTypes.reduce((acc, type) => {
         this.generatorData.cargo[type as keyof typeof this.generatorData.cargo]
           .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
@@ -151,14 +151,16 @@ export default defineComponent({
             const [type, cargoType] = c.split(':');
             const carWagonObjs = this.store.carDataList.filter((cw) => cw.type.startsWith(type));
             const cargoObjs = [] as (ICargo | undefined)[];
+            
+            if(!cargoType || empty) cargoObjs.push(undefined);
+            else if(cargoType == 'all') cargoObjs.push(...carWagonObjs[0]?.cargoList);
+            else cargoObjs.push(carWagonObjs[0]?.cargoList.find((cargo) => cargo.id == cargoType));
 
-            if (cargoType == 'all') cargoObjs.push(...carWagonObjs[0]?.cargoList);
-            else if (cargoType) cargoObjs.push(carWagonObjs[0]?.cargoList.find((cargo) => cargo.id == cargoType));
-            else cargoObjs.push(undefined);
+            // if (cargoType == 'all') 
+            // else if (cargoType)
+            // else cargoObjs.push(undefined);
 
             carWagonObjs.forEach((cw) => {
-              console.log(cw, cargoType);
-
               cargoObjs.forEach((cargoObj) => {
                 acc.push({ carWagon: cw, cargo: cargoObj });
               });
diff --git a/src/components/StockSection.vue b/src/components/StockSection.vue
index a315e01..426e77d 100644
--- a/src/components/StockSection.vue
+++ b/src/components/StockSection.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="stock-section">
-    <keep-alive>
-      <transition name="tab-change" mode="out-in">
-        <component :is="chosenSectionComponent" :key="store.stockSectionMode"></component>
-      </transition>
-    </keep-alive>
+    <transition name="tab-change" mode="out-in">
+      <keep-alive>
+        <component :is="chosenSectionComponent" :key="chosenSectionComponent"></component>
+      </keep-alive>
+    </transition>
   </div>
 </template>