From e586a62a95951a5991c798ecde8018351d05a1b8 Mon Sep 17 00:00:00 2001 From: John Mizerek Date: Sun, 11 Jan 2026 17:32:07 -0800 Subject: [PATCH] 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 --- api/Application.cfm | 1 + api/admin/cleanupDuplicateEmployees.cfm | 89 +++++++++++++++++++++++++ portal/index.html | 4 +- portal/portal.js | 16 ++++- 4 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 api/admin/cleanupDuplicateEmployees.cfm diff --git a/api/Application.cfm b/api/Application.cfm index 607f2e6..15a6560 100644 --- a/api/Application.cfm +++ b/api/Application.cfm @@ -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/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/cleanupDuplicateEmployees.cfm", request._api_path)) request._api_isPublic = true; // Setup/Import endpoints if (findNoCase("/api/setup/importBusiness.cfm", request._api_path)) request._api_isPublic = true; diff --git a/api/admin/cleanupDuplicateEmployees.cfm b/api/admin/cleanupDuplicateEmployees.cfm new file mode 100644 index 0000000..c2f5170 --- /dev/null +++ b/api/admin/cleanupDuplicateEmployees.cfm @@ -0,0 +1,89 @@ + + + + + +/* + 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 + }); +} + diff --git a/portal/index.html b/portal/index.html index dd31e5f..5814327 100644 --- a/portal/index.html +++ b/portal/index.html @@ -320,7 +320,7 @@ Name Email - Role + Phone Status Actions @@ -424,6 +424,6 @@
- + diff --git a/portal/portal.js b/portal/portal.js index 1edb5e5..54b6522 100644 --- a/portal/portal.js +++ b/portal/portal.js @@ -374,6 +374,20 @@ const Portal = { 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 async loadMenu() { console.log('[Portal] Loading menu...'); @@ -528,7 +542,7 @@ const Portal = { ${member.Email || '-'} - ${member.StatusName || 'Unknown'} + ${this.formatPhone(member.Phone)} ${member.IsActive ? 'Active' : 'Inactive'}