phares3757/mesa-fab-approval
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Daniel Wathen 2023-03-06 15:29:55 -07:00
commit 29b28296b1
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Fab2ApprovalSystem/Models/EightDModel.cs
View File

@ -241,6 +241,7 @@ namespace Fab2ApprovalSystem.Models
public string ICAValidationActivities { get; set; } public string ICAValidationActivities { get; set; }
public string RootCauseVerification { get; set; } public string RootCauseVerification { get; set; }
public string EscapePoint { get; set; } public string EscapePoint { get; set; }
public DateTime? NextDueDate { get; set; }
public DateTime? FollowUpDate { get; set; } public DateTime? FollowUpDate { get; set; }
public bool CASubmitted { get; set; } public bool CASubmitted { get; set; }

2
Fab2ApprovalSystem/ViewModels/LotDispositionViewModel.cs
View File

@ -32,7 +32,7 @@ namespace Fab2ApprovalSystem.ViewModels
public DateTime? ExpirationDate { get; set; } public DateTime? ExpirationDate { get; set; }
[DisplayFormat(DataFormatString = "{0:MM/dd/yyyy}")] [DisplayFormat(DataFormatString = "{0:MM/dd/yyyy}")]
public DateTime? ExtensionDate { get; set; } public DateTime? ExtensionDate { get; set; }
public DateTime? NextDueDate { get; set; }
} }

1
Fab2ApprovalSystem/Views/Home/CorrectiveActionList.cshtml
View File

@ -36,6 +36,7 @@
columns.Bound(l => l.PendingApprovers); columns.Bound(l => l.PendingApprovers);
columns.Bound(l => l.PendingAIOwners).Title("Action Item Owners"); columns.Bound(l => l.PendingAIOwners).Title("Action Item Owners");
columns.Bound(l => l.D8DueDate).Format("{0:MM/dd/yy}"); 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}"); columns.Bound(l => l.ClosedDate).Format("{0:MM/dd/yy}");
if ((bool)Session[GlobalVars.IS_ADMIN]) 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>"); columns.Template(t => { }).HeaderTemplate("").ClientTemplate(@"<a href='javascript: void(0)' class='abutton delete' onclick='deleteRowCA(this)' title='button delete'>button delete</a>");

7
Fab2ApprovalSystem/Views/Home/MyTasks.cshtml
View File

@ -40,8 +40,9 @@
columns.Bound(l => l.Title); columns.Bound(l => l.Title);
//columns.Bound(l => l.LotNos); //columns.Bound(l => l.LotNos);
//columns.Bound(l => l.PendingApprovers).HtmlAttributes(new { style = "font-weight: bold; color: red;" }); //columns.Bound(l => l.PendingApprovers).HtmlAttributes(new { style = "font-weight: bold; color: red;" });
columns.Bound(l => l.ItemStatus); columns.Bound(l => l.ItemStatus).Hidden();
columns.Bound(l => l.SubmitedDate).Format("{0:MM/dd/yy hh:mm:ss}"); 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.Bound(l => l.CloseDate).Format("{0:MM/dd/yy hh:mm:ss}");
columns.Command(command => command.Custom("Re-Assign").Click("showReAssignRole")).Width("100px"); columns.Command(command => command.Custom("Re-Assign").Click("showReAssignRole")).Width("100px");
@ -82,10 +83,10 @@
"<td>#:Originator #</td>" + "<td>#:Originator #</td>" +
//"<td>#: IssueDate #</td>" + //"<td>#: IssueDate #</td>" +
"<td>#:Title #</td>" + "<td>#:Title #</td>" +
"<td>#:ItemStatus #</td>" + "<td>#=FormatDate(SubmitedDate)#</td>" +
//"<td>#: LotNos #</td>" + //"<td>#: LotNos #</td>" +
//"<td>#:PendingApprovers #</td>" + //"<td>#:PendingApprovers #</td>" +
"<td>#=FormatDate(SubmitedDate)#</td>" + "<td>#=FormatDate(NextDueDate)#</td>" +
//"<td>#: CloseDate #</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>" + "<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>" "</tr>"