From b41b81e207c30136640497413a10e41fd74ab695 Mon Sep 17 00:00:00 2001 From: Aaron Plave Date: Wed, 31 Jan 2024 15:22:17 -0800 Subject: [PATCH 1/2] Use one day as default plan duration --- src/routes/plans/+page.svelte | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/routes/plans/+page.svelte b/src/routes/plans/+page.svelte index 4cca977b60..5764d6d1c4 100644 --- a/src/routes/plans/+page.svelte +++ b/src/routes/plans/+page.svelte @@ -34,7 +34,7 @@ import { removeQueryParam } from '../../utilities/generic'; import { permissionHandler } from '../../utilities/permissionHandler'; import { featurePermissions } from '../../utilities/permissions'; - import { convertUsToDurationString, getShortISOForDate, getUnixEpochTime } from '../../utilities/time'; + import { convertUsToDurationString, getDoyTime, getShortISOForDate, getUnixEpochTime } from '../../utilities/time'; import { min, required, timestamp } from '../../utilities/validators'; import type { PageData } from './$types'; @@ -293,10 +293,15 @@ goto(`${base}/plans/${plan.id}`); } - function onStartTimeChanged() { + async function onStartTimeChanged() { if ($startTimeDoyField.value && $startTimeDoyField.valid && $endTimeDoyField.value === '') { - endTimeDoyField.set($startTimeDoyField); + // Set end time as start time plus a day by default + const startTimeDate = new Date(getUnixEpochTime($startTimeDoyField.value)); + startTimeDate.setDate(startTimeDate.getDate() + 1); + const newEndTimeDoy = getDoyTime(startTimeDate, false); + await endTimeDoyField.validateAndSet(newEndTimeDoy); } + updateDurationString(); } From 0ab805cc77d33ec229da65dfd0e61c135d3b49be Mon Sep 17 00:00:00 2001 From: Aaron Plave Date: Wed, 31 Jan 2024 15:31:50 -0800 Subject: [PATCH 2/2] Test fix --- e2e-tests/tests/plans.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-tests/tests/plans.test.ts b/e2e-tests/tests/plans.test.ts index 44c657506c..9b774adac5 100644 --- a/e2e-tests/tests/plans.test.ts +++ b/e2e-tests/tests/plans.test.ts @@ -83,7 +83,7 @@ test.describe.serial('Plans', () => { await plans.fillInputStartTime(); const endTime = await plans.inputEndTime.inputValue(); - expect(endTime).toEqual(plans.startTime); + expect(endTime).toEqual('2022-002T00:00:00'); }); test('Entering an invalid start should not prepopulate the end time', async () => {