Skip to content

feat(measurements): remove date restriction to allow multiple entries per day #1214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sg172003 wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −20
Open

feat(measurements): remove date restriction to allow multiple entries per day #1214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809f8e3
feat(measurements): remove date restriction to allow multiple entries…
sg172003 Mar 18, 2026
dbabc47
fix(measurements): replace DatePicker with DateTimePicker to allow ti…
sg172003 Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions src/components/Measurements/widgets/EntryForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Stack, TextField } from "@mui/material";
import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers";
import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterLuxon } from "@mui/x-date-pickers/AdapterLuxon";
import { LoadingPlaceholder } from "components/Core/LoadingWidget/LoadingWidget";
import { MeasurementEntry } from "components/Measurements/models/Entry";
Expand All @@ -13,7 +13,6 @@ import { DateTime, Settings } from "luxon";
import React from 'react';
import { useTranslation } from "react-i18next";
import { TIMEZONE } from "utils/consts";
import { dateToYYYYMMDD } from "utils/date";
import * as yup from 'yup';

Settings.defaultZone = TIMEZONE;
Expand Down Expand Up @@ -87,32 +86,17 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
{categoryQuery.isLoading
? <LoadingPlaceholder />
: <LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={i18n.language}>
<DatePicker
format="yyyy-MM-dd"
<DateTimePicker
label={t('date')}
value={dateValue}
slotProps={{ textField: { variant: 'outlined' } }}
disableFuture={true}

onChange={(newValue) => {
if (newValue) {
formik.setFieldValue('date', newValue.toJSDate());
}
setDateValue(newValue);
}}
shouldDisableDate={(date) => {
// Allow the date of the current weight entry, since we are editing it
if (entry && dateToYYYYMMDD(entry.date) === dateToYYYYMMDD(date.toJSDate())) {
return false;
}

// if date is in list of existing entries, disable it
if (date) {
return categoryQuery.data!.entries.some(entry => dateToYYYYMMDD(entry.date) === dateToYYYYMMDD(date.toJSDate()));
}

// all other dates are allowed
return false;
}}
/>
</LocalizationProvider>}

Expand All @@ -136,4 +120,4 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
)}
</Formik>)
);
};
};
Loading