Fix date input

traccar · Aug 30, 2024 · 0b64296 · 0b64296
1 parent b0f721b
commit 0b64296
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/settings/DevicePage.jsx b/src/settings/DevicePage.jsx
@@ -132,8 +132,12 @@ const DevicePage = () => {
               <TextField
                 label={t('userExpirationTime')}
                 type="date"
-                value={(item.expirationTime && dayjs(item.expirationTime).locale('en').format('YYYY-MM-DD')) || '2099-01-01'}
-                onChange={(e) => setItem({ ...item, expirationTime: dayjs(e.target.value, 'YYYY-MM-DD').locale('en').format() })}
+                value={item.expirationTime ? item.expirationTime.split('T')[0] : '2099-01-01'}
+                onChange={(e) => {
+                  if (e.target.value) {
+                    setItem({ ...item, expirationTime: new Date(e.target.value).toISOString() })
+                  }
+                }}
                 disabled={!admin}
               />
               <FormControlLabel

diff --git a/src/settings/SharePage.jsx b/src/settings/SharePage.jsx
@@ -62,8 +62,8 @@ const SharePage = () => {
             <TextField
               label={t('userExpirationTime')}
               type="date"
-              value={(expiration && dayjs(expiration).locale('en').format('YYYY-MM-DD')) || '2099-01-01'}
-              onChange={(e) => setExpiration(dayjs(e.target.value, 'YYYY-MM-DD').locale('en').format())}
+              value={expiration}
+              onChange={(e) => setExpiration(e.target.value)}
             />
             <Button
               variant="outlined"

diff --git a/src/settings/UserPage.jsx b/src/settings/UserPage.jsx
@@ -324,8 +324,12 @@ const UserPage = () => {
               <TextField
                 label={t('userExpirationTime')}
                 type="date"
-                value={(item.expirationTime && dayjs(item.expirationTime).locale('en').format('YYYY-MM-DD')) || '2099-01-01'}
-                onChange={(e) => setItem({ ...item, expirationTime: dayjs(e.target.value, 'YYYY-MM-DD').locale('en').format() })}
+                value={item.expirationTime ? item.expirationTime.split('T')[0] : '2099-01-01'}
+                onChange={(e) => {
+                  if (e.target.value) {
+                    setItem({ ...item, expirationTime: new Date(e.target.value).toISOString() })
+                  }
+                }}
                 disabled={!manager}
               />
               <TextField