diff --git a/WebHandler/ADCompareWebHandler.cs b/WebHandler/ADCompareWebHandler.cs index 7a11cbc..b0ae947 100644 --- a/WebHandler/ADCompareWebHandler.cs +++ b/WebHandler/ADCompareWebHandler.cs @@ -44,13 +44,13 @@ namespace Disco.Plugins.ADCompare.WebHandler var service = new DeviceCompareService(Database); var summary = service.CompareAllDevices(); var sb = new StringBuilder(); - sb.AppendLine("SerialNumber,ComputerName,DiscoAssignedUser,DiscoAssignedUserName,ADManagedByUser,ADManagedByName,Match,Reason"); + sb.AppendLine("SerialNumber,ComputerName,DiscoAssignedUser,DiscoAssignedUserName,ADManagedBy,Match,Reason"); foreach (var r in summary.Results.Where(r => !r.IsMatch)) { sb.AppendLine(string.Join(",", CsvEsc(r.SerialNumber), CsvEsc(r.ComputerName), CsvEsc(r.DiscoAssignedUserId), CsvEsc(r.DiscoAssignedUserDisplayName), - CsvEsc(r.ADManagedByUserId), CsvEsc(r.ADManagedByDisplayName), + CsvEsc(r.ADManagedByDisplayName), r.IsMatch.ToString(), CsvEsc(r.MismatchReason))); } var fileName = "AD_ManagedBy_Compare_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".csv"; @@ -103,14 +103,15 @@ namespace Disco.Plugins.ADCompare.WebHandler sb.Append(".green{color:#5cb85c;} .orange{color:#f0ad4e;} .red{color:#d9534f;} .blue{color:#5bc0de;} .grey{color:#999;}"); sb.Append("table{width:100%;border-collapse:collapse;margin-top:10px;} th{background:#f5f5f5;text-align:left;padding:8px;border-bottom:2px solid #ddd;}"); sb.Append("td{padding:8px;border-bottom:1px solid #eee;} tr:hover{background:#f9f9f9;}"); - sb.Append(".warn-row{background:#fcf8e3;} .danger-row{background:#f2dede;}"); + sb.Append(".warn-row{background:#fcf8e3;}"); sb.Append(".badge{display:inline-block;padding:2px 8px;border-radius:10px;font-size:11px;color:#fff;}"); - sb.Append(".badge-warn{background:#f0ad4e;} .badge-err{background:#d9534f;}"); + sb.Append(".badge-warn{background:#f0ad4e;}"); sb.Append(".muted{color:#999;font-style:italic;} .small{font-size:12px;color:#888;}"); + sb.Append(".info-bar{margin:10px 0;padding:8px 12px;background:#d9edf7;border-radius:4px;font-size:13px;color:#31708f;}"); sb.Append("
"); sb.Append("Compares the AD computer Managed By field against the Disco Assigned User.
"); + sb.Append("Compares the AD computer Managed By field against the Disco Assigned User for domain-joined devices found in AD.
"); sb.Append("| Status | Serial Number | Computer Name | "); + sb.Append("Serial Number | Computer Name | "); sb.Append("Disco Assigned User | AD Managed By | Reason | "); sb.Append("
|---|---|---|---|---|---|---|---|
| " + badge + " | "); + sb.Append("|||||||
| " + H(r.SerialNumber) + " | "); sb.Append("" + H(r.ComputerName) + " | "); sb.Append("" + discoUser + " | ");