eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: assessment in progress

Browse Source
This commit is contained in:
Jannat Patel
2023-05-31 10:35:12 +05:30
parent bb39999b84
commit f6cdac4826
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lms/www/classes/progress.html
View File

@@ -49,18 +49,22 @@
{% macro Progress(class_info, student) %} {% macro Progress(class_info, student) %}
<div> <div>
{% for assessment in assessments %} {% for assessment in assessments %}
<div> <div class="list-row level">
<div> <div>
{{ assessment.title }} {{ assessment.title }}
</div> </div>
{{ assessment.submission}}
{% if assessment.submission %} {% if assessment.submission %}
<div> {% set status = assessment.submission.status %}
{{ assessment.submission.status }} {% set color = "green" if status == "Pass" else "red" if status == "Fail" else "orange" %}
</div> <div>
<a class="btn btn-secondary btn-sm" href="{{ assessment.url }}"> <div class="indicator-pill {{ color }}">
{{ _("Grade") }} {{ assessment.submission.status }}
</a> </div>
<a class="btn btn-secondary btn-sm" href="{{ assessment.url }}">
{{ _("Grade") }}
</a>
</div>
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}

43
lms/www/utils.py
View File

@@ -74,29 +74,30 @@ def get_assessments(is_moderator, class_name, member):
assessment.title = frappe.db.get_value( assessment.title = frappe.db.get_value(
"LMS Assignment", assessment.assessment_name, "title" "LMS Assignment", assessment.assessment_name, "title"
) )
if is_moderator:
assessment.url = f"/assignments/{assessment.assessment_name}"
else:
existing_submission = frappe.db.exists(
{
"doctype": "LMS Assignment Submission",
"member": member,
"assignment": assessment.assessment_name,
}
)
print(existing_submission)
if existing_submission:
assessment.submission = frappe.db.get_value(
"LMS Assignment Submission",
existing_submission,
["name", "grade", "comments"],
as_dict=True,
)
submission_name = existing_submission if existing_submission else "new-submission" existing_submission = frappe.db.exists(
assessment.url = ( {
f"/assignment-submission/{assessment.assessment_name}/{submission_name}" "doctype": "LMS Assignment Submission",
"member": member,
"assignment": assessment.assessment_name,
}
)
if existing_submission:
assessment.submission = frappe.db.get_value(
"LMS Assignment Submission",
existing_submission,
["name", "status", "comments"],
as_dict=True,
) )
assessment.edit_url = f"/assignments/{assessment.assessment_name}"
assessment.grade_url = f"/assignment-grading/{existing_submission}"
submission_name = existing_submission if existing_submission else "new-submission"
assessment.url = (
f"/assignment-submission/{assessment.assessment_name}/{submission_name}"
)
elif assessment.assessment_type == "LMS Quiz": elif assessment.assessment_type == "LMS Quiz":
assessment.title = frappe.db.get_value( assessment.title = frappe.db.get_value(
"LMS Quiz", assessment.assessment_name, "title" "LMS Quiz", assessment.assessment_name, "title"