From 9f68d628d0ac72d4186258d263315ab91a699d78 Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 21 Dec 2022 15:51:13 +0100 Subject: [PATCH] =?UTF-8?q?Wska=C5=BAnik=20aktywnych=20filtr=C3=B3w=20dzie?= =?UTF-8?q?nnika=20DR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/JournalDispatchers.vue | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue index f0a85fb..9d5c5b5 100644 --- a/src/views/JournalDispatchers.vue +++ b/src/views/JournalDispatchers.vue @@ -8,6 +8,7 @@ @on-options-reset="resetOptions" :sorter-option-ids="['timestampFrom', 'duration']" :data-status="dataStatus" + :current-options-active="currentOptionsActive" />
@@ -71,7 +72,15 @@ import JournalHeader from '../components/JournalView/JournalHeader.vue'; const DISPATCHERS_API_URL = `${URLs.stacjownikAPI}/api/getDispatchers`; export default defineComponent({ - components: { SearchBox, ActionButton, JournalOptions, DispatcherStats, Loading, JournalDispatchersList, JournalHeader }, + components: { + SearchBox, + ActionButton, + JournalOptions, + DispatcherStats, + Loading, + JournalDispatchersList, + JournalHeader, + }, name: 'JournalDispatchers', props: { @@ -88,11 +97,14 @@ export default defineComponent({ data: () => ({ currentQuery: '', + currentQueryArray: [] as string[], + scrollDataLoaded: true, scrollNoMoreData: false, showReturnButton: false, statsCardOpen: false, + currentOptionsActive: false, dataStatus: DataStatus.Initialized, DataStatus, @@ -133,6 +145,13 @@ export default defineComponent({ }; }, + watch: { + currentQueryArray(q: string[]) { + this.currentOptionsActive = + q.length > 2 || q.some((qv) => qv.startsWith('sortBy=') && qv.split('=')[1] != 'timestampFrom'); + }, + }, + computed: { computedHistoryList() { return this.historyList.filter( @@ -169,6 +188,7 @@ export default defineComponent({ resetOptions() { this.searchersValues['search-station'] = ''; this.searchersValues['search-dispatcher'] = ''; + this.searchersValues['search-date'] = ''; this.sorterActive.id = 'timestampFrom'; this.searchHistory(); @@ -231,6 +251,7 @@ export default defineComponent({ queries.push('countLimit=30'); this.currentQuery = queries.join('&'); + this.currentQueryArray = queries; try { const responseData: DispatcherHistory[] = await ( @@ -265,3 +286,4 @@ export default defineComponent({ +