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:
@ -19,8 +19,6 @@ public class TrainingDMO {
|
||||
|
||||
public int Create(int issueId) {
|
||||
DynamicParameters parameters = new();
|
||||
|
||||
parameters = new DynamicParameters();
|
||||
parameters.Add("@TrainingId", dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
|
||||
parameters.Add("@ECNNumber", issueId);
|
||||
|
||||
@ -32,9 +30,6 @@ public class TrainingDMO {
|
||||
|
||||
public int CreateAssignment(int trainingId, int userId) {
|
||||
DynamicParameters parameters = new();
|
||||
|
||||
parameters = new DynamicParameters();
|
||||
//parameters.Add("@TrainingId", dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
|
||||
parameters.Add("@TrainingID", trainingId);
|
||||
parameters.Add("@UserID", userId);
|
||||
parameters.Add("@AssignmentID", dbType: DbType.Int32, direction: ParameterDirection.InputOutput);
|
||||
@ -147,9 +142,6 @@ public class TrainingDMO {
|
||||
public void AddTrainingGroupToECN(int ECNNumber, int groupId) {
|
||||
#if !NET8
|
||||
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
||||
//ECNTrainingBy ecnTraining = new ECNTrainingBy();
|
||||
//ecnTraining.AcknowledgementTrainingByID = groupId;
|
||||
//ecnTraining.ECNNumber = ECNNumber;
|
||||
|
||||
var parameters = new DynamicParameters();
|
||||
parameters.Add("@ECNNumber", ECNNumber);
|
||||
@ -157,7 +149,6 @@ public class TrainingDMO {
|
||||
|
||||
this.db.Execute("ECNInsertTrainingBy", parameters, commandType: CommandType.StoredProcedure);
|
||||
|
||||
//db.ECNTrainingBies.Add(ecnTraining);
|
||||
#else
|
||||
throw new NotImplementedException();
|
||||
#endif
|
||||
@ -166,16 +157,11 @@ public class TrainingDMO {
|
||||
public void SetTrainingFlag(int ECNNumber) {
|
||||
#if !NET8
|
||||
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
||||
//ECNTrainingBy ecnTraining = new ECNTrainingBy();
|
||||
//ecnTraining.AcknowledgementTrainingByID = groupId;
|
||||
//ecnTraining.ECNNumber = ECNNumber;
|
||||
|
||||
var parameters = new DynamicParameters();
|
||||
parameters.Add("@ECNNumber", ECNNumber);
|
||||
|
||||
this.db.Execute("ECNSetTrainingFlag", parameters, commandType: CommandType.StoredProcedure);
|
||||
|
||||
//db.ECNTrainingBies.Add(ecnTraining);
|
||||
#else
|
||||
throw new NotImplementedException();
|
||||
#endif
|
||||
@ -235,10 +221,7 @@ public class TrainingDMO {
|
||||
|
||||
public void AcknowledgeDocument(int trainingDocAckID) {
|
||||
DynamicParameters parameters = new();
|
||||
|
||||
parameters = new DynamicParameters();
|
||||
parameters.Add("@TrainingDocAckID", trainingDocAckID);
|
||||
//parameters.Add("@AttachmentID", attachmentID);
|
||||
|
||||
db.Execute("TrainingAcknowledgeDocument", parameters, commandType: CommandType.StoredProcedure);
|
||||
}
|
||||
@ -337,7 +320,7 @@ public class TrainingDMO {
|
||||
#if !NET8
|
||||
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
||||
bool isFinished = true;
|
||||
//TrainingDocAck docsAssigned = null;
|
||||
// TrainingDocAck docsAssigned = null;
|
||||
|
||||
var docsAssigned = from a in db.TrainingDocAcks where a.TrainingAssignmentID == trainingAssignmentID && a.Deleted != true select a;
|
||||
|
||||
@ -447,7 +430,6 @@ public class TrainingDMO {
|
||||
foreach (TrainingAssignment trainingAssignment in trainingAssignments) {
|
||||
DeleteTrainingAssignment(trainingAssignment.ID);
|
||||
DeleteTrainingDocAck(trainingAssignment.ID);
|
||||
//db.SaveChanges();
|
||||
}
|
||||
#else
|
||||
throw new NotImplementedException();
|
||||
@ -461,9 +443,9 @@ public class TrainingDMO {
|
||||
var userAssignments = (from a in db.TrainingAssignments where a.UserID == userId select a).ToList();
|
||||
|
||||
foreach (var item in userAssignments) {
|
||||
//get document assignments
|
||||
// get document assignments
|
||||
var docAssignments = (from a in db.TrainingDocAcks where a.TrainingAssignmentID == item.TrainingID select a).ToList();
|
||||
//delete each docAssignment
|
||||
// delete each docAssignment
|
||||
foreach (var docAssignment in docAssignments) {
|
||||
DeleteTrainingDocAck(docAssignment.ID);
|
||||
}
|
||||
@ -479,15 +461,15 @@ public class TrainingDMO {
|
||||
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
||||
TrainingDocAck ack = (from a in db.TrainingDocAcks where a.ID == docAckId select a).FirstOrDefault();
|
||||
|
||||
//TODO Check the user is valid
|
||||
// TODO Check the user is valid
|
||||
|
||||
//Check that the assignment exists
|
||||
// Check that the assignment exists
|
||||
if (ack != null) {
|
||||
//Check that the assignment isn't deleted
|
||||
// Check that the assignment isn't deleted
|
||||
if (ack.Deleted == true) {
|
||||
return false;
|
||||
}
|
||||
//Check that the assignment isn't completed
|
||||
// Check that the assignment isn't completed
|
||||
else if (ack.Reviewed == true) {
|
||||
return false;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user