Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-04 22:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

dzienniki: fix ładowania

Browse Source
This commit is contained in:
Spythere
2023-02-14 16:50:12 +01:00
parent ca19f7e397
commit 221e0c7e82
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JournalView/JournalStats.vue
+6 -4
View File
@@ -35,7 +35,8 @@ type TStatTab = 'daily' | 'driver';
const store = useStore(); const store = useStore();
const dailyStatsComp: Ref<InstanceType<typeof JournalDailyStats> | null> = ref(null); const dailyStatsComp: Ref<InstanceType<typeof JournalDailyStats> | null> = ref(null);
const areStatsOpen = ref(true); const lastDailyStatsOpen = ref(false);
const areStatsOpen = ref(false);
const lastClickedTab = ref('daily'); const lastClickedTab = ref('daily');
let data = reactive({ let data = reactive({
@@ -54,9 +55,9 @@ let data = reactive({
// Methods // Methods
function onTabButtonClick(tab: TStatTab) { function onTabButtonClick(tab: TStatTab) {
if (lastClickedTab.value == tab || !areStatsOpen.value) { if (lastClickedTab.value == tab || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
areStatsOpen.value = !areStatsOpen.value;
} if (tab == 'daily') lastDailyStatsOpen.value = areStatsOpen.value;
store.currentStatsTab = tab; store.currentStatsTab = tab;
lastClickedTab.value = tab; lastClickedTab.value = tab;
@@ -77,6 +78,7 @@ watch(
lastClickedTab.value = statsData ? 'driver' : 'daily'; lastClickedTab.value = statsData ? 'driver' : 'daily';
if (statsData) areStatsOpen.value = true; if (statsData) areStatsOpen.value = true;
if (!statsData) areStatsOpen.value = lastDailyStatsOpen.value;
} }
); );
</script> </script>
src/views/JournalDispatchers.vue
+2 -2
View File
@@ -19,7 +19,7 @@
{{ $t('app.offline') }} {{ $t('app.offline') }}
</div> </div>
<Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" /> <Loading v-else-if="dataStatus == DataStatus.Loading" />
<div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error"> <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
{{ $t('app.error') }} {{ $t('app.error') }}
@@ -111,7 +111,7 @@ export default defineComponent({
statsCardOpen: false, statsCardOpen: false,
currentOptionsActive: false, currentOptionsActive: false,
dataStatus: DataStatus.Initialized, dataStatus: DataStatus.Loading,
DataStatus, DataStatus,
historyList: [] as DispatcherHistory[], historyList: [] as DispatcherHistory[],
src/views/JournalTimetables.vue
+3 -3
View File
@@ -22,7 +22,7 @@
{{ $t('app.offline') }} {{ $t('app.offline') }}
</div> </div>
<Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" /> <Loading v-else-if="dataStatus == DataStatus.Loading" />
<div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error"> <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
{{ $t('app.error') }} {{ $t('app.error') }}
@@ -105,7 +105,7 @@ export default defineComponent({
timetableHistory: [] as TimetableHistory[], timetableHistory: [] as TimetableHistory[],
journalTimetableFilters, journalTimetableFilters,
dataStatus: DataStatus.Initialized, dataStatus: DataStatus.Loading,
dataErrorMessage: '', dataErrorMessage: '',
DataStatus, DataStatus,
@@ -215,7 +215,7 @@ export default defineComponent({
}, },
async fetchHistoryData() { async fetchHistoryData() {
if(this.dataStatus == DataStatus.Loading) return; // if(this.dataStatus == DataStatus.Loading) return;
const queries: string[] = []; const queries: string[] = [];