mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-17 04:32:15 +01:00
Added the ability to disable group similar time entries (#1054)
* Added the ability to disable group similar time entries * Fix E2E test for Group similar time entries * Simplify `TimeEntryGroupedTable` by replacing ternary with early return logic * Refactor time entry grouping settings: rename storage key, move logic into a dedicated module * Replace fixed `waitForTimeout` calls in E2E tests with element-based waits and assertions * Run frontend linting and formatting for changes
This commit is contained in:
@@ -2,8 +2,10 @@
|
||||
import FormSection from '@/Components/FormSection.vue';
|
||||
import { Field, FieldLabel, FieldDescription } from '@/packages/ui/src/field';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
|
||||
import { Checkbox } from '@/packages/ui/src';
|
||||
import { usePreferredColorScheme } from '@vueuse/core';
|
||||
import { themeSetting } from '@/utils/theme';
|
||||
import { groupSimilarTimeEntriesSetting } from '@/utils/timeEntryGrouping';
|
||||
|
||||
const preferredColor = usePreferredColorScheme();
|
||||
</script>
|
||||
@@ -15,6 +17,7 @@ const preferredColor = usePreferredColorScheme();
|
||||
<template #description> Choose how you want solidtime to look on your device </template>
|
||||
|
||||
<template #form>
|
||||
<!-- Theme -->
|
||||
<Field class="col-span-6 sm:col-span-4">
|
||||
<FieldLabel for="theme">Theme</FieldLabel>
|
||||
<Select id="theme" v-model="themeSetting">
|
||||
@@ -31,6 +34,14 @@ const preferredColor = usePreferredColorScheme();
|
||||
System default: {{ preferredColor }}
|
||||
</FieldDescription>
|
||||
</Field>
|
||||
|
||||
<!-- Group similar time entries -->
|
||||
<Field class="col-span-6 sm:col-span-4" orientation="horizontal">
|
||||
<Checkbox
|
||||
id="group_similar_time_entries"
|
||||
v-model:checked="groupSimilarTimeEntriesSetting" />
|
||||
<FieldLabel for="group_similar_time_entries">Group similar time entries</FieldLabel>
|
||||
</Field>
|
||||
</template>
|
||||
</FormSection>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user