Merge branch 'develop' into feature/phase-2

This commit is contained in:
Vitalii Kiiko
2024-10-16 12:10:51 +02:00
2 changed files with 4 additions and 3 deletions

View File

@@ -1,6 +1,7 @@
import React from 'react';
import React, { useEffect } from 'react';
import { classNames } from 'primereact/utils';
import { Controller } from 'react-hook-form';
import { is } from 'ramda';
import { Calendar } from 'primereact/calendar';
@@ -30,7 +31,7 @@ const Datepicker = ({
render={({ field, fieldState }) => (
<Calendar id={field.name}
disabled={disabled}
value={field.value ?? []}
value={is(String, field.value) ? new Date(field.value) : field.value}
onChange={(e) => field.onChange(e.value)}
dateFormat="dd/mm/yy"
hourFormat="24"