From 7c325e6729b6d1b163eb317110974fa0af0f4202 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Thu, 3 Aug 2023 16:21:21 +0200 Subject: [PATCH] fix no reset --- src/modules/record/components/StepRecord.vue | 4 ++-- src/modules/record/components/TaskRecord.vue | 12 +++++++----- src/modules/record/stores/useTaskRecordStore.ts | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/modules/record/components/StepRecord.vue b/src/modules/record/components/StepRecord.vue index a19c5ce..834864f 100644 --- a/src/modules/record/components/StepRecord.vue +++ b/src/modules/record/components/StepRecord.vue @@ -39,8 +39,8 @@ const duration = computed(() => { return null } - // When in pause, it can be a tick where now - // is behind new Date(). + // When in pause, it can happen to + // have a tick where now is behind new Date(). const mostRecentDate = new Date( Math.max(new Date(now.value).getTime(), new Date().getTime()) ) diff --git a/src/modules/record/components/TaskRecord.vue b/src/modules/record/components/TaskRecord.vue index 66e018f..b8d7423 100644 --- a/src/modules/record/components/TaskRecord.vue +++ b/src/modules/record/components/TaskRecord.vue @@ -4,7 +4,7 @@ import RecordResume from '@/modules/record/components/RecordResume.vue' import { useTaskStore } from '@/modules/task/stores/useTask.store' import { formatLongDate } from '@/shared/format-date' import { useLoopyTitle } from '@/shared/useLoopyTitle' -import { computed } from 'vue' +import { computed, onMounted } from 'vue' import { useRouter } from 'vue-router' import { useTaskRecordStore } from '../stores/useTaskRecordStore' import RecordControls from './RecordControls.vue' @@ -21,10 +21,12 @@ const router = useRouter() const task = computed(() => taskStore.getTask(props.taskId)) -if (task.value) { - recordStore.syncTaskRecord(task.value) -} -recordStore.addRecord(props.taskId) +onMounted(() => { + if (task.value) { + recordStore.syncTaskRecord(task.value) + } + recordStore.initRecord(props.taskId) +}) useLoopyTitle(task.value?.title ?? '') diff --git a/src/modules/record/stores/useTaskRecordStore.ts b/src/modules/record/stores/useTaskRecordStore.ts index 5e9aa9e..42893dc 100644 --- a/src/modules/record/stores/useTaskRecordStore.ts +++ b/src/modules/record/stores/useTaskRecordStore.ts @@ -23,7 +23,7 @@ export const useTaskRecordStore = defineStore('task-record-store', { const record = this.records[task.id] - const taskRecordStepIds = Object.keys(record) + const taskRecordStepIds = Object.keys(record.stepRecords) const taskStepIds = new Set(task.steps.map((step) => step.id)) const hasSameSteps = @@ -36,7 +36,7 @@ export const useTaskRecordStore = defineStore('task-record-store', { this.records[task.id] = new TaskRecord(task.id) } }, - addRecord(taskId: string) { + initRecord(taskId: string) { if (taskId in this.records) { return }