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

Feature #2: Improve Warranty Logging

Browse Source 
Warranty job UI changes to make consistent with plans for Repair Logging
This commit is contained in:
Gary Sharp
2014-07-08 16:47:13 +10:00
parent 67a624d5b5
commit 5ba9fde10f
13 changed files with 933 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Controllers/JobController.cs
+48 -2
View File
@@ -397,7 +397,7 @@ namespace Disco.Web.Controllers
{
// Create New Job
var currentUser = Database.Users.Find(UserService.CurrentUserId);
// Try QuickLog?
bool addAutoQueues = !(Authorization.Has(Claims.Job.Actions.Close)
&& m.QuickLog.HasValue && m.QuickLog.Value
@@ -473,7 +473,12 @@ namespace Disco.Web.Controllers
[DiscoAuthorize(Claims.Job.Actions.LogWarranty)]
public virtual ActionResult LogWarranty(int id, string WarrantyProviderId, int? OrganisationAddressId)
{
var m = new Models.Job.LogWarrantyModel() { JobId = id, WarrantyProviderId = WarrantyProviderId, OrganisationAddressId = OrganisationAddressId };
var m = new Models.Job.LogWarrantyModel()
{
JobId = id,
WarrantyProviderId = WarrantyProviderId,
OrganisationAddressId = OrganisationAddressId
};
m.UpdateModel(Database, false);
m.FaultDescription = m.Job.GenerateFaultDescription(Database);
@@ -500,6 +505,47 @@ namespace Disco.Web.Controllers
{
switch (m.WarrantyAction)
{
case "Update":
var updatedModel = new Models.Job.LogWarrantyModel()
{
JobId = m.JobId,
WarrantyProviderId = m.WarrantyProviderId,
OrganisationAddressId = m.OrganisationAddressId,
FaultDescription = m.FaultDescription
};
updatedModel.UpdateModel(Database, false);
if (updatedModel.WarrantyProvider != null)
{
using (var wp = updatedModel.WarrantyProvider.CreateInstance<WarrantyProviderFeature>())
{
if (wp.SubmitJobViewType != null)
{
updatedModel.WarrantyProviderSubmitJobViewType = wp.SubmitJobViewType;
updatedModel.WarrantyProviderSubmitJobModel = wp.SubmitJobViewModel(Database, this, updatedModel.Job, updatedModel.OrganisationAddress, updatedModel.TechUser);
}
}
}
return View(updatedModel);
case "Custom":
if (string.IsNullOrWhiteSpace(m.CustomProviderName))
{
ModelState.AddModelError("CustomProviderName", "The Custom Warranty Provider Name is required");
return View(Views.LogWarranty, m);
}
try
{
m.Job.OnLogWarranty(Database, m.FaultDescription, m.CustomProviderName, m.CustomProviderReference, m.OrganisationAddress, m.TechUser);
Database.SaveChanges();
return RedirectToAction(MVC.Job.Show(m.JobId));
}
catch (Exception ex)
{
m.Error = ex;
return View(Views.LogWarrantyError, m);
throw;
}
case "Disclose":
using (var p = m.WarrantyProvider.CreateInstance<WarrantyProviderFeature>())
{