merge main > uat #2

Merged
kctripathy merged 11 commits from main into uat 2025-10-31 03:30:02 +00:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit bc6d5a967e - Show all commits

View File

@ -394,7 +394,7 @@ namespace OnlineAssessment.Data.EFCore
details.total_time = (int)exam.ExamDurationInSeconds; details.total_time = (int)exam.ExamDurationInSeconds;
details.total_likes = _context.BookmarkedExams.Where(b => b.ExamId == exam_id && b.IsActive == true).ToList().Count; ; details.total_likes = _context.BookmarkedExams.Where(b => b.ExamId == exam_id && b.IsActive == true).ToList().Count; ;
details.author_id = exam.CreatedBy; details.author_id = exam.CreatedBy;
//details.points_needed = 0; details.points_needed = 0;
details.attempts_allowed = (int)exam.AttemptsAllowed; details.attempts_allowed = (int)exam.AttemptsAllowed;
/* SUBSDELETE /* SUBSDELETE
@ -410,10 +410,10 @@ namespace OnlineAssessment.Data.EFCore
SubscribedExams subsExam = _context.SubscribedExams.Where(se => se.SubscriptionId == svm.id && se.ExamId == exam_id && se.IsActive == true).FirstOrDefault(); SubscribedExams subsExam = _context.SubscribedExams.Where(se => se.SubscriptionId == svm.id && se.ExamId == exam_id && se.IsActive == true).FirstOrDefault();
details.isSubscribed = subsExam != null ? true : false; details.isSubscribed = subsExam != null ? true : false;
} }
*/
details.points_available = 1; details.points_available = 1;
details.isSubscribed = true; details.isSubscribed = true;
*/
List <ExamAttempts> allAttempts = _context.ExamAttempts.Where(a => a.ExamId == exam_id && a.IsActive == true).ToList(); List <ExamAttempts> allAttempts = _context.ExamAttempts.Where(a => a.ExamId == exam_id && a.IsActive == true).ToList();
List<ExamAttempts> myAttempts; List<ExamAttempts> myAttempts;

View File

@ -1147,9 +1147,9 @@ namespace OnlineAssessment.Data.EFCore
name = e.Name, name = e.Name,
sections_count = 0,//_context.ExamSections.Where(es => es.IsActive == true && es.ExamId == e.Id).ToList().Count, sections_count = 0,//_context.ExamSections.Where(es => es.IsActive == true && es.ExamId == e.Id).ToList().Count,
sections_status = StatusCode.DRAFT.ToString(), sections_status = StatusCode.DRAFT.ToString(),
//examtype_id = (int)e.ExamTypeId, examtype_id = (int)e.ExamTypeId, //Comment
//language_id = e.LanguageId, language_id = e.LanguageId, //Comment
//exam_status = e.ExamStatus, exam_status = e.ExamStatus,
//complexity = (short)e.Complexity, //complexity = (short)e.Complexity,
created_on = e.CreatedOn, created_on = e.CreatedOn,
updated_on = e.UpdatedOn, updated_on = e.UpdatedOn,
@ -1330,7 +1330,7 @@ namespace OnlineAssessment.Data.EFCore
module_id = p.ModuleId, module_id = p.ModuleId,
language_code = _context.Languages.Where(l => l.Id == p.LanguageId).FirstOrDefault().Code.ToString(), language_code = _context.Languages.Where(l => l.Id == p.LanguageId).FirstOrDefault().Code.ToString(),
status = p.Status, status = p.Status,
complexity = (short)p.Complexity, //complexity = (short)p.Complexity,
start_date = p.OpenDatetime, start_date = p.OpenDatetime,
created_on = p.CreatedOn, created_on = p.CreatedOn,
updated_on = p.UpdatedOn, updated_on = p.UpdatedOn,