`;
}).join('');
}
-function editUser(userId) {
+function getRoleBadgeClass(role) {
+ switch (role) {
+ case 'admin': return 'danger';
+ case 'manager': return 'warning';
+ default: return 'secondary';
+ }
+}
+
+async function editUser(userId) {
const user = users.find(u => u.id === userId);
if (!user) return;
+ // Populate form
document.getElementById('userId').value = user.id;
- document.getElementById('editName').value = user.name;
+ document.getElementById('editName').value = user.name || '';
document.getElementById('editEmail').value = user.email;
document.getElementById('editRole').value = user.role;
- document.getElementById('editOffice').value = user.office_id || '';
document.getElementById('editQuota').value = user.manager_parking_quota || 0;
document.getElementById('editPrefix').value = user.manager_spot_prefix || '';
- const isManager = user.role === 'manager';
+ // Populate manager dropdown
+ const managerSelect = document.getElementById('editManager');
+ managerSelect.innerHTML = '';
+ managers.forEach(m => {
+ if (m.id !== userId) { // Can't be own manager
+ const option = document.createElement('option');
+ option.value = m.id;
+ option.textContent = m.name;
+ if (m.id === user.manager_id) option.selected = true;
+ managerSelect.appendChild(option);
+ }
+ });
- // Show/hide manager fields based on role
- document.getElementById('quotaGroup').style.display = isManager ? 'block' : 'none';
- document.getElementById('prefixGroup').style.display = isManager ? 'block' : 'none';
- document.getElementById('managedOfficesGroup').style.display = isManager ? 'block' : 'none';
+ // Handle LDAP restrictions
+ const isLdap = user.is_ldap_user;
+ const isLdapAdmin = user.is_ldap_admin;
- // Build managed offices checkboxes
- const checkboxContainer = document.getElementById('managedOfficesCheckboxes');
- const userManagedOffices = managedOfficesMap[userId] || [];
- checkboxContainer.innerHTML = offices.map(office => `
-
- `).join('');
+ // LDAP notice
+ document.getElementById('ldapNotice').style.display = isLdap ? 'block' : 'none';
+ // Name field - disabled for LDAP users
+ const nameInput = document.getElementById('editName');
+ nameInput.disabled = isLdap;
+ document.getElementById('nameHelp').style.display = isLdap ? 'block' : 'none';
+
+ // Role field - admin option disabled for LDAP admins (they can't be demoted)
+ const roleSelect = document.getElementById('editRole');
+ roleSelect.disabled = isLdapAdmin;
+ document.getElementById('roleHelp').style.display = isLdapAdmin ? 'block' : 'none';
+
+ // Manager group - show for all users (admins can also be assigned to a manager)
+ document.getElementById('managerGroup').style.display = 'block';
+
+ // Manager fields - show only for managers
+ document.getElementById('managerFields').style.display = user.role === 'manager' ? 'block' : 'none';
+
+ document.getElementById('userModalTitle').textContent = 'Edit User';
document.getElementById('userModal').style.display = 'flex';
}
@@ -143,14 +140,12 @@ async function deleteUser(userId) {
const user = users.find(u => u.id === userId);
if (!user) return;
- if (!confirm(`Delete user "${user.name}"? This cannot be undone.`)) return;
+ if (!confirm(`Delete user "${user.name || user.email}"?`)) return;
const response = await api.delete(`/api/users/${userId}`);
if (response && response.ok) {
- await loadUsers();
- await loadManagedOffices();
- renderUsers();
utils.showMessage('User deleted', 'success');
+ await loadUsers();
} else {
const error = await response.json();
utils.showMessage(error.detail || 'Failed to delete user', 'error');
@@ -163,22 +158,21 @@ function setupEventListeners() {
renderUsers(e.target.value);
});
- // Modal
+ // Role change - toggle manager fields (manager group always visible since any user can have a manager)
+ document.getElementById('editRole').addEventListener('change', (e) => {
+ const role = e.target.value;
+ document.getElementById('managerFields').style.display = role === 'manager' ? 'block' : 'none';
+ // Manager group stays visible - any user (including admins) can have a manager assigned
+ });
+
+ // Modal close
document.getElementById('closeUserModal').addEventListener('click', () => {
document.getElementById('userModal').style.display = 'none';
});
-
document.getElementById('cancelUser').addEventListener('click', () => {
document.getElementById('userModal').style.display = 'none';
});
-
- // Role change shows/hides manager fields
- document.getElementById('editRole').addEventListener('change', (e) => {
- const isManager = e.target.value === 'manager';
- document.getElementById('quotaGroup').style.display = isManager ? 'block' : 'none';
- document.getElementById('prefixGroup').style.display = isManager ? 'block' : 'none';
- document.getElementById('managedOfficesGroup').style.display = isManager ? 'block' : 'none';
- });
+ utils.setupModalClose('userModal');
// Form submit
document.getElementById('userForm').addEventListener('submit', async (e) => {
@@ -188,60 +182,35 @@ function setupEventListeners() {
const role = document.getElementById('editRole').value;
const data = {
- name: document.getElementById('editName').value,
role: role,
- office_id: document.getElementById('editOffice').value || null
+ manager_id: document.getElementById('editManager').value || null
};
+ // Only include name if not disabled (LDAP users can't change name)
+ const nameInput = document.getElementById('editName');
+ if (!nameInput.disabled) {
+ data.name = nameInput.value;
+ }
+
+ // Manager-specific fields
if (role === 'manager') {
data.manager_parking_quota = parseInt(document.getElementById('editQuota').value) || 0;
- data.manager_spot_prefix = document.getElementById('editPrefix').value.toUpperCase() || null;
+ data.manager_spot_prefix = document.getElementById('editPrefix').value || null;
}
const response = await api.put(`/api/users/${userId}`, data);
if (response && response.ok) {
- // Update managed offices if manager
- if (role === 'manager') {
- await updateManagedOffices(userId);
- }
-
document.getElementById('userModal').style.display = 'none';
- await loadUsers();
- await loadManagedOffices();
- renderUsers();
utils.showMessage('User updated', 'success');
+ await loadManagers(); // Reload in case role changed
+ await loadUsers();
} else {
const error = await response.json();
utils.showMessage(error.detail || 'Failed to update user', 'error');
}
});
-
- utils.setupModalClose('userModal');
}
-async function updateManagedOffices(userId) {
- // Get currently selected offices
- const checkboxes = document.querySelectorAll('input[name="managedOffice"]:checked');
- const selectedOfficeIds = Array.from(checkboxes).map(cb => cb.value);
-
- // Get current managed offices
- const currentOfficeIds = managedOfficesMap[userId] || [];
-
- // Find offices to add and remove
- const toAdd = selectedOfficeIds.filter(id => !currentOfficeIds.includes(id));
- const toRemove = currentOfficeIds.filter(id => !selectedOfficeIds.includes(id));
-
- // Add new memberships
- for (const officeId of toAdd) {
- await api.post(`/api/offices/${officeId}/managers`, { user_id: userId });
- }
-
- // Remove old memberships
- for (const officeId of toRemove) {
- await api.delete(`/api/offices/${officeId}/managers/${userId}`);
- }
-}
-
-// Make functions globally accessible
+// Make functions available globally for onclick handlers
window.editUser = editUser;
window.deleteUser = deleteUser;
diff --git a/frontend/js/api.js b/frontend/js/api.js
index fe29646..896bf4e 100644
--- a/frontend/js/api.js
+++ b/frontend/js/api.js
@@ -26,21 +26,42 @@ const api = {
},
/**
- * Check if user is authenticated
+ * Check if user is authenticated (token or Authelia)
*/
isAuthenticated() {
- return !!this.getToken();
+ return !!this.getToken() || this._autheliaAuth;
+ },
+
+ /**
+ * Check authentication - works with both JWT and Authelia
+ * Call this on page load to verify auth status
+ */
+ async checkAuth() {
+ // Try to get current user - works with Authelia headers or JWT
+ const response = await fetch('/api/auth/me', {
+ headers: this.getToken() ? { 'Authorization': `Bearer ${this.getToken()}` } : {}
+ });
+
+ if (response.ok) {
+ this._autheliaAuth = true;
+ return await response.json();
+ }
+
+ this._autheliaAuth = false;
+ return null;
},
/**
* Redirect to login if not authenticated
+ * Returns user object if authenticated, null otherwise
*/
- requireAuth() {
- if (!this.isAuthenticated()) {
+ async requireAuth() {
+ const user = await this.checkAuth();
+ if (!user) {
window.location.href = '/login';
- return false;
+ return null;
}
- return true;
+ return user;
},
/**
@@ -143,11 +164,11 @@ const api = {
/**
* Register
*/
- async register(email, password, name, officeId = null) {
+ async register(email, password, name) {
const response = await fetch('/api/auth/register', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ email, password, name, office_id: officeId })
+ body: JSON.stringify({ email, password, name })
});
if (response.ok) {
diff --git a/frontend/js/nav.js b/frontend/js/nav.js
index f9de41d..d11b891 100644
--- a/frontend/js/nav.js
+++ b/frontend/js/nav.js
@@ -43,8 +43,8 @@ const ICONS = {
const NAV_ITEMS = [
{ href: '/presence', icon: 'calendar', label: 'My Presence' },
- { href: '/team-calendar', icon: 'users', label: 'Team Calendar', roles: ['admin', 'manager'] },
- { href: '/office-rules', icon: 'rules', label: 'Office Rules', roles: ['admin', 'manager'] },
+ { href: '/team-calendar', icon: 'users', label: 'Team Calendar' },
+ { href: '/team-rules', icon: 'rules', label: 'Team Rules', roles: ['admin', 'manager'] },
{ href: '/admin/users', icon: 'user', label: 'Manage Users', roles: ['admin'] }
];
@@ -77,26 +77,19 @@ async function initNav() {
if (!navContainer) return;
const currentPath = window.location.pathname;
- let userRole = null;
- let currentUser = null;
- // Get user info
- if (api.isAuthenticated()) {
- currentUser = await api.getCurrentUser();
- if (currentUser) {
- userRole = currentUser.role;
- }
- }
+ // Get user info (works with both JWT and Authelia)
+ const currentUser = await api.checkAuth();
// Render navigation
- navContainer.innerHTML = renderNav(currentPath, userRole);
+ navContainer.innerHTML = renderNav(currentPath, currentUser?.role);
// Update user info in sidebar
if (currentUser) {
- const userName = document.getElementById('userName');
- const userRole = document.getElementById('userRole');
- if (userName) userName.textContent = currentUser.name || 'User';
- if (userRole) userRole.textContent = currentUser.role || '-';
+ const userNameEl = document.getElementById('userName');
+ const userRoleEl = document.getElementById('userRole');
+ if (userNameEl) userNameEl.textContent = currentUser.name || 'User';
+ if (userRoleEl) userRoleEl.textContent = currentUser.role || '-';
}
// Setup user menu
diff --git a/frontend/js/presence.js b/frontend/js/presence.js
index 500820f..7d5322f 100644
--- a/frontend/js/presence.js
+++ b/frontend/js/presence.js
@@ -10,9 +10,7 @@ let parkingData = {};
let currentAssignmentId = null;
document.addEventListener('DOMContentLoaded', async () => {
- if (!api.requireAuth()) return;
-
- currentUser = await api.getCurrentUser();
+ currentUser = await api.requireAuth();
if (!currentUser) return;
await Promise.all([loadPresences(), loadParkingAssignments()]);
diff --git a/frontend/js/team-calendar.js b/frontend/js/team-calendar.js
index 2fd5e03..c8eaa59 100644
--- a/frontend/js/team-calendar.js
+++ b/frontend/js/team-calendar.js
@@ -16,17 +16,9 @@ let selectedDate = null;
let currentAssignmentId = null;
document.addEventListener('DOMContentLoaded', async () => {
- if (!api.requireAuth()) return;
-
- currentUser = await api.getCurrentUser();
+ currentUser = await api.requireAuth();
if (!currentUser) return;
- // Only managers and admins can view
- if (currentUser.role === 'employee') {
- window.location.href = '/presence';
- return;
- }
-
// Initialize start date based on week start preference
const weekStartDay = currentUser.week_start_day || 0;
currentStartDate = utils.getWeekStart(new Date(), weekStartDay);
@@ -38,7 +30,7 @@ document.addEventListener('DOMContentLoaded', async () => {
});
async function loadManagers() {
- const response = await api.get('/api/offices/managers/list');
+ const response = await api.get('/api/managers');
if (response && response.ok) {
managers = await response.json();
const select = document.getElementById('managerFilter');
@@ -48,20 +40,32 @@ async function loadManagers() {
if (currentUser.role === 'manager') {
// Manager only sees themselves
filteredManagers = managers.filter(m => m.id === currentUser.id);
+ } else if (currentUser.role === 'employee') {
+ // Employee only sees their own manager
+ if (currentUser.manager_id) {
+ filteredManagers = managers.filter(m => m.id === currentUser.manager_id);
+ } else {
+ filteredManagers = [];
+ }
}
filteredManagers.forEach(manager => {
const option = document.createElement('option');
option.value = manager.id;
- const officeNames = manager.offices.map(o => o.name).join(', ');
- option.textContent = `${manager.name} (${officeNames})`;
+ const userCount = manager.managed_user_count || 0;
+ option.textContent = `${manager.name} (${userCount} users)`;
select.appendChild(option);
});
- // Auto-select if only one manager (for manager role)
+ // Auto-select for managers and employees (they only see their team)
if (filteredManagers.length === 1) {
select.value = filteredManagers[0].id;
}
+
+ // Hide manager filter for employees (they can only see their team)
+ if (currentUser.role === 'employee') {
+ select.style.display = 'none';
+ }
}
}
@@ -129,7 +133,7 @@ function renderCalendar() {
// Build header row
const dayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
- let headerHtml = '
Name
Office
';
+ let headerHtml = '
Name
Manager
';
for (let i = 0; i < dayCount; i++) {
const date = new Date(startDate);
@@ -161,7 +165,7 @@ function renderCalendar() {
teamData.forEach(member => {
bodyHtml += `
${member.name || 'Unknown'}
-
${member.office_name || '-'}
`;
+
${member.manager_name || '-'}
`;
for (let i = 0; i < dayCount; i++) {
const date = new Date(startDate);
@@ -197,16 +201,18 @@ function renderCalendar() {
});
body.innerHTML = bodyHtml;
- // Add click handlers to cells
- body.querySelectorAll('.calendar-cell').forEach(cell => {
- cell.style.cursor = 'pointer';
- cell.addEventListener('click', () => {
- const userId = cell.dataset.userId;
- const date = cell.dataset.date;
- const userName = cell.dataset.userName;
- openDayModal(userId, date, userName);
+ // Add click handlers to cells (only for admins and managers)
+ if (currentUser.role === 'admin' || currentUser.role === 'manager') {
+ body.querySelectorAll('.calendar-cell').forEach(cell => {
+ cell.style.cursor = 'pointer';
+ cell.addEventListener('click', () => {
+ const userId = cell.dataset.userId;
+ const date = cell.dataset.date;
+ const userName = cell.dataset.userName;
+ openDayModal(userId, date, userName);
+ });
});
- });
+ }
}
function openDayModal(userId, dateStr, userName) {
diff --git a/frontend/js/office-rules.js b/frontend/js/team-rules.js
similarity index 83%
rename from frontend/js/office-rules.js
rename to frontend/js/team-rules.js
index c500489..a812ec4 100644
--- a/frontend/js/office-rules.js
+++ b/frontend/js/team-rules.js
@@ -1,8 +1,8 @@
/**
- * Office Rules Page
+ * Team Rules Page
* Manage closing days, parking guarantees, and exclusions
*
- * Rules are set at manager level and apply to all offices managed by that manager.
+ * Rules are set at manager level for their parking pool.
*/
let currentUser = null;
@@ -10,9 +10,7 @@ let selectedManagerId = null;
let managerUsers = [];
document.addEventListener('DOMContentLoaded', async () => {
- if (!api.requireAuth()) return;
-
- currentUser = await api.getCurrentUser();
+ currentUser = await api.requireAuth();
if (!currentUser) return;
// Only managers and admins can access
@@ -26,10 +24,10 @@ document.addEventListener('DOMContentLoaded', async () => {
});
async function loadManagers() {
- const response = await api.get('/api/offices/managers/list');
+ const response = await api.get('/api/managers');
if (response && response.ok) {
const managers = await response.json();
- const select = document.getElementById('officeSelect');
+ const select = document.getElementById('managerSelect');
// Filter to managers this user can see
let filteredManagers = managers;
@@ -45,14 +43,10 @@ async function loadManagers() {
filteredManagers.forEach(manager => {
const option = document.createElement('option');
option.value = manager.id;
- // Show manager name and count of offices
- const officeCount = manager.offices.length;
- const officeNames = manager.offices.map(o => o.name).join(', ');
- if (officeCount > 0) {
- option.textContent = `${manager.name} (${officeNames})`;
- } else {
- option.textContent = `${manager.name} (no offices)`;
- }
+ // Show manager name with user count and parking quota
+ const userCount = manager.managed_user_count || 0;
+ const quota = manager.parking_quota || 0;
+ option.textContent = `${manager.name} (${userCount} users, ${quota} spots)`;
select.appendChild(option);
totalManagers++;
if (!firstManagerId) firstManagerId = manager.id;
@@ -71,12 +65,12 @@ async function selectManager(managerId) {
if (!managerId) {
document.getElementById('rulesContent').style.display = 'none';
- document.getElementById('noOfficeMessage').style.display = 'block';
+ document.getElementById('noManagerMessage').style.display = 'block';
return;
}
document.getElementById('rulesContent').style.display = 'block';
- document.getElementById('noOfficeMessage').style.display = 'none';
+ document.getElementById('noManagerMessage').style.display = 'none';
await Promise.all([
loadWeeklyClosingDays(),
@@ -88,7 +82,7 @@ async function selectManager(managerId) {
}
async function loadWeeklyClosingDays() {
- const response = await api.get(`/api/offices/managers/${selectedManagerId}/weekly-closing-days`);
+ const response = await api.get(`/api/managers/${selectedManagerId}/weekly-closing-days`);
if (response && response.ok) {
const days = await response.json();
const weekdays = days.map(d => d.weekday);
@@ -102,7 +96,7 @@ async function loadWeeklyClosingDays() {
}
async function loadManagerUsers() {
- const response = await api.get(`/api/offices/managers/${selectedManagerId}/users`);
+ const response = await api.get(`/api/managers/${selectedManagerId}/users`);
if (response && response.ok) {
managerUsers = await response.json();
updateUserSelects();
@@ -123,7 +117,7 @@ function updateUserSelects() {
}
async function loadClosingDays() {
- const response = await api.get(`/api/offices/managers/${selectedManagerId}/closing-days`);
+ const response = await api.get(`/api/managers/${selectedManagerId}/closing-days`);
const container = document.getElementById('closingDaysList');
if (response && response.ok) {
@@ -158,7 +152,7 @@ function formatDateRange(startDate, endDate) {
}
async function loadGuarantees() {
- const response = await api.get(`/api/offices/managers/${selectedManagerId}/guarantees`);
+ const response = await api.get(`/api/managers/${selectedManagerId}/guarantees`);
const container = document.getElementById('guaranteesList');
if (response && response.ok) {
@@ -188,7 +182,7 @@ async function loadGuarantees() {
}
async function loadExclusions() {
- const response = await api.get(`/api/offices/managers/${selectedManagerId}/exclusions`);
+ const response = await api.get(`/api/managers/${selectedManagerId}/exclusions`);
const container = document.getElementById('exclusionsList');
if (response && response.ok) {
@@ -220,7 +214,7 @@ async function loadExclusions() {
// Delete functions
async function deleteClosingDay(id) {
if (!confirm('Delete this closing day?')) return;
- const response = await api.delete(`/api/offices/managers/${selectedManagerId}/closing-days/${id}`);
+ const response = await api.delete(`/api/managers/${selectedManagerId}/closing-days/${id}`);
if (response && response.ok) {
await loadClosingDays();
}
@@ -228,7 +222,7 @@ async function deleteClosingDay(id) {
async function deleteGuarantee(id) {
if (!confirm('Remove this parking guarantee?')) return;
- const response = await api.delete(`/api/offices/managers/${selectedManagerId}/guarantees/${id}`);
+ const response = await api.delete(`/api/managers/${selectedManagerId}/guarantees/${id}`);
if (response && response.ok) {
await loadGuarantees();
}
@@ -236,7 +230,7 @@ async function deleteGuarantee(id) {
async function deleteExclusion(id) {
if (!confirm('Remove this parking exclusion?')) return;
- const response = await api.delete(`/api/offices/managers/${selectedManagerId}/exclusions/${id}`);
+ const response = await api.delete(`/api/managers/${selectedManagerId}/exclusions/${id}`);
if (response && response.ok) {
await loadExclusions();
}
@@ -244,7 +238,7 @@ async function deleteExclusion(id) {
function setupEventListeners() {
// Manager selection
- document.getElementById('officeSelect').addEventListener('change', (e) => {
+ document.getElementById('managerSelect').addEventListener('change', (e) => {
selectManager(e.target.value);
});
@@ -255,7 +249,7 @@ function setupEventListeners() {
if (e.target.checked) {
// Add weekly closing day
- const response = await api.post(`/api/offices/managers/${selectedManagerId}/weekly-closing-days`, { weekday });
+ const response = await api.post(`/api/managers/${selectedManagerId}/weekly-closing-days`, { weekday });
if (!response || !response.ok) {
e.target.checked = false;
const error = await response.json();
@@ -263,12 +257,12 @@ function setupEventListeners() {
}
} else {
// Remove weekly closing day - need to find the ID first
- const getResponse = await api.get(`/api/offices/managers/${selectedManagerId}/weekly-closing-days`);
+ const getResponse = await api.get(`/api/managers/${selectedManagerId}/weekly-closing-days`);
if (getResponse && getResponse.ok) {
const days = await getResponse.json();
const day = days.find(d => d.weekday === weekday);
if (day) {
- const deleteResponse = await api.delete(`/api/offices/managers/${selectedManagerId}/weekly-closing-days/${day.id}`);
+ const deleteResponse = await api.delete(`/api/managers/${selectedManagerId}/weekly-closing-days/${day.id}`);
if (!deleteResponse || !deleteResponse.ok) {
e.target.checked = true;
}
@@ -320,7 +314,7 @@ function setupEventListeners() {
date: document.getElementById('closingDate').value,
reason: document.getElementById('closingReason').value || null
};
- const response = await api.post(`/api/offices/managers/${selectedManagerId}/closing-days`, data);
+ const response = await api.post(`/api/managers/${selectedManagerId}/closing-days`, data);
if (response && response.ok) {
document.getElementById('closingDayModal').style.display = 'none';
await loadClosingDays();
@@ -337,7 +331,7 @@ function setupEventListeners() {
start_date: document.getElementById('guaranteeStartDate').value || null,
end_date: document.getElementById('guaranteeEndDate').value || null
};
- const response = await api.post(`/api/offices/managers/${selectedManagerId}/guarantees`, data);
+ const response = await api.post(`/api/managers/${selectedManagerId}/guarantees`, data);
if (response && response.ok) {
document.getElementById('guaranteeModal').style.display = 'none';
await loadGuarantees();
@@ -354,7 +348,7 @@ function setupEventListeners() {
start_date: document.getElementById('exclusionStartDate').value || null,
end_date: document.getElementById('exclusionEndDate').value || null
};
- const response = await api.post(`/api/offices/managers/${selectedManagerId}/exclusions`, data);
+ const response = await api.post(`/api/managers/${selectedManagerId}/exclusions`, data);
if (response && response.ok) {
document.getElementById('exclusionModal').style.display = 'none';
await loadExclusions();
diff --git a/frontend/pages/admin-users.html b/frontend/pages/admin-users.html
index 0f0e931..720f183 100644
--- a/frontend/pages/admin-users.html
+++ b/frontend/pages/admin-users.html
@@ -54,10 +54,7 @@