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

fix: removed unnecessary lines of code

Browse Source
This commit is contained in:
Jannat Patel
2022-11-25 09:21:59 +05:30
parent 9a183d2ef1
commit 8b5a9e1639
5 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/hooks.py
View File

@@ -172,7 +172,6 @@ website_route_rules = [
"to_route": "/classes/progress", "to_route": "/classes/progress",
}, },
{"from_route": "/assignments/<assignment>", "to_route": "assignments/assignment"}, {"from_route": "/assignments/<assignment>", "to_route": "assignments/assignment"},
{"from_route": "/quiz-result/<subname>", "to_route": "quiz_result/quiz_result"},
] ]
website_redirects = [ website_redirects = [

2
lms/lms/doctype/lms_quiz/lms_quiz.py
View File

@@ -77,7 +77,7 @@ def quiz_summary(quiz, results):
result["question"] = frappe.db.get_value( result["question"] = frappe.db.get_value(
"LMS Quiz Question", {"parent": quiz, "idx": result["question_index"]}, ["question"] "LMS Quiz Question", {"parent": quiz, "idx": result["question_index"]}, ["question"]
) )
print(result)
for point in result["is_correct"]: for point in result["is_correct"]:
correct = correct and point correct = correct and point

2
lms/public/js/html2canvas.js
View File

@@ -6012,7 +6012,7 @@
if (isSelectElement(element)) { if (isSelectElement(element)) {
return new SelectElementContainer(context, element); return new SelectElementContainer(context, element);
} }
if (isElement(element)) { if (isTextareaElement(element)) {
return new TextareaElementContainer(context, element); return new TextareaElementContainer(context, element);
} }
if (isIFrameElement(element)) { if (isIFrameElement(element)) {

121
lms/www/assignments/assignment.html
View File

@@ -9,67 +9,70 @@
<div class="container"> <div class="container">
<div class="common-card-style column-card medium"> <div class="common-card-style column-card medium">
<div class="course-home-headings"> {{ _("Assignment Grading") }} </div> <div class="course-home-headings"> {{ _("Assignment Grading") }} </div>
{% set course_title = frappe.db.get_value("LMS Course", assignment.course, "title") %} {{ AssignmentForm(assignment) }}
{% set lesson_title = frappe.db.get_value("Course Lesson", assignment.lesson, "title") %}
<form class="register-form">
<div class="form-padding">
<div class="form-row">
<div class="form-group col-md-6">
<label> {{ _("Member") }} </label>
<input type="text" class="form-control" value="{{ assignment.member_name }}" readonly />
</div>
<div class="form-group col-md-6">
<label> {{ _("Course") }} </label>
<input type="text" class="form-control" value="{{ course_title }}" readonly />
</div>
</div>
<div class="form-row">
<div class="col-md-6">
<div class="form-group">
<label> {{ _("Lesson") }} </label>
<input type="text" class="form-control" value="{{ lesson_title }}" readonly />
</div>
<div class="form-group">
<label> {{ _("Result") }} </label>
<div class="control-input flex align-center form-control">
<select class="input-with-feedback form-control pl-0" id="result" data-type="{{ assignment.status }}">
<option selected> {{ _("Not Graded") }} </option>
<option value="Pass"> {{ _("Pass") }} </option>
<option value="Fail"> {{ _("Fail") }} </option>
</select>
<div class="select-icon">
<svg class="icon icon-sm">
<use class="" href="#icon-select"></use>
</svg>
</div>
</div>
</div>
</div>
<div class="form-group col-md-6">
<label>{{ _("Comments") }}</label>
<textarea class="form-control" id="comments">{% if assignment.comments %}{{ assignment.comments }}{% endif %}</textarea>
</div>
</div>
</div>
<div class="text-right form-padding">
<a class="btn btn-secondary btn-md" href="{{ assignment.assignment }}" target="_blank">
{{ _("Open Attachment") }}
</a>
<button class="btn btn-primary btn-md ml-2" id="save-assignment" data-assignment="{{ assignment.name }}">
{{ _("Save") }}
</button>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% macro AssignmentForm(assignment) %}
{% set course_title = frappe.db.get_value("LMS Course", assignment.course, "title") %}
{% set lesson_title = frappe.db.get_value("Course Lesson", assignment.lesson, "title") %}
<form class="register-form">
<div class="form-padding">
<div class="form-row">
<div class="form-group col-md-6">
<label> {{ _("Member") }} </label>
<input type="text" class="form-control" value="{{ assignment.member_name }}" disabled readonly />
</div>
<div class="form-group col-md-6">
<label> {{ _("Course") }} </label>
<input type="text" class="form-control" value="{{ course_title }}" disabled readonly />
</div>
</div>
<div class="form-row">
<div class="col-md-6">
<div class="form-group">
<label> {{ _("Lesson") }} </label>
<input type="text" class="form-control" value="{{ lesson_title }}" disabled readonly />
</div>
<div class="form-group">
<label> {{ _("Result") }} </label>
<div class="control-input flex align-center form-control">
<select class="input-with-feedback form-control pl-0" id="result" data-type="{{ assignment.status }}">
<option selected> {{ _("Not Graded") }} </option>
<option value="Pass"> {{ _("Pass") }} </option>
<option value="Fail"> {{ _("Fail") }} </option>
</select>
<div class="select-icon">
<svg class="icon icon-sm">
<use class="" href="#icon-select"></use>
</svg>
</div>
</div>
</div>
</div>
<div class="form-group col-md-6">
<label>{{ _("Comments") }}</label>
<textarea class="form-control" id="comments">{% if assignment.comments %}{{ assignment.comments }}{% endif %}</textarea>
</div>
</div>
</div>
<div class="text-right form-padding">
<a class="btn btn-secondary btn-sm" href="{{ assignment.assignment }}" target="_blank">
{{ _("Open Attachment") }}
</a>
<button class="btn btn-primary btn-sm ml-2" id="save-assignment" data-assignment="{{ assignment.name }}">
{{ _("Save") }}
</button>
</div>
</form>
{% endmacro %}

4
lms/www/assignments/assignment.py
View File

@@ -6,8 +6,7 @@ from frappe import _
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
assignment = frappe.form_dict["assignment"] assignment = frappe.form_dict["assignment"]
print("assignment")
print(assignment)
if not has_course_moderator_role(): if not has_course_moderator_role():
message = "Only Moderators have access to this page." message = "Only Moderators have access to this page."
if frappe.session.user == "Guest": if frappe.session.user == "Guest":
@@ -21,4 +20,3 @@ def get_context(context):
["assignment", "comments", "status", "name", "member_name", "course", "lesson"], ["assignment", "comments", "status", "name", "member_name", "course", "lesson"],
as_dict=True, as_dict=True,
) )
print("call twice")