From 00a4a840b096bf773cacb82e4a4626f8cd7e3797 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 18 Dec 2023 16:00:18 +0100
Subject: [PATCH] statystyki DR

---
 .../JournalView/JournalDispatcherStats.vue    | 38 ++++++++++++++-----
 src/components/JournalView/JournalStats.vue   |  4 +-
 .../SceneryInfo/SceneryInfoDispatcher.vue     |  2 +-
 src/styles/JournalStats.scss                  |  1 +
 src/typings/api.ts                            | 23 ++++++++---
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/components/JournalView/JournalDispatcherStats.vue b/src/components/JournalView/JournalDispatcherStats.vue
index 0dc767c..891d40f 100644
--- a/src/components/JournalView/JournalDispatcherStats.vue
+++ b/src/components/JournalView/JournalDispatcherStats.vue
@@ -3,7 +3,10 @@
     class="journal-stats dispatcher"
     v-if="store.dispatcherStatsName && store.dispatcherStatsData"
   >
-    <span class="loading" v-if="!store.dispatcherStatsData._count._all">
+    <span
+      class="loading"
+      v-if="!store.dispatcherStatsData.issuedTimetables || !store.dispatcherStatsData.services"
+    >
       Ten dyżurny nie ma jeszcze szczegółowych statystyk!
     </span>
 
@@ -18,22 +21,34 @@
 
       <hr class="header-separator" />
 
-      <div class="info-stats" v-if="store.dispatcherStatsData._count._all">
+      <div class="info-stats">
         <span class="stat-badge">
-          <span>LICZBA</span>
-          <span>{{ store.dispatcherStatsData._count._all }}</span>
+          <span>DYŻURY</span>
+          <span>{{ store.dispatcherStatsData.services.count }}</span>
         </span>
         <span class="stat-badge">
-          <span>SUMA (KM)</span>
-          <span>{{ store.dispatcherStatsData._sum.routeDistance.toFixed(2) }}km</span>
+          <span>WYSTAWIONE RJ</span>
+          <span>{{ store.dispatcherStatsData.issuedTimetables.count }}</span>
         </span>
         <span class="stat-badge">
-          <span>NAJDŁUŻSZY</span>
-          <span>{{ store.dispatcherStatsData._max.routeDistance.toFixed(2) }}km</span>
+          <span>MAKS. CZAS DYŻURU</span>
+          <span>{{ calculateDuration(store.dispatcherStatsData.services.durationMax) }}</span>
         </span>
         <span class="stat-badge">
-          <span>ŚREDNIO</span>
-          <span>{{ store.dispatcherStatsData._avg.routeDistance.toFixed(2) }}km</span>
+          <span>ŚREDNI CZAS DYŻURU</span>
+          <span>{{ calculateDuration(store.dispatcherStatsData.services.durationAvg) }}</span>
+        </span>
+        <span class="stat-badge">
+          <span>SUMA WYSTAWIONYCH RJ</span>
+          <span>{{ store.dispatcherStatsData.issuedTimetables.distanceSum.toFixed(2) }}km</span>
+        </span>
+        <span class="stat-badge">
+          <span>NAJDŁUŻSZY WYSTAWIONY RJ</span>
+          <span>{{ store.dispatcherStatsData.issuedTimetables.distanceMax.toFixed(2) }}km</span>
+        </span>
+        <span class="stat-badge">
+          <span>ŚREDNIA WYSTAWIONYCH RJ</span>
+          <span>{{ store.dispatcherStatsData.issuedTimetables.distanceAvg.toFixed(2) }}km</span>
         </span>
       </div>
     </span>
@@ -43,10 +58,13 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { useMainStore } from '../../store/mainStore';
+import dateMixin from '../../mixins/dateMixin';
 
 export default defineComponent({
   name: 'journal-dispatcher-stats',
 
+  mixins: [dateMixin],
+
   setup() {
     const store = useMainStore();
 
diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue
index e88f27c..e46c8fe 100644
--- a/src/components/JournalView/JournalStats.vue
+++ b/src/components/JournalView/JournalStats.vue
@@ -115,13 +115,15 @@ export default defineComponent({
 
       try {
         const statsData: API.DispatcherStats.Response = await (
-          await http.get('api/getDispatcherInfo', {
+          await http.get('api/getDispatcherStats', {
             params: {
               name: this.mainStore.dispatcherStatsName
             }
           })
         ).data;
 
+        console.log(statsData);
+
         this.mainStore.dispatcherStatsData = statsData;
       } catch (error) {
         this.mainStore.dispatcherStatsData = undefined;
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
index d7d759f..41508ad 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue
@@ -10,7 +10,7 @@
 
       <router-link
         class="dispatcher_name"
-        :to="`/journal/dispatchers?dispatcherName=${onlineScenery.dispatcherName}`"
+        :to="`/journal/dispatchers?search-dispatcher=${onlineScenery.dispatcherName}`"
       >
         <span
           class="text--donator"
diff --git a/src/styles/JournalStats.scss b/src/styles/JournalStats.scss
index 3a68ca1..708f828 100644
--- a/src/styles/JournalStats.scss
+++ b/src/styles/JournalStats.scss
@@ -25,6 +25,7 @@ hr.header-separator {
 .info-stats {
   display: flex;
   flex-wrap: wrap;
+  justify-content: center;
   gap: 0.5em;
 }
 
diff --git a/src/typings/api.ts b/src/typings/api.ts
index c4505db..78ae85d 100644
--- a/src/typings/api.ts
+++ b/src/typings/api.ts
@@ -31,7 +31,11 @@ export namespace API {
 
   export namespace DispatcherStats {
     export interface DistanceStat {
-      routeDistance: number;
+      routeDistance: number | null;
+    }
+
+    export interface DurationStat {
+      currentDuration: number | null;
     }
 
     export interface Count {
@@ -39,11 +43,18 @@ export namespace API {
     }
 
     export interface Response {
-      _sum: DistanceStat;
-      _max: DistanceStat;
-      _min: DistanceStat;
-      _avg: DistanceStat;
-      _count: Count;
+      services: {
+        count: number;
+        durationMax: number;
+        durationAvg: number;
+      } | null;
+
+      issuedTimetables: {
+        count: number;
+        distanceMax: number;
+        distanceAvg: number;
+        distanceSum: number;
+      } | null;
     }
   }