GIT: perform LF normalization
This commit is contained in:
Gary Sharp
@@ -1,154 +1,154 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using Disco.Models;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.Data.Repository;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
[CustomValidation(typeof(CreateModelValidation), "ValidateCreateModel")]
|
||||
public class CreateModelOld
|
||||
{
|
||||
private Disco.Models.Repository.Device _Device;
|
||||
private Disco.Models.Repository.User _User;
|
||||
|
||||
public Disco.Models.Repository.Device Device
|
||||
{
|
||||
get
|
||||
{
|
||||
return _Device;
|
||||
}
|
||||
set
|
||||
{
|
||||
_Device = value;
|
||||
DeviceSerialNumber = value.SerialNumber;
|
||||
}
|
||||
}
|
||||
public Disco.Models.Repository.User User
|
||||
{
|
||||
get
|
||||
{
|
||||
return _User;
|
||||
}
|
||||
set
|
||||
{
|
||||
_User = value;
|
||||
UserId = value.Id;
|
||||
}
|
||||
}
|
||||
|
||||
public string DeviceSerialNumber { get; set; }
|
||||
public string UserId { get; set; }
|
||||
|
||||
[Required]
|
||||
public string Type { get; set; }
|
||||
[Required]
|
||||
public List<string> SubTypes { get; set; }
|
||||
|
||||
public List<Disco.Models.Repository.JobType> JobTypes { get; set; }
|
||||
public List<Disco.Models.Repository.JobSubType> JobSubTypes { get; set; }
|
||||
|
||||
public Disco.Models.Repository.JobType GetJobType
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.Type))
|
||||
{
|
||||
return this.JobTypes.FirstOrDefault(m => m.Id == this.Type);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
public List<Disco.Models.Repository.JobSubType> GetJobSubTypes
|
||||
{
|
||||
get
|
||||
{
|
||||
if (SubTypes != null)
|
||||
{
|
||||
var subTypes = this.SubTypes;
|
||||
return this.JobSubTypes.Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateModel(DiscoDataContext dbContext)
|
||||
{
|
||||
if (this.JobTypes == null)
|
||||
JobTypes = dbContext.JobTypes.ToList();
|
||||
if (this.JobSubTypes == null)
|
||||
JobSubTypes = dbContext.JobSubTypes.ToList();
|
||||
|
||||
if (!string.IsNullOrEmpty(DeviceSerialNumber))
|
||||
{
|
||||
this.Device = dbContext.Devices.Include("DeviceModel").Where(d => d.SerialNumber == DeviceSerialNumber).FirstOrDefault();
|
||||
if (this.Device == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid Device Serial Number Specified", "DeviceSerialNumber");
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.UserId) && !string.IsNullOrEmpty(this.Device.AssignedUserId))
|
||||
{
|
||||
this.UserId = this.Device.AssignedUserId;
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.Type))
|
||||
this.Type = this.JobTypes.First(jt => jt.Id == "HWar").Id;
|
||||
}
|
||||
else
|
||||
{
|
||||
// No Device - Remove Hardware Types
|
||||
foreach (var jobType in JobTypes.ToArray())
|
||||
{
|
||||
if (jobType.Id != Disco.Models.Repository.JobType.JobTypeIds.SApp)
|
||||
{
|
||||
JobTypes.Remove(jobType);
|
||||
JobSubTypes.RemoveAll(jst => jst.JobType == jobType);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(UserId))
|
||||
{
|
||||
this.User = dbContext.Users.Find(UserId);
|
||||
if (this.User == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid User Id Specified", "UserId");
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.Type))
|
||||
this.Type = Disco.Models.Repository.JobType.JobTypeIds.SApp;
|
||||
}
|
||||
if (this.User == null && this.Device == null)
|
||||
{
|
||||
throw new InvalidOperationException("A Job must reference a Device and/or a User");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class CreateModelValidation
|
||||
{
|
||||
|
||||
public static ValidationResult ValidateCreateModel(CreateModelOld model)
|
||||
{
|
||||
|
||||
// Device && User both can't be null
|
||||
if (string.IsNullOrEmpty(model.DeviceSerialNumber) && string.IsNullOrEmpty(model.UserId))
|
||||
return new ValidationResult("A Job must reference a Device and/or a User");
|
||||
|
||||
if (!string.IsNullOrEmpty(model.Type) && model.SubTypes != null)
|
||||
{
|
||||
var typeId = string.Format("{0}_", model.Type);
|
||||
model.SubTypes = model.SubTypes.Where(m => m.StartsWith(typeId)).ToList();
|
||||
if (model.SubTypes.Count == 0)
|
||||
{
|
||||
model.SubTypes = null;
|
||||
return new ValidationResult("At least one Sub Type is required", new string[] { "SubTypes" });
|
||||
}
|
||||
}
|
||||
|
||||
return ValidationResult.Success;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using Disco.Models;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.Data.Repository;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
[CustomValidation(typeof(CreateModelValidation), "ValidateCreateModel")]
|
||||
public class CreateModelOld
|
||||
{
|
||||
private Disco.Models.Repository.Device _Device;
|
||||
private Disco.Models.Repository.User _User;
|
||||
|
||||
public Disco.Models.Repository.Device Device
|
||||
{
|
||||
get
|
||||
{
|
||||
return _Device;
|
||||
}
|
||||
set
|
||||
{
|
||||
_Device = value;
|
||||
DeviceSerialNumber = value.SerialNumber;
|
||||
}
|
||||
}
|
||||
public Disco.Models.Repository.User User
|
||||
{
|
||||
get
|
||||
{
|
||||
return _User;
|
||||
}
|
||||
set
|
||||
{
|
||||
_User = value;
|
||||
UserId = value.Id;
|
||||
}
|
||||
}
|
||||
|
||||
public string DeviceSerialNumber { get; set; }
|
||||
public string UserId { get; set; }
|
||||
|
||||
[Required]
|
||||
public string Type { get; set; }
|
||||
[Required]
|
||||
public List<string> SubTypes { get; set; }
|
||||
|
||||
public List<Disco.Models.Repository.JobType> JobTypes { get; set; }
|
||||
public List<Disco.Models.Repository.JobSubType> JobSubTypes { get; set; }
|
||||
|
||||
public Disco.Models.Repository.JobType GetJobType
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.Type))
|
||||
{
|
||||
return this.JobTypes.FirstOrDefault(m => m.Id == this.Type);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
public List<Disco.Models.Repository.JobSubType> GetJobSubTypes
|
||||
{
|
||||
get
|
||||
{
|
||||
if (SubTypes != null)
|
||||
{
|
||||
var subTypes = this.SubTypes;
|
||||
return this.JobSubTypes.Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateModel(DiscoDataContext dbContext)
|
||||
{
|
||||
if (this.JobTypes == null)
|
||||
JobTypes = dbContext.JobTypes.ToList();
|
||||
if (this.JobSubTypes == null)
|
||||
JobSubTypes = dbContext.JobSubTypes.ToList();
|
||||
|
||||
if (!string.IsNullOrEmpty(DeviceSerialNumber))
|
||||
{
|
||||
this.Device = dbContext.Devices.Include("DeviceModel").Where(d => d.SerialNumber == DeviceSerialNumber).FirstOrDefault();
|
||||
if (this.Device == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid Device Serial Number Specified", "DeviceSerialNumber");
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.UserId) && !string.IsNullOrEmpty(this.Device.AssignedUserId))
|
||||
{
|
||||
this.UserId = this.Device.AssignedUserId;
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.Type))
|
||||
this.Type = this.JobTypes.First(jt => jt.Id == "HWar").Id;
|
||||
}
|
||||
else
|
||||
{
|
||||
// No Device - Remove Hardware Types
|
||||
foreach (var jobType in JobTypes.ToArray())
|
||||
{
|
||||
if (jobType.Id != Disco.Models.Repository.JobType.JobTypeIds.SApp)
|
||||
{
|
||||
JobTypes.Remove(jobType);
|
||||
JobSubTypes.RemoveAll(jst => jst.JobType == jobType);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(UserId))
|
||||
{
|
||||
this.User = dbContext.Users.Find(UserId);
|
||||
if (this.User == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid User Id Specified", "UserId");
|
||||
}
|
||||
if (string.IsNullOrEmpty(this.Type))
|
||||
this.Type = Disco.Models.Repository.JobType.JobTypeIds.SApp;
|
||||
}
|
||||
if (this.User == null && this.Device == null)
|
||||
{
|
||||
throw new InvalidOperationException("A Job must reference a Device and/or a User");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class CreateModelValidation
|
||||
{
|
||||
|
||||
public static ValidationResult ValidateCreateModel(CreateModelOld model)
|
||||
{
|
||||
|
||||
// Device && User both can't be null
|
||||
if (string.IsNullOrEmpty(model.DeviceSerialNumber) && string.IsNullOrEmpty(model.UserId))
|
||||
return new ValidationResult("A Job must reference a Device and/or a User");
|
||||
|
||||
if (!string.IsNullOrEmpty(model.Type) && model.SubTypes != null)
|
||||
{
|
||||
var typeId = string.Format("{0}_", model.Type);
|
||||
model.SubTypes = model.SubTypes.Where(m => m.StartsWith(typeId)).ToList();
|
||||
if (model.SubTypes.Count == 0)
|
||||
{
|
||||
model.SubTypes = null;
|
||||
return new ValidationResult("At least one Sub Type is required", new string[] { "SubTypes" });
|
||||
}
|
||||
}
|
||||
|
||||
return ValidationResult.Success;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class CreateRedirectModel
|
||||
{
|
||||
public string RedirectLink { get; set; }
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class CreateRedirectModel
|
||||
{
|
||||
public string RedirectLink { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,99 +1,99 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using Disco.Data.Repository;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.BI;
|
||||
using System.Web.Script.Serialization;
|
||||
using Disco.Services.Plugins;
|
||||
using Disco.Services.Plugins.Features.WarrantyProvider;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class LogWarrantyModel
|
||||
{
|
||||
public Disco.Models.Repository.Job Job { get; set; }
|
||||
public List<PluginFeatureManifest> WarrantyProviders { get; set; }
|
||||
public PluginFeatureManifest WarrantyProvider { get; set; }
|
||||
public List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
|
||||
public Disco.Models.BI.Config.OrganisationAddress OrganisationAddress { get; set; }
|
||||
|
||||
public Disco.Models.Repository.User TechUser { get; set; }
|
||||
|
||||
[Required]
|
||||
public int JobId { get; set; }
|
||||
[Required(ErrorMessage = "Please specify a Repair Address")]
|
||||
public Nullable<int> OrganisationAddressId { get; set; }
|
||||
[Required(ErrorMessage = "Please specify a Warranty Provider")]
|
||||
public string WarrantyProviderId { get; set; }
|
||||
[Required(ErrorMessage = "A fault description is required"), DataType(System.ComponentModel.DataAnnotations.DataType.MultilineText)]
|
||||
public string FaultDescription { get; set; }
|
||||
[Required]
|
||||
public string WarrantyAction { get; set; }
|
||||
|
||||
public Type WarrantyProviderSubmitJobViewType { get; set; }
|
||||
public object WarrantyProviderSubmitJobModel { get; set; }
|
||||
public string WarrantyProviderPropertiesJson { get; set; }
|
||||
public Dictionary<string, string> WarrantyProviderProperties()
|
||||
{
|
||||
Dictionary<string, string> p = default(Dictionary<string, string>);
|
||||
if (string.IsNullOrEmpty(this.WarrantyProviderPropertiesJson))
|
||||
{
|
||||
JavaScriptSerializer s = new JavaScriptSerializer();
|
||||
try
|
||||
{
|
||||
p = s.Deserialize<Dictionary<string, string>>(this.WarrantyProviderPropertiesJson);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
// Ignore Errors
|
||||
}
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
public Dictionary<string, string> DiscloseProperties { get; set; }
|
||||
|
||||
public Exception Error { get; set; }
|
||||
|
||||
public void UpdateModel(DiscoDataContext dbContext, bool IsPostBack)
|
||||
{
|
||||
dbContext.Configuration.LazyLoadingEnabled = true;
|
||||
if (Job == null)
|
||||
{
|
||||
Job = (from j in dbContext.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes")
|
||||
where (j.Id == JobId)
|
||||
select j).FirstOrDefault();
|
||||
if (Job == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid Job Number Specified", "JobId");
|
||||
}
|
||||
}
|
||||
|
||||
this.TechUser = DiscoApplication.CurrentUser;
|
||||
|
||||
WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature));
|
||||
|
||||
if (!IsPostBack && string.IsNullOrEmpty(WarrantyProviderId))
|
||||
{
|
||||
WarrantyProviderId = Job.Device.DeviceModel.DefaultWarrantyProvider;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(WarrantyProviderId))
|
||||
WarrantyProvider = Plugins.GetPluginFeature(WarrantyProviderId, typeof(WarrantyProviderFeature));
|
||||
|
||||
this.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
|
||||
|
||||
if (!IsPostBack && !this.OrganisationAddressId.HasValue)
|
||||
{
|
||||
OrganisationAddressId = Job.Device.DeviceProfile.DefaultOrganisationAddress;
|
||||
}
|
||||
if (this.OrganisationAddressId.HasValue)
|
||||
this.OrganisationAddress = this.OrganisationAddresses.FirstOrDefault(oa => oa.Id == this.OrganisationAddressId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(FaultDescription))
|
||||
FaultDescription = FaultDescription.Trim();
|
||||
}
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using Disco.Data.Repository;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.BI;
|
||||
using System.Web.Script.Serialization;
|
||||
using Disco.Services.Plugins;
|
||||
using Disco.Services.Plugins.Features.WarrantyProvider;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class LogWarrantyModel
|
||||
{
|
||||
public Disco.Models.Repository.Job Job { get; set; }
|
||||
public List<PluginFeatureManifest> WarrantyProviders { get; set; }
|
||||
public PluginFeatureManifest WarrantyProvider { get; set; }
|
||||
public List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
|
||||
public Disco.Models.BI.Config.OrganisationAddress OrganisationAddress { get; set; }
|
||||
|
||||
public Disco.Models.Repository.User TechUser { get; set; }
|
||||
|
||||
[Required]
|
||||
public int JobId { get; set; }
|
||||
[Required(ErrorMessage = "Please specify a Repair Address")]
|
||||
public Nullable<int> OrganisationAddressId { get; set; }
|
||||
[Required(ErrorMessage = "Please specify a Warranty Provider")]
|
||||
public string WarrantyProviderId { get; set; }
|
||||
[Required(ErrorMessage = "A fault description is required"), DataType(System.ComponentModel.DataAnnotations.DataType.MultilineText)]
|
||||
public string FaultDescription { get; set; }
|
||||
[Required]
|
||||
public string WarrantyAction { get; set; }
|
||||
|
||||
public Type WarrantyProviderSubmitJobViewType { get; set; }
|
||||
public object WarrantyProviderSubmitJobModel { get; set; }
|
||||
public string WarrantyProviderPropertiesJson { get; set; }
|
||||
public Dictionary<string, string> WarrantyProviderProperties()
|
||||
{
|
||||
Dictionary<string, string> p = default(Dictionary<string, string>);
|
||||
if (string.IsNullOrEmpty(this.WarrantyProviderPropertiesJson))
|
||||
{
|
||||
JavaScriptSerializer s = new JavaScriptSerializer();
|
||||
try
|
||||
{
|
||||
p = s.Deserialize<Dictionary<string, string>>(this.WarrantyProviderPropertiesJson);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
// Ignore Errors
|
||||
}
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
public Dictionary<string, string> DiscloseProperties { get; set; }
|
||||
|
||||
public Exception Error { get; set; }
|
||||
|
||||
public void UpdateModel(DiscoDataContext dbContext, bool IsPostBack)
|
||||
{
|
||||
dbContext.Configuration.LazyLoadingEnabled = true;
|
||||
if (Job == null)
|
||||
{
|
||||
Job = (from j in dbContext.Jobs.Include("Device.DeviceModel").Include("JobMetaWarranty").Include("JobSubTypes")
|
||||
where (j.Id == JobId)
|
||||
select j).FirstOrDefault();
|
||||
if (Job == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid Job Number Specified", "JobId");
|
||||
}
|
||||
}
|
||||
|
||||
this.TechUser = DiscoApplication.CurrentUser;
|
||||
|
||||
WarrantyProviders = Plugins.GetPluginFeatures(typeof(WarrantyProviderFeature));
|
||||
|
||||
if (!IsPostBack && string.IsNullOrEmpty(WarrantyProviderId))
|
||||
{
|
||||
WarrantyProviderId = Job.Device.DeviceModel.DefaultWarrantyProvider;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(WarrantyProviderId))
|
||||
WarrantyProvider = Plugins.GetPluginFeature(WarrantyProviderId, typeof(WarrantyProviderFeature));
|
||||
|
||||
this.OrganisationAddresses = dbContext.DiscoConfiguration.OrganisationAddresses.Addresses;
|
||||
|
||||
if (!IsPostBack && !this.OrganisationAddressId.HasValue)
|
||||
{
|
||||
OrganisationAddressId = Job.Device.DeviceProfile.DefaultOrganisationAddress;
|
||||
}
|
||||
if (this.OrganisationAddressId.HasValue)
|
||||
this.OrganisationAddress = this.OrganisationAddresses.FirstOrDefault(oa => oa.Id == this.OrganisationAddressId.Value);
|
||||
|
||||
if (!string.IsNullOrEmpty(FaultDescription))
|
||||
FaultDescription = FaultDescription.Trim();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class WarrantyProviderJobDetailsModel
|
||||
{
|
||||
public Type ViewType { get; set; }
|
||||
public object ViewModel { get; set; }
|
||||
|
||||
public Exception JobDetailsException { get; set; }
|
||||
public bool JobDetailsSupported { get; set; }
|
||||
public string JobDetailsNotSupportedMessage { get; set; }
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
public class WarrantyProviderJobDetailsModel
|
||||
{
|
||||
public Type ViewType { get; set; }
|
||||
public object ViewModel { get; set; }
|
||||
|
||||
public Exception JobDetailsException { get; set; }
|
||||
public bool JobDetailsSupported { get; set; }
|
||||
public string JobDetailsNotSupportedMessage { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user