Merge pull request #949 from frappe/develop

chore: Merge develop to main

frontend/src/components/Quiz.vue

@@ -269,18 +269,20 @@ const quiz = createResource({
 	cache: ['quiz', props.quizName],
 	auto: true,
 	onSuccess(data) {
-		shuffleQuiz()
+		populateQuestions()
 	},
 })
 
-const shuffleQuiz = () => {
+const populateQuestions = () => {
 	let data = quiz.data
 	if (data.shuffle_questions) {
 		questions = shuffleArray(data.questions)
-	}
 		if (data.limit_questions_to) {
 			questions = questions.slice(0, data.limit_questions_to)
 		}
+	} else {
+		questions = data.questions
+	}
 }
 
 const shuffleArray = (array) => {
@@ -322,7 +324,7 @@ const attempts = createResource({
 watch(
 	() => quiz.data,
 	() => {
-		if (quiz.data) {
+		if (quiz.data && quiz.data.max_attempts) {
 			attempts.reload()
 			resetQuiz()
 		}
@@ -476,7 +478,7 @@ const submitQuiz = () => {
 
 const createSubmission = () => {
 	quizSubmission.reload().then(() => {
-		attempts.reload()
+		if (quiz.data && quiz.data.max_attempts) attempts.reload()
 	})
 }
 
@@ -485,7 +487,7 @@ const resetQuiz = () => {
 	selectedOptions.splice(0, selectedOptions.length, ...[0, 0, 0, 0])
 	showAnswers.length = 0
 	quizSubmission.reset()
-	shuffleQuiz()
+	populateQuestions()
 }
 
 const getSubmissionColumns = () => {

lms/lms/doctype/lms_question/lms_question.json

@@ -195,7 +195,8 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-05-24 16:12:26.331351",
+ "make_attachments_public": 1,
+ "modified": "2024-08-01 13:01:55.000072",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Question",