Compare commits
No commits in common. "adfd911f7bafd774b11c0776ac51ca4e11588f3d" and "93704a70f6b85a8c3664871b1bc6c4272bafc871" have entirely different histories.
adfd911f7b
...
93704a70f6
|
|
@ -1,8 +0,0 @@
|
|||
import figlet from "figlet";
|
||||
import chalk from "chalk";
|
||||
|
||||
figlet("Jai Pandey DocVA", (err, data) => {
|
||||
if (err) return console.log("Error generating banner");
|
||||
console.log(chalk.cyan(data));
|
||||
console.log(chalk.green("\n🚀 Development Mode Starting...\n"));
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,8 +5,7 @@
|
|||
"type": "module",
|
||||
"main": "dist-electron/main.js",
|
||||
"scripts": {
|
||||
"banner": "node banner.js",
|
||||
"dev": "npm-run-all banner --parallel transpile:electron dev:react dev:electron",
|
||||
"dev": "npm-run-all --parallel transpile:electron dev:react dev:electron",
|
||||
"dev:react": "vite",
|
||||
"dev:electron": "npm run build && cross-env NODE_ENV=development electron --inspect=5858 .",
|
||||
"prod:electron": "npm run build && cross-env NODE_ENV=production electron .",
|
||||
|
|
@ -25,7 +24,6 @@
|
|||
"axios": "^1.13.2",
|
||||
"chalk": "^5.6.2",
|
||||
"electron-store": "^11.0.2",
|
||||
"figlet": "^1.9.4",
|
||||
"https": "^1.0.0",
|
||||
"lucide-react": "^0.552.0",
|
||||
"luxon": "^3.7.2",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ const httpsAgent = new https.Agent({
|
|||
});
|
||||
|
||||
const api: AxiosInstance = axios.create({
|
||||
baseURL: 'https://daniela-nonprofessed-boastfully.ngrok-free.app/api/v1/va', // 🔁 your backend
|
||||
baseURL: 'https://quality-friendly-goldfish.ngrok-free.app/api/v1/va', // 🔁 your backend
|
||||
httpsAgent
|
||||
// timeout: 10000,
|
||||
});
|
||||
|
|
@ -38,33 +38,14 @@ api.interceptors.request.use(
|
|||
);
|
||||
|
||||
// --- Response Interceptor ---
|
||||
// api.interceptors.response.use(
|
||||
// (response: AxiosResponse) => response.data,
|
||||
// async (error) => {
|
||||
// console.error('[Axios Error]', error.status);
|
||||
// if (error.status === 401 || 403) {
|
||||
// console.warn('Token expired — trigger refresh logic if needed');
|
||||
// // sendTokenExpired();
|
||||
// }
|
||||
// return Promise.reject(error);
|
||||
// }
|
||||
// );
|
||||
|
||||
api.interceptors.response.use(
|
||||
(response: AxiosResponse) => response.data,
|
||||
async (error) => {
|
||||
|
||||
console.log(error , "Line 46")
|
||||
const status = error?.response?.status;
|
||||
|
||||
console.error('[Axios Error]', status);
|
||||
|
||||
// Only logout when token actually expired
|
||||
if (status === 401 || status === 403) {
|
||||
// console.error('[Axios Error]', error.message);
|
||||
if (error.response?.status === 401 || 403) {
|
||||
console.warn('Token expired — trigger refresh logic if needed');
|
||||
sendTokenExpired();
|
||||
}
|
||||
|
||||
return Promise.reject(error);
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -345,8 +345,6 @@ ipcMain.handle("create-leave-request", async (event, payload) => {
|
|||
|
||||
let message = "Unknown error";
|
||||
|
||||
console.log(error.response)
|
||||
|
||||
if (error.response) {
|
||||
console.log("Status:", error.response.status);
|
||||
console.log("Message:", error.response.statusText);
|
||||
|
|
@ -407,10 +405,11 @@ ipcMain.handle("get-payslips", async (event, vaId: string) => {
|
|||
console.log("get-payslips", vaId)
|
||||
try {
|
||||
const response = await api.get(`/paySlip/${vaId}`);
|
||||
console.log(response.data , "Line 409")
|
||||
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: response.data || [],
|
||||
data: response.data?.data || [],
|
||||
};
|
||||
} catch (error: any) {
|
||||
let message = "Unknown error occurred";
|
||||
|
|
@ -440,10 +439,10 @@ ipcMain.handle("get-leave-list", async () => {
|
|||
const res = await api.get("/leaves/all");
|
||||
|
||||
console.log("/leaves/all", res.data);
|
||||
return {
|
||||
success: true,
|
||||
data: res.data,
|
||||
};
|
||||
return {
|
||||
success: true,
|
||||
data: res.data,
|
||||
};
|
||||
} catch (error: any) {
|
||||
let message = "Unknown error occurred";
|
||||
|
||||
|
|
@ -469,10 +468,10 @@ ipcMain.handle("get-adjustments-list", async (event, vaId: string) => {
|
|||
const res = await api.get(`/timesheet/adjustments/list?vaId=${vaId}`);
|
||||
|
||||
console.log("/timesheet/adjustments/list", res.data);
|
||||
return {
|
||||
success: true,
|
||||
data: res.data,
|
||||
};
|
||||
return {
|
||||
success: true,
|
||||
data: res.data,
|
||||
};
|
||||
} catch (error: any) {
|
||||
let message = "Unknown error occurred";
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ app.on("ready", async () => {
|
|||
show: true,
|
||||
skipTaskbar: true,
|
||||
webPreferences: {
|
||||
devTools: false,
|
||||
devTools: true,
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -164,17 +164,17 @@ app.on("ready", async () => {
|
|||
});
|
||||
|
||||
|
||||
app.on('browser-window-focus', () => {
|
||||
globalShortcut.register('CommandOrControl+R', () => {
|
||||
// Do nothing; disables reload
|
||||
});
|
||||
globalShortcut.register('F5', () => {
|
||||
// Do nothing; disables reload
|
||||
});
|
||||
globalShortcut.register('CommandOrControl+Shift+I', () => {
|
||||
// Do nothing; disables DevTools
|
||||
});
|
||||
});
|
||||
// app.on('browser-window-focus', () => {
|
||||
// globalShortcut.register('CommandOrControl+R', () => {
|
||||
// // Do nothing; disables reload
|
||||
// });
|
||||
// globalShortcut.register('F5', () => {
|
||||
// // Do nothing; disables reload
|
||||
// });
|
||||
// globalShortcut.register('CommandOrControl+Shift+I', () => {
|
||||
// // Do nothing; disables DevTools
|
||||
// });
|
||||
// });
|
||||
|
||||
// app.on('browser-window-blur', () => {
|
||||
// globalShortcut.unregisterAll();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ test('', () => {
|
|||
expect(template[0].label).toEqual('Show');
|
||||
template[0]?.click?.(null as any, null as any, null as any);
|
||||
expect(mainWindow.show).toHaveBeenCalled();
|
||||
expect(app.dock!.show).toHaveBeenCalled();
|
||||
expect(app.dock.show).toHaveBeenCalled();
|
||||
|
||||
template[1]?.click?.(null as any, null as any, null as any);
|
||||
expect(app.quit).toHaveBeenCalled();
|
||||
|
|
|
|||
|
|
@ -8,12 +8,14 @@ interface DailyHours {
|
|||
remaining: string;
|
||||
}
|
||||
|
||||
|
||||
|
||||
export const useActiveAppTracker = (
|
||||
isTracking: boolean,
|
||||
activeProjectLogId: string | null,
|
||||
projectId: string | null,
|
||||
projectName: string | null,
|
||||
onLimitExceeded?: () => void
|
||||
onLimitExceeded?: () => void // Callback when limit is reached
|
||||
) => {
|
||||
const dispatch = useDispatch();
|
||||
const lastActiveRef = useRef<WindowInfo | null>(null);
|
||||
|
|
@ -22,9 +24,8 @@ export const useActiveAppTracker = (
|
|||
const intervalIdRef = useRef<number | null>(null);
|
||||
const finalizeTrackingRef = useRef<(() => Promise<void>) | null>(null);
|
||||
const limitCheckedRef = useRef<boolean>(false);
|
||||
const isStoppingRef = useRef<boolean>(false); // ✅ Flag to prevent new requests
|
||||
|
||||
const canSend = !!(activeProjectLogId && projectId && !isStoppingRef.current);
|
||||
const canSend = !!(activeProjectLogId && projectId);
|
||||
|
||||
// ✅ Parse time string to minutes
|
||||
const parseTimeToMinutes = (timeStr: string): number => {
|
||||
|
|
@ -52,6 +53,7 @@ export const useActiveAppTracker = (
|
|||
exceeded: remainingMins <= 0
|
||||
});
|
||||
|
||||
// If remaining time is 0 or negative, limit is exceeded
|
||||
if (remainingMins <= 0) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -59,7 +61,6 @@ export const useActiveAppTracker = (
|
|||
return false;
|
||||
};
|
||||
|
||||
// ✅ Send activity log (POST for new, PATCH for update)
|
||||
const sendActivityLog = async (
|
||||
projectLogId: string,
|
||||
projectId: string,
|
||||
|
|
@ -67,14 +68,8 @@ export const useActiveAppTracker = (
|
|||
appName: string,
|
||||
isNew: boolean
|
||||
) => {
|
||||
// ✅ CRITICAL: Block all requests when stopping
|
||||
if (isStoppingRef.current) {
|
||||
console.log("🚫 Stopping in progress — blocking activity log");
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!canSend) {
|
||||
console.log("🚫 Skipping API — missing required IDs");
|
||||
console.log("🚫 Skipping API — missing activeProjectLogId or projectId");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -104,18 +99,20 @@ export const useActiveAppTracker = (
|
|||
|
||||
// Store the log ID for future updates
|
||||
if (isNew && res?.data?._id) {
|
||||
console.log("res?.data?._id", res?.data?._id)
|
||||
lastLogIdRef.current = res.data._id;
|
||||
console.log("💾 Stored log ID:", res.data._id);
|
||||
}
|
||||
|
||||
// ✅ Check daily limit after every API call
|
||||
if (res?.dailyHours) {
|
||||
const limitExceeded = checkDailyLimit(res.dailyHours);
|
||||
console.log("res?.data?.dailyHours", res?.dailyHours)
|
||||
const limitExceeded = checkDailyLimit(res?.dailyHours);
|
||||
|
||||
if (limitExceeded && !limitCheckedRef.current) {
|
||||
limitCheckedRef.current = true;
|
||||
console.warn("🚨 Daily limit exceeded!");
|
||||
console.warn("🚨 Daily limit exceeded! Stopping tracking...");
|
||||
|
||||
// Trigger stop tracking callback
|
||||
if (onLimitExceeded) {
|
||||
setTimeout(() => {
|
||||
onLimitExceeded();
|
||||
|
|
@ -131,69 +128,54 @@ export const useActiveAppTracker = (
|
|||
}
|
||||
};
|
||||
|
||||
// ✅ Stop the interval immediately
|
||||
const stopInterval = useCallback(() => {
|
||||
console.log("🛑 Stopping activity tracking interval...");
|
||||
if (intervalIdRef.current) {
|
||||
clearInterval(intervalIdRef.current);
|
||||
intervalIdRef.current = null;
|
||||
console.log("✅ Interval cleared");
|
||||
}
|
||||
}, []);
|
||||
|
||||
// ✅ Send final PATCH before stopping (called by handleStopTracking)
|
||||
// ✅ Final PATCH before stopping
|
||||
const sendFinalPatch = useCallback(async () => {
|
||||
console.log("=".repeat(60));
|
||||
console.log("🛑 FINAL PATCH INITIATED");
|
||||
console.log("=".repeat(60));
|
||||
|
||||
// ✅ STEP 1: Set stopping flag IMMEDIATELY
|
||||
isStoppingRef.current = true;
|
||||
console.log("🔒 Stopping flag set — no new requests allowed");
|
||||
|
||||
// ✅ STEP 2: Stop the interval IMMEDIATELY
|
||||
stopInterval();
|
||||
|
||||
if (!activeProjectLogId || !projectId) {
|
||||
console.log("⚠️ Skipping final PATCH — no active project log ID");
|
||||
if (!canSend) {
|
||||
console.log("🚫 Skipping final PATCH — no active project log ID");
|
||||
return;
|
||||
}
|
||||
|
||||
// ✅ STEP 3: Send ONE final PATCH for the last active window
|
||||
console.log("=".repeat(60));
|
||||
console.log("🛑 FINAL PATCH INITIATED - Recording last activity");
|
||||
console.log("=".repeat(60));
|
||||
|
||||
if (lastLogIdRef.current && lastTitleRef.current && lastActiveRef.current) {
|
||||
try {
|
||||
console.log("📊 Final Activity Details:");
|
||||
console.log(` • Window: ${lastTitleRef.current}`);
|
||||
console.log(` • App: ${lastActiveRef.current.owner.name}`);
|
||||
console.log(` • Window Title: ${lastTitleRef.current}`);
|
||||
console.log(` • App Name: ${lastActiveRef.current.owner.name}`);
|
||||
console.log(` • Log ID: ${lastLogIdRef.current}`);
|
||||
console.log(` • Project: ${projectId}`);
|
||||
console.log(` • Project ID: ${projectId}`);
|
||||
|
||||
const result = await sendActivityLog(
|
||||
activeProjectLogId,
|
||||
projectId,
|
||||
activeProjectLogId!,
|
||||
projectId!,
|
||||
lastTitleRef.current,
|
||||
lastActiveRef.current.owner.name || "Unknown",
|
||||
false // PATCH (update existing log)
|
||||
false // This is a PATCH (update), not a POST (new)
|
||||
);
|
||||
|
||||
console.log("✅ Final PATCH sent successfully!");
|
||||
|
||||
if (result?.dailyHours) {
|
||||
console.log("📈 Final Daily Hours:");
|
||||
console.log(` • Today: ${result.dailyHours.todayTotal}`);
|
||||
console.log(` • Limit: ${result.dailyHours.dailyLimit}`);
|
||||
console.log("📈 Final Daily Hours Summary:");
|
||||
console.log(` • Today Total: ${result.dailyHours.todayTotal}`);
|
||||
console.log(` • Daily Limit: ${result.dailyHours.dailyLimit}`);
|
||||
console.log(` • Remaining: ${result.dailyHours.remaining}`);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error("❌ Final PATCH failed:", error);
|
||||
throw error;
|
||||
throw error; // Re-throw to let caller handle
|
||||
}
|
||||
} else {
|
||||
console.log("ℹ️ No active window to finalize");
|
||||
console.log(" • Last Log ID:", lastLogIdRef.current || "None");
|
||||
console.log(" • Last Title:", lastTitleRef.current || "None");
|
||||
console.log(" • Last Active Window:", lastActiveRef.current ? "Yes" : "No");
|
||||
}
|
||||
|
||||
// ✅ STEP 4: Clean up all refs
|
||||
// Clean up all refs
|
||||
console.log("🧹 Cleaning up tracking references...");
|
||||
lastActiveRef.current = null;
|
||||
lastTitleRef.current = null;
|
||||
|
|
@ -201,88 +183,70 @@ export const useActiveAppTracker = (
|
|||
limitCheckedRef.current = false;
|
||||
console.log("✅ Cleanup complete");
|
||||
console.log("=".repeat(60));
|
||||
}, [activeProjectLogId, projectId, stopInterval]);
|
||||
}, [activeProjectLogId, projectId, canSend]);
|
||||
|
||||
// ✅ Update ref whenever sendFinalPatch changes
|
||||
useEffect(() => {
|
||||
finalizeTrackingRef.current = sendFinalPatch;
|
||||
}, [sendFinalPatch]);
|
||||
|
||||
// ✅ Main tracking interval effect
|
||||
useEffect(() => {
|
||||
// Reset flags when tracking starts
|
||||
// Reset limit check when tracking starts
|
||||
if (isTracking) {
|
||||
limitCheckedRef.current = false;
|
||||
isStoppingRef.current = false;
|
||||
console.log("🟢 Tracking started — flags reset");
|
||||
}
|
||||
|
||||
if (!isTracking || !canSend) {
|
||||
console.log("🟡 Tracking inactive — cleaning up");
|
||||
stopInterval();
|
||||
console.log("🟡 Tracking inactive or missing IDs — skipping tracker setup");
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`🟢 Starting active tracker for: ${projectName}`);
|
||||
|
||||
const fetchActiveApp = async () => {
|
||||
// ✅ Double-check stopping flag before each fetch
|
||||
if (isStoppingRef.current) {
|
||||
console.log("🚫 Stopping in progress — skipping fetch");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const details = (await window.electron.getActiveAppDetails()) as WindowInfo;
|
||||
if (!details || !details.id) return;
|
||||
|
||||
console.log("details" , details)
|
||||
|
||||
const title = details.title;
|
||||
const appName = details.owner.name;
|
||||
const prevTitle = lastTitleRef.current;
|
||||
const hasChanged = !prevTitle || prevTitle !== title;
|
||||
|
||||
if (hasChanged) {
|
||||
// PATCH previous window before creating new log
|
||||
if (lastLogIdRef.current && prevTitle) {
|
||||
console.log("🔄 Updating previous window:", prevTitle);
|
||||
console.log("🔄 Patching previous log:", prevTitle);
|
||||
await sendActivityLog(activeProjectLogId!, projectId!, prevTitle, appName, false);
|
||||
}
|
||||
|
||||
// POST new window log
|
||||
console.log("🆕 New window detected:", title);
|
||||
console.log("🆕 New title detected → creating POST:", title);
|
||||
await sendActivityLog(activeProjectLogId!, projectId!, title, appName, true);
|
||||
|
||||
// Update refs and Redux
|
||||
lastActiveRef.current = details;
|
||||
lastTitleRef.current = title;
|
||||
dispatch(setActiveWindow({ window: details, projectId, projectName }));
|
||||
} else {
|
||||
console.log("⏸️ Same window, skipping");
|
||||
console.log("⏸ Same window, skipping log");
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("❌ Failed to fetch active app:", error);
|
||||
console.error("Failed to fetch active app:", error);
|
||||
}
|
||||
};
|
||||
|
||||
// Initial fetch
|
||||
fetchActiveApp();
|
||||
|
||||
// Set up interval (every 5 seconds)
|
||||
intervalIdRef.current = setInterval(fetchActiveApp, 5000);
|
||||
|
||||
// Cleanup on unmount
|
||||
return () => {
|
||||
console.log("🧹 Cleaning up tracker interval");
|
||||
stopInterval();
|
||||
if (intervalIdRef.current) {
|
||||
clearInterval(intervalIdRef.current);
|
||||
intervalIdRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [isTracking, activeProjectLogId, projectId, projectName, dispatch, stopInterval]);
|
||||
}, [isTracking, activeProjectLogId]);
|
||||
|
||||
return {
|
||||
finalizeTracking: finalizeTrackingRef.current,
|
||||
stopInterval,
|
||||
setIsStopping: (value: boolean) => {
|
||||
isStoppingRef.current = value;
|
||||
console.log(`🔒 Stopping flag manually set to: ${value}`);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
@ -135,10 +135,155 @@ const DashboardLayout = () => {
|
|||
document.documentElement.setAttribute("data-theme", theme);
|
||||
}, [theme]);
|
||||
|
||||
|
||||
// Create a ref to store the stop function so it can be called from the hook
|
||||
const stopTrackingRef = useRef<(() => Promise<void>) | null>(null);
|
||||
const limitAlertShownRef = useRef(false);
|
||||
|
||||
// Define handleStopTracking FIRST
|
||||
const handleStopTracking = useCallback(async () => {
|
||||
if (loadingStop || loadingStart) return;
|
||||
|
||||
if (!selectedProject) {
|
||||
console.warn("No selected project to stop");
|
||||
return;
|
||||
}
|
||||
|
||||
// Reset alert flag when stopping
|
||||
limitAlertShownRef.current = false;
|
||||
|
||||
let currentStopTime = new Date().toISOString();
|
||||
const projectId = selectedProject.projectId;
|
||||
|
||||
console.log(" Stop tracking initiated for:", selectedProject.projectName);
|
||||
console.log(" Current elapsed time:", elapsedTime);
|
||||
|
||||
setIsStopping(true);
|
||||
setLoadingStop(true);
|
||||
handleSocketDisconnect();
|
||||
|
||||
// STEP 1: Clear timer FIRST to prevent further client-side updates
|
||||
if (timerRef.current) {
|
||||
clearInterval(timerRef.current);
|
||||
timerRef.current = null;
|
||||
console.log("Timer cleared");
|
||||
}
|
||||
|
||||
// STEP 2: Send final PATCH with last active window data
|
||||
if (stopTrackingRef.current) {
|
||||
try {
|
||||
console.log(" Sending final PATCH to record last activity...");
|
||||
await stopTrackingRef.current();
|
||||
console.log(" Final tracking data sent successfully");
|
||||
} catch (error) {
|
||||
console.error(" Error sending final tracking data:", error);
|
||||
}
|
||||
}
|
||||
|
||||
// STEP 3: Send LOGOUT to backend
|
||||
try {
|
||||
const payload = {
|
||||
vaId: projectSummary.vaId,
|
||||
projectId: projectId,
|
||||
type: "LOGOUT",
|
||||
time: currentStopTime
|
||||
};
|
||||
|
||||
console.log("📡 Sending LOGOUT request:", payload);
|
||||
const res = await window.electron.stopProjectTracking(payload);
|
||||
console.log(" LOGOUT successful:", res);
|
||||
} catch (error) {
|
||||
console.error(" Failed to send LOGOUT:", error);
|
||||
}
|
||||
|
||||
// STEP 4: Update Redux tracking state to stop tracking
|
||||
console.log("🔄 Updating Redux state to stop tracking...");
|
||||
dispatch(
|
||||
stopTrackingReducer({
|
||||
projectId,
|
||||
})
|
||||
);
|
||||
|
||||
// Allow React to process the state update
|
||||
await new Promise(resolve => setTimeout(resolve, 50));
|
||||
|
||||
// STEP 5: Refresh project list to get updated work hours from server
|
||||
try {
|
||||
console.log("🔄 Refreshing project list...");
|
||||
const projectListRes = await window.electron.getProjectList();
|
||||
console.log("📊 Updated project list:", projectListRes);
|
||||
|
||||
if (projectListRes?.success && Array.isArray(projectListRes.data)) {
|
||||
// Update projects data
|
||||
dispatch(setProjectsDataSlice(projectListRes.data));
|
||||
|
||||
// Update project summary
|
||||
dispatch(
|
||||
setProjectSummarySlice({
|
||||
totalProjects: projectListRes.totalProjects || 0,
|
||||
activeProjects: projectListRes.activeProjects || 0,
|
||||
awayProjects: projectListRes.awayProjects || 0,
|
||||
totalWorkTime: projectListRes.totalWorkTime || "0h 0m 0s",
|
||||
totalWorkMs: projectListRes.totalWorkMs || 0,
|
||||
vaName: projectListRes.vaName || "",
|
||||
vaId: projectListRes.vaId || "",
|
||||
})
|
||||
);
|
||||
|
||||
// Update selected project with fresh data
|
||||
const updatedProject = projectListRes.data.find(
|
||||
(p: Project) => p.projectId === projectId
|
||||
);
|
||||
|
||||
if (updatedProject) {
|
||||
dispatch(setSelectedProjectSlice(updatedProject));
|
||||
|
||||
// CRITICAL FIX: Use server time instead of client elapsedTime
|
||||
const serverElapsedTime = parseTimeStringToSeconds(updatedProject.totalWorkTime);
|
||||
|
||||
console.log("🔄 Syncing client time with server time:", {
|
||||
serverTime: updatedProject.totalWorkTime,
|
||||
serverElapsedSeconds: serverElapsedTime,
|
||||
previousClientTime: elapsedTime,
|
||||
difference: serverElapsedTime - elapsedTime
|
||||
});
|
||||
|
||||
// Force update the tracking map with server time
|
||||
dispatch(
|
||||
updateProjectTracking({
|
||||
projectId: updatedProject.projectId,
|
||||
data: {
|
||||
elapsedTime: serverElapsedTime,
|
||||
accumulatedTime: serverElapsedTime,
|
||||
isTracking: false,
|
||||
isPaused: false,
|
||||
startTime: null,
|
||||
endTime: Date.now(),
|
||||
pauseStartTime: null,
|
||||
totalPausedTime: 0
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
console.log("✅ Selected project updated with server time");
|
||||
}
|
||||
}
|
||||
|
||||
// STEP 6: Update UI (window restore)
|
||||
await window.electron.toggleCloseBtn(true);
|
||||
await window.electron.resizeWindow(500, 600);
|
||||
toggleWindowSize.current = true;
|
||||
|
||||
} catch (error) {
|
||||
console.error("❌ Error refreshing project list:", error);
|
||||
} finally {
|
||||
// Clear loading states
|
||||
setLoadingStop(false);
|
||||
setIsStopping(false);
|
||||
console.log("🎉 TRACKING STOPPED SUCCESSFULLY");
|
||||
}
|
||||
}, [selectedProject, projectSummary, elapsedTime, dispatch]);
|
||||
|
||||
// NOW define handleLimitExceeded using the defined handleStopTracking
|
||||
const handleLimitExceeded = useCallback(async () => {
|
||||
console.log("🚨 LIMIT EXCEEDED - Showing alert (not stopping)");
|
||||
|
|
@ -171,7 +316,7 @@ const DashboardLayout = () => {
|
|||
}, [selectedProject]);
|
||||
|
||||
// Initialize useActiveAppTracker and store finalizeTracking in ref
|
||||
const { finalizeTracking, setIsStopping: setIsStoppingInTracker } = useActiveAppTracker(
|
||||
const { finalizeTracking } = useActiveAppTracker(
|
||||
isTracking,
|
||||
activeProjectLogId,
|
||||
selectedProject?.projectId ?? null,
|
||||
|
|
@ -179,186 +324,6 @@ const DashboardLayout = () => {
|
|||
handleLimitExceeded
|
||||
);
|
||||
|
||||
// Define handleStopTracking FIRST
|
||||
const handleStopTracking = useCallback(async () => {
|
||||
if (loadingStop || loadingStart) {
|
||||
console.log("⏸️ Already processing, skipping...");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!selectedProject) {
|
||||
console.warn("⚠️ No selected project to stop");
|
||||
return;
|
||||
}
|
||||
|
||||
console.log("=".repeat(70));
|
||||
console.log("🛑 STOP TRACKING INITIATED");
|
||||
console.log("=".repeat(70));
|
||||
console.log(`📦 Project: ${selectedProject.projectName}`);
|
||||
console.log(`⏱️ Elapsed Time: ${elapsedTime}s`);
|
||||
|
||||
// Reset alert flag when stopping
|
||||
limitAlertShownRef.current = false;
|
||||
|
||||
const currentStopTime = new Date().toISOString();
|
||||
const projectId = selectedProject.projectId;
|
||||
|
||||
// ✅ CRITICAL: Set stopping flag IMMEDIATELY to block all new tab tracking
|
||||
console.log("🔒 Setting stopping flag...");
|
||||
if (setIsStoppingInTracker) {
|
||||
setIsStoppingInTracker(true);
|
||||
}
|
||||
|
||||
setIsStopping(true);
|
||||
setLoadingStop(true);
|
||||
handleSocketDisconnect();
|
||||
|
||||
// STEP 1: Clear local timer to prevent further client-side updates
|
||||
console.log("⏹️ STEP 1: Clearing local timer...");
|
||||
if (timerRef.current) {
|
||||
clearInterval(timerRef.current);
|
||||
timerRef.current = null;
|
||||
console.log("✅ Timer cleared");
|
||||
}
|
||||
|
||||
// STEP 2: Send final PATCH with last active window data
|
||||
console.log("📤 STEP 2: Sending final activity tracking...");
|
||||
if (stopTrackingRef.current) {
|
||||
try {
|
||||
await stopTrackingRef.current(); // This calls sendFinalPatch() in the hook
|
||||
console.log("✅ Final activity tracking completed");
|
||||
} catch (error) {
|
||||
console.error("❌ Error during final tracking:", error);
|
||||
}
|
||||
} else {
|
||||
console.log("⚠️ No tracking ref available");
|
||||
}
|
||||
|
||||
// STEP 3: Send LOGOUT to backend
|
||||
console.log("🚪 STEP 3: Sending LOGOUT request...");
|
||||
try {
|
||||
const payload = {
|
||||
vaId: projectSummary.vaId,
|
||||
projectId: projectId,
|
||||
type: "LOGOUT",
|
||||
time: currentStopTime
|
||||
};
|
||||
|
||||
console.log("📡 Logout payload:", payload);
|
||||
const res = await window.electron.stopProjectTracking(payload);
|
||||
console.log("✅ LOGOUT successful:", res);
|
||||
} catch (error) {
|
||||
console.error("❌ LOGOUT failed:", error);
|
||||
}
|
||||
|
||||
// STEP 4: Update Redux tracking state
|
||||
console.log("🔄 STEP 4: Updating Redux state...");
|
||||
dispatch(
|
||||
stopTrackingReducer({
|
||||
projectId,
|
||||
})
|
||||
);
|
||||
|
||||
// STEP 6: Update UI (restore window)
|
||||
console.log("🪟 STEP 6: Restoring window...");
|
||||
await window.electron.toggleCloseBtn(true);
|
||||
await window.electron.resizeWindow(500, 600);
|
||||
toggleWindowSize.current = true;
|
||||
console.log("✅ Window restored");
|
||||
|
||||
// Allow React to process the state update
|
||||
await new Promise(resolve => setTimeout(resolve, 50));
|
||||
|
||||
// STEP 5: Refresh project list to get updated work hours from server
|
||||
console.log("📊 STEP 5: Refreshing project list...");
|
||||
try {
|
||||
const projectListRes = await window.electron.getProjectList();
|
||||
console.log("✅ Project list fetched:", projectListRes);
|
||||
|
||||
if (projectListRes?.success && Array.isArray(projectListRes.data)) {
|
||||
// Update projects data
|
||||
dispatch(setProjectsDataSlice(projectListRes.data));
|
||||
|
||||
// Update project summary
|
||||
dispatch(
|
||||
setProjectSummarySlice({
|
||||
totalProjects: projectListRes.totalProjects || 0,
|
||||
activeProjects: projectListRes.activeProjects || 0,
|
||||
awayProjects: projectListRes.awayProjects || 0,
|
||||
totalWorkTime: projectListRes.totalWorkTime || "0h 0m 0s",
|
||||
totalWorkMs: projectListRes.totalWorkMs || 0,
|
||||
vaName: projectListRes.vaName || "",
|
||||
vaId: projectListRes.vaId || "",
|
||||
})
|
||||
);
|
||||
|
||||
// Update selected project with fresh data from server
|
||||
const updatedProject = projectListRes.data.find(
|
||||
(p: Project) => p.projectId === projectId
|
||||
);
|
||||
|
||||
if (updatedProject) {
|
||||
dispatch(setSelectedProjectSlice(updatedProject));
|
||||
|
||||
// Sync client time with server time
|
||||
const serverElapsedTime = parseTimeStringToSeconds(updatedProject.totalWorkTime);
|
||||
|
||||
console.log("🔄 Syncing with server time:", {
|
||||
serverTime: updatedProject.totalWorkTime,
|
||||
serverSeconds: serverElapsedTime,
|
||||
clientSeconds: elapsedTime,
|
||||
difference: serverElapsedTime - elapsedTime
|
||||
});
|
||||
|
||||
// Force update the tracking map with server time
|
||||
dispatch(
|
||||
updateProjectTracking({
|
||||
projectId: updatedProject.projectId,
|
||||
data: {
|
||||
elapsedTime: serverElapsedTime,
|
||||
accumulatedTime: serverElapsedTime,
|
||||
isTracking: false,
|
||||
isPaused: false,
|
||||
startTime: null,
|
||||
endTime: Date.now(),
|
||||
pauseStartTime: null,
|
||||
totalPausedTime: 0
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
console.log("✅ Project synced with server");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
} catch (error) {
|
||||
console.error("❌ Error refreshing project list:", error);
|
||||
} finally {
|
||||
// Clear loading states
|
||||
setLoadingStop(false);
|
||||
setIsStopping(false);
|
||||
|
||||
// ✅ Reset stopping flag for next session
|
||||
if (setIsStoppingInTracker) {
|
||||
setIsStoppingInTracker(false);
|
||||
}
|
||||
|
||||
console.log("=".repeat(70));
|
||||
console.log("🎉 TRACKING STOPPED SUCCESSFULLY");
|
||||
console.log("=".repeat(70));
|
||||
}
|
||||
}, [
|
||||
selectedProject,
|
||||
projectSummary,
|
||||
elapsedTime,
|
||||
dispatch,
|
||||
loadingStop,
|
||||
loadingStart,
|
||||
setIsStoppingInTracker
|
||||
]);
|
||||
|
||||
// Update the ref whenever finalizeTracking changes
|
||||
useEffect(() => {
|
||||
stopTrackingRef.current = finalizeTracking;
|
||||
|
|
@ -397,7 +362,7 @@ const DashboardLayout = () => {
|
|||
return () => {
|
||||
console.log("🧹 Cleaning token-expired listener");
|
||||
};
|
||||
}, [isTracking]);
|
||||
}, [isTracking, handleStopTracking]);
|
||||
|
||||
|
||||
const handleLogout = async () => {
|
||||
|
|
@ -588,7 +553,7 @@ const DashboardLayout = () => {
|
|||
if (!selectedProject?.projectId) return
|
||||
|
||||
console.log(selectedProject?.projectId, "SelectedProject ID")
|
||||
socketRef.current = io("https://quality-friendly-goldfish.ngrok-free.app", {
|
||||
socketRef.current = io("https://daniela-nonprofessed-boastfully.ngrok-free.app", {
|
||||
transports: ["websocket"],
|
||||
secure: true,
|
||||
rejectUnauthorized: false,
|
||||
|
|
@ -620,7 +585,7 @@ const DashboardLayout = () => {
|
|||
// socketRef.current?.emit("getVisibleApps", { token: await token, apps });
|
||||
// });
|
||||
|
||||
socketRef.current.on("startSendAppsDetails", async ({ projId }) => {
|
||||
socketRef.current.on("startSendAppsDetails", async ({projId}) => {
|
||||
if (projId !== selectedProject?.projectId) return;
|
||||
console.log("▶️ startSendAppsDetails received");
|
||||
|
||||
|
|
@ -644,7 +609,7 @@ const DashboardLayout = () => {
|
|||
}, 5000);
|
||||
});
|
||||
|
||||
socketRef.current.on("stopSendAppsDetails", async ({ projId }) => {
|
||||
socketRef.current.on("stopSendAppsDetails", async ({projId}) => {
|
||||
if (projId !== selectedProject?.projectId) return;
|
||||
console.log("⏹ stopSendAppsDetails received");
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ const LeaveAndAdjustments: React.FC = () => {
|
|||
const navigate = useNavigate();
|
||||
|
||||
const { projectSummary } = useSelector((state: any) => state.projects);
|
||||
console.log("projectSummary46", projectSummary)
|
||||
console.log("projectSummary46" , projectSummary)
|
||||
|
||||
// Tabs state
|
||||
const [activeTab, setActiveTab] = useState<"leave" | "adjustments">("leave");
|
||||
|
|
@ -95,25 +95,18 @@ const LeaveAndAdjustments: React.FC = () => {
|
|||
|
||||
// Combined refresh function
|
||||
const handleRefresh = async () => {
|
||||
// if (activeTab === "leave") {
|
||||
// await fetchLeaves();
|
||||
// } else {
|
||||
// await fetchAdjustments();
|
||||
// }
|
||||
|
||||
fetchLeaves();
|
||||
setTimeout(() => {
|
||||
fetchAdjustments();
|
||||
}, 0);
|
||||
if (activeTab === "leave") {
|
||||
await fetchLeaves();
|
||||
} else {
|
||||
await fetchAdjustments();
|
||||
}
|
||||
setLastRefreshed(new Date());
|
||||
};
|
||||
|
||||
// Initial data fetch
|
||||
useEffect(() => {
|
||||
fetchLeaves();
|
||||
setTimeout(() => {
|
||||
fetchAdjustments();
|
||||
}, 0);
|
||||
fetchAdjustments();
|
||||
setLastRefreshed(new Date());
|
||||
}, []);
|
||||
|
||||
|
|
|
|||
|
|
@ -126,33 +126,6 @@ const SickLeaveTab: React.FC<{
|
|||
reader.readAsDataURL(file);
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const editor = quillRef.current?.getEditor();
|
||||
|
||||
if (!editor) return;
|
||||
|
||||
editor.getModule("clipboard").addMatcher(Node.ELEMENT_NODE, (node: any, delta: any) => {
|
||||
return delta;
|
||||
});
|
||||
|
||||
editor.root.addEventListener("paste", async (e: any) => {
|
||||
const items = e.clipboardData?.items;
|
||||
|
||||
if (!items) return;
|
||||
|
||||
for (const item of items) {
|
||||
if (item.type.indexOf("image") === 0) {
|
||||
const file = item.getAsFile();
|
||||
const base64 = await convertToBase64(file);
|
||||
|
||||
const range = editor.getSelection();
|
||||
editor.insertEmbed(range.index, "image", base64);
|
||||
}
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
|
||||
const validateLeaveForm = (data: LeaveFormData): Partial<LeaveFormData> => {
|
||||
const errors: Partial<LeaveFormData> = {};
|
||||
|
||||
|
|
@ -188,6 +161,7 @@ const SickLeaveTab: React.FC<{
|
|||
toDate: "",
|
||||
comment: ""
|
||||
};
|
||||
|
||||
setSickLeave(emptyForm);
|
||||
setSickErrors({});
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ const PaysSlips = () => {
|
|||
return;
|
||||
}
|
||||
|
||||
console.log(response , "getPayslips")
|
||||
|
||||
// Extract payrolls array from first index
|
||||
const payrolls = response[0]?.payrolls || [];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
import React, { useEffect, useState } from "react";
|
||||
|
||||
interface Props {
|
||||
children: React.ReactNode;
|
||||
}
|
||||
|
||||
const VpnGuard: React.FC<Props> = ({ children }) => {
|
||||
const [checking, setChecking] = useState(true);
|
||||
const [vpnConnected, setVpnConnected] = useState(true);
|
||||
|
||||
// const checkVPN = async () => {
|
||||
// try {
|
||||
// const res = await window.electron.checkVpnConnection();
|
||||
// setVpnConnected(res?.success);
|
||||
// } catch {
|
||||
// setVpnConnected(false);
|
||||
// } finally {
|
||||
// setChecking(false);
|
||||
// }
|
||||
// };
|
||||
|
||||
useEffect(() => {
|
||||
// checkVPN();
|
||||
}, []);
|
||||
|
||||
if (checking) {
|
||||
return (
|
||||
<div className="min-h-screen flex justify-center items-center">
|
||||
<span className="loading loading-spinner loading-lg"></span>
|
||||
<span className="ml-3">Checking VPN...</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!vpnConnected) {
|
||||
return (
|
||||
<div className="min-h-screen flex justify-center items-center text-center">
|
||||
<div className="card shadow-xl bg-base-100 p-6">
|
||||
<h2 className="text-xl font-bold text-red-600">VPN Required</h2>
|
||||
<p className="mt-2">Please connect to your company VPN to continue.</p>
|
||||
|
||||
<button className="btn btn-primary mt-4"
|
||||
onClick={() => window.location.reload()}>
|
||||
Retry
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return <>{children}</>;
|
||||
};
|
||||
|
||||
export default VpnGuard;
|
||||
|
|
@ -1,13 +1,3 @@
|
|||
declare module "quill";
|
||||
declare module "quill-image-resize-module";
|
||||
declare module "quill-image-drop-module";
|
||||
|
||||
declare module "quill-image-resize-module-react" {
|
||||
const ImageResize: any;
|
||||
export default ImageResize;
|
||||
}
|
||||
|
||||
|
||||
type Statistics = {
|
||||
cpuUsage: number;
|
||||
ramUsage: number;
|
||||
|
|
@ -154,16 +144,14 @@ interface Window {
|
|||
vaId: string;
|
||||
projectId: string;
|
||||
type: string;
|
||||
time:string
|
||||
}) => Promise<any>;
|
||||
stopProjectTracking: (data: {
|
||||
vaId: string;
|
||||
projectId: string;
|
||||
type: string;
|
||||
time:string
|
||||
}) => Promise<any>;
|
||||
trackingTabsOpeningClosing: (data: {
|
||||
id?: string;
|
||||
id?: string; // optional, only present if updating
|
||||
logId: string;
|
||||
projectId: string;
|
||||
title: string;
|
||||
|
|
|
|||
Loading…
Reference in New Issue