update ui - tme formats
This commit is contained in:
parent
a4d737111c
commit
d6c98f93bb
@ -54,13 +54,14 @@
|
||||
const messageBox = document.getElementById('message-box'), loadingSpinner = document.getElementById('loading-spinner'), modalContainer = document.getElementById('modal-container');
|
||||
let authToken, user, allTimeEntries = [], allUsers = [], employeeTimerInterval = null;
|
||||
let adminTimerIntervals = [];
|
||||
|
||||
|
||||
// --- Helper Functions ---
|
||||
const showLoading = (show) => { loadingSpinner.innerHTML = show ? `<div class="inline-block animate-spin rounded-full h-16 w-16 border-t-2 border-b-2 border-blue-500"></div>` : ''; };
|
||||
const showMessage = (message, type = 'success') => { messageBox.innerHTML = `<div class="p-4 mb-4 text-sm rounded-lg flex items-center justify-between ${type === 'error' ? 'bg-red-100 text-red-700' : 'bg-green-100 text-green-700'}" role="alert"><span>${message}</span><button onclick="messageBox.classList.add('hidden')" class="font-bold text-lg">×</button></div>`; messageBox.classList.remove('hidden'); };
|
||||
const formatDecimal = (ms) => ms ? (ms / 3600000).toFixed(2) : '0.00';
|
||||
const formatDateTime = (s) => s ? new Date(s).toLocaleString() : 'N/A';
|
||||
const formatDate = (s) => s ? new Date(s).toLocaleDateString() : 'N/A';
|
||||
// UPDATED: Shorter date formats for mobile friendliness
|
||||
const formatDateTime = (s) => s ? new Date(s).toLocaleString(undefined, { month: '2-digit', day: '2-digit', year: '2-digit', hour: 'numeric', minute: '2-digit' }) : 'N/A';
|
||||
const formatDate = (s) => s ? new Date(s).toLocaleDateString(undefined, { month: '2-digit', day: '2-digit', year: '2-digit' }) : 'N/A';
|
||||
const toLocalISO = (d) => { if (!d) return ''; const date = new Date(d); return new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().slice(0, 16); };
|
||||
const formatDuration = (ms) => { if (!ms || ms < 0) return '00:00:00'; const totalSeconds = Math.floor(ms / 1000); const h = Math.floor(totalSeconds / 3600); const m = Math.floor((totalSeconds % 3600) / 60); const s = totalSeconds % 60; return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`; };
|
||||
|
||||
@ -72,30 +73,20 @@
|
||||
try {
|
||||
showLoading(true);
|
||||
const response = await fetch(`${API_BASE_URL}${endpoint}`, { method, headers, body: body ? JSON.stringify(body) : null });
|
||||
|
||||
if (response.status === 401) {
|
||||
handleSignOut('Your session has expired. Please log in again.');
|
||||
return { success: false };
|
||||
}
|
||||
|
||||
const text = await response.text();
|
||||
let data;
|
||||
|
||||
try {
|
||||
data = text ? JSON.parse(text) : null;
|
||||
} catch (error) {
|
||||
if (!response.ok) {
|
||||
throw new Error(text || `Request failed with status ${response.status}`);
|
||||
}
|
||||
if (!response.ok) { throw new Error(text || `Request failed with status ${response.status}`); }
|
||||
return { success: true, data: text };
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(data.message || `An unknown error occurred.`);
|
||||
}
|
||||
|
||||
if (!response.ok) { throw new Error(data.message || `An unknown error occurred.`); }
|
||||
return { success: true, data };
|
||||
|
||||
} catch (error) {
|
||||
showMessage(error.message, 'error');
|
||||
return { success: false };
|
||||
@ -105,23 +96,25 @@
|
||||
}
|
||||
|
||||
// --- View Management ---
|
||||
// --- View Management ---
|
||||
const showView = (viewName) => {
|
||||
// Clear all timers when the view changes
|
||||
clearInterval(employeeTimerInterval);
|
||||
adminTimerIntervals.forEach(clearInterval);
|
||||
adminTimerIntervals = [];
|
||||
|
||||
Object.keys(mainViews).forEach(v => mainViews[v].classList.toggle('hidden', v !== viewName));
|
||||
}
|
||||
const showView = (viewName) => {
|
||||
clearInterval(employeeTimerInterval);
|
||||
adminTimerIntervals.forEach(clearInterval);
|
||||
adminTimerIntervals = [];
|
||||
Object.keys(mainViews).forEach(v => mainViews[v].classList.toggle('hidden', v !== viewName));
|
||||
}
|
||||
|
||||
// --- UI Rendering ---
|
||||
function updateUI() {
|
||||
try {
|
||||
// UPDATED: Adjust main container padding for mobile
|
||||
const mainContainer = document.querySelector('main.container');
|
||||
if (mainContainer) {
|
||||
mainContainer.classList.remove('px-6');
|
||||
mainContainer.classList.add('px-4', 'sm:px-6');
|
||||
}
|
||||
const storedUser = localStorage.getItem('user');
|
||||
authToken = localStorage.getItem('authToken');
|
||||
user = storedUser ? JSON.parse(storedUser) : null;
|
||||
|
||||
if (authToken && user) {
|
||||
navUserControls.classList.remove('hidden');
|
||||
welcomeMessage.textContent = `Welcome, ${user.username}`;
|
||||
@ -160,7 +153,6 @@ const showView = (viewName) => {
|
||||
clearInterval(employeeTimerInterval);
|
||||
const [statusRes, timeOffRes] = await Promise.all([apiCall('/status'), apiCall('/user/time-off-requests')]);
|
||||
if (!statusRes.success || !timeOffRes.success) return;
|
||||
|
||||
const entries = statusRes.data;
|
||||
const requests = timeOffRes.data;
|
||||
const last = entries[0];
|
||||
@ -168,7 +160,6 @@ const showView = (viewName) => {
|
||||
let totalMilliseconds = entries.reduce((acc, e) => {
|
||||
return e.status === 'out' && e.punch_out_time ? acc + (new Date(e.punch_out_time) - new Date(e.punch_in_time)) : acc;
|
||||
}, 0);
|
||||
|
||||
mainViews.employee.innerHTML = `
|
||||
<div class="max-w-4xl mx-auto space-y-8">
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
@ -201,7 +192,7 @@ const showView = (viewName) => {
|
||||
<button type="submit" class="w-full bg-indigo-600 text-white p-2 rounded hover:bg-indigo-700">Submit Request</button>
|
||||
<div class="md:col-span-3"><label class="block text-sm font-medium">Reason (optional)</label><input type="text" id="reason" placeholder="e.g., Vacation" class="w-full p-2 border rounded"></div>
|
||||
</form>
|
||||
<div class="mt-4 overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Status</th></tr></thead><tbody>${requests.map(r => `<tr class="border-t"><td class="p-2">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason || ''}</td><td class="p-2 font-medium capitalize text-${r.status === 'approved' ? 'green' : r.status === 'denied' ? 'red' : 'gray'}-600">${r.status}</td></tr>`).join('') || '<tr><td colspan="3" class="text-center p-4">No requests.</td></tr>'}</tbody></table></div>
|
||||
<div class="mt-4 overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Status</th></tr></thead><tbody>${requests.map(r => `<tr class="border-t"><td class="p-2 whitespace-nowrap">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason || ''}</td><td class="p-2 font-medium capitalize text-${r.status === 'approved' ? 'green' : r.status === 'denied' ? 'red' : 'gray'}-600">${r.status}</td></tr>`).join('') || '<tr><td colspan="3" class="text-center p-4">No requests.</td></tr>'}</tbody></table></div>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h3 class="text-xl font-bold text-gray-700 mb-2">My Time Log</h3>
|
||||
@ -211,7 +202,6 @@ const showView = (viewName) => {
|
||||
document.getElementById('punch-btn').addEventListener('click', handlePunch);
|
||||
document.getElementById('change-password-btn').addEventListener('click', renderChangePasswordModal);
|
||||
document.getElementById('time-off-form').addEventListener('submit', handleTimeOffRequest);
|
||||
|
||||
if (punchedIn) {
|
||||
const durationCell = document.getElementById(`duration-${last.id}`);
|
||||
const totalHoursCell = document.getElementById('employee-total-hours');
|
||||
@ -225,105 +215,30 @@ const showView = (viewName) => {
|
||||
}
|
||||
|
||||
async function renderAdminDashboard() {
|
||||
const [logsRes, usersRes, requestsRes] = await Promise.all([apiCall('/admin/logs'), apiCall('/admin/users'), apiCall('/admin/time-off-requests/pending')]);
|
||||
if (!logsRes.success || !usersRes.success || !requestsRes.success) return;
|
||||
|
||||
allTimeEntries = logsRes.data;
|
||||
allUsers = usersRes.data;
|
||||
const pendingRequests = requestsRes.data;
|
||||
|
||||
const employeeTotals = allTimeEntries.reduce((acc, entry) => {
|
||||
const dur = entry.punch_out_time ? (new Date(entry.punch_out_time) - new Date(entry.punch_in_time)) : (Date.now() - new Date(entry.punch_in_time));
|
||||
acc[entry.username] = (acc[entry.username] || 0) + dur;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const punchedInEntries = allTimeEntries.filter(e => e.status === 'in');
|
||||
|
||||
mainViews.admin.innerHTML = `
|
||||
<div class="max-w-6xl mx-auto space-y-8">
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<div class="flex flex-wrap justify-between items-center gap-4">
|
||||
<h2 class="text-2xl font-bold">Admin Dashboard</h2>
|
||||
<div class="space-x-2">
|
||||
<button id="view-archives-btn" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600">View Archives</button>
|
||||
<button id="archive-btn" class="px-4 py-2 bg-amber-500 text-white rounded-lg hover:bg-amber-600">Archive Records</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h3 class="text-xl font-bold text-gray-700 mb-2">Currently Punched In</h3>
|
||||
<ul class="border rounded-lg divide-y">${punchedInEntries.map(e => `
|
||||
<li class="flex flex-col items-start space-y-2 p-3 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
|
||||
<span class="font-medium text-gray-800">${e.username}</span>
|
||||
<div class="flex items-center space-x-4">
|
||||
<span class="text-sm text-gray-500">Since: ${formatDateTime(e.punch_in_time)}</span>
|
||||
<button class="force-clock-out-btn px-3 py-1 text-xs bg-red-500 text-white rounded whitespace-nowrap" data-userid="${e.user_id}" data-username="${e.username}">Force Clock Out</button>
|
||||
</div>
|
||||
</li>`).join('') || '<li class="p-4 text-center text-gray-500">None</li>'}
|
||||
</ul>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<h3 class="text-xl font-bold text-gray-700">Pending Time Off Requests</h3>
|
||||
<button id="view-time-off-history-btn" class="px-4 py-2 text-sm bg-gray-200 rounded-lg hover:bg-gray-300">View History</button>
|
||||
</div>
|
||||
<div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Actions</th></tr></thead><tbody>${pendingRequests.map(r => `<tr class="border-t"><td class="p-2">${r.username}</td><td class="p-2">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason||''}</td><td class="p-2 space-x-1"><button class="approve-request-btn font-medium text-green-600 hover:underline" data-id="${r.id}">Approve</button><button class="deny-request-btn font-medium text-red-600 hover:underline" data-id="${r.id}">Deny</button></td></tr>`).join('') || '<tr><td colspan="4" class="text-center p-4">No pending requests.</td></tr>'}</tbody></table></div>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h3 class="text-xl font-bold text-gray-700 mb-2">Hours by Employee</h3>
|
||||
<div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Total Hours</th></tr></thead><tbody>${Object.entries(employeeTotals).map(([username, totalMs]) => `<tr class="border-t"><td class="p-2 font-medium">${username}</td><td class="p-2">${formatDecimal(totalMs)}</td></tr>`).join('') || '<tr><td colspan="2" class="text-center p-4">No data.</td></tr>'}</tbody></table></div>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h3 class="text-xl font-bold text-gray-700 mb-4">Detailed Logs</h3>
|
||||
<div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">In</th><th class="p-2">Out</th><th class="p-2">Duration</th><th class="p-2">Actions</th></tr></thead><tbody>${allTimeEntries.map(e => `<tr class="border-t"><td class="p-2">${e.username||'N/A'}</td><td class="p-2">${formatDateTime(e.punch_in_time)}</td><td class="p-2">${formatDateTime(e.punch_out_time)}</td><td class="p-2" id="admin-duration-${e.id}">${e.punch_out_time ? formatDecimal(new Date(e.punch_out_time) - new Date(e.punch_in_time)) + ' hrs' : '...'}</td><td class="p-2 space-x-2"><button class="edit-btn font-medium text-blue-600 hover:underline" data-id="${e.id}">Edit</button><button class="delete-btn font-medium text-red-600 hover:underline" data-id="${e.id}">Delete</button></td></tr>`).join('')}</tbody></table></div>
|
||||
</div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6">
|
||||
<h3 class="text-xl font-bold text-gray-700 mb-4">User & Payroll Management</h3>
|
||||
<div class="grid md:grid-cols-2 gap-6">
|
||||
<form id="create-user-form" class="space-y-3 bg-gray-50 p-4 rounded-lg"><h4 class="font-semibold">Create User</h4><input type="text" id="new-username" placeholder="Username" class="w-full p-2 border rounded" required><input type="password" id="new-password" placeholder="Password" class="w-full p-2 border rounded" required><select id="new-user-role" class="w-full p-2 border rounded"><option value="employee">Employee</option><option value="admin">Admin</option></select><button type="submit" class="w-full bg-green-600 text-white p-2 rounded hover:bg-green-700">Create User</button></form>
|
||||
<form id="add-punch-form" class="space-y-3 bg-gray-50 p-4 rounded-lg"><h4 class="font-semibold">Add Manual Punch</h4><select id="add-punch-user" class="w-full p-2 border rounded" required>${allUsers.map(u => `<option value="${u.id}" data-username="${u.username}">${u.username}</option>`).join('')}</select><label class="text-sm">In:</label><input type="datetime-local" id="add-punch-in" class="w-full p-2 border rounded" required><label class="text-sm">Out:</label><input type="datetime-local" id="add-punch-out" class="w-full p-2 border rounded" required><button type="submit" class="w-full bg-purple-600 text-white p-2 rounded hover:bg-purple-700">Add Punch</button></form>
|
||||
</div>
|
||||
<div class="mt-6"><h4 class="font-semibold mb-2">Manage Users</h4><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Username</th><th class="p-2">Role</th><th class="p-2">Actions</th></tr></thead><tbody>${allUsers.map(u => `<tr class="border-t"><td class="p-2 font-medium">${u.username}</td><td class="p-2 capitalize">${u.role}</td><td class="p-2 space-x-2">${u.isPrimary ? `<span class="text-sm text-gray-500">Primary Admin</span>` : `<button class="reset-pw-btn font-medium text-blue-600 hover:underline" data-username="${u.username}">Reset PW</button><button class="change-role-btn font-medium text-purple-600 hover:underline" data-username="${u.username}" data-role="${u.role}">${u.role === 'admin' ? 'Demote' : 'Promote'}</button>${u.username !== user.username ? `<button class="delete-user-btn font-medium text-red-600 hover:underline" data-username="${u.username}">Delete</button>` : ''}`}</td></tr>`).join('')}</tbody></table></div></div>
|
||||
</div>
|
||||
</div>`;
|
||||
|
||||
// ** NEW: Start timers for all currently punched-in users **
|
||||
punchedInEntries.forEach(entry => {
|
||||
const durationCell = document.getElementById(`admin-duration-${entry.id}`);
|
||||
if (durationCell) {
|
||||
const punchInTime = new Date(entry.punch_in_time);
|
||||
const intervalId = setInterval(() => {
|
||||
durationCell.textContent = formatDuration(Date.now() - punchInTime.getTime());
|
||||
}, 1000);
|
||||
adminTimerIntervals.push(intervalId); // Store the timer to clear it later
|
||||
const [logsRes, usersRes, requestsRes] = await Promise.all([apiCall('/admin/logs'), apiCall('/admin/users'), apiCall('/admin/time-off-requests/pending')]);
|
||||
if (!logsRes.success || !usersRes.success || !requestsRes.success) return;
|
||||
allTimeEntries = logsRes.data; allUsers = usersRes.data; const pendingRequests = requestsRes.data;
|
||||
const employeeTotals = allTimeEntries.reduce((acc, entry) => { const dur = entry.punch_out_time ? (new Date(entry.punch_out_time) - new Date(entry.punch_in_time)) : (Date.now() - new Date(entry.punch_in_time)); acc[entry.username] = (acc[entry.username] || 0) + dur; return acc; }, {});
|
||||
const punchedInEntries = allTimeEntries.filter(e => e.status === 'in');
|
||||
mainViews.admin.innerHTML = `
|
||||
<div class="max-w-6xl mx-auto space-y-8">
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><div class="flex flex-wrap justify-between items-center gap-4"><h2 class="text-2xl font-bold">Admin Dashboard</h2><div class="flex-shrink-0 space-x-2"><button id="view-archives-btn" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600">View Archives</button><button id="archive-btn" class="px-4 py-2 bg-amber-500 text-white rounded-lg hover:bg-amber-600">Archive Records</button></div></div></div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><h3 class="text-xl font-bold text-gray-700 mb-2">Currently Punched In</h3><ul class="border rounded-lg divide-y">${punchedInEntries.map(e => `<li class="flex flex-col items-start space-y-2 p-3 sm:flex-row sm:items-center sm:justify-between sm:space-y-0"><span class="font-medium text-gray-800">${e.username}</span><div class="flex items-center space-x-4"><span class="text-sm text-gray-500">Since: ${formatDateTime(e.punch_in_time)}</span><button class="force-clock-out-btn px-3 py-1 text-xs bg-red-500 text-white rounded whitespace-nowrap" data-userid="${e.user_id}" data-username="${e.username}">Force Clock Out</button></div></li>`).join('') || '<li class="p-4 text-center text-gray-500">None</li>'}</ul></div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><div class="flex justify-between items-center mb-4"><h3 class="text-xl font-bold text-gray-700">Pending Time Off Requests</h3><button id="view-time-off-history-btn" class="px-4 py-2 text-sm bg-gray-200 rounded-lg hover:bg-gray-300">View History</button></div><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Actions</th></tr></thead><tbody>${pendingRequests.map(r => `<tr class="border-t"><td class="p-2">${r.username}</td><td class="p-2 whitespace-nowrap">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason||''}</td><td class="p-2"><div class="flex flex-col sm:flex-row gap-2"><button class="approve-request-btn font-medium text-green-600 hover:underline" data-id="${r.id}">Approve</button><button class="deny-request-btn font-medium text-red-600 hover:underline" data-id="${r.id}">Deny</button></div></td></tr>`).join('') || '<tr><td colspan="4" class="text-center p-4">No pending requests.</td></tr>'}</tbody></table></div></div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><h3 class="text-xl font-bold text-gray-700 mb-2">Hours by Employee</h3><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Total Hours</th></tr></thead><tbody>${Object.entries(employeeTotals).map(([username, totalMs]) => `<tr class="border-t"><td class="p-2 font-medium">${username}</td><td class="p-2">${formatDecimal(totalMs)}</td></tr>`).join('') || '<tr><td colspan="2" class="text-center p-4">No data.</td></tr>'}</tbody></table></div></div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><h3 class="text-xl font-bold text-gray-700 mb-4">Detailed Logs</h3><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">In</th><th class="p-2">Out</th><th class="p-2">Duration</th><th class="p-2">Actions</th></tr></thead><tbody>${allTimeEntries.map(e => `<tr class="border-t"><td class="p-2">${e.username||'N/A'}</td><td class="p-2">${formatDateTime(e.punch_in_time)}</td><td class="p-2">${formatDateTime(e.punch_out_time)}</td><td class="p-2" id="admin-duration-${e.id}">${e.punch_out_time ? formatDecimal(new Date(e.punch_out_time) - new Date(e.punch_in_time)) + ' hrs' : '...'}</td><td class="p-2"><div class="flex flex-col sm:flex-row items-start sm:items-center gap-2">${/* UPDATED */''}<button class="edit-btn font-medium text-blue-600 hover:underline" data-id="${e.id}">Edit</button><button class="delete-btn font-medium text-red-600 hover:underline" data-id="${e.id}">Delete</button></div></td></tr>`).join('')}</tbody></table></div></div>
|
||||
<div class="bg-white rounded-xl shadow-md p-6"><h3 class="text-xl font-bold text-gray-700 mb-4">User & Payroll Management</h3><div class="grid md:grid-cols-2 gap-6"><form id="create-user-form" class="space-y-3 bg-gray-50 p-4 rounded-lg"><h4 class="font-semibold">Create User</h4><input type="text" id="new-username" placeholder="Username" class="w-full p-2 border rounded" required><input type="password" id="new-password" placeholder="Password" class="w-full p-2 border rounded" required><select id="new-user-role" class="w-full p-2 border rounded"><option value="employee">Employee</option><option value="admin">Admin</option></select><button type="submit" class="w-full bg-green-600 text-white p-2 rounded hover:bg-green-700">Create User</button></form><form id="add-punch-form" class="space-y-3 bg-gray-50 p-4 rounded-lg"><h4 class="font-semibold">Add Manual Punch</h4><select id="add-punch-user" class="w-full p-2 border rounded" required>${allUsers.map(u => `<option value="${u.id}" data-username="${u.username}">${u.username}</option>`).join('')}</select><label class="text-sm">In:</label><input type="datetime-local" id="add-punch-in" class="w-full p-2 border rounded" required><label class="text-sm">Out:</label><input type="datetime-local" id="add-punch-out" class="w-full p-2 border rounded" required><button type="submit" class="w-full bg-purple-600 text-white p-2 rounded hover:bg-purple-700">Add Punch</button></form></div><div class="mt-6"><h4 class="font-semibold mb-2">Manage Users</h4><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Username</th><th class="p-2">Role</th><th class="p-2">Actions</th></tr></thead><tbody>${allUsers.map(u => `<tr class="border-t"><td class="p-2 font-medium">${u.username}</td><td class="p-2 capitalize">${u.role}</td><td class="p-2"><div class="flex flex-col sm:flex-row items-start sm:items-center gap-2">${/* UPDATED */''}${u.isPrimary ? `<span class="text-sm text-gray-500">Primary Admin</span>` : `<button class="reset-pw-btn font-medium text-blue-600 hover:underline" data-username="${u.username}">Reset PW</button><button class="change-role-btn font-medium text-purple-600 hover:underline" data-username="${u.username}" data-role="${u.role}">${u.role === 'admin' ? 'Demote' : 'Promote'}</button>${u.username !== user.username ? `<button class="delete-user-btn font-medium text-red-600 hover:underline" data-username="${u.username}">Delete</button>` : ''}`}</div></td></tr>`).join('')}</tbody></table></div></div></div>
|
||||
</div>`;
|
||||
punchedInEntries.forEach(entry => { const durationCell = document.getElementById(`admin-duration-${entry.id}`); if (durationCell) { const punchInTime = new Date(entry.punch_in_time); const intervalId = setInterval(() => { durationCell.textContent = formatDuration(Date.now() - punchInTime.getTime()); }, 1000); adminTimerIntervals.push(intervalId); } });
|
||||
document.getElementById('archive-btn').addEventListener('click', handleArchive); document.getElementById('view-archives-btn').addEventListener('click', renderArchiveView); document.getElementById('view-time-off-history-btn').addEventListener('click', renderTimeOffHistoryView); document.getElementById('create-user-form').addEventListener('submit', handleCreateUser); document.getElementById('add-punch-form').addEventListener('submit', handleAddPunch); document.getElementById('admin-dashboard').addEventListener('click', handleAdminDashboardClick);
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById('archive-btn').addEventListener('click', handleArchive);
|
||||
document.getElementById('view-archives-btn').addEventListener('click', renderArchiveView);
|
||||
document.getElementById('view-time-off-history-btn').addEventListener('click', renderTimeOffHistoryView);
|
||||
document.getElementById('create-user-form').addEventListener('submit', handleCreateUser);
|
||||
document.getElementById('add-punch-form').addEventListener('submit', handleAddPunch);
|
||||
document.getElementById('admin-dashboard').addEventListener('click', handleAdminDashboardClick);
|
||||
}
|
||||
|
||||
function renderArchiveView() {
|
||||
apiCall('/admin/archives').then(res => {
|
||||
if (!res.success) return;
|
||||
showView('archive');
|
||||
mainViews.archive.innerHTML = `
|
||||
<div class="max-w-6xl mx-auto bg-white rounded-xl shadow-md p-6">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<h2 class="text-2xl font-bold">Archived Logs</h2>
|
||||
<button id="back-to-dash-btn" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">Back to Dashboard</button>
|
||||
</div>
|
||||
<div class="overflow-x-auto border rounded-lg">
|
||||
<table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">In</th><th class="p-2">Out</th><th class="p-2">Duration (Hrs)</th><th class="p-2">Archived On</th></tr></thead>
|
||||
<tbody>${res.data.map(e => `<tr class="border-t"><td class="p-2">${e.username||'N/A'}</td><td class="p-2">${formatDateTime(e.punch_in_time)}</td><td class="p-2">${formatDateTime(e.punch_out_time)}</td><td class="p-2">${formatDecimal(new Date(e.punch_out_time) - new Date(e.punch_in_time))}</td><td class="p-2">${formatDateTime(e.archived_at)}</td></tr>`).join('') || '<tr><td colspan="5" class="text-center p-4">No archived entries found.</td></tr>'}</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>`;
|
||||
<div class="max-w-6xl mx-auto bg-white rounded-xl shadow-md p-6"><div class="flex justify-between items-center mb-4"><h2 class="text-2xl font-bold">Archived Logs</h2><button id="back-to-dash-btn" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">Back to Dashboard</button></div><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">In</th><th class="p-2">Out</th><th class="p-2">Duration (Hrs)</th><th class="p-2">Archived On</th></tr></thead><tbody>${res.data.map(e => `<tr class="border-t"><td class="p-2">${e.username||'N/A'}</td><td class="p-2">${formatDateTime(e.punch_in_time)}</td><td class="p-2">${formatDateTime(e.punch_out_time)}</td><td class="p-2">${formatDecimal(new Date(e.punch_out_time) - new Date(e.punch_in_time))}</td><td class="p-2">${formatDateTime(e.archived_at)}</td></tr>`).join('') || '<tr><td colspan="5" class="text-center p-4">No archived entries found.</td></tr>'}</tbody></table></div></div>`;
|
||||
document.getElementById('back-to-dash-btn').addEventListener('click', () => { showView('admin'); renderAdminDashboard(); });
|
||||
});
|
||||
}
|
||||
@ -333,34 +248,13 @@ const showView = (viewName) => {
|
||||
if (!res.success) return;
|
||||
showView('timeOffHistory');
|
||||
mainViews.timeOffHistory.innerHTML = `
|
||||
<div class="max-w-6xl mx-auto bg-white rounded-xl shadow-md p-6">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<h2 class="text-2xl font-bold">Time Off History</h2>
|
||||
<button id="back-to-dash-btn" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">Back to Dashboard</button>
|
||||
</div>
|
||||
<div class="overflow-x-auto border rounded-lg">
|
||||
<table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Status</th></tr></thead>
|
||||
<tbody>${res.data.map(r => `<tr class="border-t"><td class="p-2">${r.username}</td><td class="p-2">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason||''}</td><td class="p-2 font-medium capitalize text-${r.status === 'approved' ? 'green' : 'red'}-600">${r.status}</td></tr>`).join('') || '<tr><td colspan="4" class="text-center p-4">No history.</td></tr>'}</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>`;
|
||||
<div class="max-w-6xl mx-auto bg-white rounded-xl shadow-md p-6"><div class="flex justify-between items-center mb-4"><h2 class="text-2xl font-bold">Time Off History</h2><button id="back-to-dash-btn" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">Back to Dashboard</button></div><div class="overflow-x-auto border rounded-lg"><table class="min-w-full text-sm text-left"><thead class="bg-gray-50"><tr><th class="p-2">Employee</th><th class="p-2">Dates</th><th class="p-2">Reason</th><th class="p-2">Status</th></tr></thead><tbody>${res.data.map(r => `<tr class="border-t"><td class="p-2">${r.username}</td><td class="p-2 whitespace-nowrap">${formatDate(r.start_date)} - ${formatDate(r.end_date)}</td><td class="p-2">${r.reason||''}</td><td class="p-2 font-medium capitalize text-${r.status === 'approved' ? 'green' : 'red'}-600">${r.status}</td></tr>`).join('') || '<tr><td colspan="4" class="text-center p-4">No history.</td></tr>'}</tbody></table></div></div>`;
|
||||
document.getElementById('back-to-dash-btn').addEventListener('click', () => { showView('admin'); renderAdminDashboard(); });
|
||||
});
|
||||
}
|
||||
|
||||
function renderModal(title, formHTML, submitHandler) {
|
||||
modalContainer.innerHTML = `
|
||||
<div class="modal-overlay">
|
||||
<div class="modal-content">
|
||||
<h3 class="text-xl font-bold mb-4">${title}</h3>
|
||||
<form id="modal-form" class="space-y-4">${formHTML}
|
||||
<div class="flex justify-end space-x-2 pt-4">
|
||||
<button type="button" class="cancel-modal-btn px-4 py-2 bg-gray-300 rounded-lg hover:bg-gray-400">Cancel</button>
|
||||
<button type="submit" class="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700">Save</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>`;
|
||||
modalContainer.innerHTML = `<div class="modal-overlay" role="dialog" aria-modal="true"><div class="modal-content"><h3 class="text-xl font-bold mb-4">${title}</h3><form id="modal-form" class="space-y-4">${formHTML}<div class="flex justify-end space-x-2 pt-4"><button type="button" class="cancel-modal-btn px-4 py-2 bg-gray-300 rounded-lg hover:bg-gray-400">Cancel</button><button type="submit" class="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700">Save</button></div></form></div></div>`;
|
||||
document.getElementById('modal-form').addEventListener('submit', submitHandler);
|
||||
document.querySelector('.cancel-modal-btn').addEventListener('click', () => modalContainer.innerHTML = '');
|
||||
document.querySelector('.modal-overlay').addEventListener('click', (e) => { if (e.target === e.currentTarget) modalContainer.innerHTML = ''; });
|
||||
@ -369,56 +263,27 @@ const showView = (viewName) => {
|
||||
function renderEditModal(id) {
|
||||
const entry = allTimeEntries.find(e => e.id == id);
|
||||
if (!entry) { showMessage('Could not find entry to edit.', 'error'); return; }
|
||||
const formHTML = `
|
||||
<input type="hidden" id="edit-id" value="${entry.id}">
|
||||
<div><label class="font-medium">Punch In</label><input type="datetime-local" id="edit-in" value="${toLocalISO(entry.punch_in_time)}" class="w-full p-2 border rounded" required></div>
|
||||
<div><label class="font-medium">Punch Out</label><input type="datetime-local" id="edit-out" value="${toLocalISO(entry.punch_out_time)}" class="w-full p-2 border rounded"></div>`;
|
||||
const formHTML = `<input type="hidden" id="edit-id" value="${entry.id}"><div><label class="font-medium">Punch In</label><input type="datetime-local" id="edit-in" value="${toLocalISO(entry.punch_in_time)}" class="w-full p-2 border rounded" required></div><div><label class="font-medium">Punch Out</label><input type="datetime-local" id="edit-out" value="${toLocalISO(entry.punch_out_time)}" class="w-full p-2 border rounded"></div>`;
|
||||
renderModal(`Edit Entry for ${entry.username}`, formHTML, handleEditSubmit);
|
||||
}
|
||||
|
||||
function renderChangePasswordModal() {
|
||||
const formHTML = `
|
||||
<input type="password" id="modal-current-pw" placeholder="Current Password" class="w-full p-2 border rounded" required>
|
||||
<input type="password" id="modal-new-pw" placeholder="New Password" class="w-full p-2 border rounded" required>`;
|
||||
const formHTML = `<input type="password" id="modal-current-pw" placeholder="Current Password" class="w-full p-2 border rounded" required><input type="password" id="modal-new-pw" placeholder="New Password" class="w-full p-2 border rounded" required>`;
|
||||
renderModal('Change My Password', formHTML, handleChangePassword);
|
||||
}
|
||||
|
||||
function renderResetPasswordModal(username) {
|
||||
const formHTML = `
|
||||
<input type="hidden" id="reset-username" value="${username}">
|
||||
<input type="password" id="reset-new-pw" placeholder="New Password" class="w-full p-2 border rounded" required>`;
|
||||
const formHTML = `<input type="hidden" id="reset-username" value="${username}"><input type="password" id="reset-new-pw" placeholder="New Password" class="w-full p-2 border rounded" required>`;
|
||||
renderModal(`Reset Password for ${username}`, formHTML, handleResetPassword);
|
||||
}
|
||||
|
||||
// --- Event Handlers ---
|
||||
async function handleAuthSubmit(e) {
|
||||
e.preventDefault();
|
||||
const username = e.target.elements.username.value;
|
||||
const password = e.target.elements.password.value;
|
||||
const res = await apiCall('/login', 'POST', { username, password });
|
||||
if (res.success) {
|
||||
authToken = res.data.token;
|
||||
user = res.data.user;
|
||||
localStorage.setItem('authToken', authToken);
|
||||
localStorage.setItem('user', JSON.stringify(user));
|
||||
updateUI();
|
||||
}
|
||||
}
|
||||
|
||||
const handleSignOut = (message) => {
|
||||
localStorage.clear();
|
||||
authToken = null;
|
||||
user = null;
|
||||
updateUI();
|
||||
if (message) showMessage(message, 'success');
|
||||
};
|
||||
|
||||
// --- Event Handlers (no changes needed below this line, but included for completeness) ---
|
||||
async function handleAuthSubmit(e) { e.preventDefault(); const username = e.target.elements.username.value; const password = e.target.elements.password.value; const res = await apiCall('/login', 'POST', { username, password }); if (res.success) { authToken = res.data.token; user = res.data.user; localStorage.setItem('authToken', authToken); localStorage.setItem('user', JSON.stringify(user)); updateUI(); } }
|
||||
const handleSignOut = (message) => { localStorage.clear(); authToken = null; user = null; updateUI(); if (message) showMessage(message, 'success'); };
|
||||
const handlePunch = () => apiCall('/punch', 'POST').then(res => res.success && renderEmployeeDashboard());
|
||||
|
||||
function handleAdminDashboardClick(e) {
|
||||
const target = e.target;
|
||||
const { id, userid, username, role } = target.dataset;
|
||||
|
||||
if (target.classList.contains('edit-btn')) renderEditModal(id);
|
||||
if (target.classList.contains('delete-btn') && confirm('Are you sure you want to delete this time entry?')) apiCall(`/admin/logs/${id}`, 'DELETE').then(res => res.success && renderAdminDashboard());
|
||||
if (target.classList.contains('force-clock-out-btn') && confirm(`Are you sure you want to force clock out ${username}?`)) apiCall('/admin/force-clock-out', 'POST', { userId: userid }).then(res => res.success && renderAdminDashboard());
|
||||
@ -428,111 +293,18 @@ const showView = (viewName) => {
|
||||
if (target.classList.contains('approve-request-btn')) { if (confirm('Set this request to "approved"?')) apiCall('/admin/update-time-off-status', 'POST', { requestId: id, status: 'approved' }).then(res => res.success && renderAdminDashboard()); }
|
||||
if (target.classList.contains('deny-request-btn')) { if (confirm('Set this request to "denied"?')) apiCall('/admin/update-time-off-status', 'POST', { requestId: id, status: 'denied' }).then(res => res.success && renderAdminDashboard()); }
|
||||
}
|
||||
|
||||
async function handleEditSubmit(e) {
|
||||
e.preventDefault();
|
||||
const id = e.target.elements['edit-id'].value;
|
||||
const punch_in_time = new Date(e.target.elements['edit-in'].value).toISOString();
|
||||
const punch_out_value = e.target.elements['edit-out'].value;
|
||||
const punch_out_time = punch_out_value ? new Date(punch_out_value).toISOString() : null;
|
||||
const res = await apiCall(`/admin/logs/${id}`, 'PUT', { punch_in_time, punch_out_time });
|
||||
if (res.success) {
|
||||
modalContainer.innerHTML = '';
|
||||
renderAdminDashboard();
|
||||
showMessage('Entry updated successfully.', 'success');
|
||||
}
|
||||
}
|
||||
|
||||
const handleArchive = () => {
|
||||
if (confirm('Are you sure you want to archive all completed time entries? This action cannot be undone.')) {
|
||||
apiCall('/admin/archive', 'POST').then(res => {
|
||||
if(res.success) {
|
||||
showMessage('Records archived successfully.', 'success');
|
||||
renderAdminDashboard();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
async function handleCreateUser(e) {
|
||||
e.preventDefault();
|
||||
const username = e.target.elements['new-username'].value;
|
||||
const password = e.target.elements['new-password'].value;
|
||||
const role = e.target.elements['new-user-role'].value;
|
||||
const res = await apiCall('/admin/create-user', 'POST', { username, password, role });
|
||||
if (res.success) {
|
||||
showMessage(res.data.message, 'success');
|
||||
e.target.reset();
|
||||
renderAdminDashboard();
|
||||
}
|
||||
}
|
||||
|
||||
async function handleChangePassword(e) {
|
||||
e.preventDefault();
|
||||
const currentPassword = e.target.elements['modal-current-pw'].value;
|
||||
const newPassword = e.target.elements['modal-new-pw'].value;
|
||||
const res = await apiCall('/user/change-password', 'POST', { currentPassword, newPassword });
|
||||
if (res.success) {
|
||||
showMessage(res.data.message, 'success');
|
||||
modalContainer.innerHTML = '';
|
||||
}
|
||||
}
|
||||
|
||||
async function handleResetPassword(e) {
|
||||
e.preventDefault();
|
||||
const username = e.target.elements['reset-username'].value;
|
||||
const newPassword = e.target.elements['reset-new-pw'].value;
|
||||
const res = await apiCall('/admin/reset-password', 'POST', { username, newPassword });
|
||||
if (res.success) {
|
||||
showMessage(res.data.message, 'success');
|
||||
modalContainer.innerHTML = '';
|
||||
}
|
||||
}
|
||||
|
||||
async function handleAddPunch(e) {
|
||||
e.preventDefault();
|
||||
const selected = e.target.elements['add-punch-user'];
|
||||
const userId = selected.value;
|
||||
const username = selected.options[selected.selectedIndex].dataset.username;
|
||||
const punchInTime = new Date(e.target.elements['add-punch-in'].value).toISOString();
|
||||
const punchOutTime = new Date(e.target.elements['add-punch-out'].value).toISOString();
|
||||
const res = await apiCall('/admin/add-punch', 'POST', { userId, username, punchInTime, punchOutTime });
|
||||
if (res.success) {
|
||||
showMessage(res.data.message, 'success');
|
||||
e.target.reset();
|
||||
renderAdminDashboard();
|
||||
}
|
||||
}
|
||||
|
||||
async function handleTimeOffRequest(e) {
|
||||
e.preventDefault();
|
||||
const startDate = e.target.elements['start-date'].value;
|
||||
const endDate = e.target.elements['end-date'].value;
|
||||
const reason = e.target.elements['reason'].value;
|
||||
if (new Date(endDate) < new Date(startDate)) {
|
||||
return showMessage('End date cannot be before start date.', 'error');
|
||||
}
|
||||
const res = await apiCall('/user/request-time-off', 'POST', { startDate, endDate, reason });
|
||||
if (res.success) {
|
||||
showMessage(res.data.message, 'success');
|
||||
e.target.reset();
|
||||
renderEmployeeDashboard();
|
||||
}
|
||||
}
|
||||
async function handleEditSubmit(e) { e.preventDefault(); const id = e.target.elements['edit-id'].value; const punch_in_time = new Date(e.target.elements['edit-in'].value).toISOString(); const punch_out_value = e.target.elements['edit-out'].value; const punch_out_time = punch_out_value ? new Date(punch_out_value).toISOString() : null; const res = await apiCall(`/admin/logs/${id}`, 'PUT', { punch_in_time, punch_out_time }); if (res.success) { modalContainer.innerHTML = ''; renderAdminDashboard(); showMessage('Entry updated successfully.', 'success'); } }
|
||||
const handleArchive = () => { if (confirm('Are you sure you want to archive all completed time entries? This action cannot be undone.')) { apiCall('/admin/archive', 'POST').then(res => { if(res.success) { showMessage('Records archived successfully.', 'success'); renderAdminDashboard(); } }); } };
|
||||
async function handleCreateUser(e) { e.preventDefault(); const username = e.target.elements['new-username'].value; const password = e.target.elements['new-password'].value; const role = e.target.elements['new-user-role'].value; const res = await apiCall('/admin/create-user', 'POST', { username, password, role }); if (res.success) { showMessage(res.data.message, 'success'); e.target.reset(); renderAdminDashboard(); } }
|
||||
async function handleChangePassword(e) { e.preventDefault(); const currentPassword = e.target.elements['modal-current-pw'].value; const newPassword = e.target.elements['modal-new-pw'].value; const res = await apiCall('/user/change-password', 'POST', { currentPassword, newPassword }); if (res.success) { showMessage(res.data.message, 'success'); modalContainer.innerHTML = ''; } }
|
||||
async function handleResetPassword(e) { e.preventDefault(); const username = e.target.elements['reset-username'].value; const newPassword = e.target.elements['reset-new-pw'].value; const res = await apiCall('/admin/reset-password', 'POST', { username, newPassword }); if (res.success) { showMessage(res.data.message, 'success'); modalContainer.innerHTML = ''; } }
|
||||
async function handleAddPunch(e) { e.preventDefault(); const selected = e.target.elements['add-punch-user']; const userId = selected.value; const username = selected.options[selected.selectedIndex].dataset.username; const punchInTime = new Date(e.target.elements['add-punch-in'].value).toISOString(); const punchOutTime = new Date(e.target.elements['add-punch-out'].value).toISOString(); const res = await apiCall('/admin/add-punch', 'POST', { userId, username, punchInTime, punchOutTime }); if (res.success) { showMessage(res.data.message, 'success'); e.target.reset(); renderAdminDashboard(); } }
|
||||
async function handleTimeOffRequest(e) { e.preventDefault(); const startDate = e.target.elements['start-date'].value; const endDate = e.target.elements['end-date'].value; const reason = e.target.elements['reason'].value; if (new Date(endDate) < new Date(startDate)) { return showMessage('End date cannot be before start date.', 'error'); } const res = await apiCall('/user/request-time-off', 'POST', { startDate, endDate, reason }); if (res.success) { showMessage(res.data.message, 'success'); e.target.reset(); renderEmployeeDashboard(); } }
|
||||
|
||||
// --- Initializer ---
|
||||
signOutBtn.addEventListener('click', () => handleSignOut('You have been signed out.'));
|
||||
|
||||
// Adds a listener to refresh data when the tab becomes visible again
|
||||
document.addEventListener('visibilitychange', () => {
|
||||
if (document.visibilityState === 'visible' && user) {
|
||||
console.log("Tab is visible, refreshing UI.");
|
||||
updateUI();
|
||||
}
|
||||
});
|
||||
|
||||
// Initial load
|
||||
updateUI();
|
||||
document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'visible' && user) { console.log("Tab is visible, refreshing UI."); updateUI(); } });
|
||||
updateUI(); // Initial load
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user