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

fix: progress view

Browse Source
This commit is contained in:
Jannat Patel
2023-06-01 14:29:15 +05:30
parent 961f8c1627
commit fe80ef9b85
7 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/www/assignment_submission/assignment_submission.html
View File

@@ -44,29 +44,38 @@
<article class="field-parent">
<div class="field-group">
<div class="field-label">
{{ _("Question")}}
{{ _("Student") }}
</div>
{{ submission.member_name }}
</div>
<div class="field-group">
<!-- <div class="field-label">
{{ _("Question")}}
</div> -->
{{ assignment.question }}
</div>
<div class="field-group">
<div class="field-label">
{{ _("Submit your assignment")}}
{{ _("Submit")}}
</div>
<div class="field-description">
{{ _("Upload assignment as {0}").format(assignment.type) }}
</div>
<div class="file-source-preview">
{% if submission.status == "Not Graded" %}
{% if submission.status == "Not Graded" and submission.member == frappe.session.user %}
<span class="btn btn-default btn-sm btn-close">
{{ _("Clear") }}
</span>
{% endif %}
<div class="btn-upload clickable {% if submission.assignment_attachment %} hide {% endif %}" data-type="{{ assignment.type }}">
{{ _("Upload a {0}").format(assignment.type) }}
{{ _("Browse").format(assignment.type) }}
</div>
<iframe class="image-preview {% if not submission.assignment_attachment %} hide {% endif %}" {% if submission.assignment_attachment %} src="{{ submission.assignment_attachment }}" {% endif %}></iframe>
</div>
</div>
</article>
{% endmacro %}

7
lms/www/assignment_submission/assignment_submission.py
View File

@@ -1,11 +1,14 @@
import frappe
from frappe import _
from lms.lms.utils import has_course_moderator_role
def get_context(context):
context.no_cache = 1
context.is_moderator = has_course_moderator_role()
submission = frappe.form_dict["submission"]
assignment = frappe.form_dict["assignment"]
context.assignment = frappe.db.get_value(
"LMS Assignment", assignment, ["title", "name", "type", "question"], as_dict=1
)
@@ -16,9 +19,11 @@ def get_context(context):
context.submission = frappe.db.get_value(
"LMS Assignment Submission",
submission,
["name", "assignment_attachment", "comments", "status"],
["name", "assignment_attachment", "comments", "status", "member", "member_name"],
as_dict=True,
)
if not context.is_moderator and frappe.session.user != context.submission.member:
raise frappe.PermissionError(_("You don't have permission to access this page."))
if not context.assignment or not context.submission:
raise frappe.PermissionError(_("Invalid Submission URL"))