From dfa8d4aa08c9fd92383bfbaecfc3c845c6fcfa7b Mon Sep 17 00:00:00 2001
From: Daniel Wathen <daniel.wathen@infineon.com>
Date: Mon, 6 Mar 2023 12:35:11 -0700
Subject: [PATCH 1/2] Added NextDueDate into Corrective Actions model and
 tables

---
 Fab2ApprovalSystem/Models/EightDModel.cs                  | 1 +
 Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Fab2ApprovalSystem/Models/EightDModel.cs b/Fab2ApprovalSystem/Models/EightDModel.cs
index 414e2e5..f12e401 100644
--- a/Fab2ApprovalSystem/Models/EightDModel.cs
+++ b/Fab2ApprovalSystem/Models/EightDModel.cs
@@ -241,6 +241,7 @@ namespace Fab2ApprovalSystem.Models
         public string ICAValidationActivities { get; set; }
         public string RootCauseVerification { get; set; }
         public string EscapePoint { get; set; }
+        public DateTime? NextDueDate { get; set; }
         public DateTime? FollowUpDate { get; set; }
         public bool CASubmitted { get; set; }
 
diff --git a/Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml b/Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml
index ce75e48..f0b82bc 100644
--- a/Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml
+++ b/Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml
@@ -36,6 +36,7 @@
                             columns.Bound(l => l.PendingApprovers);
                             columns.Bound(l => l.PendingAIOwners).Title("Action Item Owners");
                             columns.Bound(l => l.D8DueDate).Format("{0:MM/dd/yy}");
+                            columns.Bound(l => l.NextDueDate).Format("{0:MM/dd/yy}");
                             columns.Bound(l => l.ClosedDate).Format("{0:MM/dd/yy}");
                             if ((bool)Session[GlobalVars.IS_ADMIN])
                                 columns.Template(t => { }).HeaderTemplate("").ClientTemplate(@"<a href='javascript: void(0)' class='abutton delete' onclick='deleteRowCA(this)' title='button delete'>button delete</a>");

From 36fb43d9cd7de6bee5e08aac7e84bcd3d4921022 Mon Sep 17 00:00:00 2001
From: Daniel Wathen <daniel.wathen@infineon.com>
Date: Mon, 6 Mar 2023 15:05:38 -0700
Subject: [PATCH 2/2] Added next due date to models and tables for tasks

---
 .../ViewModels/LotDispositionViewModel.cs           |  2 +-
 Fab2ApprovalSystem/Views/Home/MyTasks.cshtml        | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

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(@<text> @Html.ActionLink(@item.IssueID.ToString(), null)</text>)
                                 .ClientTemplate("<a href='/#=DocumentType#/Edit?IssueID=#=DocID#'>#=formatIssueID(IssueID, DocumentType)#</a>");
-                            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 @@
                                                "<td>#:Originator #</td>" +
                                                //"<td>#: IssueDate #</td>" +
                                                "<td>#:Title #</td>" +
-                                               "<td>#:ItemStatus #</td>" +
+                                               "<td>#=FormatDate(SubmitedDate)#</td>" +
                                                            //"<td>#: LotNos #</td>" +
                                                            //"<td>#:PendingApprovers #</td>" +
-                                                           "<td>#=FormatDate(SubmitedDate)#</td>" +
+                                                           "<td>#=FormatDate(NextDueDate)#</td>" +
                                                    //"<td>#: CloseDate #</td>     " +
                                                    "<td><button class='btn btn-warning btn-xs' id='Delegate' name='Refresh' onclick='showReAssignRole(&quot;#=PendingApprovers#&quot;,&quot;#=CloseDate#&quot;,&quot;#=DocID#&quot;, &quot;#=DocumentType#&quot;,&quot;#=SubmitedDate#&quot;);'>Delegate</buton></td>" +
                                            "</tr>"