From 43117bc0357836a12c80df148483a45469323a9e Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 17 Feb 2025 19:28:50 +0530 Subject: [PATCH 1/3] feat:assignment comments is now text editor --- frontend/src/components/Assignment.vue | 30 +++++++++++++++---- .../lms_assignment_submission.json | 11 +++++-- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/Assignment.vue b/frontend/src/components/Assignment.vue index 004a9d64..0cccc5a9 100644 --- a/frontend/src/components/Assignment.vue +++ b/frontend/src/components/Assignment.vue @@ -155,12 +155,23 @@ type="select" :options="submissionStatusOptions" /> - +
+
+ {{ __('Comments') }} +
+ +
@@ -184,6 +195,7 @@ import { useRouter } from 'vue-router' const submissionFile = ref(null) const answer = ref(null) +const comments = ref(null) const router = useRouter() const user = inject('$user') const showTitle = router.currentRoute.value.name == 'AssignmentSubmission' @@ -281,6 +293,9 @@ watch(submissionResource, () => { if (submissionResource.doc.answer) { answer.value = submissionResource.doc.answer } + if (submissionResource.doc.comments) { + comments.value = submissionResource.doc.comments + } if (submissionResource.isDirty) { isDirty.value = true } else if (showUploader() && !submissionFile.value) { @@ -305,11 +320,14 @@ const submitAssignment = () => { submissionResource.doc && submissionResource.doc.owner != user.data?.name ? user.data?.name : null + submissionResource.setValue.submit( { ...submissionResource.doc, assignment_attachment: submissionFile.value?.file_url, evaluator: evaluator, + comments: comments.value, + answer: answer.value, }, { onSuccess(data) { diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json index 00ac7f09..61cf0858 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json @@ -13,11 +13,12 @@ "column_break_3", "member", "member_name", + "evaluator", "section_break_dlzh", "assignment_attachment", "answer", + "section_break_ydgh", "column_break_oqqy", - "evaluator", "status", "comments", "section_break_rqal", @@ -80,7 +81,7 @@ }, { "fieldname": "comments", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Comments" }, { @@ -139,12 +140,16 @@ { "fieldname": "column_break_oqqy", "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_ydgh", + "fieldtype": "Section Break" } ], "index_web_pages_for_search": 1, "links": [], "make_attachments_public": 1, - "modified": "2024-12-24 21:22:35.212732", + "modified": "2025-02-17 18:40:53.374932", "modified_by": "Administrator", "module": "LMS", "name": "LMS Assignment Submission", From 9ce64a037d55b1a107f7e749674b09910da41ecb Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 17 Feb 2025 19:41:24 +0530 Subject: [PATCH 2/3] fix: increased column width for grading --- frontend/src/components/Assignment.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/Assignment.vue b/frontend/src/components/Assignment.vue index 0cccc5a9..5bd99c3b 100644 --- a/frontend/src/components/Assignment.vue +++ b/frontend/src/components/Assignment.vue @@ -1,7 +1,7 @@
-
-
+
+
- + {{ submissionFile.file_name }} From 3d209024dd0db319769fbec5956c7840a20e4693 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 17 Feb 2025 19:45:45 +0530 Subject: [PATCH 3/3] fix: height of batch page --- frontend/src/components/Assignment.vue | 2 +- frontend/src/pages/Batch.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Assignment.vue b/frontend/src/components/Assignment.vue index 5bd99c3b..9056fb30 100644 --- a/frontend/src/components/Assignment.vue +++ b/frontend/src/components/Assignment.vue @@ -1,7 +1,7 @@