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

Merge pull request #529 from pateljannat/lesson-assignment-fixes

Browse Source 
fix: assignment submission in lesson
This commit is contained in:
Jannat Patel
2023-06-05 10:59:07 +05:30
committed by GitHub
parent c173953c6a b336d769c8
commit 414f126f1e
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
View File

@@ -42,8 +42,7 @@
"fieldname": "assignment", "fieldname": "assignment",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Assignment", "label": "Assignment",
"options": "LMS Assignment", "options": "LMS Assignment"
"reqd": 1
}, },
{ {
"fieldname": "member", "fieldname": "member",
@@ -140,7 +139,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
"modified": "2023-05-30 16:10:09.173258", "modified": "2023-06-05 09:39:37.672298",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Assignment Submission", "name": "LMS Assignment Submission",

6
lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py
View File

@@ -26,7 +26,7 @@ class LMSAssignmentSubmission(Document):
@frappe.whitelist() @frappe.whitelist()
def upload_assignment( def upload_assignment(
assignment_attachment, assignment_attachment,
assignment, assignment=None,
lesson=None, lesson=None,
status="Not Graded", status="Not Graded",
comments=None, comments=None,
@@ -63,11 +63,11 @@ def get_assignment(lesson):
assignment = frappe.db.get_value( assignment = frappe.db.get_value(
"LMS Assignment Submission", "LMS Assignment Submission",
{"lesson": lesson, "member": frappe.session.user}, {"lesson": lesson, "member": frappe.session.user},
["lesson", "member", "assignment", "comments", "status"], ["name", "lesson", "member", "assignment_attachment", "comments", "status"],
as_dict=True, as_dict=True,
) )
assignment.file_name = frappe.db.get_value( assignment.file_name = frappe.db.get_value(
"File", {"file_url": assignment.assignment}, "file_name" "File", {"file_url": assignment.assignment_attachment}, "file_name"
) )
return assignment return assignment

9
lms/www/batch/learn.js
View File

@@ -383,8 +383,9 @@ const create_lesson_work = (file, target) => {
frappe.call({ frappe.call({
method: "lms.lms.doctype.lms_assignment_submission.lms_assignment_submission.upload_assignment", method: "lms.lms.doctype.lms_assignment_submission.lms_assignment_submission.upload_assignment",
args: { args: {
assignment: file.file_url, assignment_attachment: file.file_url,
lesson: $(".title").attr("data-lesson"), lesson: $(".title").attr("data-lesson"),
submission: $(".preview-work").data("submission") || "",
}, },
callback: (data) => { callback: (data) => {
target.siblings(".attach-file").addClass("hide"); target.siblings(".attach-file").addClass("hide");
@@ -470,8 +471,12 @@ const fetch_assignments = () => {
target target
.siblings(".preview-work") .siblings(".preview-work")
.find("a") .find("a")
.attr("href", assignment.assignment) .attr("href", assignment.assignment_attachment)
.text(assignment.file_name); .text(assignment.file_name);
target
.siblings(".preview-work")
.attr("data-submission", assignment.name);
} }
}, },
}); });