diff --git a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs index f948735..5b89249 100644 --- a/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs +++ b/microservices/_layers/data/EFCore/EfCoreCommonRepository.cs @@ -1205,6 +1205,7 @@ namespace OnlineAssessment.Data.EFCore join us in _context.Users on ex.CreatedBy equals us.Id join qs in _context.ExamQuestionsMarkWeight on us.IsActive equals qs.IsActive into qns + where ex.InstituteId == institute_id && uge.UserGroupId == batch_id && uge.IsActive == true && sections.All(a => a.IsActive == true) @@ -1233,6 +1234,14 @@ namespace OnlineAssessment.Data.EFCore examDetail.attempts_allowed = item.e.AttemptsAllowed; //examDetail.points_needed = (short)item.e.CreditsNeeded; //examDetail.points_available = myExamPoints; + var latestAttempt = _context.ExamAttempts + .Where(a => a.ExamId == item.e.Id && a.CreatedBy == user_id) + .OrderByDescending(a => a.CreatedOn) + .FirstOrDefault(); + + if (latestAttempt != null) + examDetail.attempt_status = latestAttempt.Status; + examDetail.start_date = item.e.ExamOpenDatetime; examDetail.end_date = item.e.ExamCloseDatetime; examDetail.exam_duration = item.e.ExamDurationInSeconds;