jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Additional UI Extension Hooks

Browse Source
This commit is contained in:
Gary Sharp
2013-04-30 12:35:27 +10:00
parent 849736d42e
commit b17ed91fb0
84 changed files with 810 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
+32 -7
View File
@@ -6,6 +6,8 @@ using System.Web.Mvc;
using Disco.BI;
using Disco.BI.Extensions;
using Disco.Web.Extensions;
using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.DeviceBatch;
namespace Disco.Web.Areas.Config.Controllers
{
@@ -31,35 +33,50 @@ namespace Disco.Web.Areas.Config.Controllers
m.DeviceCount = m.DeviceBatch.Devices.Count();
m.DeviceDecommissionedCount = m.DeviceBatch.Devices.Count(d => d.DecommissionedDate.HasValue);
m.DeviceModels = dbContext.DeviceModels.ToSelectListItems();
m.DeviceModels = dbContext.DeviceModels.ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchShowModel>(this.ControllerContext, m);
return View(MVC.Config.DeviceBatch.Views.Show, m);
}
else
{
return View(Models.DeviceBatch.IndexModel.Build(dbContext));
var m = Models.DeviceBatch.IndexModel.Build(dbContext);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchIndexModel>(this.ControllerContext, m);
return View(m);
}
}
public virtual ActionResult Create()
{
// Default Batch
var m = BI.DeviceBI.BatchUtilities.DefaultNewDeviceBatch(dbContext);
var m = new Models.DeviceBatch.CreateModel()
{
DeviceBatch = BI.DeviceBI.BatchUtilities.DefaultNewDeviceBatch(dbContext)
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(this.ControllerContext, m);
return View(m);
}
[HttpPost]
public virtual ActionResult Create(Disco.Models.Repository.DeviceBatch model)
public virtual ActionResult Create(Models.DeviceBatch.CreateModel model)
{
if (ModelState.IsValid)
{
// Check for Existing
var existing = dbContext.DeviceBatches.Where(m => m.Name == model.Name).FirstOrDefault();
var existing = dbContext.DeviceBatches.Where(m => m.Name == model.DeviceBatch.Name).FirstOrDefault();
if (existing == null)
{
dbContext.DeviceBatches.Add(model);
dbContext.DeviceBatches.Add(model.DeviceBatch);
dbContext.SaveChanges();
return RedirectToAction(MVC.Config.DeviceBatch.Index(model.Id));
return RedirectToAction(MVC.Config.DeviceBatch.Index(model.DeviceBatch.Id));
}
else
{
@@ -67,11 +84,19 @@ namespace Disco.Web.Areas.Config.Controllers
}
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(this.ControllerContext, model);
return View(model);
}
public virtual ActionResult Timeline()
{
var m = new Models.DeviceBatch.TimelineModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchTimelineModel>(this.ControllerContext, m);
return View();
}
Disco.Web/Areas/Config/Controllers/DeviceModelController.cs
+16 -3
View File
@@ -6,6 +6,8 @@ using System.Web.Mvc;
using Disco.Services.Plugins.Features.WarrantyProvider;
using Disco.Services.Plugins;
using Disco.BI.Extensions;
using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.DeviceModel;
namespace Disco.Web.Areas.Config.Controllers
{
@@ -21,7 +23,7 @@ namespace Disco.Web.Areas.Config.Controllers
WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature))
};
m.DeviceComponentsModel = new Models.DeviceModel.DeviceComponentsModel()
m.DeviceComponentsModel = new Models.DeviceModel.ComponentsModel()
{
DeviceModelId = m.DeviceModel.Id,
DeviceComponents = m.DeviceModel.DeviceComponents.ToList(),
@@ -35,22 +37,33 @@ namespace Disco.Web.Areas.Config.Controllers
//m.Devices = dbContext.Devices.Include("DeviceModel").Include("DeviceProfile").Include("AssignedUser")
// .Where(d => d.DeviceModelId == m.DeviceModel.Id).ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceModelShowModel>(this.ControllerContext, m);
return View(MVC.Config.DeviceModel.Views.Show, m);
}
else
{
return View(Models.DeviceModel.IndexModel.Build(dbContext));
var m = Models.DeviceModel.IndexModel.Build(dbContext);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceModelIndexModel>(this.ControllerContext, m);
return View(m);
}
}
public virtual ActionResult GenericComponents()
{
var m = new Models.DeviceModel.DeviceComponentsModel()
var m = new Models.DeviceModel.ComponentsModel()
{
DeviceComponents = dbContext.DeviceComponents.Include("JobSubTypes").Where(dc => !dc.DeviceModelId.HasValue).ToList(),
JobSubTypes = dbContext.JobSubTypes.Where(jst => jst.JobTypeId == Disco.Models.Repository.JobType.JobTypeIds.HNWar).ToList()
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceModelComponentsModel>(this.ControllerContext, m);
return View(m);
}
}
Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
+28 -7
View File
@@ -8,6 +8,8 @@ using Disco.BI;
using Disco.BI.Extensions;
using Disco.Services.Plugins.Features.CertificateProvider;
using Disco.Services.Plugins;
using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.DeviceProfile;
namespace Disco.Web.Areas.Config.Controllers
{
@@ -45,33 +47,46 @@ namespace Disco.Web.Areas.Config.Controllers
//m.OrganisationalUnit = m.DeviceProfile.OrganisationalUnit;
//m.ComputerNameTemplate = m.DeviceProfile.ComputerNameTemplate;
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileShowModel>(this.ControllerContext, m);
return View(MVC.Config.DeviceProfile.Views.Show, m);
}
else
{
return View(Models.DeviceProfile.IndexModel.Build(dbContext));
var m = Models.DeviceProfile.IndexModel.Build(dbContext);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileIndexModel>(this.ControllerContext, m);
return View(m);
}
}
public virtual ActionResult Create()
{
return View();
var m = new Models.DeviceProfile.CreateModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, m);
return View(m);
}
[HttpPost]
public virtual ActionResult Create(Disco.Models.Repository.DeviceProfile model)
public virtual ActionResult Create(Models.DeviceProfile.CreateModel model)
{
if (ModelState.IsValid)
{
// Check for Existing
var existing = dbContext.DeviceProfiles.Where(m => m.Name == model.Name).FirstOrDefault();
var existing = dbContext.DeviceProfiles.Where(m => m.Name == model.DeviceProfile.Name).FirstOrDefault();
if (existing == null)
{
model.ProvisionADAccount = true;
model.DeviceProfile.ProvisionADAccount = true;
dbContext.DeviceProfiles.Add(model);
dbContext.DeviceProfiles.Add(model.DeviceProfile);
dbContext.SaveChanges();
return RedirectToAction(MVC.Config.DeviceProfile.Index(model.Id));
return RedirectToAction(MVC.Config.DeviceProfile.Index(model.DeviceProfile.Id));
}
else
{
@@ -79,6 +94,9 @@ namespace Disco.Web.Areas.Config.Controllers
}
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, model);
return View(model);
}
@@ -93,6 +111,9 @@ namespace Disco.Web.Areas.Config.Controllers
m.DeviceProfilesAndNone = m.DeviceProfiles.ToList();
m.DeviceProfilesAndNone.Insert(0, new Disco.Models.Repository.DeviceProfile() { Id = 0, Name = "<No Default>" });
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileDefaultsModel>(this.ControllerContext, m);
return View(m);
}
Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+28
View File
@@ -5,6 +5,8 @@ using System.Web;
using System.Web.Mvc;
using Disco.BI;
using Disco.BI.Extensions;
using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.DocumentTemplate;
namespace Disco.Web.Areas.Config.Controllers
{
@@ -16,6 +18,10 @@ namespace Disco.Web.Areas.Config.Controllers
if (string.IsNullOrEmpty(id))
{
var m = new Models.DocumentTemplate.IndexModel() { DocumentTemplates = dbContext.DocumentTemplates.ToList() };
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateIndexModel>(this.ControllerContext, m);
return View(m);
}
else
@@ -26,12 +32,21 @@ namespace Disco.Web.Areas.Config.Controllers
};
m.TemplateExpressions = m.DocumentTemplate.ExtractPdfExpressions(dbContext);
m.UpdateModel(dbContext);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowModel>(this.ControllerContext, m);
return View(MVC.Config.DocumentTemplate.Views.Show, m);
}
}
public virtual ActionResult ImportStatus()
{
var m = new Models.DocumentTemplate.ImportStatusModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateImportStatusModel>(this.ControllerContext, m);
return View();
}
public virtual ActionResult UndetectedPages()
@@ -41,6 +56,9 @@ namespace Disco.Web.Areas.Config.Controllers
DocumentTemplates = dbContext.DocumentTemplates.ToList()
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateUndetectedPagesModel>(this.ControllerContext, m);
return View(m);
}
@@ -49,6 +67,9 @@ namespace Disco.Web.Areas.Config.Controllers
var m = new Models.DocumentTemplate.CreateModel();
m.UpdateModel(dbContext);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(this.ControllerContext, m);
return View(m);
}
@@ -87,6 +108,10 @@ namespace Disco.Web.Areas.Config.Controllers
ModelState.AddModelError("Name", "A Document Template with this Name already exists.");
}
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(this.ControllerContext, model);
return View(model);
}
@@ -103,6 +128,9 @@ namespace Disco.Web.Areas.Config.Controllers
ExtensionLibraries = BI.Expressions.Expression.ExtensionLibraryTypes()
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateExpressionBrowserModel>(this.ControllerContext, m);
return View(m);
}
else
Disco.Web/Areas/Config/Controllers/EnrolmentController.cs
+12 -2
View File
@@ -1,4 +1,6 @@
using System;
using Disco.Models.UI.Config.Enrolment;
using Disco.Services.Plugins.Features.UIExtension;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -18,11 +20,19 @@ namespace Disco.Web.Areas.Config.Controllers
MacSshUsername = dbContext.DiscoConfiguration.Bootstrapper.MacSshUsername
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigEnrolmentIndexModel>(this.ControllerContext, m);
return View(m);
}
public virtual ActionResult Status()
{
return View();
var m = new Models.Enrolment.StatusModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigEnrolmentStatusModel>(this.ControllerContext, m);
return View(m);
}
}
Disco.Web/Areas/Config/Controllers/LoggingController.cs
+11 -1
View File
@@ -5,6 +5,8 @@ using System.Web;
using System.Web.Mvc;
using Disco.Services.Logging;
using Disco.Services.Logging.Models;
using Disco.Services.Plugins.Features.UIExtension;
using Disco.Models.UI.Config.Logging;
namespace Disco.Web.Areas.Config.Controllers
{
@@ -24,6 +26,9 @@ namespace Disco.Web.Areas.Config.Controllers
m.LogModules.Add(logModule, logModule.EventTypes.Values.Where(et => et.UsePersist).ToList());
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigLoggingIndexModel>(this.ControllerContext, m);
return View(m);
}
@@ -36,7 +41,12 @@ namespace Disco.Web.Areas.Config.Controllers
if (taskStatus == null)
return RedirectToAction(MVC.Config.Logging.Index());
return View(new Models.Logging.TaskStatusModel() { SessionId = taskStatus.SessionId });
var m = new Models.Logging.TaskStatusModel() { SessionId = taskStatus.SessionId };
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigLoggingTaskStatusModel>(this.ControllerContext, m);
return View(m);
}
}
Disco.Web/Areas/Config/Controllers/OrganisationController.cs
+7 -2
View File
@@ -1,4 +1,6 @@
using System;
using Disco.Models.UI.Config.Organisation;
using Disco.Services.Plugins.Features.UIExtension;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -18,7 +20,10 @@ namespace Disco.Web.Areas.Config.Controllers
viewModel.OrganisationName = dbContext.DiscoConfiguration.OrganisationName;
viewModel.MultiSiteMode = dbContext.DiscoConfiguration.MultiSiteMode;
viewModel.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigOrganisationIndexModel>(this.ControllerContext, viewModel);
return View(viewModel);
}
Disco.Web/Areas/Config/Models/DeviceBatch/CreateModel.cs
+13
View File
@@ -0,0 +1,13 @@
using Disco.Models.UI.Config.DeviceBatch;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DeviceBatch
{
public class CreateModel : ConfigDeviceBatchCreateModel
{
public Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
}
}
Disco.Web/Areas/Config/Models/DeviceBatch/IndexModel.cs
+6 -5
View File
@@ -3,29 +3,30 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Disco.Data.Repository;
using Disco.Models.UI.Config.DeviceBatch;
namespace Disco.Web.Areas.Config.Models.DeviceBatch
{
public class IndexModel
public class IndexModel : ConfigDeviceBatchIndexModel
{
public List<_IndexModelDeviceBatch> DeviceBatches { get; set; }
public List<ConfigDeviceBatchIndexModelItem> DeviceBatches { get; set; }
public static IndexModel Build(DiscoDataContext dbContext)
{
var m = new IndexModel();
m.DeviceBatches = dbContext.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelDeviceBatch()
m.DeviceBatches = dbContext.DeviceBatches.OrderBy(db => db.Name).Select(db => new _IndexModelItem()
{
Id = db.Id,
Name = db.Name,
PurchaseDate = db.PurchaseDate,
PurchaseUnitQuantity = db.UnitQuantity,
DeviceCount = db.Devices.Count,
DeviceDecommissionedCount = db.Devices.Count(d=> d.DecommissionedDate.HasValue),
DeviceDecommissionedCount = db.Devices.Count(d => d.DecommissionedDate.HasValue),
DefaultDeviceModel = db.DefaultDeviceModel.Description,
WarrantyExpires = db.WarrantyValidUntil,
InsuranceSupplier = db.InsuranceSupplier,
InsuredUntil = db.InsuredUntil
}).ToList();
}).Cast<ConfigDeviceBatchIndexModelItem>().ToList();
return m;
}
Disco.Web/Areas/Config/Models/DeviceBatch/ShowModel.cs
+4 -3
View File
@@ -1,4 +1,5 @@
using System;
using Disco.Models.UI.Config.DeviceBatch;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -6,10 +7,10 @@ using System.Web.Mvc;
namespace Disco.Web.Areas.Config.Models.DeviceBatch
{
public class ShowModel
public class ShowModel : ConfigDeviceBatchShowModel
{
public Disco.Models.Repository.DeviceBatch DeviceBatch { get; set; }
public List<SelectListItem> DeviceModels { get; set; }
public List<Disco.Models.Repository.DeviceModel> DeviceModels { get; set; }
public int DeviceCount { get; set; }
public int DeviceDecommissionedCount { get; set; }
public bool CanDelete { get; set; }
Disco.Web/Areas/Config/Models/DeviceBatch/TimelineModel.cs
+12
View File
@@ -0,0 +1,12 @@
using Disco.Models.UI.Config.DeviceBatch;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DeviceBatch
{
public class TimelineModel : ConfigDeviceBatchTimelineModel
{
}
}
Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelDeviceBatch.cs → Disco.Web/Areas/Config/Models/DeviceBatch/_IndexModelItem.cs
+2 -1
View File
@@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;
using Disco.Models.UI.Config.DeviceBatch;
namespace Disco.Web.Areas.Config.Models.DeviceBatch
{
public class _IndexModelDeviceBatch
public class _IndexModelItem : ConfigDeviceBatchIndexModelItem
{
public int Id { get; set; }
public string Name { get; set; }
Disco.Web/Areas/Config/Models/DeviceModel/DeviceComponentsModel.cs → Disco.Web/Areas/Config/Models/DeviceModel/ComponentsModel.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System;
using Disco.Models.UI.Config.DeviceModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DeviceModel
{
public class DeviceComponentsModel
public class ComponentsModel : ConfigDeviceModelComponentsModel
{
public int? DeviceModelId { get; set; }
public List<Disco.Models.Repository.DeviceComponent> DeviceComponents { get; set; }
Disco.Web/Areas/Config/Models/DeviceModel/IndexModel.cs
+5 -5
View File
@@ -3,17 +3,18 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Disco.Data.Repository;
using Disco.Models.UI.Config.DeviceModel;
namespace Disco.Web.Areas.Config.Models.DeviceModel
{
public class IndexModel
public class IndexModel : ConfigDeviceModelIndexModel
{
public List<_IndexModelDeviceModel> DeviceModels { get; set; }
public List<ConfigDeviceModelIndexModelItem> DeviceModels { get; set; }
public static IndexModel Build(DiscoDataContext dbContext)
{
var m = new IndexModel();
m.DeviceModels = dbContext.DeviceModels.OrderBy(dm => dm.Description).Select(dm => new _IndexModelDeviceModel()
m.DeviceModels = dbContext.DeviceModels.OrderBy(dm => dm.Description).Select(dm => new _IndexModelItem()
{
Id = dm.Id,
Name = dm.Description,
@@ -21,10 +22,9 @@ namespace Disco.Web.Areas.Config.Models.DeviceModel
Model = dm.Model,
ModelType = dm.ModelType,
DeviceCount = dm.Devices.Count
}).ToList();
}).Cast<ConfigDeviceModelIndexModelItem>().ToList();
return m;
}
}
}
Disco.Web/Areas/Config/Models/DeviceModel/ShowModel.cs
+4 -3
View File
@@ -3,15 +3,16 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Disco.Services.Plugins;
using Disco.Models.UI.Config.DeviceModel;
namespace Disco.Web.Areas.Config.Models.DeviceModel
{
public class ShowModel
public class ShowModel : ConfigDeviceModelShowModel
{
public Disco.Models.Repository.DeviceModel DeviceModel { get; set; }
public Models.DeviceModel.DeviceComponentsModel DeviceComponentsModel { get; set; }
public ConfigDeviceModelComponentsModel DeviceComponentsModel { get; set; }
public List<PluginFeatureManifest> WarrantyProviders { get; set; }
public bool CanDelete { get; set; }
Disco.Web/Areas/Config/Models/DeviceModel/_IndexModelDeviceModel.cs → Disco.Web/Areas/Config/Models/DeviceModel/_IndexModelItem.cs
+2 -1
View File
@@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;
using Disco.Models.UI.Config.DeviceModel;
namespace Disco.Web.Areas.Config.Models.DeviceModel
{
public class _IndexModelDeviceModel
public class _IndexModelItem : ConfigDeviceModelIndexModelItem
{
public int Id { get; set; }
public string Name { get; set; }
Disco.Web/Areas/Config/Models/DeviceProfile/CreateModel.cs
+13
View File
@@ -0,0 +1,13 @@
using Disco.Models.UI.Config.DeviceProfile;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
public class CreateModel : ConfigDeviceProfileCreateModel
{
public Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
}
}
Disco.Web/Areas/Config/Models/DeviceProfile/DefaultsModel.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System;
using Disco.Models.UI.Config.DeviceProfile;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
public class DefaultsModel
public class DefaultsModel : ConfigDeviceProfileDefaultsModel
{
public List<Disco.Models.Repository.DeviceProfile> DeviceProfiles { get; set; }
public List<Disco.Models.Repository.DeviceProfile> DeviceProfilesAndNone { get; set; }
Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
+5 -4
View File
@@ -4,17 +4,18 @@ using System.Linq;
using System.Web;
using Disco.Data.Repository;
using Disco.BI.Extensions;
using Disco.Models.UI.Config.DeviceProfile;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
public class IndexModel
public class IndexModel : ConfigDeviceProfileIndexModel
{
public List<_IndexModelDeviceProfile> DeviceProfiles { get; set; }
public List<ConfigDeviceProfileIndexModelItem> DeviceProfiles { get; set; }
public static IndexModel Build(DiscoDataContext dbContext)
{
var m = new IndexModel();
m.DeviceProfiles = dbContext.DeviceProfiles.OrderBy(dp => dp.Name).Select(dp => new _IndexModelDeviceProfile()
m.DeviceProfiles = dbContext.DeviceProfiles.OrderBy(dp => dp.Name).Select(dp => new _IndexModelItem()
{
Id = dp.Id,
Name = dp.Name,
@@ -24,7 +25,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
DistributionTypeId = dp.DistributionTypeDb,
DeviceCount = dp.Devices.Count,
DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue)
}).ToList();
}).Cast<ConfigDeviceProfileIndexModelItem>().ToList();
if (DiscoApplication.MultiSiteMode)
{
Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
+2 -1
View File
@@ -4,10 +4,11 @@ using System.Linq;
using System.Web;
using System.Web.Mvc;
using Disco.Services.Plugins;
using Disco.Models.UI.Config.DeviceProfile;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
public class ShowModel
public class ShowModel : ConfigDeviceProfileShowModel
{
public Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
public List<SelectListItem> DeviceProfileDistributionTypes { get; set; }
Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelDeviceProfile.cs → Disco.Web/Areas/Config/Models/DeviceProfile/_IndexModelItem.cs
+2 -2
View File
@@ -4,16 +4,16 @@ using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;
using Disco.Web.Extensions;
using Disco.Models.UI.Config.DeviceProfile;
namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
public class _IndexModelDeviceProfile
public class _IndexModelItem : ConfigDeviceProfileIndexModelItem
{
public int Id { get; set; }
public string Name { get; set; }
public string ShortName { get; set; }
public int? Address { get; set; }
//public string AddressShortName { get; set; }
public string AddressName { get; set; }
public string Description { get; set; }
public int DistributionTypeId { get; set; }
Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
+2 -1
View File
@@ -4,11 +4,12 @@ using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;
using Disco.Data.Repository;
using Disco.Models.UI.Config.DocumentTemplate;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
[CustomValidation(typeof(CreateModelValidation), "ValidateCreateModel")]
public class CreateModel
public class CreateModel : ConfigDocumentTemplateCreateModel
{
public Disco.Models.Repository.DocumentTemplate DocumentTemplate { get; set; }
Disco.Web/Areas/Config/Models/DocumentTemplate/ExpressionBrowserModel.cs
+3 -6
View File
@@ -1,20 +1,17 @@
using System;
using Disco.Models.UI.Config.DocumentTemplate;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class ExpressionBrowserModel
public class ExpressionBrowserModel : ConfigDocumentTemplateExpressionBrowserModel
{
public string DeviceType { get; set; }
public string UserType { get; set; }
public string JobType { get; set; }
//public string DataExtType { get; set; }
//public string DeviceExtType { get; set; }
//public string UserExtType { get; set; }
public Dictionary<string, string> Variables { get; set; }
public Dictionary<string, string> ExtensionLibraries { get; set; }
}
Disco.Web/Areas/Config/Models/DocumentTemplate/ImportStatusModel.cs
+12
View File
@@ -0,0 +1,12 @@
using Disco.Models.UI.Config.DocumentTemplate;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class ImportStatusModel : ConfigDocumentTemplateImportStatusModel
{
}
}
Disco.Web/Areas/Config/Models/DocumentTemplate/IndexModel.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System;
using Disco.Models.UI.Config.DocumentTemplate;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class IndexModel
public class IndexModel : ConfigDocumentTemplateIndexModel
{
public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
}
Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs
+2 -1
View File
@@ -4,10 +4,11 @@ using System.Linq;
using System.Web;
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.UI.Config.DocumentTemplate;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class ShowModel
public class ShowModel : ConfigDocumentTemplateShowModel
{
public Disco.Models.Repository.DocumentTemplate DocumentTemplate { get; set; }
Disco.Web/Areas/Config/Models/DocumentTemplate/UndetectedPagesModel.cs
+2 -1
View File
@@ -6,10 +6,11 @@ using System.Web.Mvc;
using Disco.BI;
using Disco.BI.Extensions;
using Disco.Web.Extensions;
using Disco.Models.UI.Config.DocumentTemplate;
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
{
public class UndetectedPagesModel
public class UndetectedPagesModel : ConfigDocumentTemplateUndetectedPagesModel
{
public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
Disco.Web/Areas/Config/Models/Enrolment/IndexModel.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System;
using Disco.Models.UI.Config.Enrolment;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.Enrolment
{
public class IndexModel
public class IndexModel : ConfigEnrolmentIndexModel
{
public string MacSshUsername { get; set; }
}
Disco.Web/Areas/Config/Models/Enrolment/StatusModel.cs
+12
View File
@@ -0,0 +1,12 @@
using Disco.Models.UI.Config.Enrolment;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.Enrolment
{
public class StatusModel : ConfigEnrolmentStatusModel
{
}
}
Disco.Web/Areas/Config/Models/Logging/IndexModel.cs
+2 -1
View File
@@ -4,10 +4,11 @@ using System.Linq;
using System.Web;
using Disco.Services.Logging;
using Disco.Services.Logging.Models;
using Disco.Models.UI.Config.Logging;
namespace Disco.Web.Areas.Config.Models.Logging
{
public class IndexModel
public class IndexModel : ConfigLoggingIndexModel
{
public Dictionary<LogBase, List<LogEventType>> LogModules { get; set; }
}
Disco.Web/Areas/Config/Models/Logging/TaskStatusModel.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System;
using Disco.Models.UI.Config.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Disco.Web.Areas.Config.Models.Logging
{
public class TaskStatusModel
public class TaskStatusModel : ConfigLoggingTaskStatusModel
{
public string SessionId { get; set; }
}
Disco.Web/Areas/Config/Models/Organisation/IndexModel.cs
+2 -1
View File
@@ -4,10 +4,11 @@ using System.Linq;
using System.Web;
using Disco.Models.BI.Config;
using System.ComponentModel.DataAnnotations;
using Disco.Models.UI.Config.Organisation;
namespace Disco.Web.Areas.Config.Models.Organisation
{
public class IndexModel
public class IndexModel : ConfigOrganisationIndexModel
{
public string OrganisationName { get; set; }
[Display(Name="Enabled")]
Disco.Web/Areas/Config/Views/DeviceBatch/Create.cshtml
+3 -3
View File
@@ -1,4 +1,4 @@
@model Disco.Models.Repository.DeviceBatch
@model Disco.Web.Areas.Config.Models.DeviceBatch.CreateModel
@{
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Batches", MVC.Config.DeviceBatch.Index(null), "Create");
}
@@ -11,14 +11,14 @@
Name:
</th>
<td>
@Html.EditorFor(model => model.Name)<br />@Html.ValidationMessageFor(model => model.Name)
@Html.EditorFor(model => model.DeviceBatch.Name)<br />@Html.ValidationMessageFor(model => model.DeviceBatch.Name)
</td>
</tr>
<tr>
<th>
Purchase Date:
</th>
<td>@Html.EditorFor(model => model.PurchaseDate)<br />@Html.ValidationMessageFor(model => model.PurchaseDate)
<td>@Html.EditorFor(model => model.DeviceBatch.PurchaseDate)<br />@Html.ValidationMessageFor(model => model.DeviceBatch.PurchaseDate)
</td>
</tr>
</table>
Disco.Web/Areas/Config/Views/DeviceBatch/Create.generated.cs
+7 -7
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.17929
// Runtime Version:4.0.30319.18033
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -31,9 +31,9 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
using Disco.Web;
using Disco.Web.Extensions;
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Create.cshtml")]
public class Create : System.Web.Mvc.WebViewPage<Disco.Models.Repository.DeviceBatch>
public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.CreateModel>
{
public Create()
{
@@ -71,7 +71,7 @@ WriteLiteral(" ");
#line 14 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
Write(Html.EditorFor(model => model.Name));
Write(Html.EditorFor(model => model.DeviceBatch.Name));
#line default
@@ -80,7 +80,7 @@ WriteLiteral("<br />");
#line 14 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
Write(Html.ValidationMessageFor(model => model.Name));
Write(Html.ValidationMessageFor(model => model.DeviceBatch.Name));
#line default
@@ -91,7 +91,7 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n <tr>
#line 21 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
Write(Html.EditorFor(model => model.PurchaseDate));
Write(Html.EditorFor(model => model.DeviceBatch.PurchaseDate));
#line default
@@ -100,7 +100,7 @@ WriteLiteral("<br />");
#line 21 "..\..\Areas\Config\Views\DeviceBatch\Create.cshtml"
Write(Html.ValidationMessageFor(model => model.PurchaseDate));
Write(Html.ValidationMessageFor(model => model.DeviceBatch.PurchaseDate));
#line default
Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml
+1 -1
View File
@@ -205,7 +205,7 @@
Default Device Model:
</th>
<td>
@Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels)
@Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems())
@AjaxHelpers.AjaxSave()
@AjaxHelpers.AjaxLoader()
<script type="text/javascript">
Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs
+4 -4
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.17929
// Runtime Version:4.0.30319.18033
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -31,9 +31,9 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
using Disco.Web;
using Disco.Web.Extensions;
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceBatch/Show.cshtml")]
public class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.ShowModel>
public partial class Show : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceBatch.ShowModel>
{
public Show()
{
@@ -564,7 +564,7 @@ WriteLiteral(" ");
#line 208 "..\..\Areas\Config\Views\DeviceBatch\Show.cshtml"
Write(Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels));
Write(Html.DropDownListFor(model => model.DeviceBatch.DefaultDeviceModelId, Model.DeviceModels.ToSelectListItems()));
#line default
Disco.Web/Areas/Config/Views/DeviceModel/GenericComponents.generated.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/GenericComponents.cshtml")]
public class GenericComponents : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.DeviceComponentsModel>
public class GenericComponents : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
{
public GenericComponents()
{
Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceModel
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml")]
public class DeviceComponentsTable : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.DeviceComponentsModel>
public class DeviceComponentsTable : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceModel.ComponentsModel>
{
public DeviceComponentsTable()
{
Disco.Web/Areas/Config/Views/DeviceProfile/Create.cshtml
+4 -4
View File
@@ -1,4 +1,4 @@
@model Disco.Models.Repository.DeviceProfile
@model Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel
@{
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Device Profiles", MVC.Config.DeviceProfile.Index(null), "Create");
}
@@ -11,21 +11,21 @@
Name:
</th>
<td>
@Html.TextBoxFor(model => model.Name)<br />@Html.ValidationMessageFor(model => model.Name)
@Html.TextBoxFor(model => model.DeviceProfile.Name)<br />@Html.ValidationMessageFor(model => model.DeviceProfile.Name)
</td>
</tr>
<tr>
<th>
Short Name:
</th>
<td>@Html.TextBoxFor(model => model.ShortName)<br />@Html.ValidationMessageFor(model => model.ShortName)
<td>@Html.TextBoxFor(model => model.DeviceProfile.ShortName)<br />@Html.ValidationMessageFor(model => model.DeviceProfile.ShortName)
</td>
</tr>
<tr>
<th>
Description:
</th>
<td>@Html.TextBoxFor(model => model.Description)<br />@Html.ValidationMessageFor(model => model.Description)
<td>@Html.TextBoxFor(model => model.DeviceProfile.Description)<br />@Html.ValidationMessageFor(model => model.DeviceProfile.Description)
</td>
</tr>
</table>
Disco.Web/Areas/Config/Views/DeviceProfile/Create.generated.cs
+9 -9
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.17929
// Runtime Version:4.0.30319.18033
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -31,9 +31,9 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
using Disco.Web;
using Disco.Web.Extensions;
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/Create.cshtml")]
public class Create : System.Web.Mvc.WebViewPage<Disco.Models.Repository.DeviceProfile>
public partial class Create : System.Web.Mvc.WebViewPage<Disco.Web.Areas.Config.Models.DeviceProfile.CreateModel>
{
public Create()
{
@@ -71,7 +71,7 @@ WriteLiteral(" ");
#line 14 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.TextBoxFor(model => model.Name));
Write(Html.TextBoxFor(model => model.DeviceProfile.Name));
#line default
@@ -80,7 +80,7 @@ WriteLiteral("<br />");
#line 14 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.ValidationMessageFor(model => model.Name));
Write(Html.ValidationMessageFor(model => model.DeviceProfile.Name));
#line default
@@ -90,7 +90,7 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n <tr>
#line 21 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.TextBoxFor(model => model.ShortName));
Write(Html.TextBoxFor(model => model.DeviceProfile.ShortName));
#line default
@@ -99,7 +99,7 @@ WriteLiteral("<br />");
#line 21 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.ValidationMessageFor(model => model.ShortName));
Write(Html.ValidationMessageFor(model => model.DeviceProfile.ShortName));
#line default
@@ -110,7 +110,7 @@ WriteLiteral("\r\n </td>\r\n </tr>\r\n <tr>
#line 28 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.TextBoxFor(model => model.Description));
Write(Html.TextBoxFor(model => model.DeviceProfile.Description));
#line default
@@ -119,7 +119,7 @@ WriteLiteral("<br />");
#line 28 "..\..\Areas\Config\Views\DeviceProfile\Create.cshtml"
Write(Html.ValidationMessageFor(model => model.Description));
Write(Html.ValidationMessageFor(model => model.DeviceProfile.Description));
#line default
Disco.Web/Areas/Config/Views/DeviceProfile/_TableRender.generated.cs
+1 -1
View File
@@ -33,7 +33,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
[System.Web.WebPages.PageVirtualPathAttribute("~/Areas/Config/Views/DeviceProfile/_TableRender.cshtml")]
public class TableRender : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelDeviceProfile>>
public class TableRender : System.Web.Mvc.WebViewPage<IEnumerable<Disco.Web.Areas.Config.Models.DeviceProfile._IndexModelItem>>
{
public TableRender()
{