chore: merged conflicts

This commit is contained in:
Jannat Patel
2024-12-30 18:21:47 +05:30
18 changed files with 644 additions and 597 deletions

View File

@@ -1487,8 +1487,7 @@ def get_batch_students(batch):
detail.courses_completed = courses_completed
detail.assessments_completed = assessments_completed
if len(batch_courses) or len(assessments):
if len(batch_courses) + len(assessments):
detail.progress = flt(
(
(courses_completed + assessments_completed)