From eb350c5a20e71c37a95750673d6ebb9eb0df0cc1 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 11 Oct 2024 19:16:40 +0530
Subject: [PATCH] fix: batch self enrollment

---
 frontend/src/components/Assessments.vue       |  1 +
 frontend/src/components/BatchOverlay.vue      | 37 ++++++++++++++++++-
 frontend/src/components/BrandSettings.vue     |  1 -
 .../lms_assessment/lms_assessment.json        |  8 ++--
 lms/lms/utils.py                              | 14 ++++---
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue
index 55c849dd..d7e4c141 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -140,6 +140,7 @@ const removeAssessments = (selections, unselectAll) => {
 }
 
 const getRowRoute = (row) => {
+	console.log(row)
 	if (row.assessment_type == 'LMS Assignment') {
 		if (row.submission) {
 			return {
diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 670548a4..43f687f7 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -75,6 +75,7 @@
 			variant="solid"
 			class="w-full mt-2"
 			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
+			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
 		</Button>
@@ -97,11 +98,13 @@
 </template>
 <script setup>
 import { inject, computed } from 'vue'
-import { Badge, Button } from 'frappe-ui'
+import { Badge, Button, createResource } from 'frappe-ui'
 import { BookOpen, Clock, Globe } from 'lucide-vue-next'
-import { formatNumberIntoCurrency, formatTime } from '@/utils'
+import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
 import DateRange from '@/components/Common/DateRange.vue'
+import { useRouter } from 'vue-router'
 
+const router = useRouter()
 const user = inject('$user')
 
 const props = defineProps({
@@ -111,6 +114,36 @@ const props = defineProps({
 	},
 })
 
+const enroll = createResource({
+	url: 'lms.lms.utils.enroll_in_batch',
+	makeParams(values) {
+		return {
+			batch: props.batch.data.name,
+		}
+	},
+})
+
+const enrollInBatch = () => {
+	enroll.submit(
+		{},
+		{
+			onSuccess(data) {
+				showToast(
+					__('Success'),
+					__('You have been enrolled in this batch'),
+					'check'
+				)
+				router.push({
+					name: 'Batch',
+					params: {
+						batchName: props.batch.data.name,
+					},
+				})
+			},
+		}
+	)
+}
+
 const seats_left = computed(() => {
 	if (props.batch.data?.seat_count) {
 		return props.batch.data?.seat_count - props.batch.data?.students?.length
diff --git a/frontend/src/components/BrandSettings.vue b/frontend/src/components/BrandSettings.vue
index e8debd76..0257637d 100644
--- a/frontend/src/components/BrandSettings.vue
+++ b/frontend/src/components/BrandSettings.vue
@@ -85,7 +85,6 @@ const update = () => {
 }
 
 watch(props.data, (newData) => {
-	console.log(newData)
 	if (newData && !isDirty.value) {
 		isDirty.value = true
 	}
diff --git a/lms/lms/doctype/lms_assessment/lms_assessment.json b/lms/lms/doctype/lms_assessment/lms_assessment.json
index cab085f9..9a2fec8a 100644
--- a/lms/lms/doctype/lms_assessment/lms_assessment.json
+++ b/lms/lms/doctype/lms_assessment/lms_assessment.json
@@ -15,20 +15,22 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Assessment Type",
-   "options": "DocType"
+   "options": "DocType",
+   "reqd": 1
   },
   {
    "fieldname": "assessment_name",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Assessment Name",
-   "options": "assessment_type"
+   "options": "assessment_type",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-05-29 14:56:36.602399",
+ "modified": "2024-10-11 19:16:01.630524",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Assessment",
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index ca81644b..de0fdf67 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1702,21 +1702,23 @@ def enroll_in_course(payment_name, course):
 		enrollment.save(ignore_permissions=True)
 
 
-def enroll_in_batch(payment_name, batch):
+@frappe.whitelist()
+def enroll_in_batch(batch, payment_name=None):
 	if not frappe.db.exists(
 		"Batch Student", {"parent": batch, "student": frappe.session.user}
 	):
 		student = frappe.new_doc("Batch Student")
 		current_count = frappe.db.count("Batch Student", {"parent": batch})
-		payment = frappe.db.get_value(
-			"LMS Payment", payment_name, ["name", "source"], as_dict=True
-		)
+		if payment_name:
+			payment = frappe.db.get_value(
+				"LMS Payment", payment_name, ["name", "source"], as_dict=True
+			)
 
 		student.update(
 			{
 				"student": frappe.session.user,
-				"payment": payment.name,
-				"source": payment.source,
+				"payment": payment.name if payment_name else None,
+				"source": payment.source if payment_name else None,
 				"parent": batch,
 				"parenttype": "LMS Batch",
 				"parentfield": "students",