Skip to content

Commit 0597301

Browse files
authored
Merge pull request #2830 from TechnologyEnhancedLearning/Develop/Fix/TD-4672-DateTime-Issue-SelfAssessment
TD-4672-Acitivity Delegates - Dates converted to local date time
2 parents 11c4e38 + 93f3edf commit 0597301

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,19 +243,22 @@ public IActionResult Index(
243243

244244
var adminId = User.GetCustomClaimAsRequiredInt(CustomClaimTypes.UserAdminId);
245245

246-
foreach (var delagate in selfAssessmentDelegatesData.Delegates ?? Enumerable.Empty<SelfAssessmentDelegate>())
246+
foreach (var saDelegate in selfAssessmentDelegatesData.Delegates ?? Enumerable.Empty<SelfAssessmentDelegate>())
247247
{
248-
var competencies = selfAssessmentService.GetCandidateAssessmentResultsById(delagate.CandidateAssessmentsId, adminId).ToList();
248+
var competencies = selfAssessmentService.GetCandidateAssessmentResultsById(saDelegate.CandidateAssessmentsId, adminId).ToList();
249249
if (competencies?.Count() > 0)
250250
{
251251
var questions = competencies.SelectMany(c => c.AssessmentQuestions).Where(q => q.Required);
252252
var selfAssessedCount = questions.Count(q => q.Result.HasValue);
253253
var verifiedCount = questions.Count(q => !((q.Result == null || q.Verified == null || q.SignedOff != true) && q.Required));
254254

255-
delagate.Progress = "Self assessed: " + selfAssessedCount + " / " + questions.Count() + Environment.NewLine +
255+
saDelegate.Progress = "Self assessed: " + selfAssessedCount + " / " + questions.Count() + Environment.NewLine +
256256
"Confirmed: " + verifiedCount + " / " + questions.Count();
257-
258257
}
258+
saDelegate.StartedDate = (DateTime)DateHelper.GetLocalDateTime(saDelegate.StartedDate);
259+
saDelegate.LastAccessed = DateHelper.GetLocalDateTime(saDelegate.LastAccessed);
260+
saDelegate.SubmittedDate = DateHelper.GetLocalDateTime(saDelegate.SubmittedDate);
261+
saDelegate.RemovedDate = DateHelper.GetLocalDateTime(saDelegate.RemovedDate);
259262
}
260263
}
261264

0 commit comments

Comments
 (0)