From 342127d541c48586634bf9141bedec597e695705 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 4 Feb 2025 16:39:24 +0100
Subject: [PATCH] chore: improved journal filtering by date

---
 src/components/JournalView/JournalOptions.vue |  8 +-
 src/components/JournalView/typings.ts         |  9 +-
 src/locales/en.json                           | 86 ++-----------------
 src/locales/pl.json                           | 79 ++---------------
 src/views/JournalDispatchers.vue              | 25 +++---
 src/views/JournalTimetables.vue               |  4 +-
 6 files changed, 37 insertions(+), 174 deletions(-)

diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue
index 44a5b90..ac4c5f5 100644
--- a/src/components/JournalView/JournalOptions.vue
+++ b/src/components/JournalView/JournalOptions.vue
@@ -33,7 +33,7 @@
           <h1 class="option-title">{{ $t('options.search-title') }}</h1>
           <div class="search_content">
             <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
-              <label v-if="propName == 'search-date'" for="search-date">{{
+              <label v-if="propName == 'search-date-from'" for="search-date">{{
                 $t(`options.search-${optionsType}-date`)
               }}</label>
 
@@ -45,13 +45,13 @@
                   @focus="preventKeyDown = true"
                   @blur="preventKeyDown = false"
                   :placeholder="$t(`options.${propName}`)"
-                  :type="propName == 'search-date' ? 'date' : 'text'"
-                  :min="propName == 'search-date' ? '2022-02-01' : undefined"
+                  :type="propName.toString().startsWith('search-date') ? 'date' : 'text'"
+                  :min="propName.toString().startsWith('search-date') ? '2022-02-01' : undefined"
                   :id="`${propName}`"
                   :list="propName.toString()"
                 />
 
-                <button class="search-exit" v-if="propName != 'search-date'">
+                <button class="search-exit" v-if="!propName.toString().startsWith('search-date')">
                   <img
                     src="/images/icon-exit.svg"
                     alt="exit-icon"
diff --git a/src/components/JournalView/typings.ts b/src/components/JournalView/typings.ts
index 4e3785f..2534d40 100644
--- a/src/components/JournalView/typings.ts
+++ b/src/components/JournalView/typings.ts
@@ -1,10 +1,14 @@
 export namespace Journal {
-  export type DispatcherSearchKey = 'search-dispatcher' | 'search-station' | 'search-date';
+  export type DispatcherSearchKey =
+    | 'search-dispatcher'
+    | 'search-station'
+    | 'search-date-from'
+    | 'search-date-to';
 
   export type TimetableSearchKey =
     | 'search-driver'
     | 'search-train'
-    | 'search-date'
+    | 'search-date-from'
     | 'search-dispatcher'
     | 'search-issuedFrom'
     | 'search-terminatingAt'
@@ -80,4 +84,3 @@ export namespace Journal {
     isConfirmed: boolean;
   }
 }
-
diff --git a/src/locales/en.json b/src/locales/en.json
index 7fe7497..96b4659 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -23,7 +23,7 @@
   "warnings": {
     "TWR": "Train with high risk cargo",
     "SKR": "Train with exceeded gauge",
-    "PN": "Train with extra deliveries", 
+    "PN": "Train with extra deliveries",
     "TN": "Train with dangerous cargo",
     "header-title": "Freight notes:"
   },
@@ -59,20 +59,16 @@
     "EI": "domestic express",
     "EC": "international express",
     "EN": "domestic night express",
-
     "MP": "intervoivodeship bullet",
     "MO": "intervoivodeship regio",
     "MM": "international bullet",
     "MH": "intervoivodeship night bullet",
-
     "RP": "voivodeship bullet",
     "RM": "international voivodeship regio",
     "RO": "voivodeship regio",
     "RA": "voivodeship regio (urban)",
-
     "PW": "empty passenger",
     "PX": "empty passenger test drive",
-
     "TC": "international freight (intermodal)",
     "TG": "international freight (organized cargo)",
     "TR": "international freight (unorganized cargo)",
@@ -82,18 +78,14 @@
     "TK": "freight (for stations & sidings)",
     "TS": "empty freight test drive",
     "TH": "locomotive rolling stock (over 3 vehicles)",
-
     "LT": "freight locomotive only",
     "LP": "passenger locomotive only",
     "LS": "shunting locomotive only",
     "LZ": "shunting locomotive only",
-
     "ZN": "inspection / diagnostic type",
     "ZU": "other maintenance type",
     "ZG": "emergency (deprecated)",
-
     "AP": "voivodeship regio (deprecated)",
-
     "E": "electric loco",
     "J": "EMU",
     "S": "diesel loco",
@@ -132,7 +124,6 @@
     "mechaniczne": "levers (mechanical)",
     "mechaniczne+SPK": "levers + SPK",
     "mechaniczne+SCS": "levers + SCS",
-
     "abbrevs": {
       "SPK": "SPK",
       "SCS": "SCS",
@@ -161,14 +152,11 @@
   "options": {
     "filters": "FILTERS",
     "donate": "DONATE",
-
     "search-button": "SEARCH",
     "reset-button": "RESET",
-
     "sort-title": "SORT BY:",
     "filter-title": "FILTER BY:",
     "search-title": "SEARCH:",
-
     "search-train-no": "Train no. / #",
     "search-train": "Train no.",
     "search-driver": "Driver name",
@@ -178,10 +166,10 @@
     "search-issuedFrom": "Issuing scenery name",
     "search-via": "Via scenery name",
     "search-terminatingAt": "Terminating scenery name",
-    "search-timetables-date": "Timetable date (UTC+2 / CEST)",
-    "search-dispatchers-date": "Service date (UTC+2 / CEST)",
-    "search-date": "Date (UTC+2 / CEST)",
-
+    "search-timetables-date": "Timetable date",
+    "search-dispatchers-date": "Service date (from / to)",
+    "search-date-from": "Date (UTC+2 / CEST)",
+    "search-date-to": "Date (UTC+2 / CEST)",
     "sort-mass": "mass",
     "sort-speed": "speed",
     "sort-length": "length",
@@ -190,13 +178,11 @@
     "sort-progress": "route progress",
     "sort-delay": "current delay",
     "sort-id": "timetable id",
-
     "sort-allStopsCount": "total stops",
     "sort-beginDate": "date",
     "sort-timetableId": "timetable ID",
     "sort-timestampFrom": "date",
     "sort-currentDuration": "duration",
-
     "filter-noComments": "NO COMMENTS",
     "filter-withComments": "COMMENTS",
     "filter-twr": "TWR",
@@ -211,13 +197,10 @@
     "filter-other": "OTHER",
     "filter-noTimetable": "NO TIMETABLE",
     "filter-withTimetable": "TIMETABLE",
-
     "filter-reset": "RESET FILTERS",
     "filter-clear": "CLEAR FILTERS",
-
     "filter-section-timetable-status": "TIMETABLE STATUS",
     "filter-section-special": "SPECIAL TYPE",
-
     "filter-all-statuses": "ALL",
     "filter-abandoned": "ABANDONED",
     "filter-fulfilled": "FULFILLED",
@@ -225,7 +208,6 @@
   },
   "filters": {
     "desc": " &bull; Left mouse click: select / unselect chosen filter <br /> &bull; Double left click: unselect all filters but chosen from a <b class='text--primary'>group</b> <br /> &bull; <span style='color: coral'>RESET</span>: reset all filters from a <b class='text--primary'>group</b>",
-
     "sections": {
       "quick": "QUICK FILTERS",
       "stationType": "STATION TYPE",
@@ -240,18 +222,14 @@
       "timetables": "ACTIVE TIMETABLES",
       "spawns": "OPEN SPAWNS"
     },
-
     "changed-filters-count": "Changed filters:",
     "no-changed-filters": "No changed filters",
-
     "all-available": "ALL AVAILABLE",
     "all-free": "CURRENTLY FREE",
-
     "endingStatus": "ENDS SOON",
     "afkStatus": "AFK",
     "noSpaceStatus": "NO SPACE",
     "unavailableStatus": "UNAVAILABLE",
-
     "title": "STATION FILTERS",
     "default": "IN-GAME",
     "notDefault": "ADDITIONAL",
@@ -260,7 +238,6 @@
     "unavailable": "UNSUPPORTED",
     "nonPublic": "NON-PUBLIC",
     "abandoned": "ABANDONED",
-
     "SPK": "SPK",
     "SPK-R": "SPK + MANUAL",
     "SPK-M": "SPK + MECH.",
@@ -270,29 +247,22 @@
     "SPE": "SPE",
     "manual": "MANUAL",
     "mechanical": "MECHANICAL",
-
     "SUP": "SUP (RASP-UZK)",
     "noSUP": "WITHOUT SUP",
-
     "ASDEK": "ASDEK",
     "noASDEK": "NO ASDEK",
-
     "SBL": "AUTOMATIC (SBL)",
     "PBL": "SEMIAUTOMATIC (PBL)",
-
     "modern": "MODERN",
     "semaphores": "SEMAPHORES",
     "mixed": "MIXED",
     "historical": "HISTORICAL",
     "free": "FREE",
     "occupied": "OCCUPIED",
-
     "withActiveTimetables": "ACTIVE",
     "withoutActiveTimetables": "NO ACTIVE",
-
     "junction": "JUNCTIONS",
     "nonJunction": "OTHER",
-
     "sliders": {
       "minLevel": "MIN. REQUIRED DISPATCHER LEVEL",
       "maxLevel": "MAX. REQUIRED DISPATCHER LEVEL",
@@ -303,13 +273,11 @@
       "minTwoWayCatenary": "MIN. CATENARY DOUBLE TRACK ROUTES",
       "minTwoWay": "MIN. OTHER DOUBLE TRACK ROUTES"
     },
-
     "sceneries-search": "SCENERY SEARCH:",
     "sceneries-placeholder": "Enter scenery name...",
     "authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
     "authors-placeholder": "Enter the author nickname...",
     "search-button-title": "SEARCH",
-
     "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
     "now": "NOW",
     "hour": "h",
@@ -372,7 +340,6 @@
     "no-trains": "No trains to show here!",
     "loading": "Loading train data...",
     "offline": "Offline ride",
-
     "stats": "TRAFFIC STATISTICS",
     "stats-speed": "TRAINS SPEED (MIN, AVG, MAX) [km/h]",
     "stats-length": "TIMETABLES LENGTH (MIN, AVG, MAX) [km]",
@@ -380,23 +347,17 @@
     "stats-special-twr": "HIGH RISK",
     "stats-special-skr": "EXCEEDED STRUCT. GAUGE",
     "stats-locos": "MOST COMMON UNITS",
-
     "current-scenery": "on scenery",
     "current-signal": "at signal",
     "current-track": "on track",
-
     "vmax-tooltip": "Maximum speed based on vehicles and acceptable train mass",
-   
     "catenary-tooltip": "Electrified route",
     "no-catenary-tooltip": "Non-electrified route",
     "sbl-tooltip": "Route with SBL\n(automatic block signalling)",
-
     "delayed": "Delayed: ",
     "preponed": "Ahead of schedule: ",
     "on-time": "On time",
-
     "route-progress": "Progress: ",
-
     "detailed-timetable": "Detailed timetable for train no. ",
     "via-title": "Via: ",
     "no-timetable": "no current timetable",
@@ -409,24 +370,19 @@
     "timetable-comments": "Exploitation comments available for this train",
     "comment": "Exploitation comments for: ",
     "table-limit": "For performance reasons there's a limit of 10 trains shown at the same time.",
-
     "last-seen-now": "since now",
     "last-seen-min": "since one minute",
     "last-seen-ago": "since {minutes} minutes",
-
     "scenery-offline": "Offline ride",
     "timeout": "An error occured while trying to refresh SWDR timetable data!",
-
     "driver-journal-link": "DRIVER JOURNAL",
     "driver-return-link": "GO BACK",
-
     "driver-not-found-header": "Train not found! :/",
     "driver-not-found-desc-1": "This train has already been terminated, changed its number or is offline.",
     "driver-not-found-desc-2": "You can browse timetable history in the",
     "driver-not-found-journal": "TIMETABLES JOURNAL",
     "driver-not-found-others": "Player {driver} is online as:",
     "driver-not-found-return": "GO BACK TO THE MAIN SITE",
-
     "stock-copy": "COPY THE STOCK",
     "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard!",
     "stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/"
@@ -451,14 +407,10 @@
     "loading": "Loading dispatcher history data...",
     "no-history": "No dispatcher history found!",
     "data-refreshed-at": "Data refreshed at",
-
     "section-timetables": "TIMETABLES",
     "section-dispatchers": "DISPATCHERS",
-
     "no-further-data": "No further data for current parameters",
     "loading-further-data": "Loading...",
-    
-
     "route-length": "Route length:",
     "station-count": "Stations:",
     "dispatcher-name": "Author",
@@ -467,33 +419,25 @@
     "timetable-fulfilled": "FULFILLED",
     "timetable-abandoned": "ABANDONED",
     "timetable-online-button": "ONLINE TIMETABLE",
-
     "online-since": "ONLINE SINCE",
     "duty-lasted": "The duty lasted",
-
     "hours": "{value} hour | {value} hours",
     "minutes": "{value} min | {value} mins",
     "seconds": "{value} s",
-
     "entry-details": "DETAILS",
     "no-entry-details": "NO DETAILS AVAILABLE",
-
     "stock-length": "Length",
     "stock-mass": "Mass",
     "stock-max-speed": "Max. speed",
     "stock-timetable-speed": "Timetable speed",
-
     "stock-dangers": "ADDITIONAL NOTES",
     "stock-preview": "STOCK PREVIEW",
     "stock-copy": "COPY THE STOCK",
-   "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard:",
+    "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard:",
     "stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/",
-
     "load-data": "Load further data...",
-
     "last-seen-at": "Last seen at",
     "currently-at": "Currently at",
-
     "driver-stats": {
       "button": "DRIVER STATS",
       "title": "{name}'s DRIVER STATS",
@@ -504,7 +448,6 @@
       "distance": "DISTANCE",
       "stations": "STATIONS"
     },
-
     "daily-stats": {
       "button": "DAILY STATS",
       "title": "STATS OF THE DAY",
@@ -516,14 +459,12 @@
       "most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
       "longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
       "count": "timetable | timetables",
-
       "rippedSwitches": "RIPPED SWITCHES",
       "derailments": "DERAILMENTS",
       "skippedStopSignals": "SKIPPED STOP SIGNALS",
       "radioStops": "RADIOSTOPS",
       "kills": "KILLS"
     },
-
     "dispatcher-stats": {
       "button": "DISPATCHER STATS",
       "title": "{name}'s DISPATCHER STATS",
@@ -537,13 +478,10 @@
       "timetables-max": "LONGEST TIMETABLE",
       "timetables-avg": "AVG TIMETABLE DISTANCE"
     },
-
     "stats-loading": "Fetching statistics...",
     "stats-error": "Oops! An unexpected error occurred while trying to fetch statistics! :/",
-
     "timetable-location-signal": "signal:",
     "timetable-location-route": "route:",
-
     "history-name": "Scenery name",
     "history-hash": "Hash",
     "history-dispatcher": "Dispatcher",
@@ -570,30 +508,22 @@
     "project-title": "Project name",
     "one-way-routes": "One way routes",
     "two-way-routes": "Two way routes",
-
     "option-active-timetables": "Active timetables",
     "option-timetables-history": "Timetables history PL1",
     "option-dispatchers-history": "Dispatchers history PL1",
-
     "timetable-via": "ALL TIMETABLES",
     "timetable-issuedFrom": "BEGINS HERE",
     "timetable-terminatingAt": "TERMINATES HERE",
-
     "timetable-issued-date": "Issued",
     "timetable-issued-by": " by:",
     "timetable-issued-for": " for driver:",
-
     "dispatcher-rate": "Rate:",
     "dispatcher-status-changes": "Status changes:",
-
     "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required",
     "history-list-empty": "No recorded scenery history!",
-
     "forum-topic": "Official {name} forum topic",
-
     "pragotron-link": "Timetable pallet board",
     "tablice-link": "Timetable summary board (by Thundo)",
-
     "bottom-info": "Show full history in the Journal tab"
   },
   "availability": {
@@ -610,10 +540,8 @@
     "terminated": "Timetable terminated",
     "begins": "BEGINS HERE",
     "terminates": "TERMINATES\nHERE",
-
     "from": "FROM",
     "to": "TO",
-
     "desc-arriving": "The train is not here yet. It's going to come from: {prevStationName} (szlak {prevDepartureLine})",
     "desc-online": "The train is at the station. It's going to leave to: {nextStationName} (szlak {nextArrivalLine})",
     "desc-stopped": "The train is at the station and is stopped. It's going to leave towards: {nextStationName} (szlak {nextArrivalLine})",
@@ -628,4 +556,4 @@
     "search-train": "Train no.",
     "search-driver": "Driver name"
   }
-}
+}
\ No newline at end of file
diff --git a/src/locales/pl.json b/src/locales/pl.json
index e00586e..589525f 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -56,20 +56,16 @@
     "EI": "ekspres krajowy",
     "EC": "ekspres międzynarodowy",
     "EN": "ekspres krajowy nocny",
-
     "MP": "międzywojewódzki pospieszny",
     "MO": "międzywojewódzki osobowy",
     "MM": "międzynarodowy pospieszny",
     "MH": "międzywojewódzki pospieszny (nocny)",
-
     "RP": "wojewódzki pospieszny",
     "RO": "wojewódzki osobowy",
     "RM": "wojewódzki osobowy międzynarodowy",
     "RA": "wojewódzki osobowy aglomeracyjny",
-
     "PW": "pasażerski próżny - służbowy",
     "PX": "pasażerski próżny próbny",
-
     "TC": "towarowy międzynarodowy intermodalny",
     "TG": "towarowy międzynarodowy masowy",
     "TR": "towarowy międzynarodowy niemasowy",
@@ -79,18 +75,14 @@
     "TK": "towarowy zdawczy",
     "TS": "towarowy próżny próbny",
     "TH": "skład lokomotyw (powyżej 3 pojazdów)",
-
     "LT": "lokomotywa towarowa luzem",
     "LP": "lokomotywa pasażerska luzem",
     "LS": "lokomotywa manewrowa luzem",
     "LZ": "lokomotywa dla poc. utrzymaniowo-naprawczych",
-
     "ZN": "inspekcyjny / diagnostyczny",
     "ZU": "inny utrzymaniowy",
     "ZG": "ratunkowy (kat. wycofana)",
-
     "AP": "wojewódzki osobowy (kat. wycofana)",
-
     "E": "elektrowóz",
     "J": "EZT",
     "S": "spalinowóz",
@@ -129,7 +121,6 @@
     "mechaniczne": "mechaniczne",
     "mechaniczne+SPK": "mechaniczne z SPK",
     "mechaniczne+SCS": "mechaniczne z SCS",
-
     "abbrevs": {
       "SPK": "SPK",
       "SCS": "SCS",
@@ -158,14 +149,11 @@
   "options": {
     "filters": "FILTRY",
     "donate": "WESPRZYJ",
-
     "search-button": "SZUKAJ",
     "reset-button": "ZRESETUJ",
-
     "sort-title": "SORTUJ WG:",
     "filter-title": "FILTRUJ WG:",
     "search-title": "SZUKAJ:",
-
     "search-train-no": "Nr pociągu",
     "search-train": "Nr pociągu / #",
     "search-driver": "Nick maszynisty",
@@ -175,10 +163,10 @@
     "search-issuedFrom": "Sceneria początkowa",
     "search-via": "Przez scenerię",
     "search-terminatingAt": "Sceneria końcowa",
-    "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
-    "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
-    "search-date": "Data (UTC+2 / CEST)",
-
+    "search-timetables-date": "Data rozkładu jazdy",
+    "search-dispatchers-date": "Data służby (od / do)",
+    "search-date-from": "Data (UTC+2 / CEST)",
+    "search-date-to": "Data (UTC+2 / CEST)",
     "sort-routeDistance": "kilometraż",
     "sort-allStopsCount": "stacje",
     "sort-beginDate": "data",
@@ -186,7 +174,6 @@
     "sort-timestampFrom": "data",
     "sort-currentDuration": "czas dyżuru",
     "sort-id": "id rozkładu",
-
     "sort-mass": "masa",
     "sort-speed": "prędkość",
     "sort-length": "długość",
@@ -194,7 +181,6 @@
     "sort-progress": "przebyta trasa",
     "sort-delay": "opóźnienie",
     "sort-comments": "uwagi ekspl.",
-
     "filter-withComments": "UWAGI EKSPLOATACYJNE",
     "filter-noComments": "BEZ UWAG",
     "filter-twr": "TWR",
@@ -209,13 +195,10 @@
     "filter-other": "INNE",
     "filter-noTimetable": "BEZ RJ",
     "filter-withTimetable": "ROZKŁAD JAZDY",
-
     "filter-reset": "ZRESETUJ FILTRY",
     "filter-clear": "WYŁĄCZ FILTRY",
-
     "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
     "filter-section-special": "TYPY SPECJALNE",
-
     "filter-all-specials": "WSZYSTKIE",
     "filter-abandoned": "PORZUCONE",
     "filter-fulfilled": "WYPEŁNIONE",
@@ -223,7 +206,6 @@
   },
   "filters": {
     "desc": " &bull; Kliknięcie: zaznaczenie / odznaczenie filtru <br /> &bull; Podwójne kliknięcie: odznaczenie reszty filtrów z <b class='text--primary'>grupy</b> <br /> &bull; <span style='color: coral'>RESET</span>: zresetowanie filtrów z <b class='text--primary'>grupy</b>",
-
     "sections": {
       "quick": "SZYBKIE FILTRY",
       "stationType": "RODZAJ STACJI",
@@ -238,18 +220,14 @@
       "timetables": "AKTYWNE ROZKŁADY JAZDY",
       "spawns": "OTWARTE SPAWNY"
     },
-
     "changed-filters-count": "Zmienione filtry:",
     "no-changed-filters": "Brak zmienionych filtrów",
-
     "all-available": "WSZYSTKIE DOSTĘPNE",
     "all-free": "WSZYSTKIE WOLNE",
-
     "endingStatus": "KOŃCZY",
     "afkStatus": "Z/W",
     "noSpaceStatus": "BRAK MIEJSCA",
     "unavailableStatus": "NIEDOSTĘPNY",
-
     "title": "FILTRUJ STACJE",
     "default": "DOMYŚLNA",
     "notDefault": "POZA PACZKĄ",
@@ -258,7 +236,6 @@
     "unavailable": "NIEDOSTĘPNA",
     "nonPublic": "NIEPUBLICZNA",
     "abandoned": "WYCOFANA",
-
     "SPK": "SPK",
     "SPK-R": "SPK + RĘCZNE",
     "SPK-M": "SPK + MECH.",
@@ -267,16 +244,12 @@
     "SCS-M": "SCS + MECH.",
     "SPE": "SPE",
     "manual": "RĘCZNE",
-
     "SUP": "SUP (RASP-UZK)",
     "noSUP": "BEZ SUP",
-
     "ASDEK": "ASDEK",
     "noASDEK": "BEZ ASDEK-a",
-
     "SBL": "SAMOCZYNNA",
     "PBL": "PÓŁSAMOCZYNNA",
-
     "mechanical": "MECHANICZNE",
     "modern": "WSPÓŁCZESNA",
     "semaphores": "KSZTAŁTOWA",
@@ -284,13 +257,10 @@
     "historical": "HISTORYCZNA",
     "free": "WOLNA",
     "occupied": "ZAJĘTA",
-
     "withActiveTimetables": "AKTYWNE",
     "withoutActiveTimetables": "BEZ AKTYWNYCH",
-
     "junction": "WĘZŁOWE",
     "nonJunction": "INNE",
-
     "sliders": {
       "minLevel": "MIN. WYMAGANY POZIOM DYŻURNEGO",
       "maxLevel": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
@@ -301,7 +271,6 @@
       "minTwoWayCatenary": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
       "minTwoWay": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
     },
-
     "sceneries-search": "WYSZUKAJ SCENERIĘ:",
     "sceneries-placeholder": "Wpisz nazwę scenerii...",
     "authors-search": "WYSZUKAJ AUTORA (uwzględnia inne filtry):",
@@ -367,23 +336,17 @@
     "no-trains": "Brak pociągów do wyświetlenia!",
     "loading": "Pobieranie danych o pociągach...",
     "offline": "Przejazd offline",
-
     "current-scenery": "na scenerii",
     "current-signal": "przy semaforze",
     "current-track": "na szlaku",
-
     "vmax-tooltip": "Maksymalna prędkość obliczona na podstawie pojazdów w składzie i masy dopuszczalnej",
-
     "catenary-tooltip": "Szlak zelektryfikowany",
     "no-catenary-tooltip": "Szlak niezelektryfikowany",
     "sbl-tooltip": "Szlak posiadający\nsamoczynną blokadę liniową",
-
     "delayed": "Opóźniony: ",
     "preponed": "Przed czasem: ",
     "on-time": "Planowo",
-
     "route-progress": "Postęp: ",
-
     "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
     "via-title": "Przez: ",
     "no-timetable": "brak rozkładu jazdy",
@@ -394,25 +357,19 @@
     "loco-diesel": "Spalinowóz",
     "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
     "comment": "Uwagi eksploatacyjne dla: ",
-
     "last-seen-now": "od niedawna",
     "last-seen-min": "od minuty",
     "last-seen-ago": "od {minutes} minut",
-
     "scenery-offline": "Przejazd offline",
-
     "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR",
-
     "driver-journal-link": "DZIENNIK MASZYNISTY",
     "driver-return-link": "POWRÓT",
-
     "driver-not-found-header": "Nie znaleziono pociągu! :/",
     "driver-not-found-desc-1": "Ten pociąg prawdopodobnie zakończył już swój bieg, zmienił numer lub jest offline.",
     "driver-not-found-desc-2": "Historię rozkładów jazdy możesz przejrzeć w",
     "driver-not-found-journal": "DZIENNIKU RJ",
     "driver-not-found-others": "Gracz {driver} jest online jako:",
     "driver-not-found-return": "WRÓĆ NA STRONĘ GŁÓWNĄ",
-
     "stock-copy": "SKOPIUJ SKŁAD",
     "stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka!",
     "stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/"
@@ -437,19 +394,15 @@
     "loading": "Ładowanie historii dyżurów...",
     "no-history": "Brak historii dyżurów dla tej scenerii!",
     "data-refreshed-at": "Dane odświeżone o",
-
     "section-timetables": "ROZKŁADY JAZDY",
     "section-dispatchers": "DYŻURNI",
-
     "no-further-data": "Brak dalszych wyników dla podanych parametrów",
     "loading-further-data": "Ładowanie...",
-
     "online-since": "ONLINE OD",
     "duty-lasted": "Dyżur trwał",
     "hours": "{value} godz.",
     "minutes": "{value} min.",
     "seconds": "{value} sek.",
-
     "route-length": "Kilometraż:",
     "station-count": "Stacje:",
     "dispatcher-name": "Autor",
@@ -458,26 +411,20 @@
     "timetable-fulfilled": "WYPEŁNIONY",
     "timetable-abandoned": "PORZUCONY",
     "timetable-online-button": "RJ ONLINE",
-
     "entry-details": "SZCZEGÓŁY",
     "no-entry-details": "BRAK DOSTĘPNYCH SZCZEGÓŁÓW",
-
     "stock-length": "Długość",
     "stock-mass": "Masa",
     "stock-max-speed": "Prędkość maks.",
     "stock-timetable-speed": "Prędkość RJ",
-
     "stock-dangers": "DODATKOWE UWAGI",
     "stock-preview": "PODGLĄD SKŁADU",
     "stock-copy": "SKOPIUJ SKŁAD",
     "stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka:",
     "stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/",
-
     "load-data": "Pobierz dalszą historię...",
-
     "last-seen-at": "Ostatnio widziany na: ",
     "currently-at": "Obecnie na scenerii: ",
-
     "driver-stats": {
       "button": "STAT. MASZYNISTY",
       "title": "STATYSTYKI MASZYNISTY {name}",
@@ -488,7 +435,6 @@
       "distance": "DYSTANS",
       "stations": "STACJE"
     },
-
     "daily-stats": {
       "button": "STATYSTYKI DNIA",
       "title": "STATYSTYKI DNIA",
@@ -500,14 +446,12 @@
       "most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
       "longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
       "count": "rozkład jazdy | rozkładów jazdy",
-
       "rippedSwitches": "ROZPRUTE ZWROTNICE",
       "derailments": "WYKOLEJENIA",
       "skippedStopSignals": "POMINIĘTE S1",
       "radioStops": "RADIOSTOPY",
       "kills": "POTRĄCENIA"
     },
-
     "dispatcher-stats": {
       "button": "STATYSTYKI DYŻURNEGO",
       "title": "STATYSTYKI DYŻURNEGO {name}",
@@ -520,13 +464,10 @@
       "timetables-max": "NAJDŁUŻSZY WYSTAWIONY RJ",
       "timetables-avg": "ŚREDNIA WYSTAWIONYCH RJ"
     },
-
     "stats-loading": "Pobieranie statystyk...",
     "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk!",
-
     "timetable-location-signal": "semafor:",
     "timetable-location-route": "szlak:",
-
     "history-name": "Sceneria",
     "history-hash": "Hash",
     "history-dispatcher": "Dyżurny",
@@ -553,30 +494,22 @@
     "project-title": "Projekt",
     "one-way-routes": "Szlaki jednotorowe",
     "two-way-routes": "Szlaki dwutorowe",
-
     "option-active-timetables": "Aktywne rozkłady jazdy",
     "option-timetables-history": "Historia rozkładów PL1",
     "option-dispatchers-history": "Historia dyżurów PL1",
-
     "timetable-via": "WSZYSTKIE RJ",
     "timetable-issuedFrom": "ROZPOCZYNA BIEG",
     "timetable-terminatingAt": "KOŃCZY BIEG",
-
     "timetable-issued-date": "Wystawiony",
     "timetable-issued-by": " przez:",
     "timetable-issued-for": " dla maszynisty:",
-
     "dispatcher-rate": "Ocena:",
     "dispatcher-status-changes": "Zmiany statusów:",
-
     "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
     "history-list-empty": "Brak historii dla tej scenerii!",
-
     "forum-topic": "Oficjalny wątek scenerii {name}",
-
     "pragotron-link": "Paletowa tablica informacyjna",
     "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
-
     "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
   },
   "availability": {
@@ -593,10 +526,8 @@
     "terminated": "Rozkład jazdy zakończony",
     "begins": "ROZPOCZYNA\nBIEG",
     "terminates": "KOŃCZY BIEG",
-
     "from": "Z",
     "to": "DO",
-
     "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
     "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
     "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
@@ -609,4 +540,4 @@
   "history": {
     "title": "DZIENNIK ROZKŁADÓW JAZDY"
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue
index 2332ddd..eece977 100644
--- a/src/views/JournalDispatchers.vue
+++ b/src/views/JournalDispatchers.vue
@@ -65,6 +65,8 @@ interface DispatchersQueryParams {
   stationHash?: string;
   timestampFrom?: number;
   timestampTo?: number;
+  dateFrom?: string;
+  dateTo?: string;
   countFrom?: number;
   countLimit?: number;
   sortBy?: Journal.DispatcherSorter['id'];
@@ -127,7 +129,8 @@ export default defineComponent({
     const searchersValues = reactive({
       'search-dispatcher': '',
       'search-station': '',
-      'search-date': ''
+      'search-date-from': '',
+      'search-date-to': ''
     } as Journal.DispatcherSearchType);
 
     provide('sorterActive', sorterActive);
@@ -189,7 +192,8 @@ export default defineComponent({
     handleRouteParams() {
       this.$router.push({
         query: {
-          'search-date': this.searchersValues['search-date'] || undefined,
+          'search-date-from': this.searchersValues['search-date-from'] || undefined,
+          'search-date-to': this.searchersValues['search-date-to'] || undefined,
           'search-station': this.searchersValues['search-station'] || undefined,
           'search-dispatcher': this.searchersValues['search-dispatcher'] || undefined
         }
@@ -235,7 +239,8 @@ export default defineComponent({
     },
 
     setOptions(options: { [key: string]: string }) {
-      this.searchersValues['search-date'] = options['search-date'] ?? '';
+      this.searchersValues['search-date-from'] = options['search-date-from'] ?? '';
+      this.searchersValues['search-date-to'] = options['search-date-to'] ?? '';
       this.searchersValues['search-station'] = options['search-station'] ?? '';
       this.searchersValues['search-dispatcher'] = options['search-dispatcher'] ?? '';
 
@@ -272,17 +277,13 @@ export default defineComponent({
 
       const dispatcherName = this.searchersValues['search-dispatcher'].trim() || undefined;
       const stationName = this.searchersValues['search-station'].trim() || undefined;
-      const dateString = this.searchersValues['search-date'].trim() || undefined;
-
-      const timestampFrom = dateString
-        ? Date.parse(new Date(dateString).toISOString()) - 120 * 60 * 1000
-        : undefined;
-
-      const timestampTo = timestampFrom ? timestampFrom + 86400000 : undefined;
+      const dateFromString = this.searchersValues['search-date-from'].trim() || undefined;
+      const dateToString = this.searchersValues['search-date-to'].trim() || undefined;
 
       queryParams['dispatcherName'] = dispatcherName;
-      queryParams['timestampFrom'] = timestampFrom;
-      queryParams['timestampTo'] = timestampTo;
+      queryParams['dateFrom'] = dateFromString;
+      queryParams['dateTo'] = dateToString ? `${dateToString}T23:00:00` : undefined;
+
       queryParams['countLimit'] = 30;
 
       if (stationName && stationName.startsWith('#'))
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 4b97470..40ea3aa 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -215,7 +215,7 @@ export default defineComponent({
       'search-issuedFrom': '',
       'search-via': '',
       'search-terminatingAt': '',
-      'search-date': ''
+      'search-date-from': ''
     } as Journal.TimetableSearchType);
 
     const countFromIndex = ref(0);
@@ -352,7 +352,7 @@ export default defineComponent({
       const driverName = this.searchersValues['search-driver'].trim() || undefined;
       const trainNo = this.searchersValues['search-train'].trim() || undefined;
       const authorName = this.searchersValues['search-dispatcher'].trim() || undefined;
-      const dateFrom = this.searchersValues['search-date'].trim() || undefined;
+      const dateFrom = this.searchersValues['search-date-from'].trim() || undefined;
       const issuedFrom = this.searchersValues['search-issuedFrom'].trim() || undefined;
       const via = this.searchersValues['search-via'].trim() || undefined;
       const terminatingAt = this.searchersValues['search-terminatingAt'].trim() || undefined;