Skip to content

Updated swayam csv export to use correct Moodle database #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Naman-56-56 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated swayam csv export to use correct Moodle database #721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions training/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from django.http import HttpResponse
from django.template.defaultfilters import slugify

from mdldjango.models import MdlQuizGrades, MdlUser
from ilwmoodle.models import ILWMdlUser, ILWMdlQuizGrades
from events.models import Student, StudentMaster
from donate.subscription import has_active_subscription

Expand Down Expand Up @@ -115,7 +115,7 @@ def get_moodle_user_map(participants):
return {}

moodle_users = (
MdlUser.objects.using('moodle')
ILWMdlUser.objects.using('ilwmoodle')
.filter(email__in=normalized_emails)
.only('id', 'email', 'username')
)
Expand Down Expand Up @@ -149,7 +149,7 @@ def get_moodle_grade_map(user_ids, quiz_id):

grade_map = {}
grades = (
MdlQuizGrades.objects.using('moodle')
ILWMdlQuizGrades.objects.using('ilwmoodle')
.filter(userid__in=user_ids, quiz=quiz_id)
.order_by('userid', '-timemodified')
.only('userid', 'quiz', 'timemodified')
Expand Down Expand Up @@ -218,14 +218,7 @@ def build_swayam_export_rows(event, metadata):
for index, participant in enumerate(participants, start=1):
email = (participant.email or '').strip()
moodle_user = moodle_user_map.get(participant.user_id)
moodle_grade = (
MdlQuizGrades.objects.using('moodle')
.filter(userid=moodle_user.id, quiz=quiz_id)
.order_by('-timemodified')
.first()
if moodle_user and quiz_id
else None
)
moodle_grade = moodle_grade_map.get(moodle_user.id) if moodle_user else None
final_val = format_ddmmyyyy(dt.datetime.utcfromtimestamp(moodle_grade.timemodified)) if moodle_grade and moodle_grade.timemodified else ''

logger.warning(
Expand Down