Remove ShopWorker entity and migrate worker identity to ApplicationUser

Removes the ShopWorker and ShopWorkerRoleCost entities, all related DTOs, mappings, controllers, views, and import/export paths. Worker identity is now handled entirely through ApplicationUser with per-user LaborCostPerHour. ShopWorkerRoleCosts table remains in production pending manual data migration. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-15 20:32:32 -04:00
parent 3b5511a703
commit 1a44133a63
43 changed files with 10989 additions and 1055 deletions
@@ -133,7 +133,6 @@ public class AccountDataExportController : Controller
                case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
                case "Equipment":   await AddEquipmentSheet(package, companyId, headerColor); break;
                case "Vendors":     await AddVendorsSheet(package, companyId, headerColor); break;
-                case "ShopWorkers": await AddShopWorkersSheet(package, companyId, headerColor); break;
                case "Users":       await AddUsersSheet(package, companyId, headerColor); break;
            }
        }
@@ -182,7 +181,6 @@ public class AccountDataExportController : Controller
                case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
                case "Equipment":   WriteCsvEntry(zip, "Equipment.csv",   await BuildEquipmentCsv(companyId)); break;
                case "Vendors":     WriteCsvEntry(zip, "Vendors.csv",     await BuildVendorsCsv(companyId)); break;
-                case "ShopWorkers": WriteCsvEntry(zip, "ShopWorkers.csv", await BuildShopWorkersCsv(companyId)); break;
                case "Users":       WriteCsvEntry(zip, "Users.csv",       await BuildUsersCsv(companyId)); break;
            }
        }
@@ -268,12 +266,6 @@ public class AccountDataExportController : Controller
            .Where(s => s.CompanyId == companyId && !s.IsDeleted)
            .OrderBy(s => s.CompanyName).ToListAsync();

-    /// <summary>Fetches all non-deleted shop workers for the company.</summary>
-    private Task<List<ShopWorker>> FetchShopWorkersAsync(int companyId) =>
-        _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted)
-            .OrderBy(w => w.Name).ToListAsync();
-
    /// <summary>
    /// Fetches all users for the company. <c>IsDeleted</c> is intentionally omitted because
    /// Identity users use <c>IsActive = false</c> for soft-deletion, not the base-entity flag.
@@ -462,23 +454,6 @@ public class AccountDataExportController : Controller
        AutoFit(ws, headers.Length);
    }

-    private async Task AddShopWorkersSheet(ExcelPackage pkg, int companyId, Color hdr)
-    {
-        var data = await FetchShopWorkersAsync(companyId);
-        var ws = pkg.Workbook.Worksheets.Add("Shop Workers");
-        var headers = new[] { "ID", "Name", "Role", "Phone", "Email", "Active", "Notes" };
-        WriteHeader(ws, headers, hdr);
-        for (int i = 0; i < data.Count; i++)
-        {
-            var r = i + 2; var w = data[i];
-            ws.Cells[r, 1].Value = w.Id;   ws.Cells[r, 2].Value = w.Name;
-            ws.Cells[r, 3].Value = w.Role.ToString(); ws.Cells[r, 4].Value = w.Phone;
-            ws.Cells[r, 5].Value = w.Email; ws.Cells[r, 6].Value = w.IsActive ? "Yes" : "No";
-            ws.Cells[r, 7].Value = w.Notes;
-        }
-        AutoFit(ws, headers.Length);
-    }
-
    /// <summary>
    /// Adds a "Users" worksheet. All users (active and inactive) are included because Identity
    /// uses <c>IsActive = false</c> for soft-deletion; <c>IsDeleted</c> is not applicable here.
@@ -611,17 +586,6 @@ public class AccountDataExportController : Controller
        return sb.ToString();
    }

-    /// <summary>Column names match <c>ShopWorkerImportDto</c> exactly so the file can be re-imported.</summary>
-    private async Task<string> BuildShopWorkersCsv(int companyId)
-    {
-        var data = await FetchShopWorkersAsync(companyId);
-        var sb = new StringBuilder();
-        sb.AppendLine("Name,Role,Phone,Email,IsActive,Notes");
-        foreach (var w in data)
-            sb.AppendLine($"{CsvEscape(w.Name)},{w.Role},{CsvEscape(w.Phone)},{CsvEscape(w.Email)},{w.IsActive.ToString().ToLower()},{CsvEscape(w.Notes)}");
-        return sb.ToString();
-    }
-
    /// <summary>
    /// All users (active and inactive) are exported for completeness and compliance — mirrors
    /// the reasoning in <see cref="AddUsersSheet"/> and <see cref="FetchUsersAsync"/>.
@@ -675,13 +639,13 @@ public class AccountDataExportController : Controller

    /// <summary>
    /// Returns the subset of selected sheet names reordered into the canonical export sequence
-    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → ShopWorkers → Users).
+    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → Users).
    /// Guarantees consistent file layout regardless of the order check-boxes were ticked on the form.
    /// Sheet names not in the canonical list are silently dropped.
    /// </summary>
    private static string[] OrderSheets(string[] sheets)
    {
-        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "ShopWorkers", "Users" };
+        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "Users" };
        return order.Where(sheets.Contains).ToArray();
    }

@@ -756,7 +756,6 @@ public class CompanySettingsController : Controller
            var costs = company.OperatingCosts;

            var ovens   = (await _unitOfWork.OvenCosts.FindAsync(o => o.IsActive)).OrderBy(o => o.DisplayOrder).ToList();
-            var workers = (await _unitOfWork.ShopWorkers.FindAsync(w => w.IsActive)).ToList();
            var coatingCategories = (await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.IsCoating)).ToList();

            var sb = new System.Text.StringBuilder();
@@ -783,8 +782,7 @@ public class CompanySettingsController : Controller
                    ShopCapabilityTier.Large  => "high-volume",
                    _ => "small"
                };
-                sb.AppendLine($"We are a {tierLabel} operation" +
-                    (workers.Count > 0 ? $" with {workers.Count} active shop worker{(workers.Count == 1 ? "" : "s")}." : "."));
+                sb.AppendLine($"We are a {tierLabel} operation.");
            }

            // Ovens
@@ -827,32 +825,6 @@ public class CompanySettingsController : Controller
                sb.AppendLine($"Powder categories we stock: {string.Join(", ", catNames)}.");
            }

-            // Worker roles
-            if (workers.Any())
-            {
-                var roles = workers
-                    .Select(w => w.Role)
-                    .Distinct()
-                    .Select(r => r switch
-                    {
-                        ShopWorkerRole.Sandblaster   => "sandblasting",
-                        ShopWorkerRole.Coater        => "powder coating",
-                        ShopWorkerRole.Masker        => "masking",
-                        ShopWorkerRole.QualityControl => "quality control",
-                        ShopWorkerRole.OvenOperator  => "oven operation",
-                        ShopWorkerRole.Supervisor    => "supervision",
-                        ShopWorkerRole.Maintenance   => "equipment maintenance",
-                        _                            => "general labor"
-                    })
-                    .Distinct()
-                    .ToList();
-                if (roles.Count > 1)
-                {
-                    sb.AppendLine();
-                    sb.AppendLine($"Staff specialties on hand: {string.Join(", ", roles)}.");
-                }
-            }
-
            // Rates hint
            if (costs != null && costs.StandardLaborRate > 0)
            {
@@ -2719,79 +2691,6 @@ public class CompanySettingsController : Controller

    // ── Role-Based Labor Rates ────────────────────────────────────────────────

-    /// <summary>
-    /// Returns the per-role hourly labor rates configured for the current company, keyed by
-    /// <see cref="PowderCoating.Core.Enums.ShopWorkerRole"/> integer value. An empty list is returned
-    /// (rather than a 404) when no rates have been configured yet, so the UI can render the rate grid
-    /// without special-casing an empty state. The global multi-tenant filter on
-    /// <c>ShopWorkerRoleCosts</c> ensures only this company's rates are returned.
-    /// </summary>
-    [HttpGet]
-    public async Task<IActionResult> GetRoleCosts()
-    {
-        var companyId = _tenantContext.GetCurrentCompanyId();
-        if (companyId == null) return Json(new List<object>());
-
-        var rates = await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId.Value);
-        var result = rates.Select(r => new { role = (int)r.Role, hourlyRate = r.HourlyRate }).ToList();
-        return Json(result);
-    }
-
-    /// <summary>
-    /// Upserts the per-role hourly labor rates for the current company. The operation handles three cases
-    /// per rate in a single pass: (1) rate cleared (≤ 0) — soft-delete the existing record; (2) rate set
-    /// but no existing record — insert new; (3) rate changed — update existing. This avoids full
-    /// table replace semantics that could cause audit log noise or trigger unintended EF change-tracking.
-    /// These rates are used by the pricing calculator when <c>UseRoleBasedLaborRates</c> is enabled in
-    /// <c>CompanyOperatingCosts</c>.
-    /// </summary>
-    [HttpPost]
-    public async Task<IActionResult> SaveRoleCosts([FromBody] List<SaveRoleCostDto> rates)
-    {
-        try
-        {
-            var companyId = _tenantContext.GetCurrentCompanyId();
-            if (companyId == null) return Json(new { success = false, message = "No company found." });
-
-            var existing = (await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId.Value)).ToList();
-
-            foreach (var dto in rates)
-            {
-                var record = existing.FirstOrDefault(r => (int)r.Role == dto.Role);
-                if (dto.HourlyRate <= 0)
-                {
-                    // Remove rate if cleared
-                    if (record != null)
-                        await _unitOfWork.ShopWorkerRoleCosts.SoftDeleteAsync(record.Id);
-                }
-                else if (record == null)
-                {
-                    await _unitOfWork.ShopWorkerRoleCosts.AddAsync(new PowderCoating.Core.Entities.ShopWorkerRoleCost
-                    {
-                        CompanyId = companyId.Value,
-                        Role = (PowderCoating.Core.Enums.ShopWorkerRole)dto.Role,
-                        HourlyRate = dto.HourlyRate,
-                        CreatedAt = DateTime.UtcNow
-                    });
-                }
-                else
-                {
-                    record.HourlyRate = dto.HourlyRate;
-                    record.UpdatedAt = DateTime.UtcNow;
-                    await _unitOfWork.ShopWorkerRoleCosts.UpdateAsync(record);
-                }
-            }
-
-            await _unitOfWork.CompleteAsync();
-            return Json(new { success = true });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error saving role costs");
-            return Json(new { success = false, message = "An error occurred saving role rates." });
-        }
-    }
-
    // ─── Stripe Connect ───────────────────────────────────────────────────────

    /// <summary>
@@ -3055,7 +2954,6 @@ public class CompanySettingsController : Controller
 }

 public record SaveTemplateJsonRequest(int Id, string? Subject, string? Body);
-public record SaveRoleCostDto(int Role, decimal HourlyRate);
 public record SaveOnlinePaymentSettingsDto(
    OnlinePaymentSurchargeType SurchargeType,
    decimal SurchargeValue,
@@ -226,11 +226,9 @@ public class CompanyUsersController : Controller
    /// Creates a new company user, enforcing the subscription user-count limit and a whitelist
    /// of valid <c>CompanyRole</c> values (preventing callers from submitting a null role to
    /// create a SuperAdmin-equivalent account). CompanyAdmin users automatically receive all
-    /// per-feature permissions unless a SuperAdmin is explicitly customising them. Workers
-    /// additionally get an auto-created <see cref="ShopWorker"/> record so they appear in job
-    /// assignment dropdowns without a separate onboarding step. A legacy ASP.NET Identity role
-    /// (Administrator / Manager / Employee / ReadOnly) is also assigned to satisfy policy
-    /// checks that still reference the role system.
+    /// per-feature permissions unless a SuperAdmin is explicitly customising them. A legacy
+    /// ASP.NET Identity role (Administrator / Manager / Employee / ReadOnly) is also assigned
+    /// to satisfy policy checks that still reference the role system.
    /// </summary>
    // POST: CompanyUsers/Create
    [HttpPost]
@@ -351,27 +349,7 @@ public class CompanyUsersController : Controller

                await _userManager.AddToRoleAsync(user, legacyRole);

-                // If Worker role, automatically create a ShopWorker record
-                if (model.CompanyRole == AppConstants.CompanyRoles.Worker)
-                {
-                    var shopWorker = new ShopWorker
-                    {
-                        Name = user.FullName,
-                        Email = user.Email,
-                        Phone = user.PhoneNumber,
-                        IsActive = true,
-                        Notes = $"Auto-created from user account: {user.Email}",
-                        Role = Core.Enums.ShopWorkerRole.GeneralLabor, // Default role
-                        CompanyId = companyId!.Value
-                    };
-
-                    await _unitOfWork.ShopWorkers.AddAsync(shopWorker);
-                    await _unitOfWork.CompleteAsync();
-
-                    _logger.LogInformation("ShopWorker record created for user {Email}", user.Email);
-                }
-
-                _logger.LogInformation("User {Email} created successfully by {Admin}",
+_logger.LogInformation("User {Email} created successfully by {Admin}",
                    user.Email, User.Identity?.Name);

                TempData["Success"] = $"User '{user.FullName}' created successfully.";
@@ -441,6 +419,7 @@ public class CompanyUsersController : Controller
                CompanyRole = user.CompanyRole ?? AppConstants.CompanyRoles.Viewer,
                Department = user.Department,
                Position = user.Position,
+                LaborCostPerHour = user.LaborCostPerHour,
                Phone = user.PhoneNumber,
                IsActive = user.IsActive,
                HireDate = user.HireDate,
@@ -479,11 +458,9 @@ public class CompanyUsersController : Controller
    /// Saves changes to an existing company user. Validates company isolation and role whitelist
    /// (same checks as <see cref="Edit(string, string)"/>). Prevents two dangerous deactivation
    /// scenarios: a user deactivating themselves, and deactivating the last active CompanyAdmin
-    /// for a company (which would lock out the tenant). When the role changes to Worker and no
-    /// matching <see cref="ShopWorker"/> record exists, one is created automatically; if one
-    /// already exists, its name, email, and active status are kept in sync. Email changes are
-    /// applied via <c>SetEmailAsync</c> / <c>SetUserNameAsync</c> after the main update so
-    /// Identity's own normalisation logic runs correctly.
+    /// for a company (which would lock out the tenant). Email changes are applied via
+    /// <c>SetEmailAsync</c> / <c>SetUserNameAsync</c> after the main update so Identity's own
+    /// normalisation logic runs correctly.
    /// </summary>
    // POST: CompanyUsers/Edit/id
    [HttpPost]
@@ -596,6 +573,7 @@ public class CompanyUsersController : Controller
            user.CompanyRole = model.CompanyRole;
            user.Department = model.Department;
            user.Position = model.Position;
+            user.LaborCostPerHour = model.LaborCostPerHour;
            user.PhoneNumber = model.Phone;
            user.IsActive = model.IsActive;
            user.HireDate = model.HireDate;
@@ -632,60 +610,7 @@ public class CompanyUsersController : Controller
                        user.Id, oldEmail, model.Email, User.Identity?.Name);
                }

-                // If role changed to Worker, ensure ShopWorker record exists
-                if (model.CompanyRole == AppConstants.CompanyRoles.Worker)
-                {
-                    // Search by oldEmail so we find the record even when the email just changed
-                    var lookupEmail = emailChanged ? oldEmail : user.Email;
-                    var existingShopWorker = (await _unitOfWork.ShopWorkers.FindAsync(
-                        sw => sw.Email == lookupEmail && sw.CompanyId == user.CompanyId)).ToList();
-
-                    if (!existingShopWorker.Any())
-                    {
-                        var shopWorker = new ShopWorker
-                        {
-                            Name = user.FullName,
-                            Email = user.Email,
-                            Phone = user.PhoneNumber,
-                            IsActive = user.IsActive,
-                            Notes = $"Auto-created from user account: {user.Email}",
-                            Role = Core.Enums.ShopWorkerRole.GeneralLabor, // Default role
-                            CompanyId = user.CompanyId
-                        };
-
-                        await _unitOfWork.ShopWorkers.AddAsync(shopWorker);
-                        await _unitOfWork.CompleteAsync();
-
-                        _logger.LogInformation("ShopWorker record created for user {Email}", user.Email);
-                    }
-                    else
-                    {
-                        // Update existing ShopWorker to ensure it's active
-                        var shopWorker = existingShopWorker.First();
-                        var shopWorkerDirty = false;
-
-                        if (!shopWorker.IsActive && user.IsActive)
-                        {
-                            shopWorker.IsActive = true;
-                            shopWorkerDirty = true;
-                            _logger.LogInformation("ShopWorker record reactivated for user {Email}", user.Email);
-                        }
-
-                        if (emailChanged && shopWorker.Email == oldEmail)
-                        {
-                            shopWorker.Email = user.Email;
-                            shopWorkerDirty = true;
-                        }
-
-                        shopWorker.Name = user.FullName;
-                        shopWorker.Phone = user.PhoneNumber;
-
-                        if (shopWorkerDirty)
-                            await _unitOfWork.CompleteAsync();
-                    }
-                }
-
-                _logger.LogInformation("User {Email} updated successfully by {Admin}",
+_logger.LogInformation("User {Email} updated successfully by {Admin}",
                    user.Email, User.Identity?.Name);

                TempData["Success"] = "User updated successfully.";
@@ -122,7 +122,6 @@ public class DataExportController : Controller
                case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
                case "Equipment":   await AddEquipmentSheet(package, companyId, headerColor); break;
                case "Vendors":     await AddVendorsSheet(package, companyId, headerColor); break;
-                case "ShopWorkers": await AddShopWorkersSheet(package, companyId, headerColor); break;
                case "Users":       await AddUsersSheet(package, companyId, headerColor); break;
            }
        }
@@ -172,7 +171,6 @@ public class DataExportController : Controller
                case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
                case "Equipment":   WriteCsvEntry(zip, "Equipment.csv",   await BuildEquipmentCsv(companyId)); break;
                case "Vendors":     WriteCsvEntry(zip, "Vendors.csv",     await BuildVendorsCsv(companyId)); break;
-                case "ShopWorkers": WriteCsvEntry(zip, "ShopWorkers.csv", await BuildShopWorkersCsv(companyId)); break;
                case "Users":       WriteCsvEntry(zip, "Users.csv",       await BuildUsersCsv(companyId)); break;
            }
        }
@@ -441,38 +439,6 @@ public class DataExportController : Controller
        AutoFit(ws, headers.Length);
    }

-    /// <summary>
-    /// Adds a "Shop Workers" worksheet with one row per non-deleted shop worker for the
-    /// specified company.  <c>Role.ToString()</c> converts the enum to a string; the view
-    /// typically formats these with spaces (e.g. "QualityControl" → "Quality Control") but the
-    /// raw enum name is used here so the export value is round-trip parseable.
-    /// </summary>
-    private async Task AddShopWorkersSheet(ExcelPackage pkg, int companyId, Color hdr)
-    {
-        var data = await _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted)
-            .OrderBy(w => w.Name)
-            .ToListAsync();
-
-        var ws = pkg.Workbook.Worksheets.Add("Shop Workers");
-        var headers = new[] { "ID", "Name", "Role", "Phone", "Email", "Active", "Notes" };
-        WriteHeader(ws, headers, hdr);
-
-        for (int i = 0; i < data.Count; i++)
-        {
-            var r = i + 2;
-            var w = data[i];
-            ws.Cells[r, 1].Value = w.Id;
-            ws.Cells[r, 2].Value = w.Name;
-            ws.Cells[r, 3].Value = w.Role.ToString();
-            ws.Cells[r, 4].Value = w.Phone;
-            ws.Cells[r, 5].Value = w.Email;
-            ws.Cells[r, 6].Value = w.IsActive ? "Yes" : "No";
-            ws.Cells[r, 7].Value = w.Notes;
-        }
-        AutoFit(ws, headers.Length);
-    }
-
    /// <summary>
    /// Adds an "Invoices" worksheet with one row per non-deleted invoice for the specified company.
    /// The customer navigation is eagerly loaded so the customer name can be rendered; when a
@@ -687,21 +653,6 @@ public class DataExportController : Controller
        return sb.ToString();
    }

-    /// <summary>
-    /// Builds the shop workers CSV string for the specified company, ordered alphabetically by name.
-    /// Column names match <see cref="ShopWorkerImportDto"/> exactly so the file can be re-imported.
-    /// </summary>
-    private async Task<string> BuildShopWorkersCsv(int companyId)
-    {
-        var data = await _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted).OrderBy(w => w.Name).ToListAsync();
-        var sb = new StringBuilder();
-        sb.AppendLine("Name,Role,Phone,Email,IsActive,Notes");
-        foreach (var w in data)
-            sb.AppendLine($"{CsvEscape(w.Name)},{w.Role},{CsvEscape(w.Phone)},{CsvEscape(w.Email)},{w.IsActive.ToString().ToLower()},{CsvEscape(w.Notes)}");
-        return sb.ToString();
-    }
-
    /// <summary>
    /// Builds the users CSV string for the specified company, ordered by last name.
    /// Like <see cref="AddUsersSheet"/>, the <c>IsDeleted</c> filter is intentionally omitted
@@ -769,7 +720,7 @@ public class DataExportController : Controller
    /// <param name="sheets">Raw sheet names from the form POST.</param>
    private static string[] OrderSheets(string[] sheets)
    {
-        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "ShopWorkers", "Users" };
+        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "Users" };
        return order.Where(sheets.Contains).ToArray();
    }

@@ -175,7 +175,6 @@ public class DataPurgeController : Controller
        stats.Add(await Stat("Equipment",         "Equipment",           "bi-tools",       "Inventory & Ops", _db.Equipment.Where(e => e.IsDeleted)));
        stats.Add(await Stat("MaintenanceRecords","Maintenance Records",  "bi-wrench",      "Inventory & Ops", _db.MaintenanceRecords.Where(e => e.IsDeleted)));
        stats.Add(await Stat("Vendors",           "Vendors",             "bi-truck",       "Inventory & Ops", _db.Vendors.Where(e => e.IsDeleted)));
-        stats.Add(await Stat("ShopWorkers",       "Shop Workers",        "bi-person-badge","Inventory & Ops", _db.ShopWorkers.Where(e => e.IsDeleted)));

        return stats;
    }
@@ -204,7 +203,6 @@ public class DataPurgeController : Controller
            "Equipment"          => await QueryCount(_db.Equipment, cutoff),
            "MaintenanceRecords" => await QueryCount(_db.MaintenanceRecords, cutoff),
            "Vendors"            => await QueryCount(_db.Vendors, cutoff),
-            "ShopWorkers"        => await QueryCount(_db.ShopWorkers, cutoff),
            _                    => (0, null)
        };
    }
@@ -324,11 +322,6 @@ public class DataPurgeController : Controller
                    .Where(e => e.IsDeleted && e.DeletedAt <= cutoff).ExecuteDeleteAsync();
                break;

-            case "ShopWorkers":
-                count = await _db.ShopWorkers.IgnoreQueryFilters()
-                    .Where(e => e.IsDeleted && e.DeletedAt <= cutoff).ExecuteDeleteAsync();
-                break;
-
            default:
                return 0;
        }
@@ -38,14 +38,6 @@ namespace PowderCoating.Web.Controllers
            return View();
        }

-        /// <summary>
-        /// Serves the Shop Workers help article describing roles, assignment to jobs, and maintenance tasks.
-        /// </summary>
-        public IActionResult ShopWorkers()
-        {
-            return View();
-        }
-
        /// <summary>
        /// Serves the Equipment help article explaining the equipment status lifecycle and maintenance scheduling.
        /// </summary>
@@ -3368,8 +3368,7 @@ public class JobsController : Controller
    public async Task<IActionResult> GetTimeEntries(int jobId)
    {
        var entries = await _unitOfWork.JobTimeEntries.FindAsync(
-            e => e.JobId == jobId, false,
-            e => e.Worker);  // Worker nav loaded for display of legacy entries that pre-date user migration
+            e => e.JobId == jobId, false);
        var dtos = _mapper.Map<List<JobTimeEntryDto>>(entries.OrderByDescending(e => e.WorkDate).ToList());
        return Json(dtos);
    }
@@ -3823,15 +3822,24 @@ public class JobsController : Controller

            // Operating costs for fallback labor rate and oven rate
            var opCosts = (await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == companyId)).FirstOrDefault();
-            var fallbackLaborRate = opCosts?.StandardLaborRate ?? 0m;
            var effectiveOvenMinutes = (opCosts?.DefaultOvenCycleMinutes > 0 ? (int?)opCosts!.DefaultOvenCycleMinutes : null) ?? 45;
            var defaultOvenCycleHours = effectiveOvenMinutes / 60.0m;

-            // Role cost rates map: role → hourly rate
-            var roleCosts = await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId);
-            var roleCostMap = roleCosts.ToDictionary(r => r.Role, r => r.HourlyRate);
+            // Labor cost rate priority: per-user LaborCostPerHour → company LaborCostPerHour → 20% of StandardLaborRate
+            var companyLaborCostRate = opCosts?.LaborCostPerHour ?? ((opCosts?.StandardLaborRate ?? 0m) * 0.20m);
+            var companyUsers = await _userManager.Users
+                .Where(u => u.CompanyId == companyId && u.LaborCostPerHour != null)
+                .Select(u => new { u.Id, u.LaborCostPerHour })
+                .ToListAsync();
+            var userLaborCostMap = companyUsers.ToDictionary(u => u.Id, u => u.LaborCostPerHour!.Value);

            // 1. Powder / Material cost
+            // Priority: PowderUsageLog actuals (sum per coat) > coat.ActualPowderUsedLbs > coat.PowderToOrder (estimated)
+            var usageLogs = await _unitOfWork.PowderUsageLogs.FindAsync(u => u.JobId == jobId);
+            var actualByCoat = usageLogs
+                .GroupBy(u => u.JobItemCoatId)
+                .ToDictionary(g => g.Key, g => g.Sum(u => u.ActualLbsUsed));
+
            decimal powderCost = 0m;
            var powderLines = new List<object>();
            bool hasCoatsWithRateButNoQty = false;
@@ -3839,7 +3847,19 @@ public class JobsController : Controller
            {
                foreach (var coat in item.Coats)
                {
-                    var lbs = coat.ActualPowderUsedLbs ?? coat.PowderToOrder ?? 0m;
+                    bool isActual;
+                    decimal lbs;
+                    if (actualByCoat.TryGetValue(coat.Id, out var loggedLbs) && loggedLbs > 0)
+                    {
+                        lbs = loggedLbs;
+                        isActual = true;
+                    }
+                    else
+                    {
+                        lbs = coat.ActualPowderUsedLbs ?? coat.PowderToOrder ?? 0m;
+                        isActual = coat.ActualPowderUsedLbs.HasValue;
+                    }
+
                    var costPerLb = coat.PowderCostPerLb ?? 0m;
                    var lineCost = lbs * costPerLb;
                    powderCost += lineCost;
@@ -3850,7 +3870,7 @@ public class JobsController : Controller
                            lbs = Math.Round(lbs, 3),
                            costPerLb = Math.Round(costPerLb, 4),
                            total = Math.Round(lineCost, 2),
-                            isActual = coat.ActualPowderUsedLbs.HasValue
+                            isActual
                        });
                    }
                    else if (costPerLb > 0 && lbs == 0)
@@ -3862,20 +3882,23 @@ public class JobsController : Controller
            }

            // 2. Labor cost
+            // Priority: per-user LaborCostPerHour → company LaborCostPerHour → 20% of StandardLaborRate
            decimal laborCost = 0m;
            var laborLines = new List<object>();
            foreach (var entry in job.TimeEntries)
            {
-                var rate = entry.Worker != null && roleCostMap.TryGetValue(entry.Worker.Role, out var r) ? r : fallbackLaborRate;
+                bool usingPerUser = entry.UserId != null && userLaborCostMap.TryGetValue(entry.UserId, out _);
+                var rate = usingPerUser
+                    ? userLaborCostMap[entry.UserId!]
+                    : companyLaborCostRate;
                var lineCost = entry.HoursWorked * rate;
                laborCost += lineCost;
                laborLines.Add(new {
-                    worker = entry.Worker?.Name ?? "Unknown",
-                    role = entry.Worker != null ? System.Text.RegularExpressions.Regex.Replace(entry.Worker.Role.ToString(), "([a-z])([A-Z])", "$1 $2") : "",
+                    worker = entry.UserDisplayName ?? "Unknown",
                    hours = entry.HoursWorked,
                    rate = Math.Round(rate, 2),
                    total = Math.Round(lineCost, 2),
-                    usingFallback = entry.Worker == null || !roleCostMap.ContainsKey(entry.Worker.Role),
+                    usingFallback = !usingPerUser,
                    stage = entry.Stage,
                    workDate = entry.WorkDate.ToString("MM/dd/yyyy")
                });
@@ -3949,7 +3972,7 @@ public class JobsController : Controller
                grossMargin,
                quotedMargin,
                quotedPrice = Math.Round(job.QuotedPrice, 2),
-                fallbackLaborRate,
+                companyLaborCostRate,
                powderLines,
                laborLines,
                hasPowderData = powderLines.Count > 0,
@@ -911,7 +911,7 @@ public class ToolsController : Controller
    /// <c>CompanyId</c> provides the multi-tenant isolation that global query filters would
    /// normally enforce for other entity types.
    /// </summary>
-    // GET: Tools/GetShopWorkers - For randomizer wheel
+    // GET: Tools/GetShopWorkers - Returns active company users for randomizer wheel
    [HttpGet]
    public async Task<IActionResult> GetShopWorkers()
    {
@@ -1219,7 +1219,6 @@ public static class HelpKnowledgeBase
        - [Accounts Payable](/Help/AccountsPayable)
        - [Equipment & Maintenance](/Help/Equipment)
        - [Vendors](/Help/Vendors)
-        - [Shop Workers](/Help/ShopWorkers)
        - [Reports](/Help/Reports)
        - [Settings](/Help/Settings)
        - [User Profile](/Help/UserProfile)
@@ -270,8 +270,7 @@ builder.Services.AddSingleton<IMapper>(sp =>
        cfg.AddProfile(new InventoryProfile());
        cfg.AddProfile(new EquipmentProfile());
        cfg.AddProfile(new MaintenanceProfile());
-        cfg.AddProfile(new ShopWorkerProfile());
-        cfg.AddProfile(new CatalogProfile());
+cfg.AddProfile(new CatalogProfile());
        cfg.AddProfile(new VendorProfile());
        cfg.AddProfile(new LookupProfile());
        cfg.AddProfile(new AppointmentProfile());
@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
+@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
@{
    ViewData["Title"] = "Company Settings";
    ViewData["PageIcon"] = "bi-building";
@@ -375,6 +375,18 @@
                                        <input type="number" step="0.01" class="form-control" id="standardLaborRate" name="StandardLaborRate" value="@(Model.OperatingCosts?.StandardLaborRate ?? 0)" min="0" max="10000" required>
                                        <span class="input-group-text">/hr</span>
                                    </div>
+                                    <small class="text-muted">Billing rate used in quotes and pricing</small>
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <div class="mb-3">
+                                    <label for="laborCostPerHour" class="form-label">Shop Labor Cost Rate</label>
+                                    <div class="input-group">
+                                        <span class="input-group-text">$</span>
+                                        <input type="number" step="0.01" class="form-control" id="laborCostPerHour" name="LaborCostPerHour" value="@(Model.OperatingCosts?.LaborCostPerHour?.ToString() ?? "")" min="0" max="10000" placeholder="@(((Model.OperatingCosts?.StandardLaborRate ?? 0) * 0.20m).ToString("0.00"))">
+                                        <span class="input-group-text">/hr</span>
+                                    </div>
+                                    <small class="text-muted">Actual wage cost for job costing &amp; profit display only &mdash; never shown to customers. Leave blank to default to 20% of billing rate.</small>
                                </div>
                            </div>
                            <div class="col-md-3">
@@ -516,35 +528,6 @@
                            </div>
                        </div>

-                        <!-- Role-Based Labor Rates -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-4">Role-Based Labor Cost Rates
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Role-Based Labor Cost Rates"
-                               data-bs-content="Set an optional cost rate per worker role for job profitability calculations. These are your &lt;strong&gt;internal cost rates&lt;/strong&gt; (what you pay), not what you bill customers. If a rate is left blank, the &lt;strong&gt;Standard Labor Rate&lt;/strong&gt; above is used as the fallback.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
-                        <p class="text-muted small">Used for job costing only — not shown to customers. Leave blank to use the Standard Labor Rate.</p>
-                        <div class="table-responsive mb-3">
-                            <table class="table table-sm align-middle" id="roleCostTable">
-                                <thead class="table-light">
-                                    <tr>
-                                        <th>Role</th>
-                                        <th style="width:180px;">Cost Rate / hr</th>
-                                        <th style="width:140px;" class="text-muted small">Fallback if blank</th>
-                                    </tr>
-                                </thead>
-                                <tbody id="roleCostBody">
-                                    <tr><td colspan="3" class="text-center text-muted py-2"><div class="spinner-border spinner-border-sm me-2"></div>Loading...</td></tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <button type="button" class="btn btn-sm btn-primary" onclick="saveRoleCosts()">
-                            <i class="bi bi-floppy me-1"></i>Save Labor Rates
-                        </button>
-                        <span id="roleCostSaveStatus" class="ms-2 small"></span>
-
                        <!-- Pricing & Overhead -->
                        <h6 class="border-bottom pb-2 mb-3 mt-4">Pricing &amp; Profit
                            <a tabindex="0" class="help-icon" role="button"
@@ -2949,76 +2932,6 @@
            loadOvenCosts();
        });

-        // Reload role costs whenever the Operating Costs tab is shown
-        document.getElementById('operating-costs-tab')?.addEventListener('shown.bs.tab', () => {
-            loadRoleCosts();
-        });
-
-        // If Equipment Profile tab is already active on page load, load immediately
-        if (document.getElementById('quoting-calibration')?.classList.contains('show')) {
-            loadOvenCosts();
-        }
-
-        // If Operating Costs tab is already active on page load, load role costs immediately
-        if (document.getElementById('operating-costs')?.classList.contains('show')) {
-            loadRoleCosts();
-        }
-
-        // ── Role-Based Labor Cost Rates ────────────────────────────────────────
-        const ROLE_NAMES = ['General Labor','Sandblaster','Coater','Masker','Quality Control','Oven Operator','Supervisor','Maintenance'];
-
-        async function loadRoleCosts() {
-            const resp = await fetch('/CompanySettings/GetRoleCosts');
-            const saved = await resp.json(); // [{role, hourlyRate}]
-            const rateMap = {};
-            saved.forEach(r => rateMap[r.role] = r.hourlyRate);
-
-            const fallbackEl = document.getElementById('standardLaborRate');
-            const fallback = fallbackEl ? `$${parseFloat(fallbackEl.value || 0).toFixed(2)}/hr` : 'Standard Rate';
-
-            const tbody = document.getElementById('roleCostBody');
-            tbody.innerHTML = ROLE_NAMES.map((name, i) => `
-                <tr>
-                    <td><span class="badge bg-secondary">${name}</span></td>
-                    <td>
-                        <div class="input-group input-group-sm">
-                            <span class="input-group-text">$</span>
-                            <input type="number" step="0.01" min="0" max="999"
-                                   class="form-control role-cost-input"
-                                   data-role="${i}"
-                                   value="${rateMap[i] > 0 ? rateMap[i] : ''}"
-                                   placeholder="(use default)">
-                        </div>
-                    </td>
-                    <td class="text-muted small">${fallback}</td>
-                </tr>`).join('');
-        }
-
-        async function saveRoleCosts() {
-            const inputs = document.querySelectorAll('.role-cost-input');
-            const rates = Array.from(inputs).map(el => ({
-                role: parseInt(el.dataset.role),
-                hourlyRate: parseFloat(el.value) || 0
-            }));
-            const statusEl = document.getElementById('roleCostSaveStatus');
-            statusEl.textContent = 'Saving...';
-            statusEl.className = 'ms-2 small text-muted';
-            const resp = await fetch('/CompanySettings/SaveRoleCosts', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json', 'RequestVerificationToken': document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '' },
-                body: JSON.stringify(rates)
-            });
-            const result = await resp.json();
-            if (result.success) {
-                statusEl.textContent = '✓ Saved';
-                statusEl.className = 'ms-2 small text-success';
-                setTimeout(() => statusEl.textContent = '', 3000);
-            } else {
-                statusEl.textContent = result.message || 'Error saving';
-                statusEl.className = 'ms-2 small text-danger';
-            }
-        }
-
        // ── Quote PDF Template ──────────────────────────────────────────────
        function syncColorPicker(hex) {
            if (/^#[0-9A-Fa-f]{6}$/.test(hex)) {
@@ -106,6 +106,16 @@
                                <input asp-for="Position" class="form-control" />
                                <span asp-validation-for="Position" class="text-danger"></span>
                            </div>
+                            <div class="col-md-4">
+                                <label asp-for="LaborCostPerHour" class="form-label">Labor Cost Rate</label>
+                                <div class="input-group">
+                                    <span class="input-group-text">$</span>
+                                    <input asp-for="LaborCostPerHour" type="number" step="0.01" min="0" max="10000" class="form-control" placeholder="Use company default" />
+                                    <span class="input-group-text">/hr</span>
+                                </div>
+                                <span asp-validation-for="LaborCostPerHour" class="text-danger"></span>
+                                <small class="text-muted">Used for internal job costing only &mdash; never shown to customers. Overrides the company default when set. Leave blank to use the shop-wide rate.</small>
+                            </div>
                            <div class="col-md-6">
                                <label asp-for="HireDate" class="form-label">Hire Date</label>
                                <input asp-for="HireDate" class="form-control" type="date" />
@@ -189,22 +189,6 @@
        <!-- Shop Management -->
        <h2 class="h6 fw-semibold mb-2 text-muted text-uppercase" style="letter-spacing:.05em; font-size:.7rem;">Shop Management</h2>
        <div class="row g-3 mb-4">
-            <div class="col-md-6">
-                <div class="card border-0 shadow-sm h-100">
-                    <div class="card-body">
-                        <div class="d-flex align-items-start gap-3">
-                            <div class="rounded-3 bg-info bg-opacity-10 p-2 flex-shrink-0">
-                                <i class="bi bi-person-badge text-info fs-4"></i>
-                            </div>
-                            <div>
-                                <h5 class="card-title mb-1">Shop Workers</h5>
-                                <p class="card-text text-muted small mb-2">Add floor staff, assign roles like Coater or Sandblaster, and link workers to jobs and maintenance tasks.</p>
-                                <a asp-controller="Help" asp-action="ShopWorkers" class="btn btn-sm btn-outline-info">Read more <i class="bi bi-arrow-right ms-1"></i></a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
            <div class="col-md-6">
                <div class="card border-0 shadow-sm h-100">
                    <div class="card-body">
@@ -1,226 +0,0 @@
-@{
-    ViewData["Title"] = "Shop Workers";
-}
-
-<div class="d-flex align-items-center gap-2 mb-3">
-    <a asp-controller="Help" asp-action="Index" class="btn btn-sm btn-outline-secondary"><i class="bi bi-arrow-left"></i></a>
-    <nav aria-label="breadcrumb">
-        <ol class="breadcrumb mb-0">
-            <li class="breadcrumb-item"><a asp-controller="Help" asp-action="Index">Help</a></li>
-            <li class="breadcrumb-item active">Shop Workers</li>
-        </ol>
-    </nav>
-</div>
-
-<div class="row g-4">
-    <div class="col-lg-9">
-
-        <section id="overview" class="mb-5">
-            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
-                <i class="bi bi-info-circle text-primary me-2"></i>Overview
-            </h2>
-            <p>
-                Shop Workers are the people who do the hands-on work in your facility — sandblasters, coaters,
-                maskers, oven operators, and supervisors. Adding your workers to the system lets you assign them
-                to jobs and maintenance tasks, giving you a clear picture of who is working on what at any time.
-            </p>
-            <p>
-                Shop Workers are separate from system user accounts. A worker does not need to log into the
-                system — they are simply a record that can be assigned to work. If a worker also needs to log
-                in and update job statuses themselves, an Administrator can create a linked user account for
-                them with the <em>Shop Floor</em> role.
-            </p>
-            <p>
-                Find Shop Workers under <strong>Operations &rsaquo; Shop Workers</strong> in the sidebar.
-            </p>
-        </section>
-
-        <section id="adding-a-worker" class="mb-5">
-            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
-                <i class="bi bi-person-plus text-primary me-2"></i>Adding a Worker
-            </h2>
-            <p>To add a new shop worker:</p>
-            <ol class="mb-3">
-                <li class="mb-2">Go to <strong>Operations &rsaquo; Shop Workers</strong> and click <strong>New Worker</strong>.</li>
-                <li class="mb-2">
-                    Fill in the worker's details:
-                    <ul class="mt-1">
-                        <li><strong>Name</strong> — the worker's full name as it should appear on job assignments.</li>
-                        <li><strong>Role</strong> — select the role that best describes their primary function (see below).</li>
-                        <li><strong>Phone</strong> — optional, useful for supervisors to have on file.</li>
-                        <li><strong>Email</strong> — optional, used if the worker also has a system login.</li>
-                        <li><strong>Notes</strong> — any relevant information, such as certifications, shift preferences, or specialties.</li>
-                    </ul>
-                </li>
-                <li class="mb-2">Ensure <strong>Active</strong> is checked (it is on by default).</li>
-                <li class="mb-2">Click <strong>Save Worker</strong>.</li>
-            </ol>
-            <p>
-                Once saved, the worker will appear in the assignment dropdowns on the Job Create and Edit forms.
-            </p>
-        </section>
-
-        <section id="worker-roles" class="mb-5">
-            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
-                <i class="bi bi-tags text-primary me-2"></i>Worker Roles
-            </h2>
-            <p>
-                Each worker is assigned one of the following roles. The role is a label — it helps you pick the
-                right person for a job but does not restrict what a worker can be assigned to.
-            </p>
-
-            <div class="table-responsive">
-                <table class="table table-bordered align-middle">
-                    <thead class="table-light">
-                        <tr>
-                            <th style="width:25%">Role</th>
-                            <th>Description</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><span class="badge bg-secondary">General Labor</span></td>
-                            <td>
-                                Versatile workers who assist across multiple areas of the shop — loading and unloading,
-                                racking parts, clean-up, and general support tasks. Not specialized in a single process.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-warning text-dark">Sandblaster</span></td>
-                            <td>
-                                Operates the sandblasting or media-blasting equipment to prepare metal surfaces for
-                                coating. Responsible for achieving the correct surface profile and ensuring all rust,
-                                paint, and contamination is removed.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-primary">Coater</span></td>
-                            <td>
-                                Applies powder coating using an electrostatic spray gun. Responsible for even coverage,
-                                correct mil thickness, and minimizing overspray and waste. Often the most skilled
-                                technical role on the floor.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-info text-dark">Masker</span></td>
-                            <td>
-                                Applies masking tape, plugs, and caps to protect threads, bearing surfaces, and areas
-                                that must not be coated. Attention to detail is critical — missed masking means rework.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-success">Quality Control</span></td>
-                            <td>
-                                Inspects finished parts for adhesion, color consistency, coverage, and surface defects
-                                before the job is marked as complete. May also handle pre-coat inspection after
-                                sandblasting.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-danger">Oven Operator</span></td>
-                            <td>
-                                Loads parts into the curing oven, sets correct temperatures and cure times for the
-                                powder being used, monitors the cure cycle, and unloads parts safely after cooling.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-dark">Supervisor</span></td>
-                            <td>
-                                Oversees day-to-day shop floor operations, assigns tasks to other workers, ensures
-                                jobs are progressing on schedule, and handles escalations. May also handle customer
-                                communication for production updates.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><span class="badge bg-secondary">Maintenance</span></td>
-                            <td>
-                                Responsible for keeping equipment running — performing scheduled preventive maintenance,
-                                troubleshooting breakdowns, and coordinating with external service technicians when
-                                needed.
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </section>
-
-        <section id="assigning-to-jobs" class="mb-5">
-            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
-                <i class="bi bi-briefcase text-primary me-2"></i>Assigning Workers to Jobs
-            </h2>
-            <p>
-                Each job can have one worker assigned to it as the primary responsible person. This is the
-                worker who owns the job from start to finish — typically a coater or supervisor.
-            </p>
-            <p>To assign a worker when creating or editing a job:</p>
-            <ol class="mb-3">
-                <li class="mb-1">Open the job's Create or Edit form.</li>
-                <li class="mb-1">Scroll down to the <strong>Assignment</strong> section.</li>
-                <li class="mb-1">Select a worker from the <strong>Assigned Worker</strong> dropdown. Only active workers are listed.</li>
-                <li class="mb-1">Save the job.</li>
-            </ol>
-            <p>
-                The assigned worker's name appears on the job list view, on the job detail page, and in any
-                reports filtered by worker.
-            </p>
-            <p>
-                Workers can also be assigned to <strong>maintenance tasks</strong> on equipment. See the
-                <a asp-controller="Help" asp-action="Equipment" class="text-decoration-none">Equipment &amp; Maintenance</a>
-                help page for details.
-            </p>
-            <div class="alert alert-permanent alert-info d-flex gap-2 mb-0" role="alert">
-                <i class="bi bi-lightbulb-fill flex-shrink-0 mt-1"></i>
-                <div>
-                    If a worker you want to assign does not appear in the dropdown, check that their record is
-                    marked as <strong>Active</strong>. Inactive workers are hidden from assignment lists.
-                </div>
-            </div>
-        </section>
-
-        <section id="deactivating-a-worker" class="mb-5">
-            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
-                <i class="bi bi-person-dash text-primary me-2"></i>Deactivating a Worker
-            </h2>
-            <p>
-                When a worker leaves the shop or is no longer available for assignment, deactivate their record
-                rather than deleting it. Deactivating preserves the history of all jobs they were assigned to,
-                while removing them from the active assignment dropdowns so they cannot be accidentally selected
-                for new work.
-            </p>
-            <p>To deactivate a worker:</p>
-            <ol class="mb-3">
-                <li class="mb-1">Open the worker's Details or Edit page.</li>
-                <li class="mb-1">Uncheck the <strong>Active</strong> checkbox.</li>
-                <li class="mb-1">Click <strong>Save</strong>.</li>
-            </ol>
-            <p>
-                Alternatively, use the <strong>Delete</strong> button on the Details page to perform a soft
-                delete, which has the same effect.
-            </p>
-            <div class="alert alert-permanent alert-secondary d-flex gap-2 mb-0" role="alert">
-                <i class="bi bi-info-circle flex-shrink-0 mt-1"></i>
-                <div>
-                    If a worker currently has open jobs assigned to them, reassign those jobs first before
-                    deactivating the worker — so the jobs remain clearly owned and nothing falls through the cracks.
-                </div>
-            </div>
-        </section>
-
-    </div>
-
-    <div class="col-lg-3 d-none d-lg-block">
-        @{ await Html.RenderPartialAsync("_HelpNav"); }
-        <div class="card border-0 shadow-sm sticky-top" style="top:80px">
-            <div class="card-header bg-transparent fw-semibold small text-muted text-uppercase" style="letter-spacing:.05em; font-size:.7rem;">On this page</div>
-            <div class="card-body p-0">
-                <nav class="nav flex-column">
-                    <a class="nav-link py-1 px-3 small text-body" href="#overview">Overview</a>
-                    <a class="nav-link py-1 px-3 small text-body" href="#adding-a-worker">Adding a Worker</a>
-                    <a class="nav-link py-1 px-3 small text-body" href="#worker-roles">Worker Roles</a>
-                    <a class="nav-link py-1 px-3 small text-body" href="#assigning-to-jobs">Assigning to Jobs</a>
-                    <a class="nav-link py-1 px-3 small text-body" href="#deactivating-a-worker">Deactivating a Worker</a>
-                </nav>
-            </div>
-        </div>
-    </div>
-</div>
@@ -65,11 +65,7 @@
            <div class="px-3 pt-2 pb-1">
                <span class="text-muted text-uppercase" style="font-size:.65rem; letter-spacing:.07em; font-weight:600;">Shop Management</span>
            </div>
-            <a class="nav-link py-2 px-3 d-flex align-items-center gap-2 @(currentAction == "ShopWorkers" ? "active fw-semibold text-primary" : "text-body")"
-               asp-controller="Help" asp-action="ShopWorkers">
-                <i class="bi bi-person-badge"></i> Shop Workers
-            </a>
-            <a class="nav-link py-2 px-3 d-flex align-items-center gap-2 @(currentAction == "Equipment" ? "active fw-semibold text-primary" : "text-body")"
+<a class="nav-link py-2 px-3 d-flex align-items-center gap-2 @(currentAction == "Equipment" ? "active fw-semibold text-primary" : "text-body")"
               asp-controller="Help" asp-action="Equipment">
                <i class="bi bi-tools"></i> Equipment &amp; Maintenance
            </a>
@@ -1067,8 +1067,7 @@
                var hasEquipment = User.HasClaim("Permission", "ManageEquipment") || User.IsInRole("SuperAdmin");
                var hasMaintenance = User.HasClaim("Permission", "ManageMaintenance") || User.IsInRole("SuperAdmin");
                var hasFinance = _isAdminOrManager || User.HasClaim("Permission", "ManageFinance");
-                var hasShopWorkers = _isAdminOrManager || User.HasClaim("Permission", "ManageShopWorkers");
-                var hasReports = _isAdminOrManager || User.HasClaim("Permission", "ViewReports");
+var hasReports = _isAdminOrManager || User.HasClaim("Permission", "ViewReports");
                var showOperations = hasCustomers || hasQuotes || hasInvoices || hasJobs || hasCalendar;
                var showInventorySection = hasInventory || hasVendors;
                var showEquipmentSection = hasEquipment || hasMaintenance;
@@ -12,8 +12,7 @@ document.addEventListener('DOMContentLoaded', function () {
    setupCsvImportForm('csvImportMaintenanceForm', 'csvMaintenanceFile', 'csvImportMaintenanceBtn', '/Tools/CsvImportMaintenance', 'csvMaintenanceResults');
    setupCsvImportForm('csvImportSettingsForm', 'csvSettingsFile', 'csvImportSettingsBtn', '/Tools/CsvImportCompanySettings', 'csvSettingsResults');
    setupCsvImportForm('csvImportVendorsForm', 'csvVendorsFile', 'csvImportVendorsBtn', '/Tools/CsvImportVendors', 'csvVendorsResults');
-    setupCsvImportForm('csvImportShopWorkersForm', 'csvShopWorkersFile', 'csvImportShopWorkersBtn', '/Tools/CsvImportShopWorkers', 'csvShopWorkersResults');
-    setupCsvImportForm('csvImportPrepServicesForm', 'csvPrepServicesFile', 'csvImportPrepServicesBtn', '/Tools/CsvImportPrepServices', 'csvPrepServicesResults');
+setupCsvImportForm('csvImportPrepServicesForm', 'csvPrepServicesFile', 'csvImportPrepServicesBtn', '/Tools/CsvImportPrepServices', 'csvPrepServicesResults');
 });

 function setupCsvImportForm(formId, fileInputId, submitBtnId, actionUrl, resultsId) {