diff --git a/.vs/Fab2ApprovalSystem/v17/.suo b/.vs/Fab2ApprovalSystem/v17/.suo index 0c8ab2a..7e82a9c 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/.suo and b/.vs/Fab2ApprovalSystem/v17/.suo differ diff --git a/Fab2ApprovalSystem/DMO/WorkflowDMO.cs b/Fab2ApprovalSystem/DMO/WorkflowDMO.cs index b06363e..0568677 100644 --- a/Fab2ApprovalSystem/DMO/WorkflowDMO.cs +++ b/Fab2ApprovalSystem/DMO/WorkflowDMO.cs @@ -392,18 +392,18 @@ namespace Fab2ApprovalSystem.DMO else { subRoleItems.Add("'QA Pre Approver'"); - // get the affected Modules - qryString.Clear(); - qryString.Append("SELECT ModuleName FROM ECNModule E INNER JOIN ECNAffectedModule AM ON E.ModuleID = AM.ModuleID WHERE AM.ECNNumber= @ECNNumber"); - var dataRows = this.db.Query(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); - foreach (var dataRow in dataRows) - { - subRoleItems.Add("'" + dataRow.ModuleName.ToString() + "'"); - } - // get the affected Department + // get the affected Department: Removed by JRO per Jeanne + //qryString.Clear(); + //qryString.Append("SELECT ModuleName FROM ECNModule E INNER JOIN ECNAffectedModule AM ON E.ModuleID = AM.ModuleID WHERE AM.ECNNumber= @ECNNumber"); + //var dataRows = this.db.Query(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); + //foreach (var dataRow in dataRows) + //{ + // subRoleItems.Add("'" + dataRow.ModuleName.ToString() + "'"); + //} + // get the approvers qryString.Clear(); qryString.Append("SELECT SubRoleCategoryItem FROM SubRoleCategory S INNER JOIN ECNAffectedDepartment AD ON S.SubRoleCategoryID = AD.DepartmentID WHERE AD.ECNNumber= @ECNNumber"); - dataRows = this.db.Query(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); + var dataRows = this.db.Query(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); foreach (var dataRow in dataRows) { subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'"); diff --git a/Fab2ApprovalSystem/Views/ECN/ECNPdf.cshtml b/Fab2ApprovalSystem/Views/ECN/ECNPdf.cshtml index 7c2b129..89d5f4b 100644 --- a/Fab2ApprovalSystem/Views/ECN/ECNPdf.cshtml +++ b/Fab2ApprovalSystem/Views/ECN/ECNPdf.cshtml @@ -151,7 +151,7 @@ - @Convert.ToString(string.Format("{0:dd/MM/yyyy}", @Model.ExtensionDate)) + @Convert.ToString(string.Format("{0:MM/dd/yyyy}", @Model.ExtensionDate))