From 931104319027a1e7c2f338709d9b2f33a5a87874 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 19 Feb 2025 16:40:11 +0530
Subject: [PATCH] fix: misc batch issues

---
 frontend/src/components/BatchOverlay.vue            | 13 +++++++++++--
 frontend/src/components/JobCard.vue                 |  2 +-
 frontend/src/components/Modals/EvaluationModal.vue  | 10 +++++++++-
 lms/lms/doctype/lms_batch/lms_batch.py              |  4 ++++
 .../doctype/lms_certificate/lms_certificate.json    |  3 ++-
 lms/lms/utils.py                                    |  1 +
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index be4f7a75..cf684993 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -69,7 +69,11 @@
 					name: batch.data.name,
 				},
 			}"
-			v-else-if="batch.data.paid_batch && batch.data.seats_left"
+			v-else-if="
+				batch.data.paid_batch &&
+				batch.data.seats_left > 0 &&
+				batch.data.accept_enrollments
+			"
 		>
 			<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
 				<span>
@@ -80,7 +84,11 @@
 		<Button
 			variant="solid"
 			class="w-full mt-2"
-			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
+			v-else-if="
+				batch.data.allow_self_enrollment &&
+				batch.data.seats_left &&
+				batch.data.accept_enrollments
+			"
 			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
@@ -112,6 +120,7 @@ import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const user = inject('$user')
+const dayjs = inject('$dayjs')
 
 const props = defineProps({
 	batch: {
diff --git a/frontend/src/components/JobCard.vue b/frontend/src/components/JobCard.vue
index 43928472..ca75182b 100644
--- a/frontend/src/components/JobCard.vue
+++ b/frontend/src/components/JobCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="flex space-x-4 border rounded-md p-2">
-		<Avatar :image="job.company_logo" :label="job.job_title" size="2xl" />
+		<img :src="job.company_logo" class="size-10 rounded-full object-contain" />
 		<div class="flex flex-col space-y-2 flex-1">
 			<div class="flex items-center justify-between">
 				<span class="font-semibold text-ink-gray-9">
diff --git a/frontend/src/components/Modals/EvaluationModal.vue b/frontend/src/components/Modals/EvaluationModal.vue
index 79cfd3a8..2dc02fd0 100644
--- a/frontend/src/components/Modals/EvaluationModal.vue
+++ b/frontend/src/components/Modals/EvaluationModal.vue
@@ -25,7 +25,15 @@
 					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Date') }}
 					</div>
-					<FormControl type="date" v-model="evaluation.date" />
+					<FormControl
+						type="date"
+						v-model="evaluation.date"
+						:min="
+							dayjs()
+								.add(dayjs.duration({ days: 1 }))
+								.format('YYYY-MM-DD')
+						"
+					/>
 				</div>
 				<div v-if="slots.data?.length">
 					<div class="mb-1.5 text-sm text-ink-gray-5">
diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index 71aa9c94..dfb7f4fe 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -176,6 +176,10 @@ def create_live_class(
 		class_details = frappe.get_doc(payload)
 		class_details.save()
 		return class_details
+	else:
+		frappe.throw(
+			_("Error creating live class. Please try again. {0}").format(response.text)
+		)
 
 
 def authenticate():
diff --git a/lms/lms/doctype/lms_certificate/lms_certificate.json b/lms/lms/doctype/lms_certificate/lms_certificate.json
index c4f74e7f..be51fbbd 100644
--- a/lms/lms/doctype/lms_certificate/lms_certificate.json
+++ b/lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -122,7 +122,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-17 11:57:02.859109",
+ "modified": "2025-02-19 16:26:05.902473",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate",
@@ -156,6 +156,7 @@
    "create": 1,
    "email": 1,
    "export": 1,
+   "if_owner": 1,
    "print": 1,
    "read": 1,
    "report": 1,
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index fcd28289..4da39eb4 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1233,6 +1233,7 @@ def get_batch_details(batch):
 	)
 
 	batch_details.instructors = get_instructors(batch)
+	batch_details.accept_enrollments = batch_details.start_date > getdate()
 
 	batch_details.courses = frappe.get_all(
 		"Batch Course", filters={"parent": batch}, fields=["course", "title", "evaluator"]