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

fix: assignment submission in lesson

lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json

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

lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py

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

lms/www/batch/learn.js

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