diff --git a/Fab2ApprovalSystem/ViewModels/LotDispositionViewModel.cs b/Fab2ApprovalSystem/ViewModels/LotDispositionViewModel.cs index 1990227..32f87de 100644 --- a/Fab2ApprovalSystem/ViewModels/LotDispositionViewModel.cs +++ b/Fab2ApprovalSystem/ViewModels/LotDispositionViewModel.cs @@ -32,7 +32,7 @@ namespace Fab2ApprovalSystem.ViewModels public DateTime? ExpirationDate { get; set; } [DisplayFormat(DataFormatString = "{0:MM/dd/yyyy}")] public DateTime? ExtensionDate { get; set; } - + public DateTime? NextDueDate { get; set; } } diff --git a/Fab2ApprovalSystem/Views/Home/MyTasks.cshtml b/Fab2ApprovalSystem/Views/Home/MyTasks.cshtml index 30a8196..d297661 100644 --- a/Fab2ApprovalSystem/Views/Home/MyTasks.cshtml +++ b/Fab2ApprovalSystem/Views/Home/MyTasks.cshtml @@ -33,19 +33,20 @@ columns.Bound(l => l.IssueID).Template(@ @Html.ActionLink(@item.IssueID.ToString(), null)) .ClientTemplate("#=formatIssueID(IssueID, DocumentType)#"); - columns.Bound(l => l.DocumentType); + columns.Bound(l => l.DocumentType); //columns.Bound(l => l.SubDoc); columns.Bound(l => l.Originator); //columns.Bound(l => l.IssueDate).Format("{0:MM/dd/yy: hh:mm:ss}"); ; columns.Bound(l => l.Title); //columns.Bound(l => l.LotNos); //columns.Bound(l => l.PendingApprovers).HtmlAttributes(new { style = "font-weight: bold; color: red;" }); - columns.Bound(l => l.ItemStatus); - columns.Bound(l => l.SubmitedDate).Format("{0:MM/dd/yy hh:mm:ss}"); + columns.Bound(l => l.ItemStatus).Hidden(); + columns.Bound(l => l.SubmitedDate).Format("{0:MM/dd/yy hh:mm:ss}"); + columns.Bound(l => l.NextDueDate).Format("{0:MM/dd/yy}"); //columns.Bound(l => l.CloseDate).Format("{0:MM/dd/yy hh:mm:ss}"); columns.Command(command => command.Custom("Re-Assign").Click("showReAssignRole")).Width("100px"); - }) + }) .Selectable(selectable => selectable.Mode(GridSelectionMode.Single).Type(GridSelectionType.Row)) .HtmlAttributes(new { style = "height: 350px;" }) @@ -82,10 +83,10 @@ "#:Originator #" + //"#: IssueDate #" + "#:Title #" + - "#:ItemStatus #" + + "#=FormatDate(SubmitedDate)#" + //"#: LotNos #" + //"#:PendingApprovers #" + - "#=FormatDate(SubmitedDate)#" + + "#=FormatDate(NextDueDate)#" + //"#: CloseDate # " + "