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

Bug Fix: Warranty Repair list

Browse Source
This commit is contained in:
Gary Sharp
2014-03-18 14:18:59 +11:00
parent 69091e0785
commit b841c6b2c0
4 changed files with 95 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/Extensions/JobActionExtensions.cs
+1 -1
View File
@@ -150,7 +150,7 @@ namespace Disco.BI.Extensions
return !j.ClosedDate.HasValue && return !j.ClosedDate.HasValue &&
(j.DeviceSerialNumber != null) && (j.DeviceSerialNumber != null) &&
j.JobTypeId == JobType.JobTypeIds.HWar && j.JobTypeId == JobType.JobTypeIds.HWar &&
string.IsNullOrEmpty(j.JobMetaWarranty.ExternalReference); !j.JobMetaWarranty.ExternalLoggedDate.HasValue;
} }
public static void OnLogWarranty(this Job j, DiscoDataContext Database, string FaultDescription, PluginFeatureManifest WarrantyProviderDefinition, OrganisationAddress Address, User TechUser, Dictionary<string, string> WarrantyProviderProperties) public static void OnLogWarranty(this Job j, DiscoDataContext Database, string FaultDescription, PluginFeatureManifest WarrantyProviderDefinition, OrganisationAddress Address, User TechUser, Dictionary<string, string> WarrantyProviderProperties)
{ {
Disco.Services/Jobs/JobExtensions.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace Disco.Services
if (j.JobTypeId == JobType.JobTypeIds.HWar) if (j.JobTypeId == JobType.JobTypeIds.HWar)
{ {
if (!string.IsNullOrEmpty(j.JobMetaWarranty_ExternalReference) && !j.JobMetaWarranty_ExternalCompletedDate.HasValue) if (j.JobMetaWarranty_ExternalLoggedDate.HasValue && !j.JobMetaWarranty_ExternalCompletedDate.HasValue)
return Job.JobStatusIds.AwaitingWarrantyRepair; // Job Logged - but not marked as completed return Job.JobStatusIds.AwaitingWarrantyRepair; // Job Logged - but not marked as completed
} }
Disco.Web/Views/Job/JobParts/Warranty.cshtml
+6 -22
View File
@@ -39,19 +39,10 @@
<td> <td>
@if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate)) @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalLoggedDate))
{ {
@Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate) @CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Not Logged", "Job_JobMetaWarranty_ExternalLoggedDate")
@AjaxHelpers.AjaxLoader() @AjaxHelpers.AjaxLoader()
<script type="text/javascript"> <script type="text/javascript">
$(function () { document.DiscoFunctions.DateDialogCreateUpdater('@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))', 'Warranty Logged', 'Job_JobMetaWarranty_ExternalLoggedDate', null, 'WarrantyExternalLoggedDate', 'Not Logged', '@(Model.Job.OpenedDate.ToISO8601())', false);
var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
document.DiscoFunctions.DateChangeHelper(
dateField,
'Unknown',
'@(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null)))',
'ExternalLoggedDate',
null
);
});
</script> </script>
} }
else else
@@ -89,25 +80,17 @@
} }
</td> </td>
</tr> </tr>
@if (Model.Job.JobMetaWarranty.ExternalLoggedDate.HasValue){
<tr> <tr>
<th style="width: 200px;">Warranty Completed <th style="width: 200px;">Warranty Completed
</th> </th>
<td> <td>
@if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate)) @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate))
{ {
@Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate) @CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Not Completed", "Job_JobMetaWarranty_ExternalCompletedDate")
@AjaxHelpers.AjaxLoader() @AjaxHelpers.AjaxLoader()
<script type="text/javascript"> <script type="text/javascript">
$(function () { document.DiscoFunctions.DateDialogCreateUpdater('@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))', 'Warranty Logged', 'Job_JobMetaWarranty_ExternalCompletedDate', null, 'WarrantyExternalCompletedDate', 'Not Completed', '@(Model.Job.OpenedDate.ToISO8601())', false);
var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
document.DiscoFunctions.DateChangeHelper(
dateField,
'Unknown',
'@(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null)))',
'ExternalCompletedDate',
null
);
});
</script> </script>
} }
else else
@@ -116,6 +99,7 @@
} }
</td> </td>
</tr> </tr>
}
@if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
Disco.Web/Views/Job/JobParts/Warranty.generated.cs
+87 -64
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34003 // Runtime Version:4.0.30319.34011
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Job.JobParts
using Disco; using Disco;
using Disco.BI.Extensions; using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
using Disco.Services.Web; using Disco.Services.Web;
using Disco.Web; using Disco.Web;
@@ -213,14 +214,14 @@ WriteLiteral(">Warranty Logged\r\n </th>\r\n <td>\r\n");
#line hidden #line hidden
#line 42 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 42 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalLoggedDate)); Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Not Logged", "Job_JobMetaWarranty_ExternalLoggedDate"));
#line default #line default
#line hidden #line hidden
#line 42 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 42 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
@@ -243,27 +244,29 @@ WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\""); WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@"> WriteLiteral(">\r\n document.DiscoFunctions.DateDialogCreateUpdater(\'");
$(function () {
var dateField = $('#Job_JobMetaWarranty_ExternalLoggedDate');
document.DiscoFunctions.DateChangeHelper(
dateField,
'Unknown',
'");
#line 50 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 45 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalLoggedDate(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
#line default #line default
#line hidden #line hidden
WriteLiteral("\',\r\n \'ExternalLoggedDate\',\r\n null\r\n" + WriteLiteral("\', \'Warranty Logged\', \'Job_JobMetaWarranty_ExternalLoggedDate\', null, \'WarrantyEx" +
" );\r\n });\r\n </s" + "ternalLoggedDate\', \'Not Logged\', \'");
"cript>\r\n");
#line 56 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 45 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Model.Job.OpenedDate.ToISO8601());
#line default
#line hidden
WriteLiteral("\', false);\r\n </script>\r\n");
#line 47 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
else else
{ {
@@ -272,14 +275,14 @@ WriteLiteral("\',\r\n \'ExternalLoggedDate\',\r\n
#line default #line default
#line hidden #line hidden
#line 59 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Unknown/None", null)); Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalLoggedDate, "Unknown/None", null));
#line default #line default
#line hidden #line hidden
#line 59 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 50 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
@@ -293,13 +296,13 @@ WriteLiteral(" style=\"width: 200px;\"");
WriteLiteral(">Warranty Reference\r\n </th>\r\n <td>\r\n"); WriteLiteral(">Warranty Reference\r\n </th>\r\n <td>\r\n");
#line 67 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 58 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 67 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 58 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalReference)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalReference))
{ {
@@ -307,42 +310,42 @@ WriteLiteral(">Warranty Reference\r\n </th>\r\n <td>\r\n")
#line default #line default
#line hidden #line hidden
#line 69 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 60 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference)); Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalReference));
#line default #line default
#line hidden #line hidden
#line 69 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 60 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 70 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 61 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(AjaxHelpers.AjaxSave()); Write(AjaxHelpers.AjaxSave());
#line default #line default
#line hidden #line hidden
#line 70 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 61 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 71 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 62 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(AjaxHelpers.AjaxLoader()); Write(AjaxHelpers.AjaxLoader());
#line default #line default
#line hidden #line hidden
#line 71 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 62 "..\..\Views\Job\JobParts\Warranty.cshtml"
@@ -360,7 +363,7 @@ WriteLiteral(@">
'"); '");
#line 77 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 68 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalReference(Model.Job.Id, null)));
@@ -370,7 +373,7 @@ WriteLiteral("\',\r\n \'ExternalReference\'\r\n
" });\r\n </script>\r\n"); " });\r\n </script>\r\n");
#line 82 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 73 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
else else
{ {
@@ -386,7 +389,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">&lt;Unknown/None&gt;</span>"); WriteLiteral(">&lt;Unknown/None&gt;</span>");
#line 86 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 77 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
else else
{ {
@@ -394,34 +397,49 @@ WriteLiteral(">&lt;Unknown/None&gt;</span>");
#line default #line default
#line hidden #line hidden
#line 88 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 79 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Model.Job.JobMetaWarranty.ExternalReference); Write(Model.Job.JobMetaWarranty.ExternalReference);
#line default #line default
#line hidden #line hidden
#line 88 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 79 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
} }
#line default #line default
#line hidden #line hidden
WriteLiteral(" </td>\r\n </tr>\r\n <tr>\r\n <th"); WriteLiteral(" </td>\r\n </tr>\r\n");
#line 83 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default
#line hidden
#line 83 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Model.Job.JobMetaWarranty.ExternalLoggedDate.HasValue){
#line default
#line hidden
WriteLiteral(" <tr>\r\n <th");
WriteLiteral(" style=\"width: 200px;\""); WriteLiteral(" style=\"width: 200px;\"");
WriteLiteral(">Warranty Completed\r\n </th>\r\n <td>\r\n"); WriteLiteral(">Warranty Completed\r\n </th>\r\n <td>\r\n");
#line 96 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 88 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 96 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 88 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ExternalCompletedDate))
{ {
@@ -429,28 +447,28 @@ WriteLiteral(">Warranty Completed\r\n </th>\r\n <td>\r\n")
#line default #line default
#line hidden #line hidden
#line 98 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 90 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Html.EditorFor(m => m.Job.JobMetaWarranty.ExternalCompletedDate)); Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Not Completed", "Job_JobMetaWarranty_ExternalCompletedDate"));
#line default #line default
#line hidden #line hidden
#line 98 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 90 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 99 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 91 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(AjaxHelpers.AjaxLoader()); Write(AjaxHelpers.AjaxLoader());
#line default #line default
#line hidden #line hidden
#line 99 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 91 "..\..\Views\Job\JobParts\Warranty.cshtml"
@@ -460,27 +478,29 @@ WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\""); WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@"> WriteLiteral(">\r\n document.DiscoFunctions.DateDialogCreateUpdater(\'");
$(function () {
var dateField = $('#Job_JobMetaWarranty_ExternalCompletedDate');
document.DiscoFunctions.DateChangeHelper(
dateField,
'Unknown',
'");
#line 106 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 93 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Url.Action(MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)));
#line default #line default
#line hidden #line hidden
WriteLiteral("\',\r\n \'ExternalCompletedDate\',\r\n nul" + WriteLiteral("\', \'Warranty Logged\', \'Job_JobMetaWarranty_ExternalCompletedDate\', null, \'Warrant" +
"l\r\n );\r\n });\r\n " + "yExternalCompletedDate\', \'Not Completed\', \'");
"</script>\r\n");
#line 112 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 93 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Model.Job.OpenedDate.ToISO8601());
#line default
#line hidden
WriteLiteral("\', false);\r\n </script>\r\n");
#line 95 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
else else
{ {
@@ -489,14 +509,14 @@ WriteLiteral("\',\r\n \'ExternalCompletedDate\',\r\n
#line default #line default
#line hidden #line hidden
#line 115 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 98 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Unknown/None", null)); Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaWarranty.ExternalCompletedDate, "Unknown/None", null));
#line default #line default
#line hidden #line hidden
#line 115 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 98 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
@@ -506,13 +526,16 @@ WriteLiteral("\',\r\n \'ExternalCompletedDate\',\r\n
WriteLiteral(" </td>\r\n </tr>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n");
#line 119 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 102 "..\..\Views\Job\JobParts\Warranty.cshtml"
}
#line default #line default
#line hidden #line hidden
WriteLiteral(" ");
#line 119 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 103 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
@@ -552,7 +575,7 @@ WriteLiteral(" style=\"display: none\"");
WriteLiteral(">\r\n </div>\r\n </td>\r\n </tr>\r\n"); WriteLiteral(">\r\n </div>\r\n </td>\r\n </tr>\r\n");
#line 133 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 117 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
@@ -566,13 +589,13 @@ WriteLiteral(">\r\n $(\'#jobDetailTabItems\').append(\'<li><a href=\"#jobDeta
"nty</a></li>\');\r\n"); "nty</a></li>\');\r\n");
#line 138 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 122 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 138 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 122 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
@@ -599,7 +622,7 @@ WriteLiteral(@"
'"); '");
#line 157 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 141 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Url.Action(MVC.Job.WarrantyProviderJobDetails())); Write(Url.Action(MVC.Job.WarrantyProviderJobDetails()));
@@ -608,7 +631,7 @@ WriteLiteral(@"
WriteLiteral("\',\r\n { id: \'"); WriteLiteral("\',\r\n { id: \'");
#line 158 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 142 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -631,7 +654,7 @@ WriteLiteral(@"' },
"); ");
#line 172 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 156 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }