sec remove show min

src/electron/ipc/ipcHandler.ts

@@ -274,6 +274,27 @@ ipcMain.handle("change-password", async (event, data) => {
 });
 
 
+ipcMain.handle("get-project-summary", async (_, { projectId, date }) => {
+  try {
+    const url = `/timesheet/summary/${projectId}/${date}`;
+    console.log("📡 Fetching summary:", url);
+
+    const res = await api.get(url);
+    return {
+      success: true,
+      data: res.data,
+    };
+  } catch (error: any) {
+    console.error("❌ Error fetching summary:", error.message);
+    return {
+      success: false,
+      message: error.response?.data?.message || "Something went wrong",
+    };
+  }
+});
+
+
+
 export const sendTokenExpired = () => {
   console.log("⚠️ Sending token-expired event to renderer");
 

src/electron/preload.cts

@@ -43,6 +43,10 @@ contextBridge.exposeInMainWorld('electron', {
     });
   },
 
+
+   getProjectSummary: (projectId: string, date: string) =>
+    ipcRenderer.invoke("get-project-summary", { projectId, date }),
+
 } satisfies Window['electron']);
 
 // function ipcInvoke<Key extends keyof EventPayloadMapping>(

src/ui/layout/DashboardLayout.tsx

@@ -548,7 +548,7 @@ const DashboardLayout = () => {
     const hrs = Math.floor(seconds / 3600);
     const mins = Math.floor((seconds % 3600) / 60);
     const secs = seconds % 60;
-    return `${hrs}h ${mins}m ${secs}s`;
+    return `${hrs}h ${mins}m`;
   };
 
   const toggleWindowSize = useRef(true);
@@ -651,13 +651,14 @@ const DashboardLayout = () => {
               </NavLink>
             </div>
           ))}
-          <button
+
+          {!isTracking && <button
             onClick={handleLogout}
             className="flex items-center justify-center w-10 h-10 rounded-lg transition-all duration-150 hover:bg-error/10 text-error hover:text-error mt-auto cursor-pointer tooltip  tooltip-right "
             data-tip={"Logout"}
           >
             <LogOut size={18} />
-          </button>
+          </button>}
         </aside>
 
         {/* Main Content */}

src/ui/pages/Dashboard.tsx

@@ -41,7 +41,8 @@ const formatTime = (seconds: number) => {
   const hrs = Math.floor(seconds / 3600);
   const mins = Math.floor((seconds % 3600) / 60);
   const secs = seconds % 60;
-  return `${hrs}h ${mins}m ${secs}s`;
+  // return `${hrs}h ${mins}m ${secs}s`;
+  return `${hrs}h ${mins}m `;
 };
 
 // Widget Component
@@ -95,6 +96,17 @@ const Dashboard: React.FC = () => {
     ? projectTrackingMap.get(selectedProject.projectId)
     : null;
 
+  const formatWorkTime = (time: string) => {
+    if (!time) return "0h 0m";
+
+    // Example input: "0h 2m 29s"
+    const parts = time.split(" ");
+
+    // Always return first two parts: ["0h", "2m"]
+    return parts.slice(0, 2).join(" ");
+  };
+
+
   return (
     <main className="flex-1 overflow-hidden no-scrollbar max-h-screen">
       {/* Header */}
@@ -263,7 +275,7 @@ const Dashboard: React.FC = () => {
                       <td className="text-xs opacity-70">{index + 1}</td>
                       <td className="font-medium">{project.projectName}</td>
                       <td className="font-mono text-xs">
-                        {project.totalWorkTime || "0h 0m 0s"}
+                        {formatWorkTime(project.totalWorkTime)}
                       </td>
                       <td>
                         <button
@@ -283,7 +295,7 @@ const Dashboard: React.FC = () => {
           </div>
         ) : (
           <div className="flex items-center justify-center flex-1 text-sm text-base-content/60">
-            <NoData/>
+            <NoData />
           </div>
         )}
       </div>

src/ui/pages/LeaveAndAdjustments/LeaveAndAdjustments.tsx

@@ -172,35 +172,33 @@ const LeaveAndAdjustments: React.FC = () => {
 
 
 
-  // const fetchLogs = async () => {
+  const fetchLogs = async () => {
-  //   const res = await window.electron.getProjectLogs(
+  try {
-  //     selectedProjectId,
+    console.log("Sending =>", selectedProjectId, selectedDate);
-  //     selectedDate || undefined,
-  //     selectedDate || undefined,
-  //   );
 
-  //   if (res.success) {
+    const res = await window.electron.getProjectSummary(
-  //     console.log("✅ Logs: fetchLogs", res);
+      selectedProjectId,
+      selectedDate
+    );
 
-  //     // Safely extract time if from/to exist
+    console.log("📥 Summary Response:", res);
-  //     const fromTime = res.from ? new Date(res.from).toISOString().slice(11, 16) : "";
-  //     const toTime = res.to ? new Date(res.to).toISOString().slice(11, 16) : "";
 
-  //     setPtoLeave({
+    // if (res.success) {
-  //       fromDate: fromTime,
+    //   // setProjectLogs(res.data); // <-- store logs in state
-  //       toDate: toTime,
+    // } else {
-  //     });
+    //   console.warn("⚠️ Summary API failed:", res.message);
-  //   } else {
+    // }
-  //     console.warn("⚠️ Failed to fetch project logs");
+  } catch (err) {
-  //   }
+    console.error("❌ Error fetching project summary:", err);
-  // };
+  }
+};
 
 
-  // useEffect(() => {
+  useEffect(() => {
-  //   if (selectedProjectId && selectedDate) {
+    if (selectedProjectId && selectedDate) {
-  //     fetchLogs()
+      fetchLogs()
-  //   }
+    }
-  // }, [selectedProjectId, selectedDate])
+  }, [selectedProjectId, selectedDate])
 
 
   return (

src/ui/pages/Timesheets/Timesheets.tsx

@@ -92,6 +92,16 @@ const Timesheets: React.FC = () => {
   }
 };
 
+const formatWorkTime = (time: string) => {
+  if (!time) return "0h 0m";
+
+  // Example input: "0h 2m 29s"
+  const parts = time.split(" ");
+
+  // Always return first two parts: ["0h", "2m"]
+  return parts.slice(0, 2).join(" ");
+};
+
 
 
   return (
@@ -154,7 +164,7 @@ const Timesheets: React.FC = () => {
               <tr key={entry.projectId}>
                 <td>{index+1}</td>
                 <td>{entry.projectName}</td>
-                <td>{entry.totalWorkTime}</td>
+                <td>{formatWorkTime(entry.totalWorkTime)}</td>
                 <td>
                 <button
                     onClick={() => handleViewLogs(entry.projectId, entry.projectName)}

types.d.ts

@@ -33,7 +33,7 @@ interface ProjectListResponse {
   totalWorkTime?: string;
   totalWorkMs?: number;
   data?: any[]; // you can replace `any[]` with a typed array later
-  status : number
+  status: number
 }
 
 interface TabActivity {
@@ -75,14 +75,14 @@ interface ProfileData {
   accountHolderName: string;
   accountNumber: string;
   routingNumber: string;
-  phone:string;
+  phone: string;
-  skype:string;
+  skype: string;
-  city:string;
+  city: string;
-  state:string;
+  state: string;
-  country:string;
+  country: string;
-  paymentMethod:string;
+  paymentMethod: string;
-  payoneerAccount:string;
+  payoneerAccount: string;
-  veemAccount:string;
+  veemAccount: string;
   _id: string;
 }
 
@@ -137,13 +137,16 @@ interface Window {
 
 
     changePassword: (data: {
-        oldPassword: string;
+      oldPassword: string;
-        password: string;
+      password: string;
-        cPassword: string;
+      cPassword: string;
-      }) => Promise<{ success: boolean; message?: string; data?: any }>;
+    }) => Promise<{ success: boolean; message?: string; data?: any }>;
 
 
-onTokenExpired: (callback: () => void) => void;
+    onTokenExpired: (callback: () => void) => void;
+
+
+    getProjectSummary: (projectId: string, date: string) => Promise<any>;
   };
 }