Merge pull request #1316 from FahidLatheef/fix/quiz-maximum-attempts

fix: fixed bug in which user can submit quiz over the maximum limit allowed

frontend/src/components/Quiz.vue

@@ -207,7 +207,7 @@
 						</Button>
 						<Button
 							v-else-if="activeQuestion != questions.length"
-							@click="nextQuetion()"
+							@click="nextQuestion()"
 						>
 							<span>
 								{{ __('Next') }}
@@ -258,14 +258,22 @@
 			</Button>
 		</div>
 		<div
-			v-if="quiz.data.show_submission_history && attempts?.data"
+			v-if="
+				quiz.data.show_submission_history &&
+				attempts?.data &&
+				attempts.data.length > 0
+			"
 			class="mt-10"
 		>
 			<ListView
 				:columns="getSubmissionColumns()"
 				:rows="attempts?.data"
 				row-key="name"
-				:options="{ selectable: false, showTooltip: false }"
+				:options="{
+					selectable: false,
+					showTooltip: false,
+					emptyState: { title: __('No Quiz submissions found') },
+				}"
 			>
 			</ListView>
 		</div>
@@ -282,7 +290,7 @@ import {
 	FormControl,
 } from 'frappe-ui'
 import { ref, watch, reactive, inject, computed } from 'vue'
-import { createToast } from '@/utils/'
+import { createToast, showToast } from '@/utils/'
 import { CheckCircle, XCircle, MinusCircle } from 'lucide-vue-next'
 import { timeAgo } from '@/utils'
 import { useRouter } from 'vue-router'
@@ -536,7 +544,7 @@ const addToLocalStorage = () => {
 	localStorage.setItem(quiz.data.title, JSON.stringify(quizData))
 }
 
-const nextQuetion = () => {
+const nextQuestion = () => {
 	if (!quiz.data.show_answers && questionDetails.data?.type != 'Open Ended') {
 		checkAnswer()
 	} else {
@@ -574,6 +582,16 @@ const createSubmission = () => {
 				if (quiz.data && quiz.data.max_attempts) attempts.reload()
 				if (quiz.data.duration) clearInterval(timerInterval)
 			},
+			onError(err) {
+				const errorTitle = err?.message || ''
+				if (errorTitle.includes('MaximumAttemptsExceededError')) {
+					const errorMessage = err.messages?.[0] || err
+					showToast(__('Error'), __(errorMessage), 'x')
+					setTimeout(() => {
+						window.location.reload()
+					}, 3000)
+				}
+			},
 		}
 	)
 }

frontend/src/pages/QuizForm.vue

@@ -55,7 +55,7 @@
 					<FormControl
 						type="number"
 						v-model="quiz.max_attempts"
-						:label="__('Maximun Attempts')"
+						:label="__('Maximum Attempts')"
 					/>
 					<FormControl
 						type="number"

frontend/src/router.js

@@ -219,7 +219,7 @@ let router = createRouter({
 
 router.beforeEach(async (to, from, next) => {
 	const { userResource } = usersStore()
-	const { isLoggedIn } = sessionStore()
+	let { isLoggedIn } = sessionStore()
 	const { allowGuestAccess } = useSettings()
 
 	try {

frontend/src/utils/quiz.js

@@ -4,6 +4,7 @@ import { createApp, h } from 'vue'
 import { usersStore } from '../stores/user'
 import translationPlugin from '../translation'
 import { CircleHelp } from 'lucide-vue-next'
+import router from '@/router'
 
 export class Quiz {
 	constructor({ data, api, readOnly }) {
@@ -46,6 +47,7 @@ export class Quiz {
 				quiz: quiz,
 			})
 			app.use(translationPlugin)
+			app.use(router)
 			const { userResource } = usersStore()
 			app.provide('$user', userResource)
 			app.mount(this.wrapper)

lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py

@@ -10,12 +10,29 @@ from frappe.desk.doctype.notification_log.notification_log import make_notificat
 
 class LMSQuizSubmission(Document):
 	def validate(self):
+		self.validate_if_max_attempts_exceeded()
 		self.validate_marks()
 		self.set_percentage()
 
 	def on_update(self):
 		self.notify_member()
 
+	def validate_if_max_attempts_exceeded(self):
+		max_attempts = frappe.db.get_value("LMS Quiz", self.quiz, ["max_attempts"])
+		if max_attempts == 0:
+			return
+
+		current_user_submission_count = frappe.db.count(
+			self.doctype, filters={"quiz": self.quiz, "member": frappe.session.user}
+		)
+		if current_user_submission_count >= max_attempts:
+			frappe.throw(
+				_("You have exceeded the maximum number of attempts ({0}) for this quiz").format(
+					max_attempts
+				),
+				MaximumAttemptsExceededError,
+			)
+
 	def validate_marks(self):
 		self.score = 0
 		for row in self.result:
@@ -52,3 +69,7 @@ class LMSQuizSubmission(Document):
 			)
 
 			make_notification_logs(notification, [self.member])
+
+
+class MaximumAttemptsExceededError(frappe.DuplicateEntryError):
+	pass

lms/locale/ar.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/bs.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/de.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "Max. Versuche"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/eo.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "crwdns150150:0crwdne150150:0"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr "crwdns150152:0crwdne150152:0"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/es.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "Intentos máximos"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr "Intentos máximos"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/fa.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/fr.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/hu.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/main.pot

@@ -3042,7 +3042,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/pl.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/ru.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "Максимум попыток"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/sv.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "Maximalt antal försök"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr "Maximalt antal försök"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/tr.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr "Maksimum Deneme"
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'

lms/locale/zh.po

@@ -3031,7 +3031,7 @@ msgid "Max Attempts"
 msgstr ""
 
 #: frontend/src/pages/QuizForm.vue:58
-msgid "Maximun Attempts"
+msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'