Compare commits
No commits in common. "e39e53fbdd3cf82b77d21bf6e084c44882aa08bc" and "cd2a0b4b178cf67e55571de84bcdcf2cd6ddc2ce" have entirely different histories.
e39e53fbdd
...
cd2a0b4b17
|
|
@ -179,22 +179,9 @@ router.get('/delete/:cardNumber', async (req, res) => { // Delete ACL entry. Fai
|
|||
});
|
||||
|
||||
router.get('/bulk-add', async (req, res) => { // Render form to bulk add ACL entries
|
||||
doorList = {}
|
||||
await db.query('SHOW COLUMNS FROM ACL;').then(columns => {
|
||||
columns.forEach(col => {
|
||||
if (col.Field !== 'Name' && col.Field !== 'CardNumber' && col.Field !== 'PIN' && col.Field !== 'StartDate' && col.Field !== 'EndDate') {
|
||||
doorList[col.Field] = false;
|
||||
}
|
||||
});
|
||||
}).catch(err => {
|
||||
log.error(`Database error fetching ACL columns: ${err}`);
|
||||
return {};
|
||||
});
|
||||
res.render('acl-bulk-add', { user: req.session.user, doorList });
|
||||
res.render('acl-bulk-add', { user: req.session.user });
|
||||
});
|
||||
|
||||
|
||||
|
||||
router.post('/bulk-add', async (req, res) => { // Process bulk add of ACL entries
|
||||
const data = req.body;
|
||||
if (!Array.isArray(data)) {
|
||||
|
|
@ -243,18 +230,4 @@ router.post('/bulk-add', async (req, res) => { // Process bulk add of ACL entrie
|
|||
return res.status(200).json({ results });
|
||||
});
|
||||
|
||||
router.ws("/bulk-add", (ws, req) => {
|
||||
log.debug(`Client ${req.sessionID} connected to ACL bulk add WebSocket`);
|
||||
if (!req.session.user) {
|
||||
ws.send(JSON.stringify({ error: 'Not authenticated' }))
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
|
||||
global.dbEvent.on('event', (event) => {
|
||||
if (event.EventType != 1 || event.Granted != 0) return; // Only process 'Swipe' events that were denied
|
||||
ws.send(JSON.stringify(event));
|
||||
});
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
|
@ -4,136 +4,139 @@
|
|||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Event Log Viewer</title>
|
||||
<title>Add ACL Entry</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background: #f7f7f7;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.container {
|
||||
/* max-width: 900px; */
|
||||
margin: 40px auto;
|
||||
background: #fff;
|
||||
padding: 32px;
|
||||
form#acl-edit-form {
|
||||
max-width: 500px;
|
||||
margin: 2em auto;
|
||||
padding: 2em;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
|
||||
background: #fafafa;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
h1 {
|
||||
text-align: center;
|
||||
margin-bottom: 32px;
|
||||
color: #333;
|
||||
form#acl-edit-form div {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
table {
|
||||
form#acl-edit-form label {
|
||||
display: block;
|
||||
font-weight: 500;
|
||||
margin-bottom: 0.3em;
|
||||
}
|
||||
|
||||
form#acl-edit-form input[type="text"],
|
||||
form#acl-edit-form input[type="date"] {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin-bottom: 16px;
|
||||
padding: 0.5em;
|
||||
border: 1px solid #bbb;
|
||||
border-radius: 4px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
th,
|
||||
td {
|
||||
padding: 12px 8px;
|
||||
border-bottom: 1px solid #e0e0e0;
|
||||
text-align: left;
|
||||
form#acl-edit-form fieldset {
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
padding: 1em;
|
||||
margin-bottom: 1em;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
th {
|
||||
background: #f0f0f0;
|
||||
color: #444;
|
||||
form#acl-edit-form legend {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
tr:hover {
|
||||
background: #f9f9f9;
|
||||
form#acl-edit-form button[type="submit"] {
|
||||
background: #1976d2;
|
||||
color: #fff;
|
||||
border: none;
|
||||
padding: 0.7em 1.5em;
|
||||
border-radius: 4px;
|
||||
font-size: 1em;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
form#acl-edit-form button[type="submit"]:hover {
|
||||
background: #1565c0;
|
||||
}
|
||||
|
||||
form#acl-edit-form input[type="checkbox"] {
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
const wsUrl = `${wsProtocol}//${location.host}${location.pathname}`;
|
||||
const ws = new WebSocket(wsUrl);
|
||||
|
||||
ws.onmessage = function (event) {
|
||||
// Handle incoming event log messages
|
||||
// Example: append to a table or display in the UI
|
||||
console.log('Event received:', event.data);
|
||||
const tbody = document.querySelector('tbody');
|
||||
const log = JSON.parse(event.data);
|
||||
if (!log || log.EventType != 2 || log.Granted != 0) return; // Only allow denied swipes
|
||||
const tr = document.createElement('tr');
|
||||
tr.innerHTML = `
|
||||
<td><input type="checkbox" /></td>
|
||||
<td>${log.CardNumber}</td>
|
||||
<td>${log.Controller}</td>
|
||||
<td>${log.Door}</td>
|
||||
<td>${new Date(log.Timestamp).toLocaleString()}</td>
|
||||
<td>${log.Name || ''}</td>
|
||||
<td><input type="date" value="${new Date().toISOString().slice(0, 10)}" /></td>
|
||||
<td><input type="date" value="${new Date(Date.now() + 99 * 365.25 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10)}" /></td>
|
||||
<td>
|
||||
<% for (const doorName of Object.keys(doorList)) { %>
|
||||
<label>
|
||||
<input type="checkbox" name="<%= doorName %>" checked />
|
||||
<%= doorName %>
|
||||
</label>
|
||||
<% } %>
|
||||
</td>
|
||||
`;
|
||||
tbody.insertBefore(tr, tbody.firstChild);
|
||||
tr.style.background = 'orange';
|
||||
setTimeout(() => {
|
||||
let opacity = 1;
|
||||
const fade = setInterval(() => {
|
||||
opacity -= 0.05;
|
||||
tr.style.background = `rgba(255,165,0,${opacity})`;
|
||||
if (opacity <= 0.1) {
|
||||
tr.style.background = '';
|
||||
clearInterval(fade);
|
||||
}
|
||||
}, 40);
|
||||
}, 0);
|
||||
};
|
||||
|
||||
ws.onopen = function () {
|
||||
console.log('WebSocket connection established');
|
||||
};
|
||||
|
||||
ws.onclose = function () {
|
||||
console.log('WebSocket connection closed');
|
||||
};
|
||||
|
||||
ws.onerror = function (error) {
|
||||
console.error('WebSocket error:', error);
|
||||
};
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container">
|
||||
<h1>Bulk Credential Adder</h1>
|
||||
<a href="/dashboard">Dashboard</a>
|
||||
<form action="/acl/bulk-add" method="post">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Select</th>
|
||||
<th>Credential</th>
|
||||
<th>Controller</th>
|
||||
<th>Door</th>
|
||||
<th>Data</th>
|
||||
<th>Name</th>
|
||||
<th>Start Date</th>
|
||||
<th>End Date</th>
|
||||
<th>Allowed Doors</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody></tbody>
|
||||
</table>
|
||||
<button type="submit">Add Selected</button>
|
||||
</form>
|
||||
<form id="acl-edit-form" method="patch" action="/acl">
|
||||
<div>
|
||||
<label for="Name">Name:</label>
|
||||
<input type="text" id="Name" name="Name" value="" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="CardNumber">Card Number:</label>
|
||||
<input type="number" id="CardNumber" name="CardNumber" value="" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="PIN">PIN:</label>
|
||||
<input type="text" id="PIN" name="PIN" value="">
|
||||
</div>
|
||||
<div>
|
||||
<label for="StartDate">Start Date:</label>
|
||||
<input type="date" id="StartDate" name="StartDate"
|
||||
value="<%= new Date().toISOString().slice(0,10) %>" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="EndDate">End Date:</label>
|
||||
<input type="date" id="EndDate" name="EndDate"
|
||||
value="<%= new Date(Date.now() + 99*365.25*24*60*60*1000).toISOString().slice(0,10) %>" required>
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend>Doors</legend>
|
||||
<% Object.keys(doorList).forEach(function(door) { %>
|
||||
<div>
|
||||
<label>
|
||||
<input type="checkbox" name="doors[<%= door %>]" value="1" <% if (doorList[door] &&
|
||||
doorList[door]==1) { %> checked <% } %> >
|
||||
<%= door %>
|
||||
<% doorList[door] %>
|
||||
</label>
|
||||
</div>
|
||||
<% }) %>
|
||||
</fieldset>
|
||||
<button type="submit">Save</button>
|
||||
</form>
|
||||
|
||||
<script>
|
||||
document.getElementById('acl-edit-form').addEventListener('submit', function (e) {
|
||||
e.preventDefault();
|
||||
const form = e.target;
|
||||
const formData = new FormData(form);
|
||||
const data = {
|
||||
Name: formData.get('Name'),
|
||||
CardNumber: formData.get('CardNumber'),
|
||||
PIN: formData.get('PIN'),
|
||||
StartDate: formData.get('StartDate'),
|
||||
EndDate: formData.get('EndDate'),
|
||||
doors: {}
|
||||
};
|
||||
<% Object.keys(doorList).forEach(function (door) { %>
|
||||
data.doors['<%= door %>'] = formData.get('doors[<%= door %>]') ? 1 : 0;
|
||||
<% }) %>
|
||||
fetch(form.action, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(data)
|
||||
}).then(res => {
|
||||
if (res.ok) window.location.href = '/acl';
|
||||
else alert('Failed to update ACL entry');
|
||||
}).catch(err => {
|
||||
alert('Error: ' + err.message);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Loading…
Reference in a new issue