Moved System.IO references from DMO classes to Static Helpers
Removed nugetSource from pipeline Removed more comments Created Static Classes for most DMO / Controller Classes Push ConfigurationManager.AppSettings to controller Align Tests with other Projects
This commit is contained in:
@ -15,18 +15,6 @@ namespace Fab2ApprovalSystem.DMO;
|
||||
public class WorkflowDMO {
|
||||
private readonly IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING);
|
||||
|
||||
//delegate TResult MathFunction<T1, T2, TResult>(T1 var1, T2 var2);
|
||||
|
||||
//static void PrintResult<T1, T2, TResult>(MathFunction<T1, T2,
|
||||
// TResult> mathFunction, T1 var1, T2 var2)
|
||||
//{
|
||||
// TResult result = mathFunction(var1, var2);
|
||||
// Console.WriteLine(String.Format("Result is {0}", result));
|
||||
//}
|
||||
|
||||
//PrintResult((x, y) => x / y, 2, 8);
|
||||
//GenericDelegateNumber<int, int> e = new GenericDelegateNumber<int, int>(AddInt);
|
||||
|
||||
public string GetSubRoleItems(int issueID, int docType) {
|
||||
List<string> subRoleItems = new();
|
||||
StringBuilder sqlString = new();
|
||||
@ -240,19 +228,10 @@ public class WorkflowDMO {
|
||||
/* ===== Remove the code for Director Approval Loop - Changed per Dixie's request 08/06/2018
|
||||
*/
|
||||
|
||||
//If Location = "QDB" OR PRRequired or MRB Required OR(Product = MA / RH AND Location = Probe) Get "Director" Role for all departments, except "Facilities"
|
||||
|
||||
sqlString = new StringBuilder();
|
||||
//sqlString.Append("SELECT COUNT(*) FROM LotDisposition LD INNER JOIN Lot L ON LD.IssueID = L.IssueID ");
|
||||
//sqlString.Append("WHERE ( ((L.ProductFamily = 'RH' OR L.ProductFamily = 'MA') ");
|
||||
//sqlString.Append("AND (Location = '6300' OR Location = '6400' OR Location = '6600')) ");
|
||||
//sqlString.Append("OR Location = 'QDB' OR Location = 'EDB' OR LD.PERequired = 1 OR LD.MRBRequired = 1) AND LD.IssueID = @IssueID ");
|
||||
|
||||
// 09/01/2020 -
|
||||
// Per Hans, do not include directors if PE required is checked
|
||||
//sqlString.Append("SELECT COUNT(*) FROM LotDisposition LD INNER JOIN Lot L ON LD.IssueID = L.IssueID ");
|
||||
//sqlString.Append("WHERE (LD.PERequired = 1 OR Location = 'QDB' OR Location = 'EDB' ) ");
|
||||
//sqlString.Append("AND LD.IssueID = @IssueID ");
|
||||
|
||||
// 09/01/2020
|
||||
// Per Hans, do not include directors if PE required is checked
|
||||
@ -300,7 +279,6 @@ public class WorkflowDMO {
|
||||
int recordCount = 0;
|
||||
// EMERGENCY TECNS ==============================================================================================
|
||||
if (GlobalVars.DocumentType.EECN == (GlobalVars.DocumentType)documentType) {
|
||||
//subRoleItems.Add("'QA Pre Approver'");
|
||||
qryString.Clear();
|
||||
qryString.Append("SELECT DISTINCT SRC.SubRoleCategoryItem FROM DocumentType D ");
|
||||
qryString.Append("INNER JOIN Workflows W ON D.DocumentTypeID = W.DocumentTypeID ");
|
||||
@ -309,25 +287,13 @@ public class WorkflowDMO {
|
||||
qryString.Append("INNER JOIN SubRole SR ON R.RoleID = SR.RoleID ");
|
||||
qryString.Append("INNER JOIN SubRoleCategory SRC ON SR.SubRoleCategoryID = SRC.SubRoleCategoryID ");
|
||||
qryString.Append("WHERE D.DocumentTypeID = @DocumentType");
|
||||
//qryString.Append("WHERE D.DocumentTypeID = 3");
|
||||
//subRoleItems.Add("'QA_Admin'");
|
||||
List<dynamic> dataRows = db.Query<dynamic>(qryString.ToString(), new { DocumentType = documentType }).ToList();
|
||||
foreach (var dataRow in dataRows) {
|
||||
subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
}
|
||||
//subRoleItems.Add("'QA Final Approver'");
|
||||
} //===============================================================================================================
|
||||
else {
|
||||
} else {
|
||||
subRoleItems.Add("'QA Pre Approver'");
|
||||
// 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<dynamic>(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");
|
||||
List<dynamic> dataRows = db.Query<dynamic>(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList();
|
||||
@ -346,13 +312,6 @@ public class WorkflowDMO {
|
||||
recordCount = db.Query<int>(qryString.ToString(), new { ECNNumber = ecnNumber }).Single();
|
||||
if (recordCount > 0) {
|
||||
subRoleItems.Add("'Environment'");
|
||||
//qryString.Clear();
|
||||
//qryString.Append("SELECT SubRoleCategoryItem FROM [SubRoleCategory] WHERE SubRoleCategoryItem = 'Environment' ");
|
||||
//dataRows = this.db.Query<dynamic>(qryString.ToString()).ToList();
|
||||
//foreach (var dataRow in dataRows)
|
||||
//{
|
||||
// subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
//}
|
||||
}
|
||||
|
||||
// Get the "Capacity" Impact SubRole
|
||||
@ -361,13 +320,6 @@ public class WorkflowDMO {
|
||||
recordCount = db.Query<int>(qryString.ToString(), new { ECNNumber = ecnNumber }).Single();
|
||||
if (recordCount > 0) {
|
||||
subRoleItems.Add("'Capacity'");
|
||||
//qryString.Clear();
|
||||
//qryString.Append("SELECT SubRoleCategoryItem FROM [SubRoleCategory] WHERE SubRoleCategoryItem = 'Capacity' ");
|
||||
//dataRows = this.db.Query<dynamic>(qryString.ToString()).ToList();
|
||||
//foreach (var dataRow in dataRows)
|
||||
//{
|
||||
// subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
//}
|
||||
}
|
||||
|
||||
// Get the "MaterialConsumptionChangeRequired" Impact SubRole
|
||||
@ -376,13 +328,6 @@ public class WorkflowDMO {
|
||||
recordCount = db.Query<int>(qryString.ToString(), new { ECNNumber = ecnNumber }).Single();
|
||||
if (recordCount > 0) {
|
||||
subRoleItems.Add("'MaterialConsumption'");
|
||||
//qryString.Clear();
|
||||
//qryString.Append("SELECT SubRoleCategoryItem FROM [SubRoleCategory] WHERE SubRoleCategoryItem = 'MaterialConsumption' ");
|
||||
//dataRows = this.db.Query<dynamic>(qryString.ToString()).ToList();
|
||||
//foreach (var dataRow in dataRows)
|
||||
//{
|
||||
// subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
//}
|
||||
}
|
||||
|
||||
// Get the "NewPartFlow" Impact SubRole
|
||||
@ -392,21 +337,12 @@ public class WorkflowDMO {
|
||||
if (recordCount > 0) {
|
||||
subRoleItems.Add("'NewPartFlow'");
|
||||
subRoleItems.Add("'SPN-Execution'");
|
||||
//subRoleItems.Add("'TestProgram'");
|
||||
subRoleItems.Add("'Metrology Change'");
|
||||
subRoleItems.Add("'SPC'");
|
||||
//qryString.Clear();
|
||||
//qryString.Append("SELECT SubRoleCategoryItem FROM [SubRoleCategory] WHERE SubRoleCategoryItem = 'NewPartFlow' ");
|
||||
//dataRows = this.db.Query<dynamic>(qryString.ToString()).ToList();
|
||||
//foreach (var dataRow in dataRows)
|
||||
//{
|
||||
// subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
//}
|
||||
}
|
||||
|
||||
subRoleItems.Add("'Document Control Admin'");
|
||||
subRoleItems.Add("'Training Notification'");
|
||||
//=======================================================================================================================
|
||||
|
||||
// Execution level========================================================================================================
|
||||
// Get the "SPN" SubRole
|
||||
@ -414,15 +350,6 @@ public class WorkflowDMO {
|
||||
qryString.Append("SELECT COUNT(*) FROM ECN WHERE ECNNumber= @ECNNumber AND (SPNChangeRequired = 1) ");
|
||||
recordCount = db.Query<int>(qryString.ToString(), new { ECNNumber = ecnNumber }).Single();
|
||||
if (recordCount > 0) {
|
||||
//subRoleItems.Add("'SPN-Execution'");
|
||||
|
||||
//qryString.Clear();
|
||||
//qryString.Append("SELECT SubRoleCategoryItem FROM [SubRoleCategory] WHERE SubRoleCategoryItem = 'SPN' ");
|
||||
//dataRows = this.db.Query<dynamic>(qryString.ToString()).ToList();
|
||||
//foreach (var dataRow in dataRows)
|
||||
//{
|
||||
// subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");
|
||||
//}
|
||||
}
|
||||
|
||||
// Get the "Metrology Change" SubRole
|
||||
@ -622,11 +549,9 @@ public class WorkflowDMO {
|
||||
|
||||
public string ReAssignApproval(int issueID, int assignedFromUser, int assignedToUser, byte step, int docType) {
|
||||
string email = "";
|
||||
//string emailArray = "";
|
||||
string emailIDArray = "";
|
||||
|
||||
DynamicParameters parameters = new();
|
||||
;
|
||||
email = "";
|
||||
parameters = new DynamicParameters();
|
||||
parameters.Add("@IssueID", issueID);
|
||||
@ -644,11 +569,9 @@ public class WorkflowDMO {
|
||||
|
||||
public string DelegateDocumentApproval(int issueID, int delegateFromUser, int delegateToUser) {
|
||||
string email = "";
|
||||
//string emailArray = "";
|
||||
string emailID = "";
|
||||
|
||||
DynamicParameters parameters = new();
|
||||
;
|
||||
email = "";
|
||||
parameters = new DynamicParameters();
|
||||
parameters.Add("@IssueID", issueID);
|
||||
@ -664,13 +587,11 @@ public class WorkflowDMO {
|
||||
|
||||
public string AddAdditionalApproval(int issueID, string userIDs, byte step, int documentType) {
|
||||
string email = "";
|
||||
//string emailArray = "";
|
||||
string emailIDArray = "";
|
||||
|
||||
string[] arrayOfUsers = userIDs.Split(new char[] { '~' });
|
||||
|
||||
DynamicParameters parameters = new();
|
||||
;
|
||||
for (int i = 0; i < arrayOfUsers.Length; i++) {
|
||||
email = "";
|
||||
parameters = new DynamicParameters();
|
||||
@ -689,14 +610,12 @@ public class WorkflowDMO {
|
||||
|
||||
public string AddEECNApproval(int ecnNumber, byte step, int documentType, string engUserIDs, string opUserIDs) {
|
||||
string email = "";
|
||||
//string emailArray = "";
|
||||
string emailIDArray = "";
|
||||
|
||||
string[] arrayOfUsers = engUserIDs.Split(new char[] { '~' });
|
||||
|
||||
//Engineering SubRole
|
||||
// Engineering SubRole
|
||||
DynamicParameters parameters = new();
|
||||
;
|
||||
for (int i = 0; i < arrayOfUsers.Length; i++) {
|
||||
email = "";
|
||||
parameters = new DynamicParameters();
|
||||
@ -714,7 +633,6 @@ public class WorkflowDMO {
|
||||
// Operations SubRole
|
||||
arrayOfUsers = opUserIDs.Split(new char[] { '~' });
|
||||
parameters = new DynamicParameters();
|
||||
;
|
||||
for (int i = 0; i < arrayOfUsers.Length; i++) {
|
||||
email = "";
|
||||
parameters = new DynamicParameters();
|
||||
|
Reference in New Issue
Block a user