bug fixed date-time ( SHIFT INFO &CO DRIVER INFO)

src/Components/Tasks/ShiftInfo/ShiftAndCoDriverCreateModal.tsx

@@ -36,13 +36,7 @@ const ShiftAndCoDriverCreateModal: React.FC<
       onCancel={onCancel}
       width={700}
     >
-      <Form
+      <Form form={form} layout="vertical">
-        form={form}
-        layout="vertical"
-        initialValues={{
-          driver_name: recordTask?.customer?.name,
-        }}
-      >
         {/* SHIFT INFO */}
         <Form.Item
           label="Shift Date"

src/Components/Tasks/ShiftInfo/ShiftDataTab.tsx

@@ -11,21 +11,24 @@ const ShiftDataTab: React.FC<ShiftDataTabProps> = ({ recordTask }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
   const shiftInfo = {
-    pickUpDate: recordTask?.pickup_date,
-    pickUpLocation: recordTask?.pickup_location ?? null,
     shiftDate: recordTask?.shift_date,
     shiftLocation: recordTask?.shift_location ?? null,
     cycleDate: recordTask?.cycle_date,
     cycleLocation: recordTask?.cycle_location ?? null,
+    pickUpDate: recordTask?.pickup_date,
+    pickUpTime: recordTask?.pickup_time,
+    pickUpLocation: recordTask?.pickup_location ?? null,
   };
 
   const coDriverInfo = {
     driverName: recordTask?.driver_name ?? null,
     coDriverName: recordTask?.co_driver_name ?? null,
-    coDriverPickUpLocation: recordTask?.co_driver_pickup_location ?? null,
     coDriverPickUpDate: recordTask?.co_driver_pickup_date,
-    coDriverDropLocation: recordTask?.co_driver_drop_location ?? null,
+    coDriverPickUpTime: recordTask?.co_driver_pickup_time,
+    coDriverPickUpLocation: recordTask?.co_driver_pickup_location ?? null,
     coDriverDropDate: recordTask?.co_driver_drop_date,
+    coDriverDropTime: recordTask?.co_driver_drop_time,
+    coDriverDropLocation: recordTask?.co_driver_drop_location ?? null,
   };
 
   const buildTextBlock = (title: string, items: [string, string | null][]) => {
@@ -40,20 +43,23 @@ const ShiftDataTab: React.FC<ShiftDataTabProps> = ({ recordTask }) => {
 
     if (lang === "en") {
       text = [
-        buildTextBlock("SHIFT INFO", [
+        buildTextBlock("SHIFT INFO ❗️❗️❗️", [
           ["Shift Date", shiftInfo.shiftDate],
           ["Shift Location", shiftInfo.shiftLocation],
-          ["Pick up Date", shiftInfo.pickUpDate],
-          ["Pick Up Location", shiftInfo.pickUpLocation],
           ["Cycle Date", shiftInfo.cycleDate],
           ["Cycle Location", shiftInfo.cycleLocation],
+          ["Pick up Date", shiftInfo.pickUpDate],
+          ["Pick up Time", shiftInfo.pickUpTime],
+          ["Pick Up Location", shiftInfo.pickUpLocation],
         ]),
         buildTextBlock("CO DRIVER INFO", [
           ["Driver's name", coDriverInfo.driverName],
           ["Co-Driver's name", coDriverInfo.coDriverName],
           ["Co-driver pickup date", coDriverInfo.coDriverPickUpDate],
+          ["Co-driver pickup time", coDriverInfo.coDriverPickUpTime],
           ["Co-driver pickup location", coDriverInfo.coDriverPickUpLocation],
           ["Co-driver drop date", coDriverInfo.coDriverDropDate],
+          ["Co-driver drop time", coDriverInfo.coDriverDropDate],
           ["Co-driver drop location", coDriverInfo.coDriverDropLocation],
         ]),
       ]
@@ -61,20 +67,23 @@ const ShiftDataTab: React.FC<ShiftDataTabProps> = ({ recordTask }) => {
         .join("\n\n");
     } else {
       text = [
-        buildTextBlock("ИНФОРМАЦИЯ О СМЕНЕ", [
+        buildTextBlock("ИНФОРМАЦИЯ О СМЕНЕ ❗️❗️❗️", [
-          ["Дата пикапа", shiftInfo.pickUpDate],
-          ["Место пикапа", shiftInfo.pickUpLocation],
           ["Дата шифта", shiftInfo.shiftDate],
           ["Место шифта", shiftInfo.shiftLocation],
           ["Дата сайкла", shiftInfo.cycleDate],
           ["Место сайкла", shiftInfo.cycleLocation],
+          ["Дата пикапа", shiftInfo.pickUpDate],
+          ["Время пикапа", shiftInfo.pickUpTime],
+          ["Место пикапа", shiftInfo.pickUpLocation],
         ]),
         buildTextBlock("ИНФОРМАЦИЯ О КО-ДРАЙВЕРЕ", [
           ["Имя драйвера", coDriverInfo.driverName],
           ["Имя ко-драйвера", coDriverInfo.coDriverName],
-          ["Время пикапа ко-драйвера", coDriverInfo.coDriverPickUpDate],
+          ["Дата пикапа ко-драйвера", coDriverInfo.coDriverPickUpDate],
+          ["Время пикапа ко-драйвера", coDriverInfo.coDriverPickUpTime],
           ["Место пикапа ко-драйвера", coDriverInfo.coDriverPickUpLocation],
-          ["Время высадки ко-драйвера", coDriverInfo.coDriverDropDate],
+          ["Дата высадки ко-драйвера", coDriverInfo.coDriverDropDate],
+          ["Время высадки ко-драйвера", coDriverInfo.coDriverDropTime],
           ["Место высадки ко-драйвера", coDriverInfo.coDriverDropLocation],
         ]),
       ]
@@ -114,20 +123,23 @@ const ShiftDataTab: React.FC<ShiftDataTabProps> = ({ recordTask }) => {
         }
         style={{ width: "100%", marginBottom: 20 }}
       >
-        <h4>SHIFT INFO</h4>
+        <h4>SHIFT INFO ❗️❗️❗️</h4>
         <p>Shift Date: {shiftInfo.shiftDate}</p>
         <p>Shift Location: {shiftInfo.shiftLocation}</p>
-        <p>Pick up Date: {shiftInfo.pickUpDate}</p>
-        <p>Pick Up Location: {shiftInfo.pickUpLocation}</p>
         <p>Cycle Date: {shiftInfo.cycleDate}</p>
         <p>Cycle Location: {shiftInfo.cycleLocation}</p>
+        <p>Pick up Date: {shiftInfo.pickUpDate}</p>
+        <p>Pick up Time: {shiftInfo.pickUpTime}</p>
+        <p>Pick Up Location: {shiftInfo.pickUpLocation}</p>
 
         <h4>CO-DRIVER INFO</h4>
         <p>Driver's name: {coDriverInfo.driverName}</p>
         <p>Co-driver's name: {coDriverInfo.coDriverName}</p>
         <p>Co-driver pickup date: {coDriverInfo.coDriverPickUpDate}</p>
+        <p>Co-driver pickup time: {coDriverInfo.coDriverPickUpTime}</p>
         <p>Co-driver pickup location: {coDriverInfo.coDriverPickUpLocation}</p>
         <p>Co-driver drop date: {coDriverInfo.coDriverDropDate}</p>
+        <p>Co-driver drop time: {coDriverInfo.coDriverDropTime}</p>
         <p>Co-driver drop location: {coDriverInfo.coDriverDropLocation}</p>
       </Card>
 
@@ -140,21 +152,24 @@ const ShiftDataTab: React.FC<ShiftDataTabProps> = ({ recordTask }) => {
         }
         style={{ width: "100%" }}
       >
-        <h4>ИНФОРМАЦИЯ О СМЕНЕ</h4>
+        <h4>ИНФОРМАЦИЯ О СМЕНЕ ❗️❗️❗️</h4>
         <p>Дата шифта: {shiftInfo.shiftDate}</p>
         <p>Место шифта: {shiftInfo.shiftLocation}</p>
         <p>Дата сайкла: {shiftInfo.cycleDate}</p>
         <p>Место сайкла: {shiftInfo.cycleLocation}</p>
         <p>Дата пикапа: {shiftInfo.pickUpDate}</p>
+        <p>Время пикапа: {shiftInfo.pickUpTime}</p>
         <p>Место пикапа: {shiftInfo.pickUpLocation}</p>
 
         <h4>ИНФОРМАЦИЯ О КО-ДРАЙВЕРЕ</h4>
         <p>Имя драйвера: {coDriverInfo.driverName}</p>
         <p>Имя ко-драйвера: {coDriverInfo.coDriverName}</p>
+        <p>Дата пикапа ко-драйвера: {coDriverInfo.coDriverPickUpDate}</p>
+        <p>Время пикапа ко-драйвера: {coDriverInfo.coDriverPickUpTime}</p>
         <p>Место пикапа ко-драйвера: {coDriverInfo.coDriverPickUpLocation}</p>
-        <p>Время пикапа ко-драйвера: {coDriverInfo.coDriverPickUpDate}</p>
+        <p>Дата высадки ко-драйвера: {coDriverInfo.coDriverDropDate}</p>
+        <p>Время высадки ко-драйвера: {coDriverInfo.coDriverDropTime}</p>
         <p>Место высадки ко-драйвера: {coDriverInfo.coDriverDropLocation}</p>
-        <p>Время высадки ко-драйвера: {coDriverInfo.coDriverDropDate}</p>
       </Card>
 
       <ShiftAndCoDriverEditModal

src/Components/Tasks/TaskTable.tsx

@@ -182,21 +182,24 @@ const TaskTable = ({
 
   const handleCopy = (record: any, lang: "en" | "ru") => {
     const shiftInfo = {
-      pickUpDate: record?.pickup_date,
-      pickUpLocation: record?.pickup_location ?? null,
       shiftDate: record?.shift_date,
       shiftLocation: record?.shift_location ?? null,
       cycleDate: record?.cycle_date,
       cycleLocation: record?.cycle_location ?? null,
+      pickUpDate: record?.pickup_date,
+      pickUpTime: record?.pickup_time,
+      pickUpLocation: record?.pickup_location ?? null,
     };
 
     const coDriverInfo = {
       driverName: record?.driver_name ?? null,
       coDriverName: record?.co_driver_name ?? null,
-      coDriverPickUpLocation: record?.co_driver_pickup_location ?? null,
       coDriverPickUpDate: record?.co_driver_pickup_date,
-      coDriverDropLocation: record?.co_driver_drop_location ?? null,
+      coDriverPickUpTime: record?.co_driver_pickup_time,
+      coDriverPickUpLocation: record?.co_driver_pickup_location ?? null,
       coDriverDropDate: record?.co_driver_drop_date,
+      coDriverDropTime: record?.co_driver_drop_time,
+      coDriverDropLocation: record?.co_driver_drop_location ?? null,
     };
 
     const buildTextBlock = (
@@ -213,20 +216,23 @@ const TaskTable = ({
 
     if (lang === "en") {
       text = [
-        buildTextBlock("SHIFT INFO", [
+        buildTextBlock("SHIFT INFO ❗️❗️❗️", [
           ["Shift Date", shiftInfo.shiftDate],
           ["Shift Location", shiftInfo.shiftLocation],
-          ["Pick up Date", shiftInfo.pickUpDate],
-          ["Pick Up Location", shiftInfo.pickUpLocation],
           ["Cycle Date", shiftInfo.cycleDate],
           ["Cycle Location", shiftInfo.cycleLocation],
+          ["Pick up Date", shiftInfo.pickUpDate],
+          ["Pick up Time", shiftInfo.pickUpTime],
+          ["Pick Up Location", shiftInfo.pickUpLocation],
         ]),
         buildTextBlock("CO DRIVER INFO", [
           ["Driver's name", coDriverInfo.driverName],
           ["Co-Driver's name", coDriverInfo.coDriverName],
           ["Co-driver pickup date", coDriverInfo.coDriverPickUpDate],
+          ["Co-driver pickup time", coDriverInfo.coDriverPickUpTime],
           ["Co-driver pickup location", coDriverInfo.coDriverPickUpLocation],
           ["Co-driver drop date", coDriverInfo.coDriverDropDate],
+          ["Co-driver drop time", coDriverInfo.coDriverDropTime],
           ["Co-driver drop location", coDriverInfo.coDriverDropLocation],
         ]),
       ]
@@ -234,20 +240,23 @@ const TaskTable = ({
         .join("\n\n");
     } else {
       text = [
-        buildTextBlock("ИНФОРМАЦИЯ О СМЕНЕ", [
+        buildTextBlock("ИНФОРМАЦИЯ О СМЕНЕ ❗️❗️❗️", [
-          ["Дата пикапа", shiftInfo.pickUpDate],
-          ["Место пикапа", shiftInfo.pickUpLocation],
           ["Дата шифта", shiftInfo.shiftDate],
           ["Место шифта", shiftInfo.shiftLocation],
           ["Дата сайкла", shiftInfo.cycleDate],
           ["Место сайкла", shiftInfo.cycleLocation],
+          ["Дата пикапа", shiftInfo.pickUpDate],
+          ["Время пикапа", shiftInfo.pickUpTime],
+          ["Место пикапа", shiftInfo.pickUpLocation],
         ]),
         buildTextBlock("ИНФОРМАЦИЯ О КО-ДРАЙВЕРЕ", [
           ["Имя драйвера", coDriverInfo.driverName],
           ["Имя ко-драйвера", coDriverInfo.coDriverName],
-          ["Время пикапа ко-драйвера", coDriverInfo.coDriverPickUpDate],
+          ["Дата пикапа ко-драйвера", coDriverInfo.coDriverPickUpDate],
+          ["Время пикапа ко-драйвера", coDriverInfo.coDriverPickUpTime],
           ["Место пикапа ко-драйвера", coDriverInfo.coDriverPickUpLocation],
-          ["Время высадки ко-драйвера", coDriverInfo.coDriverDropDate],
+          ["Дата высадки ко-драйвера", coDriverInfo.coDriverDropDate],
+          ["Время высадки ко-драйвера", coDriverInfo.coDriverDropTime],
           ["Место высадки ко-драйвера", coDriverInfo.coDriverDropLocation],
         ]),
       ]