-
TWR - {{ $t('general.TWR') }}
-
({{ train.timetableData?.warningNotes }})
+
+
+
TWR
+ - {{ $t('warnings.TWR') }}
+
+
+
+
TN
+ - {{ $t('warnings.TN') }}
+
+
+
+
PN
+ - {{ $t('warnings.PN') }}
+
-
-
SKR - {{ $t('general.SKR') }}
+
+
{{ $t('warnings.header-title') }}
+
+ {{ train.timetableData?.warningNotes }}
+
@@ -254,6 +280,24 @@ export default defineComponent({
margin-top: 0.5em;
}
+.dangers-badges {
+ display: flex;
+ flex-direction: column;
+ gap: 0.5em;
+}
+
+.dangers-notes {
+ margin-top: 0.5em;
+ white-space: pre-wrap;
+
+ p {
+ margin-top: 0.25em;
+ max-height: 200px;
+ max-width: 500px;
+ overflow: auto;
+ }
+}
+
.train-info {
display: grid;
grid-template-columns: 2fr 1fr;
diff --git a/src/components/TrainsView/typings.ts b/src/components/TrainsView/typings.ts
index 865bb76..30de2b4 100644
--- a/src/components/TrainsView/typings.ts
+++ b/src/components/TrainsView/typings.ts
@@ -12,12 +12,14 @@ export const enum TrainFilterId {
withComments = 'withComments',
twr = 'twr',
- skr = 'skr',
+ tn = 'tn',
+ pn = 'pn',
common = 'common',
passenger = 'passenger',
freight = 'freight',
other = 'other',
+
noTimetable = 'noTimetable',
withTimetable = 'withTimetable'
}
@@ -40,7 +42,12 @@ export const trainFilters: TrainFilter[] = [
isActive: true
},
{
- id: TrainFilterId.skr,
+ id: TrainFilterId.tn,
+ section: TrainFilterSection.TRAIN_TYPE,
+ isActive: true
+ },
+ {
+ id: TrainFilterId.pn,
section: TrainFilterSection.TRAIN_TYPE,
isActive: true
},
diff --git a/src/locales/en.json b/src/locales/en.json
index 8b646d3..efd54f6 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -20,11 +20,16 @@
"dispatcher-message": "Dispatcher supporting the Stacjownik project!",
"driver-message": "Driver supporting the Stacjownik project!"
},
+ "warnings": {
+ "TWR": "Train with high risk cargo",
+ "SKR": "Train with exceeded gauge",
+ "PN": "Train with extra deliveries",
+ "TN": "Train with dangerous cargo",
+ "header-title": "Freight notes:"
+ },
"general": {
"and": " and ",
- "refresh": "REFRESH",
- "TWR": "High risk freight train",
- "SKR": "Train with exceeded gauge"
+ "refresh": "REFRESH"
},
"update": {
"title": "Stacjownik update!",
@@ -188,15 +193,17 @@
"sort-beginDate": "date",
"sort-timetableId": "timetable ID",
"sort-timestampFrom": "date",
- "sort-duration": "duration",
+ "sort-currentDuration": "duration",
"filter-noComments": "NO COMMENTS",
"filter-withComments": "COMMENTS",
- "filter-twr": "HIGH RISK CARGO",
- "filter-skr": "EXCEEDED GAUGE",
+ "filter-twr": "TWR",
+ "filter-skr": "SKR",
+ "filter-tn": "TN",
+ "filter-pn": "PN",
"filter-twr-skr": "BOTH TYPES",
"filter-all-specials": "ALL",
- "filter-common": "NO WARNINGS",
+ "filter-common": "COMMON",
"filter-passenger": "PASSENGER",
"filter-freight": "FREIGHT",
"filter-other": "OTHER",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 2063a7f..f8e5829 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -20,11 +20,16 @@
"dispatcher-message": "Dyżurny wspierający projekt Stacjownika!",
"driver-message": "Maszynista wspierający projekt Stacjownika!"
},
+ "warnings": {
+ "TWR": "Pociąg z towarami niebezpiecznie wysokiego ryzyka",
+ "SKR": "Pociąg z przekroczoną skrajnią",
+ "PN": "Pociąg z przesyłkami nadzwyczajnymi",
+ "TN": "Pociąg z towarami niebezpiecznymi",
+ "header-title": "Uwagi przewozowe:"
+ },
"general": {
"and": " oraz ",
- "refresh": "ODŚWIEŻ",
- "TWR": "Towar niebezpieczny wysokiego ryzyka",
- "SKR": "Przekroczona skrajnia"
+ "refresh": "ODŚWIEŻ"
},
"update": {
"title": "Aktualizacja Stacjownika!",
@@ -177,7 +182,7 @@
"sort-beginDate": "data",
"sort-timetableId": "ID rozkładu",
"sort-timestampFrom": "data",
- "sort-duration": "czas dyżuru",
+ "sort-currentDuration": "czas dyżuru",
"sort-id": "id rozkładu",
"sort-mass": "masa",
@@ -190,8 +195,10 @@
"filter-withComments": "UWAGI EKSPLOATACYJNE",
"filter-noComments": "BEZ UWAG",
- "filter-twr": "WYS. RYZYKA",
- "filter-skr": "SKRAJNIA",
+ "filter-twr": "TWR",
+ "filter-skr": "SKR",
+ "filter-tn": "TN",
+ "filter-pn": "PN",
"filter-twr-skr": "TWR/SKR",
"filter-all-statuses": "WSZYSTKIE",
"filter-common": "ZWYKŁE",
@@ -364,7 +371,7 @@
"current-track": "na szlaku",
"vmax-tooltip": "Maksymalna prędkość na podstawie pojazdów w składzie - nie bierze pod uwagę masy hamowania",
-
+
"catenary-tooltip": "Szlak zelektryfikowany",
"no-catenary-tooltip": "Szlak niezelektryfikowany",
"sbl-tooltip": "Szlak posiadający\nsamoczynną blokadę liniową",
diff --git a/src/managers/trainFilterManager.ts b/src/managers/trainFilterManager.ts
index 1acf953..46c1c19 100644
--- a/src/managers/trainFilterManager.ts
+++ b/src/managers/trainFilterManager.ts
@@ -45,8 +45,11 @@ function filterTrainList(
case TrainFilterId.twr:
return !train.timetableData?.TWR;
- case TrainFilterId.skr:
- return !train.timetableData?.SKR;
+ case TrainFilterId.pn:
+ return !train.timetableData?.hasExtraDeliveries;
+
+ case TrainFilterId.tn:
+ return !train.timetableData?.hasDangerousCargo;
case TrainFilterId.common:
return train.timetableData?.SKR || train.timetableData?.TWR;
diff --git a/src/store/mainStore.ts b/src/store/mainStore.ts
index 5dea181..3fdde31 100644
--- a/src/store/mainStore.ts
+++ b/src/store/mainStore.ts
@@ -87,14 +87,16 @@ export const useMainStore = defineStore('mainStore', {
timetableData: timetable
? {
timetableId: timetable.timetableId,
- SKR: timetable.SKR,
- TWR: timetable.TWR,
route: timetable.route,
category: timetable.category,
followingStops: timetable.stopList,
routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
sceneries: timetable.sceneries,
+ TWR: timetable.TWR,
+ SKR: timetable.SKR,
warningNotes: timetable.warningNotes,
+ hasDangerousCargo: timetable.hasDangerousCargo,
+ hasExtraDeliveries: timetable.hasExtraDeliveries,
timetablePath: timetable.path.split(';').map((pathElementString) => {
const [arrival, station, departure] = pathElementString.split(',');
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index edaa5a9..f29645d 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -79,18 +79,17 @@
}
.train-badge {
- display: flex;
- align-items: center;
+ display: inline-block;
gap: 0.3em;
padding: 0.1em 0.3em;
border-radius: 0.2em;
font-weight: bold;
+ user-select: none;
&.twr {
background-color: var(--clr-twr);
box-shadow: 0 0 5px 1px var(--clr-twr);
- color: black;
}
&.skr {
@@ -98,6 +97,17 @@
box-shadow: 0 0 5px 1px var(--clr-skr);
}
+ &.tn {
+ background-color: var(--clr-tn);
+ box-shadow: 0 0 5px 1px var(--clr-tn);
+ }
+
+ &.pn {
+ background-color: var(--clr-pn);
+ box-shadow: 0 0 5px 1px var(--clr-pn);
+ color: black;
+ }
+
&.offline {
background-color: #be3728;
}
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 2d3bc8f..9b081fb 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -13,7 +13,9 @@
--clr-accent2: #ff3d5d;
--clr-skr: #ff5100;
- --clr-twr: #ffbb00;
+ --clr-twr: #ee503e;
+ --clr-tn: #cb4dcf;
+ --clr-pn: #ffd000;
--clr-error: #fa3636;
--clr-warning: #c59429;
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index c7b741d..914d8d6 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -9,6 +9,3 @@ $warningCol: #ffe15b;
$accentCol: #ffc014;
$accent2Col: #ff3d5d;
-
-$skr: #ff5100;
-$twr: #ffbb00;
diff --git a/src/typings/api.ts b/src/typings/api.ts
index 8327bf6..3dde248 100644
--- a/src/typings/api.ts
+++ b/src/typings/api.ts
@@ -201,10 +201,11 @@ export namespace API {
TWR: boolean;
SKR: boolean;
- sceneries: string[];
-
- path: string;
+ hasDangerousCargo: boolean;
+ hasExtraDeliveries: boolean;
warningNotes: string | null;
+ sceneries: string[];
+ path: string;
}
}
@@ -262,10 +263,13 @@ export namespace API {
checkpointArrivalsScheduled: string[];
checkpointDeparturesScheduled: string[];
checkpointStopTypes: string[];
+ checkpointComments: string[];
visitedSceneries: string[];
sceneryNames: string[];
path: string;
warningNotes: string | null;
+ hasDangerousCargo: boolean;
+ hasExtraDeliveries: boolean;
}
export type Response = Data[];
diff --git a/src/typings/common.ts b/src/typings/common.ts
index 7fd270e..0f1626a 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -84,10 +84,12 @@ export interface TrainTimetableData {
followingStops: TrainStop[];
TWR: boolean;
SKR: boolean;
+ hasDangerousCargo: boolean;
+ hasExtraDeliveries: boolean;
+ warningNotes: string | null;
routeDistance: number;
sceneries: string[];
timetablePath: TimetablePathElement[];
- warningNotes: string | null;
}
export interface Station {
diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue
index fda4acb..2332ddd 100644
--- a/src/views/JournalDispatchers.vue
+++ b/src/views/JournalDispatchers.vue
@@ -7,8 +7,8 @@
({
statsButtons,
- currentQuery: '',
- currentQueryArray: [] as string[],
dataRefreshedAt: null as Date | null,
+ currentQueryParams: {} as DispatchersQueryParams,
scrollDataLoaded: true,
scrollNoMoreData: false,
@@ -109,9 +130,6 @@ export default defineComponent({
'search-date': ''
} as Journal.DispatcherSearchType);
- const countFromIndex = ref(0);
- const countLimit = 15;
-
provide('sorterActive', sorterActive);
provide('journalFilterActive', journalFilterActive);
provide('searchersValues', searchersValues);
@@ -126,19 +144,17 @@ export default defineComponent({
sorterActive,
searchersValues,
- countFromIndex,
- countLimit,
-
- scrollElement,
- maxCount: ref(15)
+ scrollElement
};
},
watch: {
- currentQueryArray(q: string[]) {
- this.currentOptionsActive =
- q.length > 2 ||
- q.some((qv) => qv.startsWith('sortBy=') && qv.split('=')[1] != 'timestampFrom');
+ currentQueryParams(queryParams: DispatchersQueryParams) {
+ this.currentOptionsActive = Object.keys(queryParams).some(
+ (k) =>
+ queryParams[k as keyof DispatchersQueryParams] !=
+ defaultQueryParams[k as keyof DispatchersQueryParams]
+ );
},
'mainStore.dispatcherStatsData'(stats) {
@@ -234,13 +250,10 @@ export default defineComponent({
async addHistoryData() {
this.scrollDataLoaded = false;
-
- this.countFromIndex = this.historyList.length;
+ this.currentQueryParams['countFrom'] = this.historyList.length;
const responseData: API.DispatcherHistory.Response = await (
- await this.apiStore.client!.get(
- `api/getDispatchers?${this.currentQuery}&countFrom=${this.countFromIndex}`
- )
+ await this.apiStore.client!.get(`api/getDispatchers`, { params: this.currentQueryParams })
).data;
if (!responseData) return;
@@ -254,43 +267,38 @@ export default defineComponent({
this.scrollDataLoaded = true;
},
- async fetchHistoryData(reset = false) {
- const queries: string[] = [];
+ async fetchHistoryData() {
+ const queryParams: DispatchersQueryParams = {};
- const dispatcher = this.searchersValues['search-dispatcher'].trim();
- const station = this.searchersValues['search-station'].trim();
- const dateString = this.searchersValues['search-date'].trim();
+ 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;
- if (dispatcher) queries.push(`dispatcherName=${dispatcher}`);
-
- if (station.startsWith("#")) queries.push(`stationHash=${station.slice(1)}`);
- else if (station.length > 0) queries.push(`stationName=${station}`);
+ queryParams['dispatcherName'] = dispatcherName;
+ queryParams['timestampFrom'] = timestampFrom;
+ queryParams['timestampTo'] = timestampTo;
+ queryParams['countLimit'] = 30;
- if (timestampFrom && timestampTo)
- queries.push(`timestampFrom=${timestampFrom}`, `timestampTo=${timestampTo}`);
+ if (stationName && stationName.startsWith('#'))
+ queryParams['stationHash'] = stationName.slice(1);
+ else queryParams['stationName'] = stationName;
- // API: const SORT_TYPES = ['allStopsCount', 'endDate', 'beginDate', 'routeDistance'];
- if (this.sorterActive.id == 'timestampFrom') queries.push('sortBy=timestampFrom');
- else if (this.sorterActive.id == 'duration') queries.push('sortBy=currentDuration');
- else queries.push('sortBy=timestampFrom');
+ queryParams['sortBy'] = this.sorterActive.id;
- queries.push('countLimit=30');
+ if (JSON.stringify(this.currentQueryParams) != JSON.stringify(queryParams))
+ this.dataStatus = Status.Data.Loading;
- if (this.currentQuery != queries.join('&')) this.dataStatus = Status.Data.Loading;
-
- this.currentQuery = queries.join('&');
- this.currentQueryArray = queries;
+ this.currentQueryParams = queryParams;
try {
- if (reset) this.dataStatus = Status.Data.Loading;
-
const responseData: API.DispatcherHistory.Response = await (
- await this.apiStore.client!.get(`api/getDispatchers?${this.currentQuery}`)
+ await this.apiStore.client!.get(`api/getDispatchers`, { params: this.currentQueryParams })
).data;
if (!responseData) {
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 34a2434..4b97470 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -105,7 +105,13 @@ export const journalTimetableFilters: Journal.TimetableFilter[] = [
default: false
},
{
- id: Journal.TimetableFilterId.TWR_SKR,
+ id: Journal.TimetableFilterId.TN,
+ filterSection: Journal.FilterSection.SPECIAL,
+ isActive: false,
+ default: false
+ },
+ {
+ id: Journal.TimetableFilterId.PN,
filterSection: Journal.FilterSection.SPECIAL,
isActive: false,
default: false
@@ -118,8 +124,6 @@ interface TimetablesQueryParams {
timetableId?: string;
authorName?: string;
- // timestampFrom?: number;
- // timestampTo?: number;
dateFrom?: string;
dateTo?: string;
@@ -136,6 +140,8 @@ interface TimetablesQueryParams {
twr?: number;
skr?: number;
+ pn?: number;
+ tn?: number;
sortBy?: Journal.TimetableSorter['id'];
}
@@ -327,7 +333,7 @@ export default defineComponent({
const responseData: API.TimetableHistory.Response = await (
await this.apiStore.client!.get('api/getTimetables', {
- params: { ...this.currentQueryParams }
+ params: this.currentQueryParams
})
).data;
@@ -391,21 +397,24 @@ export default defineComponent({
case Journal.TimetableFilterId.ALL_SPECIALS:
queryParams['twr'] = undefined;
queryParams['skr'] = undefined;
+ queryParams['pn'] = undefined;
+ queryParams['tn'] = undefined;
break;
case Journal.TimetableFilterId.TWR:
queryParams['twr'] = 1;
- queryParams['skr'] = 0;
break;
case Journal.TimetableFilterId.SKR:
- queryParams['twr'] = 0;
queryParams['skr'] = 1;
break;
- case Journal.TimetableFilterId.TWR_SKR:
- queryParams['twr'] = 1;
- queryParams['skr'] = 1;
+ case Journal.TimetableFilterId.TN:
+ queryParams['tn'] = 1;
+ break;
+
+ case Journal.TimetableFilterId.PN:
+ queryParams['pn'] = 1;
break;
default: