From ca68e62ecbc1912cad1ba8472800b9df3cddba38 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 27 Jan 2022 15:18:05 +0100
Subject: [PATCH] =?UTF-8?q?Dodano=20sortowanie=20poci=C4=85g=C3=B3w=20wg.?=
 =?UTF-8?q?=20post=C4=99pu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrainsView/TrainOptions.vue | 16 ++++++++++------
 src/locales/en.json                        |  1 +
 src/locales/pl.json                        |  1 +
 src/views/TrainsView.vue                   | 17 ++++++++++++++++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/TrainsView/TrainOptions.vue b/src/components/TrainsView/TrainOptions.vue
index 7e3d795..a7d7de5 100644
--- a/src/components/TrainsView/TrainOptions.vue
+++ b/src/components/TrainsView/TrainOptions.vue
@@ -4,7 +4,7 @@
       <select-box
         :title="$t('trains.option-distance')"
         :itemList="translatedSorterOptions"
-        :defaultItemIndex="3"
+        :defaultItemIndex="0"
         :prefix="$t('trains.sorter-prefix')"
         @selected="changeSorter"
       />
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, Ref } from 'vue';
+import { computed, defineComponent, inject } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SelectBox from '../Global/SelectBox.vue';
 
@@ -41,6 +41,14 @@ export default defineComponent({
     const { t } = useI18n();
 
     const sorterOptions = [
+      {
+        id: 'distance',
+        value: 'kilometraż',
+      },
+      {
+        id: 'progress',
+        value: 'przebyta trasa',
+      },
       {
         id: 'mass',
         value: 'masa',
@@ -53,10 +61,6 @@ export default defineComponent({
         id: 'length',
         value: 'długość',
       },
-      {
-        id: 'distance',
-        value: 'kilometraż',
-      },
       {
         id: 'timetable',
         value: 'numer pociągu',
diff --git a/src/locales/en.json b/src/locales/en.json
index 23978ee..e3a7b85 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -125,6 +125,7 @@
     "option-length": "length",
     "option-distance": "distance",
     "option-timetable": "train no.",
+    "option-progress": "route progress",
     "sorter-prefix": "Sort: ",
     "search-train": "Train no.",
     "search-driver": "Driver name",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 5a88f2c..12a7858 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -125,6 +125,7 @@
     "option-length": "długość",
     "option-distance": "kilometraż",
     "option-timetable": "nr pociągu",
+    "option-progress": "przebyta trasa",
     "sorter-prefix": "Sortuj: ",
     "search-train": "Numer pociągu",
     "search-driver": "Nick maszynisty",
diff --git a/src/views/TrainsView.vue b/src/views/TrainsView.vue
index aa67138..aa3dd1c 100644
--- a/src/views/TrainsView.vue
+++ b/src/views/TrainsView.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts">
-import { computed, ComputedRef, defineComponent, provide, reactive, Ref, ref, watch } from 'vue';
+import { computed, ComputedRef, defineComponent, provide, reactive, ref } from 'vue';
 
 import { DataStatus } from '@/scripts/enums/DataStatus';
 import Train from '@/scripts/interfaces/Train';
@@ -24,6 +24,13 @@ import TrainOptions from '@/components/TrainsView/TrainOptions.vue';
 
 import { useStore } from '@/store';
 import { GETTERS } from '@/constants/storeConstants';
+import TrainStop from '@/scripts/interfaces/TrainStop';
+
+const confirmedPercentage = (stops: TrainStop[] | undefined) => {
+  if (!stops) return -1;
+
+  return Number(((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0));
+};
 
 const filteredTrainList = (
   trainList: Train[],
@@ -48,6 +55,14 @@ const filteredTrainList = (
 
           return -sorterActive.dir;
 
+        case 'progress':
+          if (
+            confirmedPercentage(a.timetableData?.followingStops) > confirmedPercentage(b.timetableData?.followingStops)
+          )
+            return sorterActive.dir;
+
+          return -sorterActive.dir;
+
         case 'speed':
           if (a.speed > b.speed) return sorterActive.dir;
           return -sorterActive.dir;