From 1b17cd75c289064d4701db700a1f01e92a370c02 Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Wed, 8 May 2024 08:26:30 -0700 Subject: [PATCH] Removing PCRB and MRB modules --- Fab2ApprovalSystem/Controllers/TrainingController.cs | 9 ++++++++- Fab2ApprovalSystem/Jobs/OOOTrainingReportJob.cs | 5 ++--- Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Fab2ApprovalSystem/Controllers/TrainingController.cs b/Fab2ApprovalSystem/Controllers/TrainingController.cs index 891aafa..4db3045 100644 --- a/Fab2ApprovalSystem/Controllers/TrainingController.cs +++ b/Fab2ApprovalSystem/Controllers/TrainingController.cs @@ -743,7 +743,14 @@ namespace Fab2ApprovalSystem.Controllers string DateAssigned = assignmentDate.HasValue ? assignmentDate.Value.ToString("MM/dd/yyyy") : ""; - trainingSection += "" + assignment.FullName + "" + DateAssigned + ""; + if (assignmentDate.HasValue && (DateTime.Now.Date - assignmentDate).Value.TotalDays >= 5) + { + trainingSection += "" + assignment.FullName + "" + DateAssigned + ""; + } + else + { + trainingSection += "" + assignment.FullName + "" + DateAssigned + ""; + } trainingSection += ""; } diff --git a/Fab2ApprovalSystem/Jobs/OOOTrainingReportJob.cs b/Fab2ApprovalSystem/Jobs/OOOTrainingReportJob.cs index 5c6f584..79047b4 100644 --- a/Fab2ApprovalSystem/Jobs/OOOTrainingReportJob.cs +++ b/Fab2ApprovalSystem/Jobs/OOOTrainingReportJob.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using System.Web; -using Fab2ApprovalSystem.Controllers; + using Fab2ApprovalSystem.DMO; using Fab2ApprovalSystem.Models; using Fab2ApprovalSystem.Utilities; + using Quartz; namespace Fab2ApprovalSystem.Workers diff --git a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml index 6c3dfb4..9b2c9de 100644 --- a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml +++ b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml @@ -81,10 +81,10 @@ Create New