Add phone column to team table, add duplicate cleanup script
- Replace Role column with Phone column in team table - Add formatPhone() helper to format phone numbers nicely - Add cleanupDuplicateEmployees.cfm admin script to remove duplicates Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
b9f5eb834f
commit
e586a62a95
4 changed files with 107 additions and 3 deletions
|
|
@ -183,6 +183,7 @@ if (len(request._api_path)) {
|
||||||
if (findNoCase("/api/admin/createChatMessagesTable.cfm", request._api_path)) request._api_isPublic = true;
|
if (findNoCase("/api/admin/createChatMessagesTable.cfm", request._api_path)) request._api_isPublic = true;
|
||||||
if (findNoCase("/api/admin/addTaskSourceColumns.cfm", request._api_path)) request._api_isPublic = true;
|
if (findNoCase("/api/admin/addTaskSourceColumns.cfm", request._api_path)) request._api_isPublic = true;
|
||||||
if (findNoCase("/api/admin/debugChatMessages.cfm", request._api_path)) request._api_isPublic = true;
|
if (findNoCase("/api/admin/debugChatMessages.cfm", request._api_path)) request._api_isPublic = true;
|
||||||
|
if (findNoCase("/api/admin/cleanupDuplicateEmployees.cfm", request._api_path)) request._api_isPublic = true;
|
||||||
|
|
||||||
// Setup/Import endpoints
|
// Setup/Import endpoints
|
||||||
if (findNoCase("/api/setup/importBusiness.cfm", request._api_path)) request._api_isPublic = true;
|
if (findNoCase("/api/setup/importBusiness.cfm", request._api_path)) request._api_isPublic = true;
|
||||||
|
|
|
||||||
89
api/admin/cleanupDuplicateEmployees.cfm
Normal file
89
api/admin/cleanupDuplicateEmployees.cfm
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
<cfsetting showdebugoutput="false">
|
||||||
|
<cfsetting enablecfoutputonly="true">
|
||||||
|
<cfcontent type="application/json; charset=utf-8" reset="true">
|
||||||
|
|
||||||
|
<cfscript>
|
||||||
|
/*
|
||||||
|
Clean up duplicate employee records for a business
|
||||||
|
POST: { "BusinessID": 17 }
|
||||||
|
*/
|
||||||
|
|
||||||
|
function apiAbort(required struct payload) {
|
||||||
|
writeOutput(serializeJSON(payload));
|
||||||
|
abort;
|
||||||
|
}
|
||||||
|
|
||||||
|
function readJsonBody() {
|
||||||
|
var raw = getHttpRequestData().content;
|
||||||
|
if (isNull(raw)) raw = "";
|
||||||
|
if (!len(trim(raw))) return {};
|
||||||
|
try {
|
||||||
|
var data = deserializeJSON(raw);
|
||||||
|
if (isStruct(data)) return data;
|
||||||
|
} catch (any e) {}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
data = readJsonBody();
|
||||||
|
businessId = structKeyExists(data, "BusinessID") ? val(data.BusinessID) : 0;
|
||||||
|
|
||||||
|
if (businessId <= 0) {
|
||||||
|
apiAbort({ "OK": false, "ERROR": "BusinessID required" });
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Find duplicate UserIDs for this business (keep the one with highest status or oldest)
|
||||||
|
qDupes = queryExecute("
|
||||||
|
SELECT UserID, COUNT(*) as cnt, MIN(EmployeeID) as keepId
|
||||||
|
FROM lt_Users_Businesses_Employees
|
||||||
|
WHERE BusinessID = ?
|
||||||
|
GROUP BY UserID
|
||||||
|
HAVING COUNT(*) > 1
|
||||||
|
", [{ value: businessId, cfsqltype: "cf_sql_integer" }], { datasource: "payfrit" });
|
||||||
|
|
||||||
|
deleted = 0;
|
||||||
|
for (row in qDupes) {
|
||||||
|
// Delete all but the one we want to keep (the one with lowest EmployeeID)
|
||||||
|
qDel = queryExecute("
|
||||||
|
DELETE FROM lt_Users_Businesses_Employees
|
||||||
|
WHERE BusinessID = ? AND UserID = ? AND EmployeeID != ?
|
||||||
|
", [
|
||||||
|
{ value: businessId, cfsqltype: "cf_sql_integer" },
|
||||||
|
{ value: row.UserID, cfsqltype: "cf_sql_integer" },
|
||||||
|
{ value: row.keepId, cfsqltype: "cf_sql_integer" }
|
||||||
|
], { datasource: "payfrit" });
|
||||||
|
deleted += (row.cnt - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get remaining employees
|
||||||
|
qRemaining = queryExecute("
|
||||||
|
SELECT e.EmployeeID, e.UserID, u.UserFirstName, u.UserLastName
|
||||||
|
FROM lt_Users_Businesses_Employees e
|
||||||
|
JOIN Users u ON e.UserID = u.UserID
|
||||||
|
WHERE e.BusinessID = ?
|
||||||
|
ORDER BY e.EmployeeID
|
||||||
|
", [{ value: businessId, cfsqltype: "cf_sql_integer" }], { datasource: "payfrit" });
|
||||||
|
|
||||||
|
remaining = [];
|
||||||
|
for (r in qRemaining) {
|
||||||
|
arrayAppend(remaining, {
|
||||||
|
"EmployeeID": r.EmployeeID,
|
||||||
|
"UserID": r.UserID,
|
||||||
|
"Name": trim(r.UserFirstName & " " & r.UserLastName)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
writeOutput(serializeJSON({
|
||||||
|
"OK": true,
|
||||||
|
"DUPLICATES_FOUND": qDupes.recordCount,
|
||||||
|
"DELETED": deleted,
|
||||||
|
"REMAINING": remaining
|
||||||
|
}));
|
||||||
|
|
||||||
|
} catch (any e) {
|
||||||
|
apiAbort({
|
||||||
|
"OK": false,
|
||||||
|
"ERROR": e.message
|
||||||
|
});
|
||||||
|
}
|
||||||
|
</cfscript>
|
||||||
|
|
@ -320,7 +320,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Email</th>
|
<th>Email</th>
|
||||||
<th>Role</th>
|
<th>Phone</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -424,6 +424,6 @@
|
||||||
<!-- Toast Container -->
|
<!-- Toast Container -->
|
||||||
<div class="toast-container" id="toastContainer"></div>
|
<div class="toast-container" id="toastContainer"></div>
|
||||||
|
|
||||||
<script src="portal.js?v=4"></script>
|
<script src="portal.js?v=5"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -374,6 +374,20 @@ const Portal = {
|
||||||
return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
|
return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// Format phone number
|
||||||
|
formatPhone(phone) {
|
||||||
|
if (!phone) return '-';
|
||||||
|
// Remove all non-digits
|
||||||
|
const digits = phone.replace(/\D/g, '');
|
||||||
|
if (digits.length === 10) {
|
||||||
|
return `(${digits.slice(0,3)}) ${digits.slice(3,6)}-${digits.slice(6)}`;
|
||||||
|
}
|
||||||
|
if (digits.length === 11 && digits[0] === '1') {
|
||||||
|
return `(${digits.slice(1,4)}) ${digits.slice(4,7)}-${digits.slice(7)}`;
|
||||||
|
}
|
||||||
|
return phone;
|
||||||
|
},
|
||||||
|
|
||||||
// Load menu - show menu builder options
|
// Load menu - show menu builder options
|
||||||
async loadMenu() {
|
async loadMenu() {
|
||||||
console.log('[Portal] Loading menu...');
|
console.log('[Portal] Loading menu...');
|
||||||
|
|
@ -528,7 +542,7 @@ const Portal = {
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td>${member.Email || '-'}</td>
|
<td>${member.Email || '-'}</td>
|
||||||
<td>${member.StatusName || 'Unknown'}</td>
|
<td>${this.formatPhone(member.Phone)}</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="status-badge ${member.IsActive ? 'active' : 'inactive'}">
|
<span class="status-badge ${member.IsActive ? 'active' : 'inactive'}">
|
||||||
${member.IsActive ? 'Active' : 'Inactive'}
|
${member.IsActive ? 'Active' : 'Inactive'}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue