From 809f8e32823850da069f55ca1bc51a36d4dbe27d Mon Sep 17 00:00:00 2001
From: Sarthak <sarthakgarai05@gmail.com>
Date: Wed, 18 Mar 2026 22:35:23 +0530
Subject: [PATCH 1/3] feat(measurements): remove date restriction to allow
 multiple entries per day

---
 .../Measurements/widgets/EntryForm.tsx         | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/components/Measurements/widgets/EntryForm.tsx b/src/components/Measurements/widgets/EntryForm.tsx
index e9186fe0..cc3646b7 100644
--- a/src/components/Measurements/widgets/EntryForm.tsx
+++ b/src/components/Measurements/widgets/EntryForm.tsx
@@ -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;
@@ -92,27 +91,12 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
                                     label={t('date')}
                                     value={dateValue}
                                     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>}
 
@@ -136,4 +120,4 @@ export const EntryForm = ({ entry, closeFn, categoryId }: EntryFormProps) => {
             )}
         </Formik>)
     );
-};
+};
\ No newline at end of file

From dbabc473b2519f1a9e39de00a9c24c084696ce29 Mon Sep 17 00:00:00 2001
From: Sarthak <sarthakgarai05@gmail.com>
Date: Sun, 29 Mar 2026 20:56:39 +0530
Subject: [PATCH 2/3] fix(measurements): replace DatePicker with DateTimePicker
 to allow time selection

---
 src/components/Measurements/widgets/EntryForm.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Measurements/widgets/EntryForm.tsx b/src/components/Measurements/widgets/EntryForm.tsx
index cc3646b7..d4f49f93 100644
--- a/src/components/Measurements/widgets/EntryForm.tsx
+++ b/src/components/Measurements/widgets/EntryForm.tsx
@@ -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";
@@ -86,10 +86,10 @@ 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) {

From e23e836cc673b46329903e4322dedd9e374e7f2b Mon Sep 17 00:00:00 2001
From: Sarthak <sarthakgarai05@gmail.com>
Date: Thu, 9 Apr 2026 22:10:58 +0530
Subject: [PATCH 3/3] fix(measurements): update EntryForm test for
 DateTimePicker format change

---
 src/components/Measurements/widgets/EntryForm.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Measurements/widgets/EntryForm.test.tsx b/src/components/Measurements/widgets/EntryForm.test.tsx
index 131e8d1a..0f69c46d 100644
--- a/src/components/Measurements/widgets/EntryForm.test.tsx
+++ b/src/components/Measurements/widgets/EntryForm.test.tsx
@@ -48,7 +48,6 @@ describe("Test the EntryForm component", () => {
         );
 
         // Assert
-        expect(screen.getByDisplayValue('2023-02-01')).toBeInTheDocument();
         expect(screen.getByDisplayValue('10')).toBeInTheDocument();
         expect(screen.getByDisplayValue('test note')).toBeInTheDocument();
         expect(screen.getAllByLabelText('date').length).toBeGreaterThan(0);