adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-17 12:42:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix unselecting bugs in time view

Browse Source
This commit is contained in:
Gregor Vostrak
2024-10-09 13:26:51 +02:00
parent 8f34fac0a6
commit 612f40a4b0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/js/Pages/Time.vue
View File

@@ -138,6 +138,7 @@ function deleteSelected() {
@submit="clearSelectionAndState" @submit="clearSelectionAndState"
:all-selected="selectedTimeEntries.length === timeEntries.length" :all-selected="selectedTimeEntries.length === timeEntries.length"
@select-all="selectedTimeEntries = [...timeEntries]" @select-all="selectedTimeEntries = [...timeEntries]"
@unselect-all="selectedTimeEntries = []"
:delete-selected="deleteSelected"></TimeEntryMassActionRow> :delete-selected="deleteSelected"></TimeEntryMassActionRow>
<TimeEntryGroupedTable <TimeEntryGroupedTable
v-model:selected="selectedTimeEntries" v-model:selected="selectedTimeEntries"

6
resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
View File

@@ -133,7 +133,11 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
selectedTimeEntries.value = selectedTimeEntries.value.filter( selectedTimeEntries.value = selectedTimeEntries.value.filter(
(timeEntry) => { (timeEntry) => {
return !value.find( return !value.find(
(filterTimeEntry) => filterTimeEntry.id === timeEntry.id (filterTimeEntry) =>
filterTimeEntry.id === timeEntry.id ||
filterTimeEntry.timeEntries?.find(
(subTimeEntry) => subTimeEntry.id === timeEntry.id
)
); );
} }
); );