From 97543a43eb3fa5fefaadcd5158e3bd6bef42ef54 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 28 Nov 2024 22:32:23 +0530
Subject: [PATCH] fix: misc quiz submission issues

---
 frontend/src/components/AppSidebar.vue        | 31 ++++++++++++-------
 frontend/src/components/DesktopLayout.vue     |  2 --
 frontend/src/pages/ProgramForm.vue            | 28 +++++++++++++++--
 frontend/src/pages/QuizForm.vue               |  1 -
 frontend/src/pages/QuizSubmission.vue         | 21 +++++++++++--
 lms/lms/doctype/lms_program/lms_program.json  |  5 +--
 lms/lms/doctype/lms_program/lms_program.py    |  5 +++
 lms/lms/doctype/lms_quiz/lms_quiz.py          |  1 -
 .../lms_quiz_submission.py                    | 26 ++++++++++++++++
 lms/lms/utils.py                              |  6 +---
 10 files changed, 100 insertions(+), 26 deletions(-)

diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index 7dba321c..dfc67968 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -186,18 +186,27 @@ const addQuizzes = () => {
 }
 
 const addPrograms = () => {
-	if (settingsStore.learningPaths.data) {
-		let activeFor = ['Programs', 'ProgramForm']
-		let index = 1
-		if (!isInstructor.value && !isModerator.value) {
-			sidebarLinks.value = sidebarLinks.value.filter(
-				(link) => link.label !== 'Courses'
-			)
-			activeFor.push('CourseDetail')
-			activeFor.push('Lesson')
-			index = 0
-		}
+	let activeFor = ['Programs', 'ProgramForm']
+	let index = 1
+	let canAddProgram = false
 
+	if (
+		!isInstructor.value &&
+		!isModerator.value &&
+		settingsStore.learningPaths.data
+	) {
+		sidebarLinks.value = sidebarLinks.value.filter(
+			(link) => link.label !== 'Courses'
+		)
+		activeFor.push('CourseDetail')
+		activeFor.push('Lesson')
+		index = 0
+		canAddProgram = true
+	} else if (isInstructor.value || isModerator.value) {
+		canAddProgram = true
+	}
+
+	if (canAddProgram) {
 		sidebarLinks.value.splice(index, 0, {
 			label: 'Programs',
 			icon: 'Route',
diff --git a/frontend/src/components/DesktopLayout.vue b/frontend/src/components/DesktopLayout.vue
index 70818bbe..79a4a1dc 100644
--- a/frontend/src/components/DesktopLayout.vue
+++ b/frontend/src/components/DesktopLayout.vue
@@ -8,7 +8,6 @@
 					<AppSidebar />
 				</div>
 				<div class="w-full overflow-auto" id="scrollContainer">
-					<OnboardingBanner />
 					<slot />
 				</div>
 			</div>
@@ -17,5 +16,4 @@
 </template>
 <script setup>
 import AppSidebar from './AppSidebar.vue'
-import OnboardingBanner from '@/components/OnboardingBanner.vue'
 </script>
diff --git a/frontend/src/pages/ProgramForm.vue b/frontend/src/pages/ProgramForm.vue
index 3f99870e..b9a74790 100644
--- a/frontend/src/pages/ProgramForm.vue
+++ b/frontend/src/pages/ProgramForm.vue
@@ -3,7 +3,7 @@
 		class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadbrumbs" />
-		<Button variant="solid">
+		<Button variant="solid" @click="saveProgram()">
 			{{ __('Save') }}
 		</Button>
 	</header>
@@ -50,6 +50,7 @@
 						item-key="name"
 						group="items"
 						@end="updateOrder"
+						class="cursor-move"
 					>
 						<template #item="{ element: row }">
 							<ListRow :row="row" />
@@ -175,7 +176,6 @@
 import {
 	Breadcrumbs,
 	Button,
-	call,
 	createDocumentResource,
 	Dialog,
 	FormControl,
@@ -191,11 +191,13 @@ import { Plus, Trash2 } from 'lucide-vue-next'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils/'
 import Draggable from 'vuedraggable'
+import { useRouter } from 'vue-router'
 
 const showDialog = ref(false)
 const currentForm = ref(null)
 const course = ref(null)
 const member = ref(null)
+const router = useRouter()
 
 const props = defineProps({
 	programName: {
@@ -302,6 +304,28 @@ const updateOrder = (e) => {
 	)
 }
 
+const saveProgram = () => {
+	program.setValue.submit(
+		{
+			title: program.doc.title,
+			program_courses: program.doc.program_courses,
+			program_members: program.doc.program_members,
+		},
+		{
+			onSuccess(data) {
+				router.push({
+					name: 'ProgramsForm',
+					params: { programName: data.name },
+				})
+				showToast(__('Success'), __('Program saved successfully'), 'check')
+			},
+			onError(err) {
+				showToast('Error', err.messages?.[0] || err, 'x')
+			},
+		}
+	)
+}
+
 const courseColumns = computed(() => {
 	return [
 		{
diff --git a/frontend/src/pages/QuizForm.vue b/frontend/src/pages/QuizForm.vue
index 95e487d0..b5968378 100644
--- a/frontend/src/pages/QuizForm.vue
+++ b/frontend/src/pages/QuizForm.vue
@@ -205,7 +205,6 @@ import {
 	inject,
 	onBeforeUnmount,
 	watch,
-	isReactive,
 } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
 import Question from '@/components/Modals/Question.vue'
diff --git a/frontend/src/pages/QuizSubmission.vue b/frontend/src/pages/QuizSubmission.vue
index a6363abf..4b6d2041 100644
--- a/frontend/src/pages/QuizSubmission.vue
+++ b/frontend/src/pages/QuizSubmission.vue
@@ -15,7 +15,7 @@
 			</Button>
 		</div>
 	</header>
-	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-7">
+	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-5">
 		<div class="text-xl font-semibold">
 			{{ submisisonDetails.doc.member_name }}
 		</div>
@@ -74,7 +74,7 @@ import {
 	Button,
 	Badge,
 } from 'frappe-ui'
-import { computed, onMounted, inject } from 'vue'
+import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { showToast } from '@/utils'
 
@@ -84,8 +84,25 @@ const user = inject('$user')
 onMounted(() => {
 	if (!user.data?.is_instructor && !user.data?.is_moderator)
 		router.push({ name: 'Courses' })
+
+	window.addEventListener('keydown', keyboardShortcut)
 })
 
+onBeforeUnmount(() => {
+	window.removeEventListener('keydown', keyboardShortcut)
+})
+
+const keyboardShortcut = (e) => {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		saveSubmission()
+		e.preventDefault()
+	}
+}
+
 const props = defineProps({
 	submission: {
 		type: String,
diff --git a/lms/lms/doctype/lms_program/lms_program.json b/lms/lms/doctype/lms_program/lms_program.json
index 5b4843fb..f92c689a 100644
--- a/lms/lms/doctype/lms_program/lms_program.json
+++ b/lms/lms/doctype/lms_program/lms_program.json
@@ -34,7 +34,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-20 12:26:02.214628",
+ "modified": "2024-11-28 22:06:16.742867",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Program",
@@ -80,5 +80,6 @@
  ],
  "sort_field": "creation",
  "sort_order": "DESC",
- "states": []
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/lms/lms/doctype/lms_program/lms_program.py b/lms/lms/doctype/lms_program/lms_program.py
index d0d6fa13..40a471a0 100644
--- a/lms/lms/doctype/lms_program/lms_program.py
+++ b/lms/lms/doctype/lms_program/lms_program.py
@@ -10,6 +10,7 @@ class LMSProgram(Document):
 	def validate(self):
 		self.validate_program_courses()
 		self.validate_program_members()
+		self.validate_title()
 
 	def validate_program_courses(self):
 		courses = [row.course for row in self.program_courses]
@@ -30,3 +31,7 @@ class LMSProgram(Document):
 					frappe.bold(next(iter(duplicates)))
 				)
 			)
+
+	def validate_title(self):
+		if self.has_value_changed("title"):
+			frappe.rename_doc(self.doctype, self.name, self.title)
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index 61328891..c6e3a089 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -145,7 +145,6 @@ def quiz_summary(quiz, results):
 
 	submission = frappe.new_doc("LMS Quiz Submission")
 	# Score and percentage are calculated by the controller function
-	print(results)
 	submission.update(
 		{
 			"doctype": "LMS Quiz Submission",
diff --git a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py
index 11c4ef0b..4e188060 100644
--- a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py
+++ b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py
@@ -5,6 +5,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
 from frappe import _
+from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
 
 
 class LMSQuizSubmission(Document):
@@ -12,6 +13,9 @@ class LMSQuizSubmission(Document):
 		self.validate_marks()
 		self.set_percentage()
 
+	def on_update(self):
+		self.notify_member()
+
 	def validate_marks(self):
 		for row in self.result:
 			if cint(row.marks) > cint(row.marks_out_of):
@@ -26,3 +30,25 @@ class LMSQuizSubmission(Document):
 	def set_percentage(self):
 		if self.score and self.score_out_of:
 			self.percentage = (self.score / self.score_out_of) * 100
+
+	def notify_member(self):
+		print(self.is_new())
+		if self.score != 0 and self.has_value_changed("score"):
+			notification = frappe._dict(
+				{
+					"subject": _("You have got a score of {0} for the quiz {1}").format(
+						self.score, self.quiz_title
+					),
+					"email_content": _(
+						"There has been an update on your submission. You have got a score of {0} for the quiz {1}"
+					).format(self.score, self.quiz_title),
+					"document_type": self.doctype,
+					"document_name": self.name,
+					"for_user": self.member,
+					"from_user": "Administrator",
+					"type": "Alert",
+					"link": "",
+				}
+			)
+
+			make_notification_logs(notification, [self.member])
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 9e920062..68decd51 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -6,11 +6,7 @@ import razorpay
 import requests
 from frappe import _
 from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_result
-from frappe.desk.doctype.notification_log.notification_log import (
-	make_notification_logs,
-	enqueue_create_notification,
-	get_title,
-)
+from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
 from frappe.desk.search import get_user_groups
 from frappe.desk.notifications import extract_mentions
 from frappe.utils import (