diff --git a/Fab2ApprovalSystem/Controllers/ECNController.cs b/Fab2ApprovalSystem/Controllers/ECNController.cs index 7e68609..c1e66c6 100644 --- a/Fab2ApprovalSystem/Controllers/ECNController.cs +++ b/Fab2ApprovalSystem/Controllers/ECNController.cs @@ -31,6 +31,7 @@ namespace Fab2ApprovalSystem.Controllers ECN_DMO ecnDMO = new ECN_DMO(); WorkflowDMO wfDMO = new WorkflowDMO(); TrainingDMO trainingDMO = new TrainingDMO(); + UserAccountDMO userDMO = new UserAccountDMO(); // @@ -2115,6 +2116,12 @@ namespace Fab2ApprovalSystem.Controllers string emailSentList = ""; List emailIst = MiscDMO.GetTECNCancelledApprovalNotifyList(ecnNumber).Distinct().ToList(); + List 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 userEmail = string.Empty; diff --git a/Fab2ApprovalSystem/DMO/ECN_DMO.cs b/Fab2ApprovalSystem/DMO/ECN_DMO.cs index 0c90d7e..a69dfbd 100644 --- a/Fab2ApprovalSystem/DMO/ECN_DMO.cs +++ b/Fab2ApprovalSystem/DMO/ECN_DMO.cs @@ -598,6 +598,13 @@ namespace Fab2ApprovalSystem.DMO var approverList = this.db.Query("ECNGetECNApprovalLogHistory", parameters, commandType: CommandType.StoredProcedure).ToList(); return approverList; } + + public IEnumerable GetTECNNotificationUsers() + { + string sql = "select T.UserId from TECNNotificationsUsers T"; + var result = this.db.Query(sql).ToList(); + return result; + } diff --git a/Fab2ApprovalSystem/DMO/TrainingDMO.cs b/Fab2ApprovalSystem/DMO/TrainingDMO.cs index 7cfa18e..39f209d 100644 --- a/Fab2ApprovalSystem/DMO/TrainingDMO.cs +++ b/Fab2ApprovalSystem/DMO/TrainingDMO.cs @@ -373,8 +373,11 @@ namespace Fab2ApprovalSystem.DMO FabApprovalTrainingEntities db = new FabApprovalTrainingEntities(); Training training = (from a in db.Trainings where a.TrainingID == trainingId select a).FirstOrDefault(); - training.Deleted = true; - training.DeletedDate = DateTime.Now; + if (training != null) + { + training.Deleted = true; + training.DeletedDate = DateTime.Now; + } List trainingAssignments = (from a in db.TrainingAssignments where a.TrainingID == trainingId select a).ToList(); db.SaveChanges();