feat:assignment comments is now text editor

This commit is contained in:
Jannat Patel
2025-02-17 19:28:50 +05:30
parent 2af704043e
commit 43117bc035
2 changed files with 32 additions and 9 deletions

View File

@@ -155,12 +155,23 @@
type="select" type="select"
:options="submissionStatusOptions" :options="submissionStatusOptions"
/> />
<FormControl <div>
v-if="submissionResource.doc" <div class="text-sm text-ink-gray-5 mb-1">
v-model="submissionResource.doc.comments" {{ __('Comments') }}
:label="__('Comments')" </div>
type="textarea" <TextEditor
/> :content="comments"
@change="
(val) => {
comments = val
isDirty = true
}
"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -184,6 +195,7 @@ import { useRouter } from 'vue-router'
const submissionFile = ref(null) const submissionFile = ref(null)
const answer = ref(null) const answer = ref(null)
const comments = ref(null)
const router = useRouter() const router = useRouter()
const user = inject('$user') const user = inject('$user')
const showTitle = router.currentRoute.value.name == 'AssignmentSubmission' const showTitle = router.currentRoute.value.name == 'AssignmentSubmission'
@@ -281,6 +293,9 @@ watch(submissionResource, () => {
if (submissionResource.doc.answer) { if (submissionResource.doc.answer) {
answer.value = submissionResource.doc.answer answer.value = submissionResource.doc.answer
} }
if (submissionResource.doc.comments) {
comments.value = submissionResource.doc.comments
}
if (submissionResource.isDirty) { if (submissionResource.isDirty) {
isDirty.value = true isDirty.value = true
} else if (showUploader() && !submissionFile.value) { } else if (showUploader() && !submissionFile.value) {
@@ -305,11 +320,14 @@ const submitAssignment = () => {
submissionResource.doc && submissionResource.doc.owner != user.data?.name submissionResource.doc && submissionResource.doc.owner != user.data?.name
? user.data?.name ? user.data?.name
: null : null
submissionResource.setValue.submit( submissionResource.setValue.submit(
{ {
...submissionResource.doc, ...submissionResource.doc,
assignment_attachment: submissionFile.value?.file_url, assignment_attachment: submissionFile.value?.file_url,
evaluator: evaluator, evaluator: evaluator,
comments: comments.value,
answer: answer.value,
}, },
{ {
onSuccess(data) { onSuccess(data) {

View File

@@ -13,11 +13,12 @@
"column_break_3", "column_break_3",
"member", "member",
"member_name", "member_name",
"evaluator",
"section_break_dlzh", "section_break_dlzh",
"assignment_attachment", "assignment_attachment",
"answer", "answer",
"section_break_ydgh",
"column_break_oqqy", "column_break_oqqy",
"evaluator",
"status", "status",
"comments", "comments",
"section_break_rqal", "section_break_rqal",
@@ -80,7 +81,7 @@
}, },
{ {
"fieldname": "comments", "fieldname": "comments",
"fieldtype": "Small Text", "fieldtype": "Text Editor",
"label": "Comments" "label": "Comments"
}, },
{ {
@@ -139,12 +140,16 @@
{ {
"fieldname": "column_break_oqqy", "fieldname": "column_break_oqqy",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "section_break_ydgh",
"fieldtype": "Section Break"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"make_attachments_public": 1, "make_attachments_public": 1,
"modified": "2024-12-24 21:22:35.212732", "modified": "2025-02-17 18:40:53.374932",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Assignment Submission", "name": "LMS Assignment Submission",