feature: batch device decommissioning

2025-07-03 19:13:52 +10:00
parent 4660425ccc
commit 583552ffdd
27 changed files with 1533 additions and 860 deletions
@@ -21,5 +21,6 @@ namespace Disco.Models.Services.Devices.Importing

        List<IDeviceImportRecord> Records { get; set; }
        int AffectedRecords { get; set; }
+        bool AllowBacktracking { get; }
    }
 }
@@ -16,5 +16,6 @@ namespace Disco.Models.UI.Config.DeviceBatch
        int DeviceCount { get; set; }
        int DeviceDecommissionedCount { get; set; }
        bool CanDelete { get; set; }
+        bool CanDecommission { get; set; }
    }
 }
@@ -5,28 +5,28 @@ using Disco.Services.Devices.ManagedGroups;
 using Disco.Services.Interop.ActiveDirectory;
 using Disco.Services.Users;
 using System;
+using System.Data.Entity;
 using System.Linq;

 namespace Disco.Services
 {
    public static class DeviceBatchExtensions
    {
-        public static bool CanDelete(this DeviceBatch db, DiscoDataContext Database)
+        public static bool CanDelete(this DeviceBatch db, DiscoDataContext database)
        {
            if (!UserService.CurrentAuthorization.Has(Claims.Config.DeviceBatch.Delete))
                return false;

            // Can't Delete if Contains Devices
-            var deviceCount = Database.Devices.Count(d => d.DeviceBatchId == db.Id);
-            if (deviceCount > 0)
+            if (database.Devices.Any(d => d.DeviceBatchId == db.Id))
                return false;

            return true;
        }

-        public static void Delete(this DeviceBatch db, DiscoDataContext Database)
+        public static void Delete(this DeviceBatch db, DiscoDataContext database)
        {
-            if (!db.CanDelete(Database))
+            if (!db.CanDelete(database))
                throw new InvalidOperationException("The state of this Device Batch doesn't allow it to be deleted");

            // Remove Linked Group
@@ -34,7 +34,26 @@ namespace Disco.Services
            ActiveDirectory.Context.ManagedGroups.Remove(DeviceBatchAssignedUsersManagedGroup.GetKey(db));

            // Delete Batch
-            Database.DeviceBatches.Remove(db);
+            database.DeviceBatches.Remove(db);
+        }
+
+        public static bool CanDecommission(this DeviceBatch db, DiscoDataContext database)
+        {
+            if (!UserService.CurrentAuthorization.Has(Claims.Device.Actions.Import))
+                return false;
+
+            if (!database.Devices.Any(d => d.DeviceBatchId == db.Id && d.DecommissionedDate == null))
+                return false;
+
+            return true;
+        }
+
+        public static void Decommission(this DeviceBatch db, DiscoDataContext database, DecommissionReasons Reason, bool unassignUsers)
+        {
+            if (!db.CanDecommission(database))
+                throw new InvalidOperationException("Decommission of Device Batch is Denied");
+
+
        }
    }
 }
@@ -48,6 +48,8 @@ namespace Disco.Services.Devices.Importing
        public List<IDeviceImportRecord> Records { get; set; }
        public int AffectedRecords { get; set; }

+        public bool AllowBacktracking { get; } = true;
+
        public int ColumnCount { get { return columns.Count; } }
        public IEnumerable<IDeviceImportColumn> Columns
        {
@@ -0,0 +1,111 @@
+using Disco.Data.Repository;
+using Disco.Models.Repository;
+using Disco.Models.Services.Devices.Importing;
+using Disco.Services.Devices.Importing.Fields;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Entity;
+using System.Linq;
+
+namespace Disco.Services.Devices.Importing
+{
+    public class DeviceDecommissionImportContext : IDeviceImportContext
+    {
+        private readonly List<IDeviceImportRecord> records;
+
+        public string SessionId { get; }
+        public string Filename { get; }
+        public string DatasetName { get; }
+        public int ColumnCount { get; }
+        public IEnumerable<IDeviceImportColumn> Columns { get; }
+
+        public int RecordCount => records.Count;
+        public List<IDeviceImportRecord> Records { get => records; set => throw new NotImplementedException(); }
+        public int AffectedRecords { get; set; }
+        public bool AllowBacktracking { get; } = false;
+
+        private DeviceDecommissionImportContext(string sourceName, List<Device> devices, DecommissionReasons decommissionReason, bool unassignUsers)
+        {
+            SessionId = Guid.NewGuid().ToString("D");
+            Filename = DatasetName = sourceName;
+
+            var columns = new List<IDeviceImportColumn>(3)
+            {
+                new DeviceImportColumn()
+                {
+                    Index = 0,
+                    Type = DeviceImportFieldTypes.DeviceSerialNumber,
+                    Handler = typeof(DeviceSerialNumberImportField),
+                    Name = "Device Serial Number",
+                },
+                new DeviceImportColumn()
+                {
+                    Index = 1,
+                    Type = DeviceImportFieldTypes.DeviceDecommissionedReason,
+                    Handler = typeof(DeviceDecommissionedReasonImportField),
+                    Name = "Device Decommissioned Reason",
+                }
+            };
+
+            if (unassignUsers && devices.Any(d => d.AssignedUserId != null))
+            {
+                ColumnCount = 3;
+                columns.Add(new DeviceImportColumn()
+                {
+                    Index = 2,
+                    Type = DeviceImportFieldTypes.AssignedUserId,
+                    Handler = typeof(AssignedUserIdImportField),
+                    Name = "Assigned User Identifier",
+                });
+            }
+            else
+            {
+                unassignUsers = false;
+            }
+
+            Columns = columns;
+            ColumnCount = columns.Count;
+
+            records = devices.Select<Device, IDeviceImportRecord>((d, i) =>
+            {
+                var fields = new List<IDeviceImportField>(ColumnCount)
+                {
+                    DeviceSerialNumberImportField.Create(d),
+                    DeviceDecommissionedReasonImportField.Create(d, decommissionReason, true, unassignUsers),
+                };
+                if (unassignUsers)
+                {
+                    fields.Add(AssignedUserIdImportField.CreateUnassigned(d));
+                }
+                return new DeviceDecommissionImportRecord(d, i, fields);
+            }).ToList();
+
+        }
+
+        public static DeviceDecommissionImportContext Create(DiscoDataContext database, DeviceBatch deviceBatch, DecommissionReasons decommissionReason, bool unassignUsers)
+        {
+            var devices = database.Devices
+                .Include(d => d.Jobs)
+                .Include(d => d.AssignedUser)
+                .Where(d => d.DeviceBatchId == deviceBatch.Id && d.DecommissionedDate == null)
+                .ToList();
+            return new DeviceDecommissionImportContext($"Batch: {deviceBatch.Name} ({deviceBatch.Id})", devices, decommissionReason, unassignUsers);
+        }
+
+        public IDeviceImportColumn GetColumn(int Index)
+            => throw new NotImplementedException();
+
+        public int? GetColumnByType(DeviceImportFieldTypes FieldType)
+            => throw new NotImplementedException();
+
+        public IDeviceImportDataReader GetDataReader()
+            => throw new NotImplementedException();
+
+        public IEnumerable<KeyValuePair<DeviceImportFieldTypes, Type>> GetFieldHandlers()
+            => throw new NotImplementedException();
+
+        public void SetColumnType(int Index, DeviceImportFieldTypes Type)
+            => throw new NotImplementedException();
+    }
+}
@@ -0,0 +1,32 @@
+using Disco.Models.Repository;
+using Disco.Models.Services.Devices.Importing;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace Disco.Services.Devices.Importing
+{
+    internal class DeviceDecommissionImportRecord : IDeviceImportRecord
+    {
+        public int Index { get; }
+        public string DeviceSerialNumber { get; }
+        public IEnumerable<IDeviceImportField> Fields { get; }
+        public EntityState RecordAction { get; }
+        public bool HasError { get; }
+
+        public DeviceDecommissionImportRecord(Device device, int index, IEnumerable<IDeviceImportField> fields)
+        {
+            Index = index;
+            DeviceSerialNumber = device.SerialNumber;
+
+            if (fields.Any(f => !f.FieldAction.HasValue))
+                RecordAction = EntityState.Detached;
+            else if (fields.Any(f => f.FieldAction == EntityState.Modified))
+                RecordAction = EntityState.Modified;
+            else
+                RecordAction = EntityState.Unchanged;
+
+            Fields = fields;
+        }
+    }
+}
@@ -40,6 +40,9 @@ namespace Disco.Services.Devices.Importing
            return context;
        }

+        public static IDeviceImportContext BeginDecommissionImport(DiscoDataContext database, DeviceBatch deviceBatch, DecommissionReasons decommissionReason, bool unassignUsers)
+            => DeviceDecommissionImportContext.Create(database, deviceBatch, decommissionReason, unassignUsers);
+
        private static void GuessHeaderTypes(this IDeviceImportContext Context, DiscoDataContext Database)
        {
            using (var dataReader = Context.GetDataReader())
@@ -151,11 +154,11 @@ namespace Disco.Services.Devices.Importing

            int affectedRecords = 0;

-            foreach (var record in Context.Records.Cast<DeviceImportRecord>().Select((r, i) => Tuple.Create(r, i)))
+            foreach (var (record, index) in Context.Records.Select((r, i) => Tuple.Create(r, i)))
            {
-                Status.UpdateStatus(((double)record.Item2 / Context.Records.Count) * 100, string.Format("Applying: {0}", record.Item1.DeviceSerialNumber));
+                Status.UpdateStatus(((double)index / Context.Records.Count) * 100, $"Applying: {record.DeviceSerialNumber}");

-                if (record.Item1.Apply(Database))
+                if (DeviceImportRecord.Apply(record, Database))
                    affectedRecords++;
            }

@@ -30,22 +30,22 @@ namespace Disco.Services.Devices.Importing
            this.RecordAction = RecordAction;
        }

-        public bool Apply(DiscoDataContext Database)
+        public static bool Apply(IDeviceImportRecord record, DiscoDataContext Database)
        {
-            if (RecordAction == EntityState.Detached || !HasError)
+            if (record.RecordAction == EntityState.Detached || !record.HasError)
            {
                Device device;

-                if (RecordAction == EntityState.Unchanged)
+                if (record.RecordAction == EntityState.Unchanged)
                {
                    // Unchanged - No Action Required
                    return false;
                }
-                else if (RecordAction == EntityState.Modified)
+                else if (record.RecordAction == EntityState.Modified)
                {
-                    device = Database.Devices.Find(DeviceSerialNumber);
+                    device = Database.Devices.Find(record.DeviceSerialNumber);
                }
-                else if (RecordAction == EntityState.Added)
+                else if (record.RecordAction == EntityState.Added)
                {
                    // Use 'Add Device Offline' default if available
                    var deviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId;
@@ -57,7 +57,7 @@ namespace Disco.Services.Devices.Importing
                    // Create Device
                    device = new Device()
                    {
-                        SerialNumber = DeviceSerialNumber.ToUpper(),
+                        SerialNumber = record.DeviceSerialNumber.ToUpper(),
                        CreatedDate = DateTime.Now,
                        AllowUnauthenticatedEnrol = true,
                        DeviceProfileId = deviceProfileId,
@@ -71,9 +71,9 @@ namespace Disco.Services.Devices.Importing
                    return false;
                }

-                bool changesMade = (RecordAction == EntityState.Added);
+                bool changesMade = (record.RecordAction == EntityState.Added);

-                foreach (var field in Fields.Cast<DeviceImportFieldBase>())
+                foreach (var field in record.Fields.Cast<DeviceImportFieldBase>())
                {
                    changesMade = field.Apply(Database, device) || changesMade;
                }
@@ -84,7 +84,7 @@ namespace Disco.Services.Devices.Importing

                bool adDescriptionSet = false;

-                foreach (var field in Fields.Cast<DeviceImportFieldBase>())
+                foreach (var field in record.Fields.Cast<DeviceImportFieldBase>())
                {
                    field.Applied(Database, device, ref adDescriptionSet);
                }
@@ -23,6 +23,25 @@ namespace Disco.Services.Devices.Importing.Fields
        public override string FriendlyValue { get { return friendlyValue; } }
        public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }

+        public static AssignedUserIdImportField CreateUnassigned(Device device)
+        {
+            var field = new AssignedUserIdImportField()
+            {
+                parsedValue = null,
+                friendlyValue = null,
+            };
+            if (device.AssignedUser != null)
+            {
+                field.friendlyPreviousValue = $"{device.AssignedUser.DisplayName} [{device.AssignedUser.UserId}]";
+                field.Success(EntityState.Modified);
+            }
+            else
+            {
+                field.Success(EntityState.Unchanged);
+            }
+            return field;
+        }
+
        public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
        {
            var value = friendlyValue = DataReader.GetString(ColumnIndex);
@@ -158,36 +158,48 @@ namespace Disco.Services.Devices.Importing.Fields
            return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
        }

-        public static bool CanDecommissionDevice(Device Device, IDeviceImportContext Context, IDeviceImportDataReader DataReader, out string ErrorMessage)
+        public static bool CanDecommissionDevice(Device device, IDeviceImportContext context, IDeviceImportDataReader dataReader, out string errorMessage)
        {
-            if (Device == null)
+            var isAssigningUser = false;
+            var assigningUserId = default(string);
+            var assignedUserIndex = context.GetColumnByType(DeviceImportFieldTypes.AssignedUserId);
+            if (assignedUserIndex.HasValue)
            {
-                ErrorMessage = "Cannot decommission new devices";
+                isAssigningUser = true;
+                assigningUserId = dataReader.GetString(assignedUserIndex.Value);
+            }
+            var hasOpenJobs = device.Jobs.Any(j => !j.ClosedDate.HasValue);
+
+            return CanDecommissionDevice(device, isAssigningUser, assigningUserId, hasOpenJobs, out errorMessage);
+        }
+
+        public static bool CanDecommissionDevice(Device device, bool isAssigningUser, string assigningUserId, bool hasOpenJobs, out string errorMessage)
+        {
+            if (device == null)
+            {
+                errorMessage = "Cannot decommission new devices";
                return false;
            }

            // Check device is assigned (or being removed in this import)
-
-            var assignedUserIndex = Context.GetColumnByType(DeviceImportFieldTypes.AssignedUserId);
-            if ((!assignedUserIndex.HasValue && Device.AssignedUserId != null) ||
-                (assignedUserIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(assignedUserIndex.Value))))
+            if (isAssigningUser && !string.IsNullOrEmpty(assigningUserId) ||
+                (!isAssigningUser && device.AssignedUserId != null))
            {
-                if (Device.AssignedUserId != null)
-                    ErrorMessage = $"The device is assigned to a user ({Device.AssignedUser.DisplayName} [{Device.AssignedUser.UserId}]) and cannot be decommissioned";
+                if (!isAssigningUser)
+                    errorMessage = $"The device is assigned to a user ({device.AssignedUser.DisplayName} [{device.AssignedUser.UserId}]) and cannot be decommissioned";
                else
-                    ErrorMessage = $"The device is being assigned to a user ({DataReader.GetString(assignedUserIndex.Value)}) and cannot be decommissioned";
+                    errorMessage = $"The device is being assigned to a user ({assigningUserId}) and cannot be decommissioned";
                return false;
            }

            // Check device doesn't have any open jobs
-            var openJobCount = Device.Jobs.Count(j => !j.ClosedDate.HasValue);
-            if (openJobCount > 0)
+            if (hasOpenJobs)
            {
-                ErrorMessage = $"The device is associated with {openJobCount} open job{(openJobCount == 1 ? null : "s")} and cannot be decommissioned";
+                errorMessage = $"The device is associated with an open job and cannot be decommissioned";
                return false;
            }

-            ErrorMessage = null;
+            errorMessage = null;
            return true;
        }
    }
@@ -24,6 +24,26 @@ namespace Disco.Services.Devices.Importing.Fields
        public override string FriendlyValue { get { return parsedValue.HasValue ? parsedValue.Value.ToString() : rawValue; } }
        public override string FriendlyPreviousValue { get { return previousValue.HasValue ? previousValue.Value.ToString() : null; } }

+        public static DeviceDecommissionedReasonImportField Create(Device device, DecommissionReasons? decommissionReason, bool setDate, bool isUnassigningUser)
+        {
+            var field = new DeviceDecommissionedReasonImportField()
+            {
+                rawValue = decommissionReason?.ToString(),
+                parsedValue = decommissionReason,
+                previousValue = device.DecommissionReason,
+                setDate = setDate
+            };
+            var hasOpenJobs = device.Jobs.Any(j => !j.ClosedDate.HasValue);
+            if (!DeviceDecommissionedDateImportField.CanDecommissionDevice(device, isUnassigningUser, null, hasOpenJobs, out var errorMessage))
+                field.Error(errorMessage);
+            else if (device.DecommissionReason == decommissionReason)
+                field.Success(EntityState.Unchanged);
+            else
+                field.Success(EntityState.Modified);
+
+            return field;
+        }
+
        public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
        {
            var value = DataReader.GetString(ColumnIndex);
@@ -50,8 +70,7 @@ namespace Disco.Services.Devices.Importing.Fields
            var decommissionedDateIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedDate);
            if (parsedValue.HasValue && !decommissionedDateIndex.HasValue)
            {
-                string errorMessage;
-                if (!DeviceDecommissionedDateImportField.CanDecommissionDevice(ExistingDevice, Context, DataReader, out errorMessage))
+                if (!DeviceDecommissionedDateImportField.CanDecommissionDevice(ExistingDevice, Context, DataReader, out var errorMessage))
                    return Error(errorMessage);

                setDate = true;
@@ -19,6 +19,16 @@ namespace Disco.Services.Devices.Importing.Fields
        public override string FriendlyValue { get { return parsedValue; } }
        public override string FriendlyPreviousValue { get { return parsedValue; } }

+        public static DeviceSerialNumberImportField Create(Device device)
+        {
+            var field = new DeviceSerialNumberImportField()
+            {
+                parsedValue = device.SerialNumber,
+            };
+            field.Success(EntityState.Unchanged);
+            return field;
+        }
+
        public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
        {
            var value = DataReader.GetString(ColumnIndex);
@@ -366,6 +366,8 @@
    <Compile Include="Devices\DeviceFlags\DeviceFlagService.cs" />
    <Compile Include="Devices\DeviceFlags\DeviceFlagDeviceAssignedUsersManagedGroup.cs" />
    <Compile Include="Devices\DeviceFlags\DeviceFlagDevicesManagedGroup.cs" />
+    <Compile Include="Devices\Importing\DeviceDecommissionImportContext.cs" />
+    <Compile Include="Devices\Importing\DeviceDecommissionImportRecord.cs" />
    <Compile Include="Documents\DocumentExport.cs" />
    <Compile Include="Exporting\Exporter.cs" />
    <Compile Include="Exporting\ExportTask.cs" />
@@ -1,7 +1,5 @@
 using Disco.Data.Repository;
 using Disco.Models.Repository;
-using Disco.Services.Authorization;
-using Disco.Services.Users;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -715,6 +715,21 @@ namespace Disco.Web.Areas.API.Controllers
            return RedirectToAction(MVC.Config.Logging.TaskStatus(status.SessionId));
        }

+        [DiscoAuthorize(Claims.Device.Actions.Import)]
+        [HttpPost, ValidateAntiForgeryToken]
+        public virtual ActionResult DeviceBatchDecommission(int id, DecommissionReasons? decommissionReason = null, bool? unassignUsers = null)
+        {
+            var deviceBatch = Database.DeviceBatches.Find(id)
+                ?? throw new ArgumentException("Invalid Device Batch Id", nameof(id));
+            if (decommissionReason == null)
+                throw new ArgumentNullException(nameof(decommissionReason), "Decommission Reason is required");
+
+            var context = DeviceImport.BeginDecommissionImport(Database, deviceBatch, decommissionReason.Value, unassignUsers.GetValueOrDefault());
+            Import_StoreContext(context);
+
+            return RedirectToAction(MVC.Device.ImportReview(context.SessionId));
+        }
+
        #endregion

        #region Exporting
@@ -48,8 +48,8 @@ namespace Disco.Web.Areas.Config.Controllers
                if (DeviceBatchDevicesManagedGroup.TryGetManagedGroup(m.DeviceBatch, out devicesManagedGroup))
                    m.DevicesLinkedGroup = devicesManagedGroup;

-                if (Authorization.Has(Claims.Config.DeviceBatch.Delete))
-                    m.CanDelete = m.DeviceBatch.CanDelete(Database);
+                m.CanDelete = m.DeviceBatch.CanDelete(Database);
+                m.CanDecommission = m.DeviceBatch.CanDecommission(Database);

                if (Authorization.Has(Claims.Config.DeviceBatch.Configure))
                {
@@ -20,6 +20,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceBatch
        public int DeviceCount { get; set; }
        public int DeviceDecommissionedCount { get; set; }
        public bool CanDelete { get; set; }
+        public bool CanDecommission { get; set; }

        public override int DeviceGroupId => DeviceBatch.Id;
    }
@@ -28,14 +28,16 @@
 <div class="form deviceBatches@(hideAdvanced ? " Config_HideAdvanced" : null)" style="width: 730px">
    <table>
        <tr>
-            <th style="width: 150px">Id:
+            <th style="width: 150px">
+                Id:
            </th>
            <td>
                @Html.DisplayFor(model => model.DeviceBatch.Id)
            </td>
        </tr>
        <tr>
-            <th>Name:
+            <th>
+                Name:
            </th>
            <td>
                @if (canConfig)
@@ -61,14 +63,16 @@
            </td>
        </tr>
        <tr>
-            <th>Default Device Model:
+            <th>
+                Default Device Model:
            </th>
-            <td>@if (canConfig)
+            <td>
+                @if (canConfig)
                {
-                @Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems(null, true))
-                @AjaxHelpers.AjaxSave()
-                @AjaxHelpers.AjaxLoader()
-                <script type="text/javascript">
+                    @Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems(null, true))
+                    @AjaxHelpers.AjaxSave()
+                    @AjaxHelpers.AjaxLoader()
+                    <script type="text/javascript">
                    $(function () {
                        document.DiscoFunctions.PropertyChangeHelper(
                            $('#DeviceBatch_DefaultDeviceModelId'),
@@ -77,7 +81,7 @@
                            'DefaultDeviceModelId'
                        );
                    });
-                </script>
+                    </script>
                }
                else
                {
@@ -85,11 +89,13 @@
                    {<span class="smallMessage">&lt;None Specified&gt;</span>}
                    else
                    {@Model.DefaultDeviceModel.ToString();
-                    }
                }
+            }
                <br />
-                <span class="smallMessage">Devices added offline will default to this Device Model.
-                    Once a device enrols the Device Model will be accurately represented.</span>
+                <span class="smallMessage">
+                    Devices added offline will default to this Device Model.
+                    Once a device enrols the Device Model will be accurately represented.
+                </span>
            </td>
        </tr>
        <tr>
@@ -154,12 +160,14 @@
            </td>
        </tr>
        <tr>
-            <th>Purchase:
+            <th>
+                Purchase:
            </th>
            <td class="details">
                <table class="sub">
                    <tr>
-                        <th class="name" style="width: 100px">Purchase Date:
+                        <th class="name" style="width: 100px">
+                            Purchase Date:
                        </th>
                        <td>
                            @if (canConfig)
@@ -187,14 +195,16 @@
                        </td>
                    </tr>
                    <tr>
-                        <th>Supplier:
+                        <th>
+                            Supplier:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.Supplier)
-                            @AjaxHelpers.AjaxSave()
-                            @AjaxHelpers.AjaxLoader()
-                            <script type="text/javascript">
+                                @Html.EditorFor(model => model.DeviceBatch.Supplier)
+                                @AjaxHelpers.AjaxSave()
+                                @AjaxHelpers.AjaxLoader()
+                                <script type="text/javascript">
                                $(function () {
                                    document.DiscoFunctions.PropertyChangeHelper(
                                        $('#DeviceBatch_Supplier'),
@@ -203,7 +213,7 @@
                                        'Supplier'
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
@@ -211,18 +221,20 @@
                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
                                else
                                {@Model.DeviceBatch.Supplier}
-                            }
+                        }
                        </td>
                    </tr>
                    <tr>
-                        <th>Unit Cost:
+                        <th>
+                            Unit Cost:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.UnitCost)
-                            @AjaxHelpers.AjaxSave()
-                            @AjaxHelpers.AjaxLoader()
-                            <script type="text/javascript">
+                                @Html.EditorFor(model => model.DeviceBatch.UnitCost)
+                                @AjaxHelpers.AjaxSave()
+                                @AjaxHelpers.AjaxLoader()
+                                <script type="text/javascript">
                                $(function () {
                                    document.DiscoFunctions.PropertyChangeHelper(
                                        $('#DeviceBatch_UnitCost'),
@@ -231,7 +243,7 @@
                                        'UnitCost'
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
@@ -239,18 +251,20 @@
                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
                                else
                                {@Model.DeviceBatch.UnitCost.Value.ToString("C")}
-                            }
+                        }
                        </td>
                    </tr>
                    <tr>
-                        <th>Quantity:
+                        <th>
+                            Quantity:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.UnitQuantity)
-                            @AjaxHelpers.AjaxSave()
-                            @AjaxHelpers.AjaxLoader()
-                            <script type="text/javascript">
+                                @Html.EditorFor(model => model.DeviceBatch.UnitQuantity)
+                                @AjaxHelpers.AjaxSave()
+                                @AjaxHelpers.AjaxLoader()
+                                <script type="text/javascript">
                                $(function () {
                                    document.DiscoFunctions.PropertyChangeHelper(
                                        $('#DeviceBatch_UnitQuantity'),
@@ -259,7 +273,7 @@
                                        'UnitQuantity'
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
@@ -267,7 +281,7 @@
                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
                                else
                                {@Model.DeviceBatch.UnitQuantity.Value.ToString("n0")}
-                            }
+                        }
                        </td>
                    </tr>
                </table>
@@ -341,12 +355,14 @@
            </td>
        </tr>
        <tr>
-            <th>Warranty:
+            <th>
+                Warranty:
            </th>
            <td class="details">
                <table class="sub">
                    <tr>
-                        <th class="name" style="width: 100px">Valid Until:
+                        <th class="name" style="width: 100px">
+                            Valid Until:
                        </th>
                        <td>
                            @if (canConfig)
@@ -444,19 +460,22 @@
            </td>
        </tr>
        <tr>
-            <th>Insurance:
+            <th>
+                Insurance:
            </th>
            <td class="details">
                <table class="sub">
                    <tr>
-                        <th class="name" style="width: 100px">Supplier:
+                        <th class="name" style="width: 100px">
+                            Supplier:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.InsuranceSupplier)
-                            @AjaxHelpers.AjaxSave()
-                            @AjaxHelpers.AjaxLoader()
-                            <script type="text/javascript">
+                                @Html.EditorFor(model => model.DeviceBatch.InsuranceSupplier)
+                                @AjaxHelpers.AjaxSave()
+                                @AjaxHelpers.AjaxLoader()
+                                <script type="text/javascript">
                                $(function () {
                                    document.DiscoFunctions.PropertyChangeHelper(
                                        $('#DeviceBatch_InsuranceSupplier'),
@@ -465,7 +484,7 @@
                                        'InsuranceSupplier'
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
@@ -473,18 +492,20 @@
                                {<span class="smallMessage">&lt;None Specified&gt;</span>}
                                else
                                {@Model.DeviceBatch.InsuranceSupplier;
-                                }
                            }
+                        }
                        </td>
                    </tr>
                    <tr>
-                        <th class="name">Insured Date:
+                        <th class="name">
+                            Insured Date:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.InsuredDate)
-                            @AjaxHelpers.AjaxLoader()
-                            <script>
+                                @Html.EditorFor(model => model.DeviceBatch.InsuredDate)
+                                @AjaxHelpers.AjaxLoader()
+                                <script>
                                $(function () {
                                    var dateField = $('#DeviceBatch_InsuredDate');
                                    document.DiscoFunctions.DateChangeHelper(
@@ -496,22 +517,24 @@
                                        true
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
-                            @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredDate, "Unknown")
+                                @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredDate, "Unknown")
                            }
                        </td>
                    </tr>
                    <tr>
-                        <th class="name">Insured Until:
+                        <th class="name">
+                            Insured Until:
                        </th>
-                        <td>@if (canConfig)
+                        <td>
+                            @if (canConfig)
                            {
-                            @Html.EditorFor(model => model.DeviceBatch.InsuredUntil)
-                            @AjaxHelpers.AjaxLoader()
-                            <script>
+                                @Html.EditorFor(model => model.DeviceBatch.InsuredUntil)
+                                @AjaxHelpers.AjaxLoader()
+                                <script>
                                $(function () {
                                    var dateField = $('#DeviceBatch_InsuredUntil');
                                    document.DiscoFunctions.DateChangeHelper(
@@ -523,11 +546,11 @@
                                        true
                                    );
                                });
-                            </script>
+                                </script>
                            }
                            else
                            {
-                            @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredUntil, "Unknown")
+                                @CommonHelpers.FriendlyDate(Model.DeviceBatch.InsuredUntil, "Unknown")
                            }
                        </td>
                    </tr>
@@ -600,13 +623,15 @@
            </td>
        </tr>
        <tr>
-            <th>Comments:<br />
+            <th>
+                Comments:<br />
                @AjaxHelpers.AjaxLoader("ajaxComments")
            </th>
-            <td>@if (canConfig)
+            <td>
+                @if (canConfig)
                {
-                @Html.EditorFor(model => model.DeviceBatch.Comments)
-                <script type="text/javascript">
+                    @Html.EditorFor(model => model.DeviceBatch.Comments)
+                    <script type="text/javascript">
                    $(function () {
                        var model = {
                            $field: $('#DeviceBatch_Comments'),
@@ -654,7 +679,7 @@
                            }
                        });
                    });
-                </script>
+                    </script>
                }
                else
                {
@@ -983,7 +1008,8 @@
            </tr>
        }
        <tr class="Config_HideAdvanced_Item">
-            <th>Linked Groups:
+            <th>
+                Linked Groups:
            </th>
            <td>
                <div>
@@ -1014,19 +1040,78 @@
 </div>
@Html.Partial(MVC.Config.Shared.Views._DeviceGroupDocumentBulkGenerate, Model)
 <div class="actionBar">
+    @if (Model.CanDecommission)
+    {
+        <button id="DeviceBatch_Decommission" class="button">Decommission All Devices</button>
+        <div id="DeviceBatch_Decommission_Dialog" class="dialog" title="Batch Device Decommission">
+            @using (Html.BeginForm(MVC.API.Device.DeviceBatchDecommission(Model.DeviceBatch.Id), FormMethod.Post))
+            {
+                @Html.AntiForgeryToken()
+                <div class="clearfix" style="margin-bottom: 10px;">
+                    <i class="fa fa-question-circle fa-lg information"></i>&nbsp;Why are these devices to be decommissioned?
+                </div>
+                <div>
+                    <ul class="none">
+                        @foreach (DecommissionReasons decommissionReason in Enum.GetValues(typeof(DecommissionReasons)).Cast<DecommissionReasons>().OrderBy(r => r.ToString()))
+                        {
+                            <li>
+                                <input type="radio" id="DeviceBatch_Decommission_Dialog_Reason_@((int)decommissionReason)"
+                                       name="decommissionReason" value="@((int)decommissionReason)" @((decommissionReason == DecommissionReasons.EndOfLife) ? "checked=\"checked\"" : string.Empty) />
+                                <label for="DeviceBatch_Decommission_Dialog_Reason_@((int)decommissionReason)">@(decommissionReason.ReasonMessage())</label>
+                            </li>
+                        }
+                    </ul>
+                    <br />
+                    <label>
+                        <input type="checkbox" value="true" name="unassignUsers" />
+                        Unassign devices users
+                    </label>
+                </div>
+            }
+        </div>
+        <script type="text/javascript">
+            $(function () {
+                let buttonDialog = null;
+                $('#DeviceBatch_Decommission').click(function () {
+                    if (!buttonDialog) {
+                        buttonDialog = $('#DeviceBatch_Decommission_Dialog')
+                            .dialog({
+                                resizable: false,
+                                modal: true,
+                                autoOpen: false,
+                                buttons: {
+                                    "Decommission": function () {
+                                        const $this = $(this);
+                                        $this.find('form').trigger('submit');
+                                        $this.dialog("disable");
+                                        $this.dialog("option", "buttons", null);
+                                    },
+                                    Cancel: function () {
+                                        $(this).dialog("close");
+                                    }
+                                }
+                            });
+                    }
+                    buttonDialog.dialog('open');
+                    return false;
+                });
+
+            });
+        </script>
+    }
    @if (Model.CanDelete)
-    { 
+    {
        @Html.ActionLinkButton("Delete", MVC.API.DeviceBatch.Delete(Model.DeviceBatch.Id, true), "buttonDelete")
    }
    @if (Model.DeviceCount > 0)
    {
        if (Authorization.Has(Claims.Device.Actions.Export))
        {
-        @Html.ActionLinkButton("Export Devices", MVC.Device.Export(null, Disco.Models.Services.Devices.DeviceExportTypes.Batch, Model.DeviceBatch.Id))
+            @Html.ActionLinkButton("Export Devices", MVC.Device.Export(null, Disco.Models.Services.Devices.DeviceExportTypes.Batch, Model.DeviceBatch.Id))
        }
        if (Authorization.Has(Claims.Device.Search) && Model.DeviceCount > 0)
        {
-        @Html.ActionLinkButton(string.Format("View {0} Device{1}", Model.DeviceCount, (Model.DeviceCount != 1 ? "s" : null)), MVC.Search.Query(Model.DeviceBatch.Id.ToString(), "DeviceBatch"))
+            @Html.ActionLinkButton(string.Format("View {0} Device{1}", Model.DeviceCount, (Model.DeviceCount != 1 ? "s" : null)), MVC.Search.Query(Model.DeviceBatch.Id.ToString(), "DeviceBatch"))
        }
    }
 </div>
@@ -1,6 +1,5 @@
 using Disco.Models.Repository;
 using Disco.Models.Services.Devices;
-using Disco.Models.Services.Documents;
 using Disco.Models.Services.Jobs.JobLists;
 using Disco.Models.UI.Device;
 using Disco.Services;
@@ -218,6 +218,12 @@ namespace Disco.Web.Areas.API.Controllers
        }
        [NonAction]
        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult DeviceBatchDecommission()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.DeviceBatchDecommission);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
        public virtual System.Web.Mvc.ActionResult Export()
        {
            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Export);
@@ -276,6 +282,7 @@ namespace Disco.Web.Areas.API.Controllers
            public readonly string ImportBegin = "ImportBegin";
            public readonly string ImportParse = "ImportParse";
            public readonly string ImportApply = "ImportApply";
+            public readonly string DeviceBatchDecommission = "DeviceBatchDecommission";
            public readonly string Export = "Export";
            public readonly string ExportRetrieve = "ExportRetrieve";
            public readonly string SaveExport = "SaveExport";
@@ -311,6 +318,7 @@ namespace Disco.Web.Areas.API.Controllers
            public const string ImportBegin = "ImportBegin";
            public const string ImportParse = "ImportParse";
            public const string ImportApply = "ImportApply";
+            public const string DeviceBatchDecommission = "DeviceBatchDecommission";
            public const string Export = "Export";
            public const string ExportRetrieve = "ExportRetrieve";
            public const string SaveExport = "SaveExport";
@@ -557,6 +565,16 @@ namespace Disco.Web.Areas.API.Controllers
        {
            public readonly string Id = "Id";
        }
+        static readonly ActionParamsClass_DeviceBatchDecommission s_params_DeviceBatchDecommission = new ActionParamsClass_DeviceBatchDecommission();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_DeviceBatchDecommission DeviceBatchDecommissionParams { get { return s_params_DeviceBatchDecommission; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_DeviceBatchDecommission
+        {
+            public readonly string id = "id";
+            public readonly string decommissionReason = "decommissionReason";
+            public readonly string unassignUsers = "unassignUsers";
+        }
        static readonly ActionParamsClass_Export s_params_Export = new ActionParamsClass_Export();
        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
        public ActionParamsClass_Export ExportParams { get { return s_params_Export; } }
@@ -943,6 +961,20 @@ namespace Disco.Web.Areas.API.Controllers
            return callInfo;
        }

+        [NonAction]
+        partial void DeviceBatchDecommissionOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, Disco.Models.Repository.DecommissionReasons? decommissionReason, bool? unassignUsers);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult DeviceBatchDecommission(int id, Disco.Models.Repository.DecommissionReasons? decommissionReason, bool? unassignUsers)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.DeviceBatchDecommission);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "decommissionReason", decommissionReason);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "unassignUsers", unassignUsers);
+            DeviceBatchDecommissionOverride(callInfo, id, decommissionReason, unassignUsers);
+            return callInfo;
+        }
+
        [NonAction]
        partial void ExportOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, Disco.Web.Models.Device.ExportModel model);

@@ -217,7 +217,7 @@
 {
    <div id="Devices_Import_Completed_Dialog" class="dialog" title="Device Import Completed">
        <h3><i class="fa fa-lg fa-check"></i>Successfully imported/updated @Model.CompletedImportSessionContext.AffectedRecords device@(Model.CompletedImportSessionContext.AffectedRecords != 1 ? "s" : null).</h3>
-        <div>File: <code>@Model.CompletedImportSessionContext.Filename</code></div>
+        <div><code>@Model.CompletedImportSessionContext.Filename</code></div>
    </div>
    <script>
        $(function () {
@@ -668,11 +668,11 @@ WriteLiteral(" device");
            
            #line default
            #line hidden
-WriteLiteral(".</h3>\r\n        <div>File: <code>");
+WriteLiteral(".</h3>\r\n        <div><code>");

            
            #line 220 "..\..\Views\Device\Import.cshtml"
-                    Write(Model.CompletedImportSessionContext.Filename);
+              Write(Model.CompletedImportSessionContext.Filename);

            
            #line default
@@ -2,7 +2,7 @@
@{
    Authorization.Require(Claims.Device.Actions.Import);

-    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), string.Format("File: {0}", Model.Context.DatasetName));
+    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), Model.Context.DatasetName);
 }
 <div id="Devices_Import_Headers">

@@ -29,7 +29,8 @@
                    {
                        <td data-headerindex="@header.Index" class="header@(header.Type.ToString())">
                            <ul class="importHeaderType" data-headerindex="@header.Index" data-headertype="@header.Type.ToString()">
-                                <li><a href="#"><span class="headerTypeTitle">@(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2)</span></a>
+                                <li>
+                                    <a href="#"><span class="headerTypeTitle">@(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2)</span></a>
                                    <ul>
                                        @foreach (var headerType in Model.HeaderTypes)
                                        {
@@ -62,7 +63,7 @@
    <div class="actionBar">
        @using (Html.BeginForm(MVC.API.Device.ImportParse(Model.Context.SessionId, null)))
        {
-            <a id="Devices_Import_Headers_Submit" href="#" class="button">Parse Device Import</a>   
+            <a id="Devices_Import_Headers_Submit" href="#" class="button">Parse Device Import</a>
        }
    </div>
 </div>
@@ -48,7 +48,7 @@ namespace Disco.Web.Views.Device
  
    Authorization.Require(Claims.Device.Actions.Import);

-    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), string.Format("File: {0}", Model.Context.DatasetName));
+    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), Model.Context.DatasetName);

            
            #line default
@@ -138,15 +138,15 @@ WriteLiteral(" data-headerindex=\"");
            #line hidden
 WriteLiteral("\"");

-WriteAttribute("class", Tuple.Create(" class=\"", 947), Tuple.Create("\"", 986)
-, Tuple.Create(Tuple.Create("", 955), Tuple.Create("header", 955), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 919), Tuple.Create("\"", 958)
+, Tuple.Create(Tuple.Create("", 927), Tuple.Create("header", 927), true)
            
            #line 24 "..\..\Views\Device\ImportHeaders.cshtml"
-, Tuple.Create(Tuple.Create("", 961), Tuple.Create<System.Object, System.Int32>(header.Type.ToString()
+, Tuple.Create(Tuple.Create("", 933), Tuple.Create<System.Object, System.Int32>(header.Type.ToString()
            
            #line default
            #line hidden
-, 961), false)
+, 933), false)
 );

 WriteLiteral(">");
@@ -196,15 +196,15 @@ WriteLiteral(" data-headerindex=\"");
            #line hidden
 WriteLiteral("\"");

-WriteAttribute("class", Tuple.Create(" class=\"", 1226), Tuple.Create("\"", 1265)
-, Tuple.Create(Tuple.Create("", 1234), Tuple.Create("header", 1234), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 1198), Tuple.Create("\"", 1237)
+, Tuple.Create(Tuple.Create("", 1206), Tuple.Create("header", 1206), true)
            
            #line 30 "..\..\Views\Device\ImportHeaders.cshtml"
-, Tuple.Create(Tuple.Create("", 1240), Tuple.Create<System.Object, System.Int32>(header.Type.ToString()
+, Tuple.Create(Tuple.Create("", 1212), Tuple.Create<System.Object, System.Int32>(header.Type.ToString()
            
            #line default
            #line hidden
-, 1240), false)
+, 1212), false)
 );

 WriteLiteral(">\r\n                            <ul");
@@ -233,7 +233,7 @@ WriteLiteral(" data-headertype=\"");
            #line hidden
 WriteLiteral("\"");

-WriteLiteral(">\r\n                                <li><a");
+WriteLiteral(">\r\n                                <li>\r\n                                    <a");

 WriteLiteral(" href=\"#\"");

@@ -244,7 +244,7 @@ WriteLiteral(" class=\"headerTypeTitle\"");
 WriteLiteral(">");

            
-            #line 32 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 33 "..\..\Views\Device\ImportHeaders.cshtml"
                                                                          Write(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2);

            
@@ -253,13 +253,13 @@ WriteLiteral(">");
 WriteLiteral("</span></a>\r\n                                    <ul>\r\n");

            
-            #line 34 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 35 "..\..\Views\Device\ImportHeaders.cshtml"
                                        
            
            #line default
            #line hidden
            
-            #line 34 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 35 "..\..\Views\Device\ImportHeaders.cshtml"
                                         foreach (var headerType in Model.HeaderTypes)
                                        {

@@ -271,7 +271,7 @@ WriteLiteral("                                            <li");
 WriteLiteral(" data-headertype=\"");

            
-            #line 36 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 37 "..\..\Views\Device\ImportHeaders.cshtml"
                                                            Write(headerType.Item1);

            
@@ -286,7 +286,7 @@ WriteLiteral(" href=\"#\"");
 WriteLiteral(">");

            
-            #line 36 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 37 "..\..\Views\Device\ImportHeaders.cshtml"
                                                                                           Write(headerType.Item2);

            
@@ -295,7 +295,7 @@ WriteLiteral(">");
 WriteLiteral("</a></li>\r\n");

            
-            #line 37 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 38 "..\..\Views\Device\ImportHeaders.cshtml"
                                        }

            
@@ -305,7 +305,7 @@ WriteLiteral("                                    </ul>\r\n
 "\n                            </ul>\r\n                        </td>\r\n");

            
-            #line 42 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 43 "..\..\Views\Device\ImportHeaders.cshtml"
                    }

            
@@ -314,13 +314,13 @@ WriteLiteral("                                    </ul>\r\n
 WriteLiteral("                </tr>\r\n            </thead>\r\n            <tbody>\r\n");

            
-            #line 46 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 47 "..\..\Views\Device\ImportHeaders.cshtml"
                
            
            #line default
            #line hidden
            
-            #line 46 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 47 "..\..\Views\Device\ImportHeaders.cshtml"
                 using (var dataReader = Model.Context.GetDataReader())
                {
                    for (int r = 0; r < Math.Min(10, Model.Context.RecordCount); r++)
@@ -333,13 +333,13 @@ WriteLiteral("                </tr>\r\n            </thead>\r\n            <tbod
 WriteLiteral("                        <tr>\r\n");

            
-            #line 52 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 53 "..\..\Views\Device\ImportHeaders.cshtml"
                            
            
            #line default
            #line hidden
            
-            #line 52 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 53 "..\..\Views\Device\ImportHeaders.cshtml"
                             for (int c = 0; c < Model.Context.ColumnCount; c++)
                            {

@@ -351,7 +351,7 @@ WriteLiteral("                                <td");
 WriteLiteral(" data-headerindex=\"");

            
-            #line 54 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 55 "..\..\Views\Device\ImportHeaders.cshtml"
                                                 Write(c);

            
@@ -362,7 +362,7 @@ WriteLiteral("\"");
 WriteLiteral(">");

            
-            #line 54 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 55 "..\..\Views\Device\ImportHeaders.cshtml"
                                                     Write(dataReader.GetString(c));

            
@@ -371,7 +371,7 @@ WriteLiteral(">");
 WriteLiteral("</td>\r\n");

            
-            #line 55 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 56 "..\..\Views\Device\ImportHeaders.cshtml"
                            }

            
@@ -380,7 +380,7 @@ WriteLiteral("</td>\r\n");
 WriteLiteral("                        </tr>\r\n");

            
-            #line 57 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 58 "..\..\Views\Device\ImportHeaders.cshtml"
                    }
                }

@@ -394,13 +394,13 @@ WriteLiteral(" class=\"actionBar\"");
 WriteLiteral(">\r\n");

            
-            #line 63 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 64 "..\..\Views\Device\ImportHeaders.cshtml"
        
            
            #line default
            #line hidden
            
-            #line 63 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 64 "..\..\Views\Device\ImportHeaders.cshtml"
         using (Html.BeginForm(MVC.API.Device.ImportParse(Model.Context.SessionId, null)))
        {

@@ -415,10 +415,10 @@ WriteLiteral(" href=\"#\"");

 WriteLiteral(" class=\"button\"");

-WriteLiteral(">Parse Device Import</a>   \r\n");
+WriteLiteral(">Parse Device Import</a>\r\n");

            
-            #line 66 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 67 "..\..\Views\Device\ImportHeaders.cshtml"
        }

            
@@ -442,13 +442,13 @@ WriteLiteral("></i>Parsing device import...</h4>\r\n</div>\r\n<script>\r\n    $(
 "  var headerTypes = {\r\n");

            
-            #line 75 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 76 "..\..\Views\Device\ImportHeaders.cshtml"
            
            
            #line default
            #line hidden
            
-            #line 75 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 76 "..\..\Views\Device\ImportHeaders.cshtml"
             foreach (var h in Model.HeaderTypes)
            {

@@ -460,7 +460,7 @@ WriteLiteral("                ");
 WriteLiteral("\'");

            
-            #line 77 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 78 "..\..\Views\Device\ImportHeaders.cshtml"
                   Write(h.Item1);

            
@@ -469,7 +469,7 @@ WriteLiteral("\'");
 WriteLiteral("\': \'");

            
-            #line 77 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 78 "..\..\Views\Device\ImportHeaders.cshtml"
                                 Write(h.Item2);

            
@@ -480,7 +480,7 @@ WriteLiteral("\',");
 WriteLiteral("\r\n");

            
-            #line 78 "..\..\Views\Device\ImportHeaders.cshtml"
+            #line 79 "..\..\Views\Device\ImportHeaders.cshtml"
            }

            
@@ -4,7 +4,7 @@
@{
    Authorization.Require(Claims.Device.Actions.Import);

-    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), string.Format("File: {0}", Model.Context.Filename));
+    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), Model.Context.Filename);
 }
 <div id="Devices_Import_Review">

@@ -23,105 +23,116 @@
    <div id="Devices_Import_Review_Navigation">
        <ul class="none">
            @if (Model.StatisticErrorRecords > 0)
-            {<li class="actionDetached">
-                <input id="Devices_Import_Review_Navigation_Error" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Error">Show Errors (@(Model.StatisticErrorRecords))</label>
-            </li>}@if (Model.StatisticNewRecords > 0)
-                  {<li class="actionAdded">
-                      <input id="Devices_Import_Review_Navigation_New" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_New">Show New Devices (@(Model.StatisticNewRecords))</label>
-                  </li>}@if (Model.StatisticModifiedRecords > 0)
-                        {<li class="actionModified">
-                            <input id="Devices_Import_Review_Navigation_Modified" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Modified">Show Modified Devices (@(Model.StatisticModifiedRecords))</label>
-                        </li>}@if (Model.StatisticUnmodifiedRecords > 0)
-                              {<li class="actionUnchanged">
-                                  <input id="Devices_Import_Review_Navigation_Unchanged" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Unchanged">Show Unchanged Devices (@(Model.StatisticUnmodifiedRecords))</label>
-                              </li>}
-        </ul>
-        <script>
-            $(function () {
-                $navigationContainer = $('#Devices_Import_Review_Navigation');
-                $tableBody = $('#Devices_Import_Review_TableContainer').find('tbody');
+            {
+                <li class="actionDetached">
+                    <input id="Devices_Import_Review_Navigation_Error" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Error">Show Errors (@(Model.StatisticErrorRecords))</label>
+                </li>
+}@if (Model.StatisticNewRecords > 0)
+            {
+                <li class="actionAdded">
+                    <input id="Devices_Import_Review_Navigation_New" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_New">Show New Devices (@(Model.StatisticNewRecords))</label>
+                </li>
+}@if (Model.StatisticModifiedRecords > 0)
+{
+    <li class="actionModified">
+        <input id="Devices_Import_Review_Navigation_Modified" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Modified">Show Modified Devices (@(Model.StatisticModifiedRecords))</label>
+    </li>
+}@if (Model.StatisticUnmodifiedRecords > 0)
+{
+    <li class="actionUnchanged">
+        <input id="Devices_Import_Review_Navigation_Unchanged" type="checkbox" checked /><label for="Devices_Import_Review_Navigation_Unchanged">Show Unchanged Devices (@(Model.StatisticUnmodifiedRecords))</label>
+    </li>
+}
+</ul>
+<script>
+    $(function () {
+        $navigationContainer = $('#Devices_Import_Review_Navigation');
+        $tableBody = $('#Devices_Import_Review_TableContainer').find('tbody');

-                $navigationContainer.on('change', 'input', function () {
-                    $tableBody.find('tr').show();
+        $navigationContainer.on('change', 'input', function () {
+            $tableBody.find('tr').show();

-                    $navigationContainer.find('input').each(function () {
-                        var $this = $(this);
-                        var action = $this.closest('li').attr('class');
-                        var records = $tableBody.find('tr.' + action);
-                        if ($this.is(':checked')) {
-                            records.show();
-                        } else {
-                            records.hide();
-                        }
-                    });
-                });
-            });
-        </script>
-    </div>
-    <div id="Devices_Import_Review_TableContainer">
-        <table class="tableData">
-            <thead>
-                <tr>
-                    <th>Action</th>
-                    <th>Row</th>
-                    @foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
-                    {
-                        <th>@(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2)</th>
-                    }
-                </tr>
-                <tr>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
-                    @foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
-                    {
-                        <th>@header.Name</th>
-                    }
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var recordEntry in Model.Context.Records.Select((r, i) => Tuple.Create(r, i)))
-                {
-                    var record = recordEntry.Item1;
-                    <tr class="action@(record.RecordAction)">
-                        <td class="action"><i class="fa fa-fw"></i></td>
-                        <td>@(recordEntry.Item2 + 1)</td>
-                        @foreach (var field in record.Fields)
-                        {
-                            var friendlyValue = field.FriendlyValue;
-                            <td class="header@(field.FieldType) action@(field.FieldAction.HasValue ? field.FieldAction.ToString() : "Error")" data-previousvalue="@(field.FieldAction.HasValue && field.FieldAction.Value == System.Data.EntityState.Modified ? field.FriendlyPreviousValue : null)">
-                                @if (!field.FieldAction.HasValue)
-                                {
-                                    <span class="errorMessage"><strong>Error:</strong> @field.ErrorMessage</span>
-                                    <i class="fa fa-exclamation-triangle fa-fw"></i>
-                                }
-                                @if (string.IsNullOrEmpty(friendlyValue))
-                                {<span class="smallMessage">&lt;None&gt;</span>}
-                                else if (field.FieldType == DeviceImportFieldTypes.DeviceSerialNumber && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Added)
-                                {
-                                    @Html.ActionLink(friendlyValue, MVC.Device.Show((string)field.RawParsedValue), new { target="_blank" })}
-                                else if (field.FieldType == DeviceImportFieldTypes.AssignedUserId && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Unchanged)
-                                {
-                                    @Html.ActionLink(friendlyValue, MVC.User.Show((string)field.RawParsedValue), new { target="_blank" })}
-                                else
-                                {@friendlyValue}
-                            </td>
-                        }
-                    </tr>
+            $navigationContainer.find('input').each(function () {
+                var $this = $(this);
+                var action = $this.closest('li').attr('class');
+                var records = $tableBody.find('tr.' + action);
+                if ($this.is(':checked')) {
+                    records.show();
+                } else {
+                    records.hide();
                }
-            </tbody>
-        </table>
-    </div>
-    <div class="actionBar">
+            });
+        });
+    });
+</script>
+</div>
+<div id="Devices_Import_Review_TableContainer">
+    <table class="tableData">
+        <thead>
+            <tr>
+                <th>Action</th>
+                <th>Row</th>
+                @foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
+                {
+                    <th>@(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2)</th>
+                }
+            </tr>
+            <tr>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                @foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
+                {
+                    <th>@header.Name</th>
+                }
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var recordEntry in Model.Context.Records.Select((r, i) => Tuple.Create(r, i)))
+            {
+                var record = recordEntry.Item1;
+                <tr class="action@(record.RecordAction)">
+                    <td class="action"><i class="fa fa-fw"></i></td>
+                    <td>@(recordEntry.Item2 + 1)</td>
+                    @foreach (var field in record.Fields)
+                    {
+                        var friendlyValue = field.FriendlyValue;
+                        <td class="header@(field.FieldType) action@(field.FieldAction.HasValue ? field.FieldAction.ToString() : "Error")" data-previousvalue="@(field.FieldAction.HasValue && field.FieldAction.Value == System.Data.EntityState.Modified ? field.FriendlyPreviousValue : null)">
+                            @if (!field.FieldAction.HasValue)
+                            {
+                                <span class="errorMessage"><strong>Error:</strong> @field.ErrorMessage</span>
+                                <i class="fa fa-exclamation-triangle fa-fw"></i>
+                            }
+                            @if (string.IsNullOrEmpty(friendlyValue))
+                            {<span class="smallMessage">&lt;None&gt;</span>}
+                            else if (field.FieldType == DeviceImportFieldTypes.DeviceSerialNumber && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Added)
+                            {
+                                @Html.ActionLink(friendlyValue, MVC.Device.Show((string)field.RawParsedValue), new { target = "_blank" })}
+                            else if (field.FieldType == DeviceImportFieldTypes.AssignedUserId && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Unchanged)
+                            {
+                                @Html.ActionLink(friendlyValue, MVC.User.Show((string)field.RawParsedValue), new { target = "_blank" })}
+                            else
+                            {@friendlyValue}
+                        </td>
+                    }
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
+<div class="actionBar">
+    @if (Model.Context.AllowBacktracking)
+    {
        <a id="Devices_Import_Review_ChangeHeaders" href="@Url.Action(MVC.Device.ImportHeaders(Model.Context.SessionId))" class="button"><i class="fa fa-caret-left"></i>Change Import Columns</a>
-        @if (Model.StatisticImportRecords == 0)
-        {
-            <a id="Devices_Import_Review_Apply" href="#" class="button disabled" disabled><i class="fa fa-wrench"></i>Apply Device Import</a>
-        }
-        else
-        {
-            <a id="Devices_Import_Review_Apply" href="@Url.Action(MVC.API.Device.ImportApply(Model.Context.SessionId))" class="button"><i class="fa fa-wrench"></i>Apply Device Import</a>
-        }
-    </div>
+    }
+    @if (Model.StatisticImportRecords == 0)
+    {
+        <a id="Devices_Import_Review_Apply" href="#" class="button disabled" disabled><i class="fa fa-wrench"></i>Apply Device Import</a>
+    }
+    else
+    {
+        <a id="Devices_Import_Review_Apply" href="@Url.Action(MVC.API.Device.ImportApply(Model.Context.SessionId))" class="button"><i class="fa fa-wrench"></i>Apply Device Import</a>
+    }
+</div>
 </div>
 <script>
    $(function () {
@@ -60,7 +60,7 @@ namespace Disco.Web.Views.Device
  
    Authorization.Require(Claims.Device.Actions.Import);

-    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), string.Format("File: {0}", Model.Context.Filename));
+    ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), "Import Devices", MVC.Device.Import(), Model.Context.Filename);

            
            #line default
@@ -185,14 +185,15 @@ WriteLiteral(">\r\n");
            #line 25 "..\..\Views\Device\ImportReview.cshtml"
             if (Model.StatisticErrorRecords > 0)
            {
+
            
            #line default
            #line hidden
-WriteLiteral("<li");
+WriteLiteral("                <li");

 WriteLiteral(" class=\"actionDetached\"");

-WriteLiteral(">\r\n                <input");
+WriteLiteral(">\r\n                    <input");

 WriteLiteral(" id=\"Devices_Import_Review_Navigation_Error\"");

@@ -205,32 +206,33 @@ WriteLiteral(" for=\"Devices_Import_Review_Navigation_Error\"");
 WriteLiteral(">Show Errors (");

            
-            #line 27 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                                          Write(Model.StatisticErrorRecords);
+            #line 28 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                                              Write(Model.StatisticErrorRecords);

            
            #line default
            #line hidden
-WriteLiteral(")</label>\r\n            </li>");
+WriteLiteral(")</label>\r\n                </li>\r\n");

            
-            #line 28 "..\..\Views\Device\ImportReview.cshtml"
-                 }
+            #line 30 "..\..\Views\Device\ImportReview.cshtml"
+}
            
            #line default
            #line hidden
            
-            #line 28 "..\..\Views\Device\ImportReview.cshtml"
-                   if (Model.StatisticNewRecords > 0)
-                  {
+            #line 30 "..\..\Views\Device\ImportReview.cshtml"
+  if (Model.StatisticNewRecords > 0)
+            {
+
            
            #line default
            #line hidden
-WriteLiteral("<li");
+WriteLiteral("                <li");

 WriteLiteral(" class=\"actionAdded\"");

-WriteLiteral(">\r\n                      <input");
+WriteLiteral(">\r\n                    <input");

 WriteLiteral(" id=\"Devices_Import_Review_Navigation_New\"");

@@ -243,32 +245,33 @@ WriteLiteral(" for=\"Devices_Import_Review_Navigation_New\"");
 WriteLiteral(">Show New Devices (");

            
-            #line 30 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                                                 Write(Model.StatisticNewRecords);
+            #line 33 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                                               Write(Model.StatisticNewRecords);

            
            #line default
            #line hidden
-WriteLiteral(")</label>\r\n                  </li>");
+WriteLiteral(")</label>\r\n                </li>\r\n");

            
-            #line 31 "..\..\Views\Device\ImportReview.cshtml"
-                       }
+            #line 35 "..\..\Views\Device\ImportReview.cshtml"
+}
            
            #line default
            #line hidden
            
-            #line 31 "..\..\Views\Device\ImportReview.cshtml"
-                         if (Model.StatisticModifiedRecords > 0)
-                        {
+            #line 35 "..\..\Views\Device\ImportReview.cshtml"
+  if (Model.StatisticModifiedRecords > 0)
+{
+
            
            #line default
            #line hidden
-WriteLiteral("<li");
+WriteLiteral("    <li");

 WriteLiteral(" class=\"actionModified\"");

-WriteLiteral(">\r\n                            <input");
+WriteLiteral(">\r\n        <input");

 WriteLiteral(" id=\"Devices_Import_Review_Navigation_Modified\"");

@@ -281,32 +284,33 @@ WriteLiteral(" for=\"Devices_Import_Review_Navigation_Modified\"");
 WriteLiteral(">Show Modified Devices (");

            
-            #line 33 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                                                                      Write(Model.StatisticModifiedRecords);
+            #line 38 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                                                  Write(Model.StatisticModifiedRecords);

            
            #line default
            #line hidden
-WriteLiteral(")</label>\r\n                        </li>");
+WriteLiteral(")</label>\r\n    </li>\r\n");

            
-            #line 34 "..\..\Views\Device\ImportReview.cshtml"
-                             }
+            #line 40 "..\..\Views\Device\ImportReview.cshtml"
+}
            
            #line default
            #line hidden
            
-            #line 34 "..\..\Views\Device\ImportReview.cshtml"
-                               if (Model.StatisticUnmodifiedRecords > 0)
-                              {
+            #line 40 "..\..\Views\Device\ImportReview.cshtml"
+  if (Model.StatisticUnmodifiedRecords > 0)
+{
+
            
            #line default
            #line hidden
-WriteLiteral("<li");
+WriteLiteral("    <li");

 WriteLiteral(" class=\"actionUnchanged\"");

-WriteLiteral(">\r\n                                  <input");
+WriteLiteral(">\r\n        <input");

 WriteLiteral(" id=\"Devices_Import_Review_Navigation_Unchanged\"");

@@ -319,109 +323,74 @@ WriteLiteral(" for=\"Devices_Import_Review_Navigation_Unchanged\"");
 WriteLiteral(">Show Unchanged Devices (");

            
-            #line 36 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                                                                               Write(Model.StatisticUnmodifiedRecords);
+            #line 43 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                                                     Write(Model.StatisticUnmodifiedRecords);

            
            #line default
            #line hidden
-WriteLiteral(")</label>\r\n                              </li>");
+WriteLiteral(")</label>\r\n    </li>\r\n");

            
-            #line 37 "..\..\Views\Device\ImportReview.cshtml"
-                                   }
+            #line 45 "..\..\Views\Device\ImportReview.cshtml"
+}

            
            #line default
            #line hidden
-WriteLiteral(@"        </ul>
-        <script>
-            $(function () {
-                $navigationContainer = $('#Devices_Import_Review_Navigation');
-                $tableBody = $('#Devices_Import_Review_TableContainer').find('tbody');
+WriteLiteral(@"</ul>
+<script>
+    $(function () {
+        $navigationContainer = $('#Devices_Import_Review_Navigation');
+        $tableBody = $('#Devices_Import_Review_TableContainer').find('tbody');

-                $navigationContainer.on('change', 'input', function () {
-                    $tableBody.find('tr').show();
+        $navigationContainer.on('change', 'input', function () {
+            $tableBody.find('tr').show();

-                    $navigationContainer.find('input').each(function () {
-                        var $this = $(this);
-                        var action = $this.closest('li').attr('class');
-                        var records = $tableBody.find('tr.' + action);
-                        if ($this.is(':checked')) {
-                            records.show();
-                        } else {
-                            records.hide();
-                        }
-                    });
-                });
+            $navigationContainer.find('input').each(function () {
+                var $this = $(this);
+                var action = $this.closest('li').attr('class');
+                var records = $tableBody.find('tr.' + action);
+                if ($this.is(':checked')) {
+                    records.show();
+                } else {
+                    records.hide();
+                }
            });
-        </script>
-    </div>
-    <div");
+        });
+    });
+</script>
+</div>
+<div");

 WriteLiteral(" id=\"Devices_Import_Review_TableContainer\"");

-WriteLiteral(">\r\n        <table");
+WriteLiteral(">\r\n    <table");

 WriteLiteral(" class=\"tableData\"");

-WriteLiteral(">\r\n            <thead>\r\n                <tr>\r\n                    <th>Action</th>" +
-"\r\n                    <th>Row</th>\r\n");
-
-            
-            #line 67 "..\..\Views\Device\ImportReview.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 67 "..\..\Views\Device\ImportReview.cshtml"
-                     foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
-                    {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        <th>");
-
-            
-            #line 69 "..\..\Views\Device\ImportReview.cshtml"
-                        Write(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</th>\r\n");
-
-            
-            #line 70 "..\..\Views\Device\ImportReview.cshtml"
-                    }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </tr>\r\n                <tr>\r\n                    <th>&nbsp;</th>\r" +
-"\n                    <th>&nbsp;</th>\r\n");
+WriteLiteral(">\r\n        <thead>\r\n            <tr>\r\n                <th>Action</th>\r\n          " +
+"      <th>Row</th>\r\n");

            
            #line 75 "..\..\Views\Device\ImportReview.cshtml"
-                    
+                
            
            #line default
            #line hidden
            
            #line 75 "..\..\Views\Device\ImportReview.cshtml"
-                     foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
-                    {
+                 foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
+                {

            
            #line default
            #line hidden
-WriteLiteral("                        <th>");
+WriteLiteral("                    <th>");

            
            #line 77 "..\..\Views\Device\ImportReview.cshtml"
-                       Write(header.Name);
+                    Write(Model.HeaderTypes.FirstOrDefault(h => h.Item1 == header.Type).Item2);

            
            #line default
@@ -430,42 +399,77 @@ WriteLiteral("</th>\r\n");

            
            #line 78 "..\..\Views\Device\ImportReview.cshtml"
-                    }
+                }

            
            #line default
            #line hidden
-WriteLiteral("                </tr>\r\n            </thead>\r\n            <tbody>\r\n");
+WriteLiteral("            </tr>\r\n            <tr>\r\n                <th>&nbsp;</th>\r\n           " +
+"     <th>&nbsp;</th>\r\n");

            
-            #line 82 "..\..\Views\Device\ImportReview.cshtml"
+            #line 83 "..\..\Views\Device\ImportReview.cshtml"
                
            
            #line default
            #line hidden
            
-            #line 82 "..\..\Views\Device\ImportReview.cshtml"
-                 foreach (var recordEntry in Model.Context.Records.Select((r, i) => Tuple.Create(r, i)))
+            #line 83 "..\..\Views\Device\ImportReview.cshtml"
+                 foreach (var header in Model.Context.Columns.Where(c => c.Type != DeviceImportFieldTypes.IgnoreColumn))
                {
-                    var record = recordEntry.Item1;

            
            #line default
            #line hidden
-WriteLiteral("                    <tr");
+WriteLiteral("                    <th>");

-WriteAttribute("class", Tuple.Create(" class=\"", 4401), Tuple.Create("\"", 4437)
-, Tuple.Create(Tuple.Create("", 4409), Tuple.Create("action", 4409), true)
            
            #line 85 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 4415), Tuple.Create<System.Object, System.Int32>(record.RecordAction
+                   Write(header.Name);
+
            
            #line default
            #line hidden
-, 4415), false)
+WriteLiteral("</th>\r\n");
+
+            
+            #line 86 "..\..\Views\Device\ImportReview.cshtml"
+                }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </tr>\r\n        </thead>\r\n        <tbody>\r\n");
+
+            
+            #line 90 "..\..\Views\Device\ImportReview.cshtml"
+            
+            
+            #line default
+            #line hidden
+            
+            #line 90 "..\..\Views\Device\ImportReview.cshtml"
+             foreach (var recordEntry in Model.Context.Records.Select((r, i) => Tuple.Create(r, i)))
+            {
+                var record = recordEntry.Item1;
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                <tr");
+
+WriteAttribute("class", Tuple.Create(" class=\"", 4017), Tuple.Create("\"", 4053)
+, Tuple.Create(Tuple.Create("", 4025), Tuple.Create("action", 4025), true)
+            
+            #line 93 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 4031), Tuple.Create<System.Object, System.Int32>(record.RecordAction
+            
+            #line default
+            #line hidden
+, 4031), false)
 );

-WriteLiteral(">\r\n                        <td");
+WriteLiteral(">\r\n                    <td");

 WriteLiteral(" class=\"action\"");

@@ -473,11 +477,11 @@ WriteLiteral("><i");

 WriteLiteral(" class=\"fa fa-fw\"");

-WriteLiteral("></i></td>\r\n                        <td>");
+WriteLiteral("></i></td>\r\n                    <td>");

            
-            #line 87 "..\..\Views\Device\ImportReview.cshtml"
-                        Write(recordEntry.Item2 + 1);
+            #line 95 "..\..\Views\Device\ImportReview.cshtml"
+                    Write(recordEntry.Item2 + 1);

            
            #line default
@@ -485,46 +489,46 @@ WriteLiteral("></i></td>\r\n                        <td>");
 WriteLiteral("</td>\r\n");

            
-            #line 88 "..\..\Views\Device\ImportReview.cshtml"
-                        
+            #line 96 "..\..\Views\Device\ImportReview.cshtml"
+                    
            
            #line default
            #line hidden
            
-            #line 88 "..\..\Views\Device\ImportReview.cshtml"
-                         foreach (var field in record.Fields)
-                        {
-                            var friendlyValue = field.FriendlyValue;
+            #line 96 "..\..\Views\Device\ImportReview.cshtml"
+                     foreach (var field in record.Fields)
+                    {
+                        var friendlyValue = field.FriendlyValue;

            
            #line default
            #line hidden
-WriteLiteral("                            <td");
+WriteLiteral("                        <td");

-WriteAttribute("class", Tuple.Create(" class=\"", 4765), Tuple.Create("\"", 4874)
-, Tuple.Create(Tuple.Create("", 4773), Tuple.Create("header", 4773), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 4357), Tuple.Create("\"", 4466)
+, Tuple.Create(Tuple.Create("", 4365), Tuple.Create("header", 4365), true)
            
-            #line 91 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 4779), Tuple.Create<System.Object, System.Int32>(field.FieldType
+            #line 99 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 4371), Tuple.Create<System.Object, System.Int32>(field.FieldType
            
            #line default
            #line hidden
-, 4779), false)
-, Tuple.Create(Tuple.Create(" ", 4797), Tuple.Create("action", 4798), true)
+, 4371), false)
+, Tuple.Create(Tuple.Create(" ", 4389), Tuple.Create("action", 4390), true)
            
-            #line 91 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 4804), Tuple.Create<System.Object, System.Int32>(field.FieldAction.HasValue ? field.FieldAction.ToString() : "Error"
+            #line 99 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 4396), Tuple.Create<System.Object, System.Int32>(field.FieldAction.HasValue ? field.FieldAction.ToString() : "Error"
            
            #line default
            #line hidden
-, 4804), false)
+, 4396), false)
 );

 WriteLiteral(" data-previousvalue=\"");

            
-            #line 91 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                                              Write(field.FieldAction.HasValue && field.FieldAction.Value == System.Data.EntityState.Modified ? field.FriendlyPreviousValue : null);
+            #line 99 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                                          Write(field.FieldAction.HasValue && field.FieldAction.Value == System.Data.EntityState.Modified ? field.FriendlyPreviousValue : null);

            
            #line default
@@ -534,53 +538,53 @@ WriteLiteral("\"");
 WriteLiteral(">\r\n");

            
-            #line 92 "..\..\Views\Device\ImportReview.cshtml"
-                                
+            #line 100 "..\..\Views\Device\ImportReview.cshtml"
+                            
            
            #line default
            #line hidden
            
-            #line 92 "..\..\Views\Device\ImportReview.cshtml"
-                                 if (!field.FieldAction.HasValue)
-                                {
+            #line 100 "..\..\Views\Device\ImportReview.cshtml"
+                             if (!field.FieldAction.HasValue)
+                            {

            
            #line default
            #line hidden
-WriteLiteral("                                    <span");
+WriteLiteral("                                <span");

 WriteLiteral(" class=\"errorMessage\"");

 WriteLiteral("><strong>Error:</strong> ");

            
-            #line 94 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                  Write(field.ErrorMessage);
+            #line 102 "..\..\Views\Device\ImportReview.cshtml"
+                                                                              Write(field.ErrorMessage);

            
            #line default
            #line hidden
 WriteLiteral("</span>\r\n");

-WriteLiteral("                                    <i");
+WriteLiteral("                                <i");

 WriteLiteral(" class=\"fa fa-exclamation-triangle fa-fw\"");

 WriteLiteral("></i>\r\n");

            
-            #line 96 "..\..\Views\Device\ImportReview.cshtml"
-                                }
+            #line 104 "..\..\Views\Device\ImportReview.cshtml"
+                            }

            
            #line default
            #line hidden
-WriteLiteral("                                ");
+WriteLiteral("                            ");

            
-            #line 97 "..\..\Views\Device\ImportReview.cshtml"
-                                 if (string.IsNullOrEmpty(friendlyValue))
-                                {
+            #line 105 "..\..\Views\Device\ImportReview.cshtml"
+                             if (string.IsNullOrEmpty(friendlyValue))
+                            {
            
            #line default
            #line hidden
@@ -591,93 +595,109 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">&lt;None&gt;</span>");

            
-            #line 98 "..\..\Views\Device\ImportReview.cshtml"
-                                                                               }
-                                else if (field.FieldType == DeviceImportFieldTypes.DeviceSerialNumber && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Added)
-                                {
-                                    
+            #line 106 "..\..\Views\Device\ImportReview.cshtml"
+                                                                           }
+                            else if (field.FieldType == DeviceImportFieldTypes.DeviceSerialNumber && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Added)
+                            {
+                                
            
            #line default
            #line hidden
            
-            #line 101 "..\..\Views\Device\ImportReview.cshtml"
-                               Write(Html.ActionLink(friendlyValue, MVC.Device.Show((string)field.RawParsedValue), new { target="_blank" }));
+            #line 109 "..\..\Views\Device\ImportReview.cshtml"
+                           Write(Html.ActionLink(friendlyValue, MVC.Device.Show((string)field.RawParsedValue), new { target = "_blank" }));

            
            #line default
            #line hidden
            
-            #line 101 "..\..\Views\Device\ImportReview.cshtml"
-                                                                                                                                           }
-                                else if (field.FieldType == DeviceImportFieldTypes.AssignedUserId && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Unchanged)
-                                {
-                                    
-            
-            #line default
-            #line hidden
-            
-            #line 104 "..\..\Views\Device\ImportReview.cshtml"
-                               Write(Html.ActionLink(friendlyValue, MVC.User.Show((string)field.RawParsedValue), new { target="_blank" }));
-
-            
-            #line default
-            #line hidden
-            
-            #line 104 "..\..\Views\Device\ImportReview.cshtml"
+            #line 109 "..\..\Views\Device\ImportReview.cshtml"
                                                                                                                                         }
-                                else
-                                {
+                            else if (field.FieldType == DeviceImportFieldTypes.AssignedUserId && field.FieldAction.HasValue && field.FieldAction.Value != EntityState.Unchanged)
+                            {
+                                
            
            #line default
            #line hidden
            
-            #line 106 "..\..\Views\Device\ImportReview.cshtml"
-                            Write(friendlyValue);
+            #line 112 "..\..\Views\Device\ImportReview.cshtml"
+                           Write(Html.ActionLink(friendlyValue, MVC.User.Show((string)field.RawParsedValue), new { target = "_blank" }));

            
            #line default
            #line hidden
            
-            #line 106 "..\..\Views\Device\ImportReview.cshtml"
-                                               }
+            #line 112 "..\..\Views\Device\ImportReview.cshtml"
+                                                                                                                                       }
+                            else
+                            {
+            
+            #line default
+            #line hidden
+            
+            #line 114 "..\..\Views\Device\ImportReview.cshtml"
+                        Write(friendlyValue);

            
            #line default
            #line hidden
-WriteLiteral("                            </td>\r\n");
-
            
-            #line 108 "..\..\Views\Device\ImportReview.cshtml"
-                        }
+            #line 114 "..\..\Views\Device\ImportReview.cshtml"
+                                           }

            
            #line default
            #line hidden
-WriteLiteral("                    </tr>\r\n");
+WriteLiteral("                        </td>\r\n");

            
-            #line 110 "..\..\Views\Device\ImportReview.cshtml"
-                }
+            #line 116 "..\..\Views\Device\ImportReview.cshtml"
+                    }

            
            #line default
            #line hidden
-WriteLiteral("            </tbody>\r\n        </table>\r\n    </div>\r\n    <div");
+WriteLiteral("                </tr>\r\n");
+
+            
+            #line 118 "..\..\Views\Device\ImportReview.cshtml"
+            }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        </tbody>\r\n    </table>\r\n</div>\r\n<div");

 WriteLiteral(" class=\"actionBar\"");

-WriteLiteral(">\r\n        <a");
+WriteLiteral(">\r\n");

-WriteLiteral(" id=\"Devices_Import_Review_ChangeHeaders\"");
-
-WriteAttribute("href", Tuple.Create(" href=\"", 6568), Tuple.Create("\"", 6637)
            
-            #line 115 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 6575), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.ImportHeaders(Model.Context.SessionId))
+            #line 123 "..\..\Views\Device\ImportReview.cshtml"
+    
            
            #line default
            #line hidden
-, 6575), false)
+            
+            #line 123 "..\..\Views\Device\ImportReview.cshtml"
+     if (Model.Context.AllowBacktracking)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <a");
+
+WriteLiteral(" id=\"Devices_Import_Review_ChangeHeaders\"");
+
+WriteAttribute("href", Tuple.Create(" href=\"", 6122), Tuple.Create("\"", 6191)
+            
+            #line 125 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 6129), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Device.ImportHeaders(Model.Context.SessionId))
+            
+            #line default
+            #line hidden
+, 6129), false)
 );

 WriteLiteral(" class=\"button\"");
@@ -689,20 +709,23 @@ WriteLiteral(" class=\"fa fa-caret-left\"");
 WriteLiteral("></i>Change Import Columns</a>\r\n");

            
-            #line 116 "..\..\Views\Device\ImportReview.cshtml"
-        
-            
-            #line default
-            #line hidden
-            
-            #line 116 "..\..\Views\Device\ImportReview.cshtml"
-         if (Model.StatisticImportRecords == 0)
-        {
+            #line 126 "..\..\Views\Device\ImportReview.cshtml"
+    }

            
            #line default
            #line hidden
-WriteLiteral("            <a");
+WriteLiteral("    ");
+
+            
+            #line 127 "..\..\Views\Device\ImportReview.cshtml"
+     if (Model.StatisticImportRecords == 0)
+    {
+
+            
+            #line default
+            #line hidden
+WriteLiteral("        <a");

 WriteLiteral(" id=\"Devices_Import_Review_Apply\"");

@@ -717,26 +740,26 @@ WriteLiteral(" class=\"fa fa-wrench\"");
 WriteLiteral("></i>Apply Device Import</a>\r\n");

            
-            #line 119 "..\..\Views\Device\ImportReview.cshtml"
-        }
-        else
-        {
+            #line 130 "..\..\Views\Device\ImportReview.cshtml"
+    }
+    else
+    {

            
            #line default
            #line hidden
-WriteLiteral("            <a");
+WriteLiteral("        <a");

 WriteLiteral(" id=\"Devices_Import_Review_Apply\"");

-WriteAttribute("href", Tuple.Create(" href=\"", 6999), Tuple.Create("\"", 7070)
+WriteAttribute("href", Tuple.Create(" href=\"", 6532), Tuple.Create("\"", 6603)
            
-            #line 122 "..\..\Views\Device\ImportReview.cshtml"
-, Tuple.Create(Tuple.Create("", 7006), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.ImportApply(Model.Context.SessionId))
+            #line 133 "..\..\Views\Device\ImportReview.cshtml"
+, Tuple.Create(Tuple.Create("", 6539), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.ImportApply(Model.Context.SessionId))
            
            #line default
            #line hidden
-, 7006), false)
+, 6539), false)
 );

 WriteLiteral(" class=\"button\"");
@@ -748,39 +771,39 @@ WriteLiteral(" class=\"fa fa-wrench\"");
 WriteLiteral("></i>Apply Device Import</a>\r\n");

            
-            #line 123 "..\..\Views\Device\ImportReview.cshtml"
-        }
+            #line 134 "..\..\Views\Device\ImportReview.cshtml"
+    }

            
            #line default
            #line hidden
-WriteLiteral("    </div>\r\n</div>\r\n<script>\r\n    $(function () {\r\n        $Devices_Import_Review" +
-"_TableContainer = $(\'#Devices_Import_Review_TableContainer\');\r\n\r\n        $Device" +
-"s_Import_Review_TableContainer.find(\'tbody\').tooltip({\r\n            items: \'td.a" +
-"ction, td.actionError, td.actionModified\',\r\n            content: function () {\r\n" +
-"                var $this = $(this);\r\n\r\n                if ($this.hasClass(\'acti" +
-"on\')) {\r\n                    var record = $(this).closest(\'tr\');\r\n\r\n            " +
-"        if (record.hasClass(\'actionDetached\')) {\r\n                        return" +
-" \'<strong>Error Parsing Record</strong><div>Review the record fields for details" +
-" about any errors.</div><div class=\"smallMessage\">This record will be skipped.</" +
-"div>\';\r\n                    } else if (record.hasClass(\'actionUnchanged\')) {\r\n  " +
-"                      return \'<strong>No Changes</strong><div>No changes were fo" +
-"und while parsing this record.</div><div class=\"smallMessage\">This record will b" +
-"e skipped.</div>\';\r\n                    } else if (record.hasClass(\'actionModifi" +
-"ed\')) {\r\n                        return \'<strong>Pending Changes</strong><div>Th" +
-"is record contains changes which will be applied.</div>\';\r\n                    }" +
-" else if (record.hasClass(\'actionAdded\')) {\r\n                        return \'<st" +
-"rong>New Record</strong><div>This record will be imported.</div>\';\r\n            " +
-"        }\r\n                } else if ($this.hasClass(\'actionError\')) {\r\n        " +
-"            return $(this).find(\'span.errorMessage\').html();\r\n                } " +
-"else if ($this.hasClass(\'actionModified\')) {\r\n                    var v = $(this" +
-").attr(\'data-previousvalue\');\r\n                    if (v) {\r\n                   " +
-"     return \'<strong>Previous Value:</strong><br />\' + v;\r\n                    }" +
-" else {\r\n                        return \'<strong>Previous Value:</strong><br /><" +
-"em>&lt;None&gt;</em>\';\r\n                    }\r\n                }\r\n            }," +
-"\r\n            position: {\r\n                my: \"left top\",\r\n                at: " +
-"\"left bottom\",\r\n                collision: \"flipfit flip\"\r\n            }\r\n      " +
-"  });\r\n\r\n    });\r\n</script>\r\n");
+WriteLiteral("</div>\r\n</div>\r\n<script>\r\n    $(function () {\r\n        $Devices_Import_Review_Tab" +
+"leContainer = $(\'#Devices_Import_Review_TableContainer\');\r\n\r\n        $Devices_Im" +
+"port_Review_TableContainer.find(\'tbody\').tooltip({\r\n            items: \'td.actio" +
+"n, td.actionError, td.actionModified\',\r\n            content: function () {\r\n    " +
+"            var $this = $(this);\r\n\r\n                if ($this.hasClass(\'action\')" +
+") {\r\n                    var record = $(this).closest(\'tr\');\r\n\r\n                " +
+"    if (record.hasClass(\'actionDetached\')) {\r\n                        return \'<s" +
+"trong>Error Parsing Record</strong><div>Review the record fields for details abo" +
+"ut any errors.</div><div class=\"smallMessage\">This record will be skipped.</div>" +
+"\';\r\n                    } else if (record.hasClass(\'actionUnchanged\')) {\r\n      " +
+"                  return \'<strong>No Changes</strong><div>No changes were found " +
+"while parsing this record.</div><div class=\"smallMessage\">This record will be sk" +
+"ipped.</div>\';\r\n                    } else if (record.hasClass(\'actionModified\')" +
+") {\r\n                        return \'<strong>Pending Changes</strong><div>This r" +
+"ecord contains changes which will be applied.</div>\';\r\n                    } els" +
+"e if (record.hasClass(\'actionAdded\')) {\r\n                        return \'<strong" +
+">New Record</strong><div>This record will be imported.</div>\';\r\n                " +
+"    }\r\n                } else if ($this.hasClass(\'actionError\')) {\r\n            " +
+"        return $(this).find(\'span.errorMessage\').html();\r\n                } else" +
+" if ($this.hasClass(\'actionModified\')) {\r\n                    var v = $(this).at" +
+"tr(\'data-previousvalue\');\r\n                    if (v) {\r\n                       " +
+" return \'<strong>Previous Value:</strong><br />\' + v;\r\n                    } els" +
+"e {\r\n                        return \'<strong>Previous Value:</strong><br /><em>&" +
+"lt;None&gt;</em>\';\r\n                    }\r\n                }\r\n            },\r\n  " +
+"          position: {\r\n                my: \"left top\",\r\n                at: \"lef" +
+"t bottom\",\r\n                collision: \"flipfit flip\"\r\n            }\r\n        })" +
+";\r\n\r\n    });\r\n</script>\r\n");

        }
    }