From 0a972a23eff0c2689624e6875e8a280a563e03b3 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 4 Jun 2023 13:35:53 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20asynchroniczno=C5=9B=C4=87=20pobierania?=
 =?UTF-8?q?=20danych=20z=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JournalView/JournalStats.vue | 24 +++++++++++++++------
 src/views/JournalTimetables.vue             |  4 +---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue
index 552c9b1..24a38f4 100644
--- a/src/components/JournalView/JournalStats.vue
+++ b/src/components/JournalView/JournalStats.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="journal-stats" v-show="!store.isOffline">
+  <div class="journal-stats" v-if="!store.isOffline">
     <div class="tabs">
       <button
         v-for="tab in data.tabs"
@@ -22,11 +22,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, KeepAlive, onActivated, onDeactivated, reactive, Ref, ref, watch } from 'vue';
+import { computed, KeepAlive, onActivated, onDeactivated, onMounted, reactive, Ref, ref, watch } from 'vue';
 import { useStore } from '../../store/store';
 import JournalDailyStats from './DailyStats.vue';
 import JournalDriverStats from './JournalDriverStats.vue';
 import StorageManager from '../../scripts/managers/storageManager';
+import { DataStatus } from '../../scripts/enums/DataStatus';
 
 // Types
 type TStatTab = 'daily' | 'driver';
@@ -60,17 +61,26 @@ function onTabButtonClick(tab: TStatTab) {
   if (tab == 'daily') {
     lastDailyStatsOpen.value = areStatsOpen.value;
     StorageManager.setBooleanValue('dailyStatsOpen', areStatsOpen.value);
+
+    if (areStatsOpen.value) dailyStatsComp.value?.startFetchingDailyStats();
   }
 
   store.currentStatsTab = tab;
   lastClickedTab.value = tab;
 }
 
-onActivated(() => {
-  dailyStatsComp.value?.startFetchingDailyStats();
-
-  if (StorageManager.getBooleanValue('dailyStatsOpen')) areStatsOpen.value = true;
-});
+onMounted(() => {
+  if (StorageManager.getBooleanValue('dailyStatsOpen')) {
+    dailyStatsComp.value?.startFetchingDailyStats();
+    areStatsOpen.value = true;
+  }
+}),
+  onActivated(async () => {
+    if (StorageManager.getBooleanValue('dailyStatsOpen')) {
+      dailyStatsComp.value?.startFetchingDailyStats();
+      areStatsOpen.value = true;
+    }
+  });
 
 onDeactivated(() => {
   dailyStatsComp.value?.stopFetchingDailyStats();
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 5d47499..9ce0cc0 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -14,7 +14,7 @@
         optionsType="timetables"
       />
 
-      <JournalStats />
+      <JournalStats v-if="dataStatus == DataStatus.Loaded" />
 
       <div class="list_wrapper" @scroll="handleScroll">
         <transition name="status-anim" mode="out-in">
@@ -165,8 +165,6 @@ export default defineComponent({
   beforeRouteUpdate(to, _) {
     this.handleQueries(to.query);
     this.fetchHistoryData();
-
-    console.log('test');
   },
 
   activated() {