Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

convert tasks.due_date to a dateTime in ui

ThieryMichel5042ce82c809
diff --git a/src/components/atomic-crm/tasks/AddTask.tsx b/src/components/atomic-crm/tasks/AddTask.tsx
index c573aab4..bcebaa0d 100644
--- a/src/components/atomic-crm/tasks/AddTask.tsx
+++ b/src/components/atomic-crm/tasks/AddTask.tsx
@@ -103,14 +103,6 @@ export const AddTask = ({
due_date: new Date().toISOString().slice(0, 10),
sales_id: identity.id,
}}
- transform={(data) => {
- const dueDate = new Date(data.due_date);
- dueDate.setHours(0, 0, 0, 0);
- return {
- ...data,
- due_date: dueDate.toISOString(),
- };
- }}
mutationOptions={{ onSuccess: handleSuccess }}
>
<Dialog open={open} onOpenChange={() => setOpen(false)}>
diff --git a/src/components/atomic-crm/tasks/Task.tsx b/src/components/atomic-crm/tasks/Task.tsx
index de5def80..dc1d86d2 100644
--- a/src/components/atomic-crm/tasks/Task.tsx
+++ b/src/components/atomic-crm/tasks/Task.tsx
@@ -107,7 +107,7 @@ export const Task = ({
</div>
<div className="text-sm text-muted-foreground">
due&nbsp;
- <DateField source="due_date" record={task} />
+ <DateField source="due_date" record={task} showDate showTime />
{showContact && (
<ReferenceField<TData, Contact>
source="contact_id"
diff --git a/src/components/atomic-crm/tasks/TaskCreateSheet.tsx b/src/components/atomic-crm/tasks/TaskCreateSheet.tsx
index 6c0c52cf..eaa3d506 100644
--- a/src/components/atomic-crm/tasks/TaskCreateSheet.tsx
+++ b/src/components/atomic-crm/tasks/TaskCreateSheet.tsx
@@ -68,17 +68,9 @@ export const TaskCreateSheet = ({
record={{
type: "None",
contact_id,
- due_date: new Date().toISOString().slice(0, 10),
+ due_date: new Date().toISOString(),
sales_id: identity.id,
}}
- transform={(data) => {
- const dueDate = new Date(data.due_date);
- dueDate.setHours(0, 0, 0, 0);
- return {
- ...data,
- due_date: dueDate.toISOString(),
- };
- }}
mutationOptions={{
onSuccess: handleSuccess,
}}
diff --git a/src/components/atomic-crm/tasks/TaskFormContent.tsx b/src/components/atomic-crm/tasks/TaskFormContent.tsx
index eb25c7c6..e45dd490 100644
--- a/src/components/atomic-crm/tasks/TaskFormContent.tsx
+++ b/src/components/atomic-crm/tasks/TaskFormContent.tsx
@@ -1,5 +1,4 @@
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
-import { DateInput } from "@/components/admin/date-input";
import { ReferenceInput } from "@/components/admin/reference-input";
import { SelectInput } from "@/components/admin/select-input";
import { TextInput } from "@/components/admin/text-input";
@@ -7,6 +6,7 @@ import { required } from "ra-core";
import { contactOptionText } from "../misc/ContactOption";
import { useConfigurationContext } from "../root/ConfigurationContext";
+import { DateTimeInput } from "@/components/admin";
export const TaskFormContent = ({
selectContact,
@@ -37,7 +37,11 @@ export const TaskFormContent = ({
)}
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
- <DateInput source="due_date" helperText={false} validate={required()} />
+ <DateTimeInput
+ source="due_date"
+ helperText={false}
+ validate={required()}
+ />
<SelectInput
source="type"
validate={required()}