{
public NonWarrantyFinance()
{
@@ -48,13 +48,13 @@ WriteLiteral(">\r\n \r\n | \r\n Accounting Charge Required\r\n | \r\n \r\n");
+WriteLiteral(">Accounting Charge Required\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 8 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.AccountingChargeRequiredDate));
+ #line 7 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargeRequiredDate, "Not Required", "Job_JobMetaNonWarranty_AccountingChargeRequiredDate"));
#line default
@@ -66,7 +66,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargeRequiredUser\"");
WriteLiteral(">");
- #line 9 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 8 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargeRequiredUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargeRequiredUser.ToString()));
@@ -77,54 +77,23 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 10 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 9 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n \r\n | \r\n |
\r\n \r\n | \r\n Accounting Charge Added\r\n | \r\n \r\n");
+WriteLiteral(">Accounting Charge Added\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 30 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.AccountingChargeAddedDate));
+ #line 16 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargeAddedDate, "Not Added", "Job_JobMetaNonWarranty_AccountingChargeAddedDate"));
#line default
@@ -136,7 +105,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargeAddedUser\"");
WriteLiteral(">");
- #line 31 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 17 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargeAddedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargeAddedUser.ToString()));
@@ -147,54 +116,23 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 32 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 18 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n \r\n | \r\n |
\r\n \r\n | \r\n Accounting Charge Paid\r\n | \r\n \r\n");
+WriteLiteral(">Accounting Charge Paid\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 52 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.AccountingChargePaidDate));
+ #line 25 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.AccountingChargePaidDate, "Not Paid", "Job_JobMetaNonWarranty_AccountingChargePaidDate"));
#line default
@@ -206,7 +144,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_AccountingChargePaidUser\"");
WriteLiteral(">");
- #line 53 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 26 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.AccountingChargePaidUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.AccountingChargePaidUser.ToString()));
@@ -217,54 +155,23 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 54 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 27 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n \r\n | \r\n |
\r\n \r\n | \r\n Purchase Order Raised\r\n | \r\n \r\n");
+WriteLiteral(">Purchase Order Raised\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 74 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderRaisedDate));
+ #line 34 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedDate, "Not Raised", "Job_JobMetaNonWarranty_PurchaseOrderRaisedDate"));
#line default
@@ -276,7 +183,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_PurchaseOrderRaisedUser\"");
WriteLiteral(">");
- #line 75 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 35 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.PurchaseOrderRaisedUser.ToString()));
@@ -287,50 +194,19 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 76 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 36 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n \r\n | \r\n Purchase Order Reference\r" +
-"\n | \r\n \r\n");
+WriteLiteral("\r\n | \r\n
\r\n \r\n | Purchase Order Reference\r\n " +
+" | \r\n \r\n");
WriteLiteral(" ");
- #line 96 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 43 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(Html.TextBoxFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderReference));
@@ -341,7 +217,7 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 97 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 44 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxSave());
@@ -352,7 +228,7 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 98 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 45 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
@@ -385,7 +261,7 @@ WriteLiteral(@">
url: '");
- #line 119 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 66 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(Url.Action(MVC.API.Job.UpdateNonWarrantyPurchaseOrderReference(Model.Job.Id, null)));
@@ -417,13 +293,13 @@ WriteLiteral(@"',
WriteLiteral(" style=\"width: 200px;\"");
-WriteLiteral(">\r\n Purchase Order Sent\r\n \r\n | \r\n");
+WriteLiteral(">Purchase Order Sent\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 145 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.PurchaseOrderSentDate));
+ #line 91 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.PurchaseOrderSentDate, "Not Sent", "Job_JobMetaNonWarranty_PurchaseOrderSentDate"));
#line default
@@ -435,7 +311,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_PurchaseOrderSentUser\"");
WriteLiteral(">");
- #line 146 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 92 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.PurchaseOrderSentUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.PurchaseOrderSentUser.ToString()));
@@ -446,54 +322,23 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 147 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 93 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n \r\n | \r\n |
\r\n \r\n | \r\n Invoice Received\r\n | \r\n \r\n");
+WriteLiteral(">Invoice Received\r\n \r\n | \r\n");
WriteLiteral(" ");
- #line 167 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
- Write(Html.EditorFor(m => m.Job.JobMetaNonWarranty.InvoiceReceivedDate));
+ #line 100 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ Write(CommonHelpers.FriendlyDate(Model.Job.JobMetaNonWarranty.InvoiceReceivedDate, "Not Received", "Job_JobMetaNonWarranty_InvoiceReceivedDate"));
#line default
@@ -505,7 +350,7 @@ WriteLiteral(" id=\"Job_JobMetaNonWarranty_InvoiceReceivedUser\"");
WriteLiteral(">");
- #line 168 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 101 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(string.IsNullOrEmpty(Model.Job.JobMetaNonWarranty.InvoiceReceivedUserId) ? string.Empty : string.Format("by {0}", Model.Job.JobMetaNonWarranty.InvoiceReceivedUser.ToString()));
@@ -516,44 +361,125 @@ WriteLiteral("\r\n");
WriteLiteral(" ");
- #line 169 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
+ #line 102 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(AjaxHelpers.AjaxLoader());
#line default
#line hidden
-WriteLiteral("\r\n \r\n " +
-" | \r\n
\r\n\r\n");
+WriteLiteral("\';\r\n\r\n document.DiscoFunctions.DateDialogCreateUpdater(\'Accounting Charge " +
+"Required\', \'Job_JobMetaNonWarranty_AccountingChargeRequiredDate\', \'Job_JobMetaNo" +
+"nWarranty_AccountingChargeRequiredUser\', \'NonWarrantyAccountingChargeRequired\', " +
+"\'Not Required\', jobOpenDate, false);\r\n document.DiscoFunctions.DateDialog" +
+"CreateUpdater(\'Accounting Charge Added\', \'Job_JobMetaNonWarranty_AccountingCharg" +
+"eAddedDate\', \'Job_JobMetaNonWarranty_AccountingChargeAddedUser\', \'NonWarrantyAcc" +
+"ountingChargeAdded\', \'Not Added\', jobOpenDate, false);\r\n document.DiscoFu" +
+"nctions.DateDialogCreateUpdater(\'Accounting Charge Paid\', \'Job_JobMetaNonWarrant" +
+"y_AccountingChargePaidDate\', \'Job_JobMetaNonWarranty_AccountingChargePaidUser\', " +
+"\'NonWarrantyAccountingChargePaid\', \'Not Paid\', jobOpenDate, false);\r\n doc" +
+"ument.DiscoFunctions.DateDialogCreateUpdater(\'Purchase Order Raised\', \'Job_JobMe" +
+"taNonWarranty_PurchaseOrderRaisedDate\', \'Job_JobMetaNonWarranty_PurchaseOrderRai" +
+"sedUser\', \'NonWarrantyPurchaseOrderRaised\', \'Not Raised\', jobOpenDate, true);\r\n " +
+" document.DiscoFunctions.DateDialogCreateUpdater(\'Purchase Order Sent\', \'J" +
+"ob_JobMetaNonWarranty_PurchaseOrderSentDate\', \'Job_JobMetaNonWarranty_PurchaseOr" +
+"derSentUser\', \'NonWarrantyPurchaseOrderSent\', \'Not Sent\', jobOpenDate, true);\r\n " +
+" document.DiscoFunctions.DateDialogCreateUpdater(\'Invoice Received\', \'Job_" +
+"JobMetaNonWarranty_InvoiceReceivedDate\', \'Job_JobMetaNonWarranty_InvoiceReceived" +
+"User\', \'NonWarrantyInvoiceReceived\', \'Not Received\', jobOpenDate, true);\r\n })" +
+";\r\n\r\n");
}
}
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.cshtml b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
index b9ac5cae..c8080548 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.cshtml
+++ b/Disco.Web/Views/Job/JobParts/_Subject.cshtml
@@ -521,7 +521,7 @@
}
@if (Model.Job.CanInsuranceClaimFormSent())
{
- @Html.ActionLinkSmallButton("Insurance Claim Form Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimFormSent_Button", "alert")
+ @Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert")
}
@if (Model.Job.CanLogRepair())
{
diff --git a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
index 5ff639d4..7ccd1fc9 100644
--- a/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+++ b/Disco.Web/Views/Job/JobParts/_Subject.generated.cs
@@ -1740,14 +1740,14 @@ WriteLiteral(" ");
#line hidden
#line 524 "..\..\Views\Job\JobParts\_Subject.cshtml"
- Write(Html.ActionLinkSmallButton("Insurance Claim Form Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimFormSent_Button", "alert"));
+ Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert"));
#line default
#line hidden
#line 524 "..\..\Views\Job\JobParts\_Subject.cshtml"
-
+
}
diff --git a/Disco.Web/Views/Job/Show.generated.cs b/Disco.Web/Views/Job/Show.generated.cs
index bc198d4c..ddb0bdf0 100644
--- a/Disco.Web/Views/Job/Show.generated.cs
+++ b/Disco.Web/Views/Job/Show.generated.cs
@@ -31,9 +31,9 @@ namespace Disco.Web.Views.Job
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("~/Views/Job/Show.cshtml")]
- public class Show : System.Web.Mvc.WebViewPage
+ public partial class Show : System.Web.Mvc.WebViewPage
{
public Show()
{