diff --git a/resources/lang/en.json b/resources/lang/en.json index cd90fdb..5adff8d 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -65,7 +65,8 @@ "reverse_sort": "Reverse sort", "last_checked": "Show last checked time", "next_reset": "Show next reset time", - "separate_completed": "Separate completed tasks below" + "separate_completed": "Separate completed tasks below", + "missed": "Show in red missed tasks (reset without check)" }, "alerts": { "task_updated": "Task updated", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index 461e21f..f7dc53b 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -65,7 +65,8 @@ "reverse_sort": "Inverser le tri", "last_checked": "Afficher la dernière completion", "next_reset": "Afficher la prochaine réinitialisation", - "separate_completed": "Séparer les tâches complétées plus bas" + "separate_completed": "Séparer les tâches complétées plus bas", + "missed": "Indiquer en rouge les tâches manquées (réinitialisées sans completion)" }, "alerts": { "task_updated": "Tâche mise a jour", diff --git a/resources/ts/App.vue b/resources/ts/App.vue index ce0ed18..228a187 100644 --- a/resources/ts/App.vue +++ b/resources/ts/App.vue @@ -25,7 +25,7 @@ onMounted(() => {
+import { ArrowDownUpIcon, Settings2Icon } from "@lucide/vue"; +import { SortType } from "@/enums"; + +defineEmits<(e: "changeSort") => void>(); + +const sortType = defineModel("sortType", { required: true }); +const sortReverse = defineModel("sortReverse", { required: true }); +const showLastChecked = defineModel("showLastChecked", { + required: true, +}); +const showNextReset = defineModel("showNextReset", { required: true }); +const separateCompleted = defineModel("separateCompleted", { + required: true, +}); +const showMissed = defineModel("showMissed", { required: true }); + + + diff --git a/resources/ts/components/TaskItem.vue b/resources/ts/components/TaskItem.vue index 0e9470b..86a1583 100644 --- a/resources/ts/components/TaskItem.vue +++ b/resources/ts/components/TaskItem.vue @@ -13,7 +13,12 @@ import { updateTask } from "@/api/tasks"; const CronInput = defineAsyncComponent( () => import("@/components/CronInput.vue"), ); -import { isTemporary, taskCompleted, taskNextReset } from "@/lib/tasks"; +import { + isTemporary, + taskCompleted, + taskFutureReset, + taskNextReset, +} from "@/lib/tasks"; import { relativeTime } from "@/lib/dates"; import { useAlertStore } from "@/stores/alerts"; import { useI18n } from "vue-i18n"; @@ -23,7 +28,11 @@ const emit = defineEmits<(e: "clone" | "delete" | "updated", task: Task) => void>(); const task = defineModel({ required: true }); -defineProps<{ showLastChecked: boolean; showNextReset: boolean }>(); +defineProps<{ + showLastChecked: boolean; + showNextReset: boolean; + showMissed: boolean; +}>(); const editMode = ref(false); const editName = ref(""); @@ -33,6 +42,13 @@ const editNameInput = ref(null); const checked = computed(() => taskCompleted(task.value)); const nextReset = computed(() => taskNextReset(task.value)); +const futureReset = computed(() => taskFutureReset(task.value)); +const missed = computed( + () => + !checked.value && + futureReset.value !== null && + futureReset.value.getTime() < new Date().getTime(), +); const i18n = useI18n(); @@ -157,6 +173,7 @@ watch(task, () => {
{{ task.name }}
diff --git a/resources/ts/lib/recurrence.ts b/resources/ts/lib/recurrence.ts index 75ab251..a4549a7 100644 --- a/resources/ts/lib/recurrence.ts +++ b/resources/ts/lib/recurrence.ts @@ -41,7 +41,7 @@ export function parseCron(cron: string | null): { type: CronType.EVERY_MONTH, value: 32, }; - } else if ((value = /^0 0 \* \* (\d+)\#1$/i.exec(cron)) !== null) { + } else if ((value = /^0 0 \* \* (\d+)#1$/i.exec(cron)) !== null) { return { type: CronType.EVERY_MONTH, value: -parseInt(value[1] ?? ""), @@ -49,7 +49,7 @@ export function parseCron(cron: string | null): { } else if ((value = /^0 0 \* \* (\d+)L$/i.exec(cron)) !== null) { return { type: CronType.EVERY_MONTH, - value: -parseInt(value[1] ?? "")-7, + value: -parseInt(value[1] ?? "") - 7, }; } else if ((value = /^0 0 1 (\d+) \*$/i.exec(cron)) !== null) { return { @@ -121,7 +121,7 @@ export function getCron( return `0 0 * * ${(-value).toFixed(0)}#1`; } if (value < -7 && value >= -14) { - return `0 0 * * ${(-value-7).toFixed(0)}L`; + return `0 0 * * ${(-value - 7).toFixed(0)}L`; } return `0 0 ${value.toFixed(0)} * *`; case CronType.EVERY_YEAR: diff --git a/resources/ts/lib/tasks.ts b/resources/ts/lib/tasks.ts index 807a5de..c5004b6 100644 --- a/resources/ts/lib/tasks.ts +++ b/resources/ts/lib/tasks.ts @@ -38,6 +38,10 @@ export function taskNextReset(task: Task): Date | null { return nextCronReset(task.check_date, task.reset_cron, task.id); } +export function taskFutureReset(task: Task): Date | null { + return nextCronReset(taskNextReset(task), task.reset_cron, task.id); +} + export function taskCompleted(task: Task): boolean { const nextReset = taskNextReset(task); if (nextReset === null) { diff --git a/resources/ts/views/ListView.vue b/resources/ts/views/ListView.vue index a8c1af8..cb6bb92 100644 --- a/resources/ts/views/ListView.vue +++ b/resources/ts/views/ListView.vue @@ -4,8 +4,6 @@ import type { Task } from "@/types"; import { getTasks, createTask, deleteTask } from "@/api/tasks"; import { CirclePlusIcon, - ArrowDownUpIcon, - Settings2Icon, CircleCheckBigIcon, CheckCheckIcon, SearchIcon, @@ -14,6 +12,9 @@ import { const TaskItem = defineAsyncComponent( () => import("@/components/TaskItem.vue"), ); +const ListOptions = defineAsyncComponent( + () => import("@/components/ListOptions.vue"), +); import { taskCompleted, sortTasks, newTemporaryTask } from "@/lib/tasks"; import { SortType } from "@/enums"; import { booleanCookieRef, enumCookieRef } from "@/lib/cookies"; @@ -36,6 +37,7 @@ const sortReverse = booleanCookieRef("sortReverse", false); const showLastChecked = booleanCookieRef("showLastChecked", false); const showNextReset = booleanCookieRef("showNextReset", false); const separateCompleted = booleanCookieRef("separateCompleted", true); +const showMissed = booleanCookieRef("showMissed", true); const completedCount = computed( () => tasks.value.filter(taskCompleted).length, @@ -146,14 +148,6 @@ function onDeleteTask(task: Task) { }); } -function onChangeSortType() { - reSortTasks(); -} - -function onChangeSortReverse() { - reSortTasks(); -} - function onShare() { if (!empty.value) { shareLink( @@ -229,6 +223,7 @@ onBeforeRouteLeave(() => { v-model="tasks[i]" :show-last-checked="showLastChecked" :show-next-reset="showNextReset" + :show-missed="showMissed" @updated="onUpdateTask" @clone="onCloneTask" @delete="onDeleteTask" @@ -256,6 +251,7 @@ onBeforeRouteLeave(() => { v-model="tasks[i]" :show-last-checked="showLastChecked" :show-next-reset="showNextReset" + :show-missed="showMissed" @clone="onCloneTask" @delete="onDeleteTask" /> @@ -281,76 +277,15 @@ onBeforeRouteLeave(() => {
-
- -
- - {{ $t("options.title") }} -
-
-
- - - - - -
-
-
+ v-model:sort-type="sortType" + v-model:sort-reverse="sortReverse" + v-model:show-last-checked="showLastChecked" + v-model:show-next-reset="showNextReset" + v-model:separate-completed="separateCompleted" + v-model:show-missed="showMissed" + class="mt-4 -mb-4" + @change-sort="reSortTasks" + />