Broadening notifications for cancelled TECNs
This commit is contained in:
parent
0289e62e9f
commit
5d701ded55
@ -31,6 +31,7 @@ namespace Fab2ApprovalSystem.Controllers
|
|||||||
ECN_DMO ecnDMO = new ECN_DMO();
|
ECN_DMO ecnDMO = new ECN_DMO();
|
||||||
WorkflowDMO wfDMO = new WorkflowDMO();
|
WorkflowDMO wfDMO = new WorkflowDMO();
|
||||||
TrainingDMO trainingDMO = new TrainingDMO();
|
TrainingDMO trainingDMO = new TrainingDMO();
|
||||||
|
UserAccountDMO userDMO = new UserAccountDMO();
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
@ -2115,6 +2116,12 @@ namespace Fab2ApprovalSystem.Controllers
|
|||||||
string emailSentList = "";
|
string emailSentList = "";
|
||||||
|
|
||||||
List<string> emailIst = MiscDMO.GetTECNCancelledApprovalNotifyList(ecnNumber).Distinct().ToList();
|
List<string> emailIst = MiscDMO.GetTECNCancelledApprovalNotifyList(ecnNumber).Distinct().ToList();
|
||||||
|
List<int> notificationUserList = ecnDMO.GetTECNNotificationUsers().ToList();
|
||||||
|
foreach (int userId in notificationUserList)
|
||||||
|
{
|
||||||
|
string email = userDMO.GetUserEmailByID(userId.ToString());
|
||||||
|
if (email != null && !emailIst.Contains(email)) emailIst.Add(email);
|
||||||
|
}
|
||||||
|
|
||||||
string emailTemplate = "TECNCancelled.txt";
|
string emailTemplate = "TECNCancelled.txt";
|
||||||
string userEmail = string.Empty;
|
string userEmail = string.Empty;
|
||||||
|
@ -598,6 +598,13 @@ namespace Fab2ApprovalSystem.DMO
|
|||||||
var approverList = this.db.Query<ApprovalLogHistory>("ECNGetECNApprovalLogHistory", parameters, commandType: CommandType.StoredProcedure).ToList();
|
var approverList = this.db.Query<ApprovalLogHistory>("ECNGetECNApprovalLogHistory", parameters, commandType: CommandType.StoredProcedure).ToList();
|
||||||
return approverList;
|
return approverList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerable<int> GetTECNNotificationUsers()
|
||||||
|
{
|
||||||
|
string sql = "select T.UserId from TECNNotificationsUsers T";
|
||||||
|
var result = this.db.Query<int>(sql).ToList();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -373,8 +373,11 @@ namespace Fab2ApprovalSystem.DMO
|
|||||||
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
FabApprovalTrainingEntities db = new FabApprovalTrainingEntities();
|
||||||
Training training = (from a in db.Trainings where a.TrainingID == trainingId select a).FirstOrDefault();
|
Training training = (from a in db.Trainings where a.TrainingID == trainingId select a).FirstOrDefault();
|
||||||
|
|
||||||
training.Deleted = true;
|
if (training != null)
|
||||||
training.DeletedDate = DateTime.Now;
|
{
|
||||||
|
training.Deleted = true;
|
||||||
|
training.DeletedDate = DateTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
List<TrainingAssignment> trainingAssignments = (from a in db.TrainingAssignments where a.TrainingID == trainingId select a).ToList();
|
List<TrainingAssignment> trainingAssignments = (from a in db.TrainingAssignments where a.TrainingID == trainingId select a).ToList();
|
||||||
db.SaveChanges();
|
db.SaveChanges();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user