Merge branch 'main' of https://github.com/etoyowimura/taskboard

src/API/LayoutApi/tasks.ts

@@ -116,10 +116,19 @@ export const taskController = {
   },
 
   async addTaskController(obj: TTasksPostParams) {
-    const { data } = await instance.post<TTask>("task/", obj).then((u) => {
+    try {
-      return u;
+      const { data, status } = await instance.post<TTask | TMessageResponse>(
-    });
+        "task/",
-    return data;
+        obj
+      );
+      if (status === 201) {
+        const datas = data as TMessageResponse;
+        message.success({ content: datas.message });
+      }
+      return data;
+    } catch (error) {
+      message.error({ content: "something went wrong" });
+    }
   },
 
   async addTaskFile(formData: TTaskPostFileParams) {

src/Components/Tasks/AddTask.tsx

@@ -100,7 +100,7 @@ const AddTask = ({
           setCustomerData(data.data);
         });
     }
-  }, [companyId]);
+  }, [companyId, customerName]);
 
   // service select
   const serviceOptions = ServiceData?.data?.map((item) => ({

src/Components/Tasks/TaskTable.tsx

@@ -46,13 +46,11 @@ const TaskTable = ({
           const value = {
             status: "Checking",
           };
-          taskController
+          taskController.taskPatch(value, record?.id).then((response: any) => {
-            .taskPatch(value, record?.id)
+            if (response?.status == 403) {
-            .then((response: { data: TTask; status: number }) => {
+              showErrorModal(response);
-              if (response?.status == 403) {
+            }
-                showErrorModal(response);
+          });
-              }
-            });
         },
       });
     }
@@ -228,6 +226,7 @@ const TaskTable = ({
         title: "Service",
         dataIndex: "service",
         width: isMobile ? "5%" : "7%",
+        align: "center",
         key: "5",
         ellipsis: {
           showTitle: false,
@@ -246,6 +245,7 @@ const TaskTable = ({
         title: "Status",
         dataIndex: "status",
         width: isMobile ? "5%" : "8%",
+        align: "center",
         key: "6",
         ellipsis: {
           showTitle: false,
@@ -400,22 +400,29 @@ const TaskTable = ({
     return columns;
   }, [role]);
 
+  const dataSource = data?.characters?.map((u, i) => {
+    const createdMoment = moment(u?.created_at, "YYYY-MM-DD HH:mm:ss");
+    const isToday = createdMoment.isSame(moment(), "day");
+
+    return {
+      ...u,
+      no: i + 1,
+      created: isToday
+        ? `Today at ${createdMoment.format("HH:mm")}`
+        : createdMoment.format("DD.MM.YYYY HH:mm"),
+      key: u?.id,
+    };
+  });
+
   return (
     <div>
       <Table
         onRow={(record: any) => ({
           onClick: (event) => handleRowClick(record, event),
         })}
-        dataSource={data?.characters?.map((u, i) => ({
+        dataSource={dataSource}
-          ...u,
-          no: i + 1,
-          created: moment(u?.created_at, "YYYY-MM-DD HH:mm:ss").format(
-            "DD.MM.YYYY HH:mm"
-          ),
-          key: u?.id,
-        }))}
-        columns={columns as any}
         size="small"
+        columns={columns as any}
         loading={isLoading}
         rowClassName={rowClassName}
         scroll={{ x: "768px" }}