Przystosowanie pod update API

src/components/JournalView/DailyStats.vue

@@ -10,7 +10,7 @@
           <template #count>
             <b class="text--primary">
               {{ data.stats.totalTimetables }}
-              {{ $t('journal.timetable-count', data.stats.dispatcherTimetablesCount) }}
+              {{ $t('journal.timetable-count', data.stats.totalTimetables) }}
             </b>
           </template>
 
@@ -38,19 +38,44 @@
           </template>
         </i18n-t>
 
-        <i18n-t keypath="journal.timetable-stats-most-active" tag="p">
+        <p v-if="firstPlaceDispatchers.length == 1">
-          <template #dispatcher>
+          <i18n-t keypath="journal.timetable-stats-most-active">
-            <router-link :to="`/journal/dispatchers?dispatcherName=${data.stats.dispatcherName}`">
+            <template #dispatcher>
-              <b>{{ data.stats.dispatcherName }}</b>
+              <router-link :to="`/journal/dispatchers?dispatcherName=${firstPlaceDispatchers[0].name}`">
-            </router-link>
+                <b>{{ firstPlaceDispatchers[0].name }}</b>
-          </template>
+              </router-link>
-          <template #count>
+            </template>
-            <b class="text--primary">
+            <template #count>
-              {{ data.stats.dispatcherTimetablesCount }}
+              <b class="text--primary">
-              {{ $t('journal.timetable-count', data.stats.dispatcherTimetablesCount) }}
+                {{ firstPlaceDispatchers[0].count }}
-            </b>
+                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
-          </template>
+              </b>
-        </i18n-t>
+            </template>
+          </i18n-t>
+        </p>
+
+        <p v-if="firstPlaceDispatchers.length > 1">
+          <i18n-t keypath="journal.timetable-stats-most-active-many">
+            <template #dispatchers>
+              <span v-for="(disp, i) in firstPlaceDispatchers">
+                <span v-if="i == firstPlaceDispatchers.length - 1"> {{ $t('general.and') }} </span>
+
+                <router-link :to="`/journal/dispatchers?dispatcherName=${disp.name}`">
+                  <b>{{ disp.name }}</b>
+                </router-link>
+
+                <span v-if="i < firstPlaceDispatchers.length - 2">, </span>
+              </span>
+            </template>
+
+            <template #count>
+              <b class="text--primary">
+                {{ firstPlaceDispatchers[0].count }}
+                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
+              </b>
+            </template>
+          </i18n-t>
+        </p>
       </span>
     </span>
   </section>
@@ -58,7 +83,7 @@
 
 <script setup lang="ts">
 import axios from 'axios';
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import { DataStatus } from '../../scripts/enums/DataStatus';
 import { ITimetablesDailyStats, ITimetablesDailyStatsResponse } from '../../scripts/interfaces/api/StatsAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
@@ -76,11 +101,18 @@ const data = reactive({
     timetableDriver: '',
     timetableId: 0,
     timetableRouteDistance: 0,
-    dispatcherName: '',
+
-    dispatcherTimetablesCount: 0,
+    mostActiveDispatchers: [],
   } as ITimetablesDailyStats,
 });
 
+const firstPlaceDispatchers = computed(() => {
+  if (data.stats.mostActiveDispatchers.length == 0) return [];
+  const maxCount = data.stats.mostActiveDispatchers[0].count;
+
+  return data.stats.mostActiveDispatchers.filter((disp) => disp.count === maxCount);
+});
+
 async function fetchDailyTimetableStats() {
   try {
     const {
@@ -88,7 +120,7 @@ async function fetchDailyTimetableStats() {
       distanceSum,
       maxTimetable,
       totalTimetables,
-      mostActiveDispatcher,
+      mostActiveDispatchers,
     }: ITimetablesDailyStatsResponse = await (
       await axios.get(`${URLs.stacjownikAPI}/api/getDailyTimetableStats`)
     ).data;
@@ -101,8 +133,8 @@ async function fetchDailyTimetableStats() {
       timetableDriver: maxTimetable?.driverName || '',
       timetableId: maxTimetable?.timetableId || 0,
       timetableRouteDistance: maxTimetable?.routeDistance || 0,
-      dispatcherName: mostActiveDispatcher?.name || '',
+
-      dispatcherTimetablesCount: mostActiveDispatcher?.count || 0,
+      mostActiveDispatchers,
     };
 
     data.statsStatus = DataStatus.Loaded;

src/locales/en.json

@@ -1,4 +1,7 @@
 {
+  "general": {
+    "and": " and "
+  },
   "app": {
     "sceneries": "SCENERIES",
     "trains": "TRAINS",
@@ -266,7 +269,8 @@
 
     "timetable-stats-total": "Today, dispatchers made so far {count} with total distance of {distance}",
     "timetable-stats-longest": "The longest timetable today is #{id} made by {author} for {driver} - {distance}",
-    "timetable-stats-most-active": "The most active dispatcher is {dispatcher} who created {count}",
+    "timetable-stats-most-active": "The most active dispatcher today is {dispatcher} who created {count}",
+    "timetable-stats-most-active-many": "The most active dispatchers today are {dispatchers} who created {count} each",
 
     "timetable-count": "timetable | timetables",
 

src/locales/pl.json

@@ -1,4 +1,7 @@
 {
+  "general": {
+    "and": " oraz "
+  },
   "app": {
     "sceneries": "SCENERIE",
     "trains": "POCIĄGI",
@@ -271,6 +274,7 @@
     "timetable-stats-total": "Dyżurni stworzyli dziś {count}  o łącznym dystansie {distance}",
     "timetable-stats-longest": "Najdłuższym rozkładem jazdy jest dzisiaj #{id} stworzony przez dyżurnego {author} dla maszynisty {driver} - {distance}",
     "timetable-stats-most-active": "Dzisiejszym najaktywniejszym dyżurnym jest {dispatcher}, który stworzył {count}",
+    "timetable-stats-most-active-many": "Dzisiejszymi najaktywniejszymi dyżurnymi są {dispatchers}, którzy stworzyli po {count}",
 
     "timetable-count": "rozkład jazdy | rozkładów jazdy",
 

src/scripts/interfaces/api/StatsAPIData.ts

@@ -10,8 +10,10 @@ export interface ITimetablesDailyStats {
   timetableDriver: string;
   timetableRouteDistance: number;
 
-  dispatcherName: string;
+  mostActiveDispatchers: {
-  dispatcherTimetablesCount: number;
+    name: string;
+    count: number;
+  }[];
 }
 
 export interface ITimetablesDailyStatsResponse {
@@ -19,8 +21,10 @@ export interface ITimetablesDailyStatsResponse {
   distanceSum: number;
   distanceAvg: number;
   maxTimetable: TimetableHistory | null;
-  mostActiveDispatcher: {
+
+  mostActiveDispatchers: {
     name: string;
     count: number;
-  } | null;
+  }[];
 }
+