diff --git a/Fab2ApprovalSystem/Controllers/TrainingController.cs b/Fab2ApprovalSystem/Controllers/TrainingController.cs index eece2b5..4a30b4a 100644 --- a/Fab2ApprovalSystem/Controllers/TrainingController.cs +++ b/Fab2ApprovalSystem/Controllers/TrainingController.cs @@ -15,6 +15,8 @@ using System.Configuration; namespace Fab2ApprovalSystem.Controllers { + + [Authorize] [SessionExpireFilter] public class TrainingController : Controller @@ -716,35 +718,38 @@ namespace Fab2ApprovalSystem.Controllers string userEmail = userDMO.GetUserByID(user.UserId).Email; emailList.Add(userEmail); } - //emailList.Add("Jonathan.Ouellette@infineon.com"); + //emailList.Add("Chase.Tucker@infineon.com"); //Get a list of open trainings List openTrainings = trainingDMO.GetAllOpenTrainings(); foreach (Training training in openTrainings) { + string trainingSection = ""; + int trainingSectionUserCount = 0; string ecnTitle = ecnDMO.GetECN(training.ECN).Title; - emailBody += "

" + training.ECN + " - " + ecnTitle + "

"; + trainingSection += "

" + training.ECN + " - " + ecnTitle + "

"; - emailBody += ""; - emailBody += ""; + trainingSection += "
NameDate AssignedOut of Office
"; + trainingSection += ""; List openAssignments = trainingDMO.GetOpenAssignmentsByTrainingID(training.TrainingID); foreach (TrainingAssignment assignment in openAssignments) { - DateTime? assignmentDate = assignment.DateAssigned; - string DateAssigned = assignmentDate.HasValue ? assignmentDate.Value.ToString("MM/dd/yyyy") : ""; + if (!userDMO.GetUserByID(assignment.UserID).OOO) + { + trainingSectionUserCount++; - emailBody += ""; + DateTime? assignmentDate = assignment.DateAssigned; - if (userDMO.GetUserByID(assignment.UserID).OOO) - emailBody += ""; - else - emailBody += ""; + string DateAssigned = assignmentDate.HasValue ? assignmentDate.Value.ToString("MM/dd/yyyy") : ""; - emailBody += ""; + trainingSection += ""; + trainingSection += ""; + } } - emailBody += "
NameDate Assigned
" + assignment.FullName + "" + DateAssigned + "X
" + assignment.FullName + "" + DateAssigned + "
"; + trainingSection += ""; + if (trainingSectionUserCount > 0) emailBody += trainingSection; } string recipientEmail = ""; List ccRecipients = emailList; diff --git a/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj b/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj index 2030839..71d89b2 100644 --- a/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj +++ b/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj @@ -426,6 +426,8 @@ FabApproval.edmx + + diff --git a/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopDebug.pubxml b/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopDebug.pubxml new file mode 100644 index 0000000..589078e --- /dev/null +++ b/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopDebug.pubxml @@ -0,0 +1,18 @@ + + + + + true + false + true + Debug + Any CPU + FileSystem + C:\Users\tuckerc\Desktop\FabApprovalDeployments-Debug + FileSystem + <_TargetId>Folder + + + \ No newline at end of file diff --git a/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopRelease.pubxml b/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopRelease.pubxml new file mode 100644 index 0000000..6570564 --- /dev/null +++ b/Fab2ApprovalSystem/Properties/PublishProfiles/ChaseDesktopRelease.pubxml @@ -0,0 +1,18 @@ + + + + + true + false + true + Release + Any CPU + FileSystem + C:\Users\tuckerc\Desktop\FabApprovalDeployments-Release + FileSystem + <_TargetId>Folder + + + \ No newline at end of file