From 5b9e77c8fcf89c85f845305bb749173b6c9f9c7b Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 30 Jun 2022 19:33:39 +0200
Subject: [PATCH] =?UTF-8?q?Poprawiono=20kart=C4=99=20ze=20statystykami=20d?=
 =?UTF-8?q?y=C5=BCurnego?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.scss                                  |  10 +-
 .../JournalView/DispatcherStats.vue           | 187 ++++++++++++------
 .../JournalView/JournalDispatchers.vue        |  14 +-
 src/styles/JournalSection.scss                |   2 +-
 src/styles/global.scss                        |   6 +-
 src/views/JournalView.vue                     |  74 +------
 6 files changed, 139 insertions(+), 154 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 67a4240..93e6ece 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -31,9 +31,8 @@
   background: $bgCol;
   color: white;
 
-  overflow: hidden;
-
   font-size: 1rem;
+  overflow-y: scroll;
 
   @include smallScreen() {
     font-size: calc(0.4rem + 1.4vw);
@@ -44,9 +43,8 @@
 .app_container {
   display: flex;
   flex-flow: column;
-
-  min-width: 0;
-  min-height: 100vh;
+  height: 100vh;
+  min-height: 800px;
 
   header {
     flex: 0 0 auto;
@@ -97,7 +95,7 @@
   &_body {
     max-width: 21em;
   }
-  
+
   &_container {
     display: flex;
     justify-content: center;
diff --git a/src/components/JournalView/DispatcherStats.vue b/src/components/JournalView/DispatcherStats.vue
index 0075d3d..a2fb70f 100644
--- a/src/components/JournalView/DispatcherStats.vue
+++ b/src/components/JournalView/DispatcherStats.vue
@@ -1,46 +1,45 @@
 <template>
-  <div class="card-dimmer" @click="closeCard"></div>
+  <div class="stats_container" v-click-outside="() => (cardVisible = false)">
+    <button class="stats_button btn btn--option" @click="toggleCard">
+      Statystyki dyżurnego {{ store.dispatcherStatsName }}
+    </button>
 
-  <div class="stats-card card">
-    <div>
-      <h2 class="card-title">
-        STATYSTYKI DYŻURNEGO <span class="text--primary">{{ store.dispatcherStatsName.toUpperCase() }}</span>
-      </h2>
+    <div class="stats_card" v-if="store.dispatcherStatsName && cardVisible">
+      <div>
+        <Loading v-if="!store.dispatcherStatsData" />
 
-      <div class="loading" v-if="!store.dispatcherStatsData">Ładowanie...</div>
-      <div class="loading" v-else-if="!store.dispatcherStatsData._count._all">Ten dyżurny nie ma jeszcze szczegółowych statystyk!</div>
-      <div v-else>
-        <h3>STATYSTYKI WYSTAWIONYCH ROZKŁADÓW</h3>
-        <div class="info-stats" v-if="store.dispatcherStatsData._count._all">
-          <span class="stat-badge">
-            <span>LICZBA</span>
-            <span>{{ store.dispatcherStatsData._count._all }}</span>
-          </span>
-          <span class="stat-badge">
-            <span>SUMA (KM)</span>
-            <span>{{ store.dispatcherStatsData._sum.routeDistance.toFixed(2) }}km</span>
-          </span>
-          <span class="stat-badge">
-            <span>NAJDŁUŻSZY</span>
-            <span>{{ store.dispatcherStatsData._max.routeDistance.toFixed(2) }}km</span>
-          </span>
-          <span class="stat-badge">
-            <span>ŚREDNIO</span>
-            <span>{{ store.dispatcherStatsData._avg.routeDistance.toFixed(2) }}km</span>
-          </span>
+        <div class="loading" v-else-if="!store.dispatcherStatsData._count._all">
+          Ten dyżurny nie ma jeszcze szczegółowych statystyk!
         </div>
 
-        <h3>OSTATNIE WYSTAWIONE ROZKŁADY</h3>
-
-        <div class="last-timetables">
-          <div class="timetable-row" v-for="timetable in timetables">
-            <span>#{{ timetable.timetableId }}</span>
-            <span>{{ timetable.routeDistance }}km</span>
-            <span>
-              <b>{{ timetable.trainNo }}</b
-              >&nbsp;{{ timetable.driverName }}
+        <div v-else>
+          <h3>STATYSTYKI WYSTAWIONYCH ROZKŁADÓW</h3>
+          <div class="info-stats" v-if="store.dispatcherStatsData._count._all">
+            <span class="stat-badge">
+              <span>LICZBA</span>
+              <span>{{ store.dispatcherStatsData._count._all }}</span>
             </span>
-            <span>{{ timetable.route.replace('|', ' > ') }}</span>
+            <span class="stat-badge">
+              <span>SUMA (KM)</span>
+              <span>{{ store.dispatcherStatsData._sum.routeDistance.toFixed(2) }}km</span>
+            </span>
+            <span class="stat-badge">
+              <span>NAJDŁUŻSZY</span>
+              <span>{{ store.dispatcherStatsData._max.routeDistance.toFixed(2) }}km</span>
+            </span>
+            <span class="stat-badge">
+              <span>ŚREDNIO</span>
+              <span>{{ store.dispatcherStatsData._avg.routeDistance.toFixed(2) }}km</span>
+            </span>
+          </div>
+
+          <h3>OSTATNIE WYSTAWIONE ROZKŁADY</h3>
+          <div class="last-timetables">
+            <div class="timetable-row" v-for="timetable in timetables">
+              #{{ timetable.timetableId }} | <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
+              {{ timetable.driverName }} ({{ timetable.routeDistance }}km)
+              <div>{{ timetable.route.replace('|', ' > ') }}</div>
+            </div>
           </div>
         </div>
       </div>
@@ -55,9 +54,10 @@ import { URLs } from '@/scripts/utils/apiURLs';
 import { useStore } from '@/store/store';
 import axios from 'axios';
 import { defineComponent } from 'vue';
+import Loading from '../Global/Loading.vue';
 
 export default defineComponent({
-  emits: ['closeCard'],
+  components: { Loading },
 
   setup() {
     const store = useStore();
@@ -65,21 +65,25 @@ export default defineComponent({
       store,
     };
   },
-
   data() {
     return {
+      cardVisible: false,
       lastDispatcherName: '',
       timetables: [] as TimetableHistory[],
     };
   },
-
-  activated() {
-    this.fetchDispatcherStats();
-  },
-
   methods: {
+    toggleCard() {
+      if (!this.store.dispatcherStatsName) return;
+
+      this.cardVisible = !this.cardVisible;
+      if (this.cardVisible) this.fetchDispatcherStats();
+    },
+
     async fetchDispatcherStats() {
-      this.store.dispatcherStatsData = undefined;
+      if (this.lastDispatcherName != this.store.dispatcherStatsName) {
+        this.store.dispatcherStatsData = undefined;
+      }
 
       const statsData: DispatcherStatsAPIData = await (
         await axios.get(`${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`)
@@ -91,10 +95,7 @@ export default defineComponent({
 
       this.timetables = timetables;
       this.store.dispatcherStatsData = statsData;
-    },
-
-    closeCard() {
-      this.$emit('closeCard');
+      this.lastDispatcherName = this.store.dispatcherStatsName;
     },
   },
 });
@@ -102,26 +103,90 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
+@import '../../styles/variables.scss';
+
+.stats_container {
+  position: relative;
+}
+
+.stats_card {
+  position: absolute;
+  z-index: 999;
+  top: 120%;
+  right: 0;
+  width: 500px;
+  max-width: 97vw;
+  min-height: 100px;
+  overflow: auto;
+
+  border-radius: 1em 0 1em 1em;
+  background-color: #222222f1;
+  box-shadow: 0 3px 10px 5px #131313;
+  padding: 1em 0.5em;
+}
+
+.last-timetables {
+  max-height: 400px;
+  margin: 0.5em 0;
+}
 
 .timetable-row {
-  display: grid;
-  grid-template-columns: 1fr 1fr 3fr 4fr;
-  gap: 0.2em;
-  margin: 0.5em 0;
+  width: 95%;
+  margin: 0.5em auto;
+  padding: 0.5em;
+
+  background-color: #4d4d4d;
+}
+
+h2.card-title {
+  font-size: 1.8em;
+}
+
+h3 {
+  margin-top: 1em;
+}
+
+h2,
+h3 {
   text-align: center;
+}
+
+.info-stats {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 1em;
+}
+
+.last-timetables {
+  overflow-y: auto;
+}
+
+.stat-badge {
+  margin-right: 0.5em;
+  padding-bottom: 1em;
 
   span {
-    min-width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    background-color: #4d4d4d;
-    padding: 0.5em 0.2em;
+    padding: 0.25em 0.3em;
   }
 
-  @include smallScreen() {
-    grid-template-columns: 1fr 1fr;
+  span:first-child {
     background-color: #4d4d4d;
   }
+
+  span:last-child {
+    background-color: $accentCol;
+    color: black;
+    font-weight: bold;
+  }
+}
+
+@include smallScreen() {
+  .stats_card {
+    text-align: center;
+    left: 50%;
+    transform: translateX(-50%);
+    border-radius: 0 0 1em 1em;
+  }
 }
 </style>
diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue
index 471a705..3074c1d 100644
--- a/src/components/JournalView/JournalDispatchers.vue
+++ b/src/components/JournalView/JournalDispatchers.vue
@@ -1,19 +1,17 @@
 <template>
   <section class="journal-timetables">
-    <keep-alive>
-      <DispatcherStats v-if="statsCardOpen" @close-card="closeDispatcherStatsCard" />
-    </keep-alive>
-
     <div class="journal-wrapper">
       <div class="journal_top-bar">
-        <journal-options
+        <JournalOptions
           @on-filter-change="search"
           @on-input-change="search"
           @on-sorter-change="search"
           :sorter-option-ids="['timestampFrom', 'duration']"
         />
 
-        <button
+        <DispatcherStats />
+
+        <!-- <button
           class="btn btn--option"
           :disabled="store.dispatcherStatsName == ''"
           @click="() => (statsCardOpen = !statsCardOpen)"
@@ -22,7 +20,7 @@
             Statystyki dyżurnego <b>{{ store.dispatcherStatsName }}</b>
           </span>
           <span v-else>Statystyki dyżurnego niedostępne</span>
-        </button>
+        </button> -->
       </div>
 
       <!-- <button class="return-btn" @click="scrollToTop" v-if="showReturnButton">
@@ -221,7 +219,7 @@ export default defineComponent({
     },
   },
 
-activated() {
+  activated() {
     if (this.sceneryName || this.dispatcherName) {
       this.searchersValues[1].value = this.sceneryName?.toString() || '';
       this.searchersValues[0].value = this.dispatcherName?.toString() || '';
diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss
index 0869a60..6aa6e43 100644
--- a/src/styles/JournalSection.scss
+++ b/src/styles/JournalSection.scss
@@ -47,7 +47,6 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  flex-wrap: wrap;
 }
 
 button.btn {
@@ -61,5 +60,6 @@ button.btn {
 
   .journal_top-bar {
     justify-content: center;
+    flex-wrap: wrap;
   }
 }
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 017b9ea..ab51602 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -16,16 +16,12 @@
 
 html {
   scroll-behavior: smooth;
-  width: 100vw;
 }
 
 body {
-  width: 100%;
   margin: 0;
-  // font-family: "Open Sans", sans-serif;
+  padding: 0;
   font-family: 'Quicksand', sans-serif;
-
-  overflow-x: hidden;
 }
 
 *:focus-visible {
diff --git a/src/views/JournalView.vue b/src/views/JournalView.vue
index e73631d..323d7d2 100644
--- a/src/views/JournalView.vue
+++ b/src/views/JournalView.vue
@@ -50,11 +50,7 @@ export default defineComponent({
 });
 </script>
 
-<style lang="scss">
-@import '../styles/card.scss';
-@import '../styles/variables.scss';
-@import '../styles/responsive.scss';
-
+<style lang="scss" scoped>
 .journal-type-options {
   display: flex;
   justify-content: center;
@@ -79,72 +75,4 @@ export default defineComponent({
 .router-link.active {
   color: gold;
 }
-
-// Stats cards
-.stats-card {
-  padding: 1em;
-  max-width: 850px;
-  width: 100vw;
-  max-height: 750px;
-  min-height: 600px;
-}
-
-.loading {
-  font-size: 1.4em;
-  padding: 0.6em;
-  text-align: center;
-  margin: 1em 0 400px 0;
-
-  background-color: #4d4d4d;
-}
-
-h2.card-title {
-  font-size: 1.8em;
-}
-
-h3 {
-  margin-top: 1em;
-}
-
-h2,
-h3 {
-  text-align: center;
-}
-
-.info-stats {
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-  margin-top: 1em;
-}
-
-.last-timetables {
-  overflow-y: auto;
-}
-
-.stat-badge {
-  margin-right: 0.5em;
-  padding-bottom: 1em;
-
-  span {
-    padding: 0.25em 0.3em;
-  }
-
-  span:first-child {
-    background-color: #4d4d4d;
-  }
-
-  span:last-child {
-    background-color: $accentCol;
-    color: black;
-    font-weight: bold;
-  }
-}
-
-@include smallScreen() {
-  .stats-card {
-    text-align: center;
-    font-size: 1.2em;
-  }
-}
 </style>