chore: resolved conflicts

frontend/package.json

@@ -19,7 +19,7 @@
     "chart.js": "^4.4.1",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.35",
+    "frappe-ui": "^0.1.46",
     "lucide-vue-next": "^0.309.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",
@@ -35,4 +35,4 @@
     "postcss": "^8.4.5",
     "vite": "^5.0.11"
   }
-}
+}

lms/lms/doctype/lms_quiz/lms_quiz.py

@@ -279,6 +279,8 @@ def check_choice_answers(question, answers):
 	for num in range(1, 5):
 		if question_details[f"option_{num}"] in answers:
 			is_correct.append(question_details[f"is_correct_{num}"])
+		elif question_details[f"is_correct_{num}"]:
+			is_correct.append(2)
 		else:
 			is_correct.append(0)
 

lms/lms/widgets/NoPreviewModal.html

@@ -29,10 +29,6 @@
                 <button class="btn btn-primary btn-sm notify-me pull-right" data-course="{{course.name | urlencode}}">
                     {{ _("Notify me when available") }}
                 </button>
-                {% elif show_start_learing_cta(course, membership) %}
-                <button class="btn btn-primary btn-sm enroll-in-course pull-right" data-course="{{ course.name | urlencode}}">
-                    {{ _("Start Learning") }}
-                </button>
                 {% endif %}
             </div>
             {% endif %}

lms/templates/quiz/quiz.js

@@ -239,7 +239,9 @@ const parse_choices = (element, is_correct) => {
 					? add_icon(elem, "check")
 					: add_icon(elem, "wrong");
 		} else {
-			add_icon(elem, "minus-circle");
+			if (this.show_answers && is_correct[i] == 2)
+				add_icon(elem, "minus-circle-green");
+			else add_icon(elem, "minus-circle");
 		}
 	});
 };

lms/templates/reviews_cta.html

@@ -6,8 +6,4 @@
     <a class="btn btn-secondary btn-sm" href="/login?redirect-to=/courses/{{ course.name }}">
         {{ _("Write a review") }}
     </a>
-{% elif show_start_learing_cta(course, membership) %}
-    <div class="btn btn-secondary btn-sm enroll-in-course" data-course="{{ course.name | urlencode }}">
-        {{ _("Start Learning") }}
-    </div>
 {% endif %}