From 9a7c77c57b28732c7b06c8ae6e052168358b1231 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Tue, 24 Feb 2026 23:25:27 +0530
Subject: [PATCH 01/17] feat: Google Meet integration for Live Classes

Add Google Meet as an alternative conferencing provider for Live Classes
in Frappe LMS, alongside the existing Zoom integration. Leverages
Frappe's built-in Google Calendar sync to generate Meet links.

Changes:
- New DocType: LMS Google Meet Settings (account_name, member, calendar)
- Schema changes to LMS Batch (conferencing_provider, google_meet_account)
- Schema changes to LMS Live Class (conferencing_provider, google_meet_account)
- Participant calendar invites via Google Calendar API
- Event update/reschedule sync (on_update hook)
- Event cancellation/deletion sync (on_trash hook)
- Async Meet link handling with user-facing fallback message
- Frontend empty link guard ("Meet link generating...")
- Batch validation for conferencing provider configuration
- Manual attendance marking for Google Meet classes
- Admin UI for managing Google Meet accounts in LMS Settings
- Unit and integration tests

Upstream Issue: frappe/lms#2027
---
 .../Modals/GoogleMeetAccountModal.vue         | 195 +++++++++
 .../src/components/Modals/LiveClassModal.vue  |  25 +-
 .../components/Modals/ManualAttendance.vue    | 113 ++++++
 .../Settings/GoogleMeetSettings.vue           | 202 ++++++++++
 frontend/src/components/Settings/Settings.vue |   8 +
 frontend/src/pages/Batches/BatchForm.vue      |  31 ++
 .../pages/Batches/components/LiveClass.vue    |  50 ++-
 lms/lms/doctype/lms_batch/lms_batch.json      |  16 +
 lms/lms/doctype/lms_batch/lms_batch.py        |  54 +++
 .../lms_google_meet_settings/__init__.py      |   0
 .../lms_google_meet_settings.js               |   8 +
 .../lms_google_meet_settings.json             | 123 ++++++
 .../lms_google_meet_settings.py               |   9 +
 .../test_lms_google_meet_settings.py          |  88 +++++
 .../lms_live_class/lms_live_class.json        |  23 +-
 .../doctype/lms_live_class/lms_live_class.py  | 179 ++++++++-
 .../lms_live_class/test_lms_live_class.py     | 370 +++++++++++++++++-
 17 files changed, 1468 insertions(+), 26 deletions(-)
 create mode 100644 frontend/src/components/Modals/GoogleMeetAccountModal.vue
 create mode 100644 frontend/src/components/Modals/ManualAttendance.vue
 create mode 100644 frontend/src/components/Settings/GoogleMeetSettings.vue
 create mode 100644 lms/lms/doctype/lms_google_meet_settings/__init__.py
 create mode 100644 lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.js
 create mode 100644 lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.json
 create mode 100644 lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.py
 create mode 100644 lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py

diff --git a/frontend/src/components/Modals/GoogleMeetAccountModal.vue b/frontend/src/components/Modals/GoogleMeetAccountModal.vue
new file mode 100644
index 00000000..59b9522a
--- /dev/null
+++ b/frontend/src/components/Modals/GoogleMeetAccountModal.vue
@@ -0,0 +1,195 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			title:
+				accountID === 'new'
+					? __('New Google Meet Account')
+					: __('Edit Google Meet Account'),
+			size: 'xl',
+			actions: [
+				{
+					label: __('Save'),
+					variant: 'solid',
+					onClick: ({ close }) => {
+						saveAccount(close)
+					},
+				},
+			],
+		}"
+	>
+		<template #body-content>
+			<div class="mb-4">
+				<FormControl
+					v-model="account.enabled"
+					:label="__('Enabled')"
+					type="checkbox"
+				/>
+			</div>
+			<div class="grid grid-cols-2 gap-5">
+				<FormControl
+					v-model="account.name"
+					:label="__('Account Name')"
+					type="text"
+					:required="true"
+				/>
+				<Link
+					v-model="account.member"
+					:label="__('Member')"
+					doctype="Course Evaluator"
+					:onCreate="(value: string, close: () => void) => openSettings('Members', close)"
+					:required="true"
+				/>
+				<Link
+					v-model="account.google_calendar"
+					:label="__('Google Calendar')"
+					doctype="Google Calendar"
+					:required="true"
+				/>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup lang="ts">
+import { call, Dialog, FormControl, toast } from 'frappe-ui'
+import { inject, reactive, watch } from 'vue'
+import { User } from '@/components/Settings/types'
+import { openSettings, cleanError } from '@/utils'
+import Link from '@/components/Controls/Link.vue'
+import { useTelemetry } from 'frappe-ui/frappe'
+
+interface GoogleMeetAccount {
+	name: string
+	account_name: string
+	enabled: boolean
+	member: string
+	google_calendar: string
+}
+
+interface GoogleMeetAccounts {
+	data: GoogleMeetAccount[]
+	reload: () => void
+	insert: {
+		submit: (
+			data: GoogleMeetAccount,
+			options: { onSuccess: () => void; onError: (err: any) => void }
+		) => void
+	}
+	setValue: {
+		submit: (
+			data: GoogleMeetAccount,
+			options: { onSuccess: () => void; onError: (err: any) => void }
+		) => void
+	}
+}
+
+const show = defineModel('show')
+const user = inject<User | null>('$user')
+const googleMeetAccounts = defineModel<GoogleMeetAccounts>('googleMeetAccounts')
+const { capture } = useTelemetry()
+
+const account = reactive({
+	name: '',
+	enabled: false,
+	member: user?.data?.name || '',
+	google_calendar: '',
+})
+
+const props = defineProps({
+	accountID: {
+		type: String,
+		default: 'new',
+	},
+})
+
+watch(
+	() => props.accountID,
+	(val) => {
+		if (val === 'new') {
+			account.name = ''
+			account.enabled = false
+			account.member = user?.data?.name || ''
+			account.google_calendar = ''
+		} else if (val && val !== 'new') {
+			const acc = googleMeetAccounts.value?.data.find((acc) => acc.name === val)
+			if (acc) {
+				account.name = acc.name
+				account.enabled = acc.enabled || false
+				account.member = acc.member
+				account.google_calendar = acc.google_calendar
+			}
+		}
+	}
+)
+
+const saveAccount = (close: () => void) => {
+	if (props.accountID == 'new') {
+		createAccount(close)
+	} else {
+		updateAccount(close)
+	}
+}
+
+const createAccount = (close: () => void) => {
+	googleMeetAccounts.value?.insert.submit(
+		{
+			account_name: account.name,
+			...account,
+		},
+		{
+			onSuccess() {
+				capture('google_meet_account_linked')
+				googleMeetAccounts.value?.reload()
+				close()
+				toast.success(__('Google Meet Account created successfully'))
+			},
+			onError(err) {
+				close()
+				toast.error(
+					cleanError(err.messages[0]) ||
+						__('Error creating Google Meet Account')
+				)
+			},
+		}
+	)
+}
+
+const updateAccount = async (close: () => void) => {
+	if (props.accountID != account.name) {
+		await renameDoc()
+	}
+	setValue(close)
+}
+
+const renameDoc = async () => {
+	await call('frappe.client.rename_doc', {
+		doctype: 'LMS Google Meet Settings',
+		old_name: props.accountID,
+		new_name: account.name,
+	})
+}
+
+const setValue = (close: () => void) => {
+	googleMeetAccounts.value?.setValue.submit(
+		{
+			...account,
+			name: account.name,
+			account_name: props.accountID,
+		},
+		{
+			onSuccess() {
+				googleMeetAccounts.value?.reload()
+				close()
+				toast.success(__('Google Meet Account updated successfully'))
+			},
+			onError(err: any) {
+				close()
+				toast.error(
+					cleanError(err.messages[0]) ||
+						__('Error updating Google Meet Account')
+				)
+			},
+		}
+	)
+}
+</script>
diff --git a/frontend/src/components/Modals/LiveClassModal.vue b/frontend/src/components/Modals/LiveClassModal.vue
index 43796d4e..ac2ee3fe 100644
--- a/frontend/src/components/Modals/LiveClassModal.vue
+++ b/frontend/src/components/Modals/LiveClassModal.vue
@@ -67,6 +67,7 @@
 							/>
 						</div>
 						<FormControl
+							v-if="props.conferencingProvider === 'Zoom'"
 							v-model="liveClass.auto_recording"
 							type="select"
 							:options="getRecordingOptions()"
@@ -99,10 +100,9 @@ const props = defineProps({
 		type: String,
 		required: true,
 	},
-	zoomAccount: {
-		type: String,
-		required: true,
-	},
+	zoomAccount: String,
+	googleMeetAccount: String,
+	conferencingProvider: String,
 })
 
 let liveClass = reactive({
@@ -159,8 +159,23 @@ const createLiveClass = createResource({
 	},
 })
 
+const createGoogleMeetLiveClass = createResource({
+	url: 'lms.lms.doctype.lms_batch.lms_batch.create_google_meet_live_class',
+	makeParams(values) {
+		return {
+			batch_name: values.batch,
+			google_meet_account: props.googleMeetAccount,
+			...values,
+		}
+	},
+})
+
 const submitLiveClass = (close) => {
-	return createLiveClass.submit(liveClass, {
+	const resource =
+		props.conferencingProvider === 'Google Meet'
+			? createGoogleMeetLiveClass
+			: createLiveClass
+	return resource.submit(liveClass, {
 		validate() {
 			validateFormFields()
 		},
diff --git a/frontend/src/components/Modals/ManualAttendance.vue b/frontend/src/components/Modals/ManualAttendance.vue
new file mode 100644
index 00000000..963bb0bf
--- /dev/null
+++ b/frontend/src/components/Modals/ManualAttendance.vue
@@ -0,0 +1,113 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			title: __('Mark Attendance - {0}').format(live_class?.title),
+			size: '2xl',
+			actions: [
+				{
+					label: __('Save'),
+					variant: 'solid',
+					onClick: () => saveAttendance(),
+				},
+			],
+		}"
+	>
+		<template #body-content>
+			<div v-if="enrollments.data?.length" class="divide-y">
+				<label
+					v-for="student in enrollments.data"
+					:key="student.member"
+					class="flex items-center space-x-3 py-2 cursor-pointer hover:bg-surface-gray-2 px-2 rounded"
+				>
+					<input
+						type="checkbox"
+						:value="student.member"
+						v-model="selectedMembers"
+						class="rounded border-outline-gray-3"
+					/>
+					<Avatar
+						:image="student.member_image"
+						:label="student.member_name"
+						size="lg"
+					/>
+					<div>
+						<div class="font-medium text-ink-gray-9">
+							{{ student.member_name }}
+						</div>
+						<div class="text-sm text-ink-gray-5">
+							{{ student.member }}
+						</div>
+					</div>
+				</label>
+			</div>
+			<div v-else class="text-sm text-ink-gray-5 italic py-4">
+				{{ __('No students enrolled in this batch.') }}
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Avatar, createListResource, createResource, Dialog, toast } from 'frappe-ui'
+import { ref, onMounted } from 'vue'
+
+const show = defineModel()
+const emit = defineEmits(['saved'])
+
+const props = defineProps({
+	live_class: {
+		type: Object,
+		required: true,
+	},
+	batch: {
+		type: String,
+		required: true,
+	},
+})
+
+const selectedMembers = ref([])
+
+const enrollments = createListResource({
+	doctype: 'LMS Batch Enrollment',
+	filters: {
+		batch: props.batch,
+	},
+	fields: ['member', 'member_name', 'member_image'],
+	auto: true,
+})
+
+const existingAttendance = createListResource({
+	doctype: 'LMS Live Class Participant',
+	filters: {
+		live_class: props.live_class?.name,
+	},
+	fields: ['member'],
+	auto: true,
+	onSuccess(data) {
+		selectedMembers.value = data.map((d) => d.member)
+	},
+})
+
+const markAttendance = createResource({
+	url: 'lms.lms.doctype.lms_live_class.lms_live_class.mark_manual_attendance',
+})
+
+const saveAttendance = () => {
+	markAttendance.submit(
+		{
+			live_class: props.live_class?.name,
+			members: JSON.stringify(selectedMembers.value),
+		},
+		{
+			onSuccess() {
+				toast.success(__('Attendance saved successfully'))
+				emit('saved')
+				show.value = false
+			},
+			onError(err) {
+				toast.error(err.messages?.[0] || err)
+			},
+		}
+	)
+}
+</script>
diff --git a/frontend/src/components/Settings/GoogleMeetSettings.vue b/frontend/src/components/Settings/GoogleMeetSettings.vue
new file mode 100644
index 00000000..2cb738a2
--- /dev/null
+++ b/frontend/src/components/Settings/GoogleMeetSettings.vue
@@ -0,0 +1,202 @@
+<template>
+	<div class="flex flex-col min-h-0 text-base">
+		<div class="flex items-center justify-between mb-5">
+			<div class="flex flex-col space-y-2">
+				<div class="text-xl font-semibold text-ink-gray-9">
+					{{ label }}
+				</div>
+				<div class="text-ink-gray-6 leading-5">
+					{{ __(description) }}
+				</div>
+			</div>
+			<div class="flex items-center space-x-5">
+				<Button @click="openForm('new')">
+					<template #prefix>
+						<Plus class="h-3 w-3 stroke-1.5" />
+					</template>
+					{{ __('New') }}
+				</Button>
+			</div>
+		</div>
+		<div v-if="googleMeetAccounts.data?.length" class="overflow-y-scroll">
+			<ListView
+				:columns="columns"
+				:rows="googleMeetAccounts.data"
+				row-key="name"
+				:options="{
+					showTooltip: false,
+					onRowClick: (row) => {
+						openForm(row.name)
+					},
+				}"
+			>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+				>
+					<ListHeaderItem :item="item" v-for="item in columns">
+						<template #prefix="{ item }">
+							<FeatherIcon
+								v-if="item.icon"
+								:name="item.icon"
+								class="h-4 w-4 stroke-1.5"
+							/>
+						</template>
+					</ListHeaderItem>
+				</ListHeader>
+
+				<ListRows>
+					<ListRow :row="row" v-for="row in googleMeetAccounts.data">
+						<template #default="{ column, item }">
+							<ListRowItem :item="row[column.key]" :align="column.align">
+								<template #prefix>
+									<div v-if="column.key == 'member_name'">
+										<Avatar
+											class="flex items-center"
+											:image="row['member_image']"
+											:label="item"
+											size="sm"
+										/>
+									</div>
+								</template>
+								<div v-if="column.key == 'enabled'">
+									<Badge v-if="row[column.key]" theme="green">
+										{{ __('Enabled') }}
+									</Badge>
+									<Badge v-else theme="gray">
+										{{ __('Disabled') }}
+									</Badge>
+								</div>
+								<div v-else class="leading-5 text-sm">
+									{{ row[column.key] }}
+								</div>
+							</ListRowItem>
+						</template>
+					</ListRow>
+				</ListRows>
+
+				<ListSelectBanner>
+					<template #actions="{ unselectAll, selections }">
+						<div class="flex gap-2">
+							<Button
+								variant="ghost"
+								@click="removeAccount(selections, unselectAll)"
+							>
+								<Trash2 class="h-4 w-4 stroke-1.5" />
+							</Button>
+						</div>
+					</template>
+				</ListSelectBanner>
+			</ListView>
+		</div>
+	</div>
+	<GoogleMeetAccountModal
+		v-model="showForm"
+		v-model:googleMeetAccounts="googleMeetAccounts"
+		:accountID="currentAccount"
+	/>
+</template>
+<script setup lang="ts">
+import {
+	Avatar,
+	Button,
+	Badge,
+	call,
+	createListResource,
+	FeatherIcon,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	ListSelectBanner,
+	toast,
+} from 'frappe-ui'
+import { computed, inject, onMounted, ref } from 'vue'
+import { Plus, Trash2 } from 'lucide-vue-next'
+import { cleanError } from '@/utils'
+import { User } from '@/components/Settings/types'
+import GoogleMeetAccountModal from '@/components/Modals/GoogleMeetAccountModal.vue'
+
+const user = inject<User | null>('$user')
+const showForm = ref(false)
+const currentAccount = ref<string | null>(null)
+
+const props = defineProps({
+	label: String,
+	description: String,
+})
+
+const googleMeetAccounts = createListResource({
+	doctype: 'LMS Google Meet Settings',
+	fields: [
+		'name',
+		'enabled',
+		'member',
+		'member_name',
+		'member_image',
+		'google_calendar',
+	],
+	cache: ['googleMeetAccounts'],
+})
+
+onMounted(() => {
+	fetchGoogleMeetAccounts()
+})
+
+const fetchGoogleMeetAccounts = () => {
+	if (!user?.data?.is_moderator && !user?.data?.is_evaluator) return
+
+	if (!user?.data?.is_moderator) {
+		googleMeetAccounts.update({
+			filters: {
+				member: user.data.name,
+			},
+		})
+	}
+	googleMeetAccounts.reload()
+}
+
+const openForm = (accountID: string) => {
+	currentAccount.value = accountID
+	showForm.value = true
+}
+
+const removeAccount = (selections, unselectAll) => {
+	call('lms.lms.api.delete_documents', {
+		doctype: 'LMS Google Meet Settings',
+		documents: Array.from(selections),
+	})
+		.then(() => {
+			googleMeetAccounts.reload()
+			toast.success(__('Google Meet Account deleted successfully'))
+			unselectAll()
+		})
+		.catch((err) => {
+			toast.error(
+				cleanError(err.messages[0]) || __('Error deleting Google Meet Account')
+			)
+		})
+}
+
+const columns = computed(() => {
+	return [
+		{
+			label: __('Member'),
+			key: 'member_name',
+			icon: 'user',
+		},
+		{
+			label: __('Account Name'),
+			key: 'name',
+			icon: 'video',
+		},
+		{
+			label: __('Status'),
+			key: 'enabled',
+			align: 'center',
+			icon: 'check-square',
+		},
+	]
+})
+</script>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 0365ed02..b3e718a5 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -76,6 +76,7 @@ import PaymentGateways from '@/components/Settings/PaymentGateways.vue'
 import Coupons from '@/components/Settings/Coupons/Coupons.vue'
 import Transactions from '@/components/Settings/Transactions/Transactions.vue'
 import ZoomSettings from '@/components/Settings/ZoomSettings.vue'
+import GoogleMeetSettings from '@/components/Settings/GoogleMeetSettings.vue'
 import Badges from '@/components/Settings/Badges.vue'
 
 const show = defineModel()
@@ -296,6 +297,13 @@ const tabsStructure = computed(() => {
 					icon: 'Video',
 					template: markRaw(ZoomSettings),
 				},
+				{
+					label: 'Google Meet Accounts',
+					description:
+						'Manage Google Meet accounts to conduct live classes from batches',
+					icon: 'Video',
+					template: markRaw(GoogleMeetSettings),
+				},
 				{
 					label: 'Badges',
 					description:
diff --git a/frontend/src/pages/Batches/BatchForm.vue b/frontend/src/pages/Batches/BatchForm.vue
index 4b1b5b9b..9e838a49 100644
--- a/frontend/src/pages/Batches/BatchForm.vue
+++ b/frontend/src/pages/Batches/BatchForm.vue
@@ -166,7 +166,14 @@
 							/>
 						</div>
 						<div class="space-y-5">
+							<FormControl
+								v-model="batchDetail.doc.conferencing_provider"
+								type="select"
+								:options="conferencingOptions"
+								:label="__('Conferencing Provider')"
+							/>
 							<Link
+								v-if="batchDetail.doc.conferencing_provider === 'Zoom'"
 								doctype="LMS Zoom Settings"
 								:label="__('Zoom Account')"
 								v-model="batchDetail.doc.zoom_account"
@@ -176,6 +183,17 @@
 									}
 								"
 							/>
+							<Link
+								v-if="batchDetail.doc.conferencing_provider === 'Google Meet'"
+								doctype="LMS Google Meet Settings"
+								:label="__('Google Meet Account')"
+								v-model="batchDetail.doc.google_meet_account"
+								:onCreate="
+									(value, close) => {
+										openSettings('Google Meet Accounts', close)
+									}
+								"
+							/>
 							<Uploader
 								v-model="batchDetail.doc.video_link"
 								:label="__('Preview Video')"
@@ -463,6 +481,19 @@ const trashBatch = (close) => {
 	})
 }
 
+const conferencingOptions = computed(() => {
+	return [
+		{
+			label: 'Zoom',
+			value: 'Zoom',
+		},
+		{
+			label: 'Google Meet',
+			value: 'Google Meet',
+		},
+	]
+})
+
 const mediumOptions = computed(() => {
 	return [
 		{
diff --git a/frontend/src/pages/Batches/components/LiveClass.vue b/frontend/src/pages/Batches/components/LiveClass.vue
index 0d3fdb42..690fbf58 100644
--- a/frontend/src/pages/Batches/components/LiveClass.vue
+++ b/frontend/src/pages/Batches/components/LiveClass.vue
@@ -1,14 +1,14 @@
 <template>
 	<div class="p-5">
 		<div
-			v-if="isAdmin() && !batch.data?.zoom_account"
+			v-if="isAdmin() && !hasProviderAccount()"
 			class="flex lg:items-center space-x-2 mb-5 bg-surface-amber-1 px-3 py-2 rounded-lg text-ink-amber-3"
 		>
 			<AlertCircle class="size-7 md:size-4 stroke-1.5" />
 			<span class="leading-5">
 				{{
 					__(
-						'Link a Zoom account to this batch from the Settings tab to create live classes'
+						'Please select a conferencing provider and add an account to the batch to create live classes.'
 					)
 				}}
 			</span>
@@ -35,7 +35,7 @@
 				v-for="cls in liveClasses.data"
 				class="flex flex-col border rounded-md h-full text-ink-gray-7 hover:border-outline-gray-3 p-3"
 				:class="{
-					'cursor-pointer': isAdmin() && cls.attendees > 0,
+					'cursor-pointer': isAdmin() && (cls.attendees > 0 || cls.conferencing_provider === 'Google Meet'),
 				}"
 				@click="
 					() => {
@@ -64,12 +64,12 @@
 						</span>
 					</div>
 					<div
-						v-if="canAccessClass(cls)"
+						v-if="canAccessClass(cls) && cls.join_url"
 						class="flex items-center space-x-2 text-ink-gray-9 mt-auto"
 					>
 						<a
 							v-if="user.data?.is_moderator || user.data?.is_evaluator"
-							:href="cls.start_url"
+							:href="cls.start_url || cls.join_url"
 							target="_blank"
 							class="cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-ink-gray-8 bg-surface-gray-2 hover:bg-surface-gray-3 active:bg-surface-gray-4 focus-visible:ring focus-visible:ring-outline-gray-3 h-7 text-base px-2 rounded"
 							:class="cls.join_url ? 'w-full' : 'w-1/2'"
@@ -86,6 +86,15 @@
 							{{ __('Join') }}
 						</a>
 					</div>
+					<div
+						v-else-if="canAccessClass(cls) && !cls.join_url"
+						class="flex items-center space-x-2 text-ink-amber-3 w-fit"
+					>
+						<Info class="w-4 h-4 stroke-1.5" />
+						<span class="text-sm">
+							{{ __('Meet link generating...') }}
+						</span>
+					</div>
 					<Tooltip
 						v-else-if="hasClassEnded(cls)"
 						:text="__('This class has ended')"
@@ -111,6 +120,8 @@
 		v-model="showLiveClassModal"
 		:batch="batch.data?.name"
 		:zoomAccount="batch.data?.zoom_account"
+		:googleMeetAccount="batch.data?.google_meet_account"
+		:conferencingProvider="batch.data?.conferencing_provider"
 		v-model:reloadLiveClasses="liveClasses"
 	/>
 
@@ -119,6 +130,14 @@
 		v-model="showAttendance"
 		:live_class="attendanceFor"
 	/>
+
+	<ManualAttendance
+		v-if="showManualAttendance"
+		v-model="showManualAttendance"
+		:live_class="attendanceFor"
+		:batch="batch.data?.name"
+		@saved="liveClasses.reload()"
+	/>
 </template>
 <script setup>
 import { createListResource, Button, Tooltip } from 'frappe-ui'
@@ -135,12 +154,14 @@ import { inject, ref } from 'vue'
 import { formatTime } from '@/utils/'
 import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
 import LiveClassAttendance from '@/components/Modals/LiveClassAttendance.vue'
+import ManualAttendance from '@/components/Modals/ManualAttendance.vue'
 
 const user = inject('$user')
 const showLiveClassModal = ref(false)
 const dayjs = inject('$dayjs')
 const readOnlyMode = window.read_only_mode
 const showAttendance = ref(false)
+const showManualAttendance = ref(false)
 const attendanceFor = ref(null)
 
 const props = defineProps({
@@ -165,6 +186,8 @@ const liveClasses = createListResource({
 		'start_url',
 		'join_url',
 		'owner',
+		'conferencing_provider',
+		'batch_name',
 	],
 	orderBy: 'date',
 	auto: true,
@@ -174,9 +197,16 @@ const openLiveClassModal = () => {
 	showLiveClassModal.value = true
 }
 
+const hasProviderAccount = () => {
+	const data = props.batch.data
+	if (data?.conferencing_provider === 'Zoom' && data?.zoom_account) return true
+	if (data?.conferencing_provider === 'Google Meet' && data?.google_meet_account) return true
+	return false
+}
+
 const canCreateClass = () => {
 	if (readOnlyMode) return false
-	if (!props.batch.data?.zoom_account) return false
+	if (!hasProviderAccount()) return false
 	return isAdmin()
 }
 
@@ -208,9 +238,13 @@ const hasClassEnded = (cls) => {
 
 const openAttendanceModal = (cls) => {
 	if (!isAdmin()) return
-	if (cls.attendees <= 0) return
-	showAttendance.value = true
 	attendanceFor.value = cls
+	if (cls.conferencing_provider === 'Google Meet') {
+		showManualAttendance.value = true
+	} else {
+		if (cls.attendees <= 0) return
+		showAttendance.value = true
+	}
 }
 </script>
 <style>
diff --git a/lms/lms/doctype/lms_batch/lms_batch.json b/lms/lms/doctype/lms_batch/lms_batch.json
index 9e657fad..ef1fd637 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.json
+++ b/lms/lms/doctype/lms_batch/lms_batch.json
@@ -36,7 +36,9 @@
   "medium",
   "confirmation_email_template",
   "column_break_flwy",
+  "conferencing_provider",
   "zoom_account",
+  "google_meet_account",
   "notification_sent",
   "section_break_jedp",
   "video_link",
@@ -361,11 +363,25 @@
    "label": "Certification"
   },
   {
+   "fieldname": "conferencing_provider",
+   "fieldtype": "Select",
+   "label": "Conferencing Provider",
+   "options": "Zoom\nGoogle Meet"
+  },
+  {
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
    "fieldname": "zoom_account",
    "fieldtype": "Link",
    "label": "Zoom Account",
    "options": "LMS Zoom Settings"
   },
+  {
+   "depends_on": "eval:doc.conferencing_provider=='Google Meet'",
+   "fieldname": "google_meet_account",
+   "fieldtype": "Link",
+   "label": "Google Meet Account",
+   "options": "LMS Google Meet Settings"
+  },
   {
    "fieldname": "video_link",
    "fieldtype": "Attach",
diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index e34c8366..95501515 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -36,6 +36,7 @@ class LMSBatch(Document):
 		self.validate_duplicate_assessments()
 		self.validate_timetable()
 		self.validate_evaluation_end_date()
+		self.validate_conferencing_provider()
 
 	def on_update(self):
 		if self.has_value_changed("published") and self.published:
@@ -126,6 +127,22 @@ class LMSBatch(Document):
 			if schedule.date < self.start_date or schedule.date > self.end_date:
 				frappe.throw(_("Row #{0} Date cannot be outside the batch duration.").format(schedule.idx))
 
+	def validate_conferencing_provider(self):
+		if self.conferencing_provider == "Google Meet":
+			if not self.google_meet_account:
+				frappe.throw(_("Please select a Google Meet account for this batch."))
+
+			google_meet_settings = frappe.get_doc("LMS Google Meet Settings", self.google_meet_account)
+			if not google_meet_settings.enabled:
+				frappe.throw(_("The selected Google Meet account is disabled. Please enable it or select another account."))
+
+			if not google_meet_settings.google_calendar:
+				frappe.throw(_("The selected Google Meet account does not have a Google Calendar configured."))
+
+		elif self.conferencing_provider == "Zoom":
+			if not self.zoom_account:
+				frappe.throw(_("Please select a Zoom account for this batch."))
+
 	def on_payment_authorized(self, payment_status):
 		if payment_status in ["Authorized", "Completed"]:
 			update_payment_record("LMS Batch", self.name)
@@ -262,6 +279,43 @@ def create_live_class(
 		frappe.throw(_("Error creating live class. Please try again. {0}").format(response.text))
 
 
+@frappe.whitelist()
+def create_google_meet_live_class(
+	batch_name,
+	google_meet_account,
+	title,
+	duration,
+	date,
+	time,
+	timezone,
+	description=None,
+):
+	google_meet_settings = frappe.get_doc("LMS Google Meet Settings", google_meet_account)
+	if not google_meet_settings.enabled:
+		frappe.throw(_("Please enable the Google Meet account to use this feature."))
+
+	if not google_meet_settings.google_calendar:
+		frappe.throw(_("The Google Meet account does not have a Google Calendar configured. Please set up a Google Calendar first."))
+
+	class_details = frappe.get_doc(
+		{
+			"doctype": "LMS Live Class",
+			"title": title,
+			"host": frappe.session.user,
+			"date": date,
+			"time": time,
+			"duration": duration,
+			"timezone": timezone,
+			"description": description,
+			"batch_name": batch_name,
+			"conferencing_provider": "Google Meet",
+			"google_meet_account": google_meet_account,
+		}
+	)
+	class_details.save()
+	return class_details
+
+
 def authenticate(zoom_account):
 	zoom = frappe.get_doc("LMS Zoom Settings", zoom_account)
 	if not zoom.enabled:
diff --git a/lms/lms/doctype/lms_google_meet_settings/__init__.py b/lms/lms/doctype/lms_google_meet_settings/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.js b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.js
new file mode 100644
index 00000000..f39ad54f
--- /dev/null
+++ b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2026, Frappe and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("LMS Google Meet Settings", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.json b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.json
new file mode 100644
index 00000000..da259f92
--- /dev/null
+++ b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.json
@@ -0,0 +1,123 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:account_name",
+ "creation": "2026-02-04 00:00:00.000000",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "enabled",
+  "section_break_xfow",
+  "account_name",
+  "member",
+  "member_name",
+  "member_image",
+  "column_break_fxxg",
+  "google_calendar"
+ ],
+ "fields": [
+  {
+   "default": "0",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "fieldname": "section_break_xfow",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "account_name",
+   "fieldtype": "Data",
+   "label": "Account Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "member",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Member",
+   "options": "User",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name"
+  },
+  {
+   "fetch_from": "member.user_image",
+   "fieldname": "member_image",
+   "fieldtype": "Attach Image",
+   "label": "Member Image"
+  },
+  {
+   "fieldname": "column_break_fxxg",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "google_calendar",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Google Calendar",
+   "options": "Google Calendar",
+   "reqd": 1
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2026-02-04 00:00:00.000000",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Google Meet Settings",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Moderator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Batch Evaluator",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
diff --git a/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.py b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.py
new file mode 100644
index 00000000..f40c7d82
--- /dev/null
+++ b/lms/lms/doctype/lms_google_meet_settings/lms_google_meet_settings.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, Frappe and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LMSGoogleMeetSettings(Document):
+	pass
diff --git a/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py b/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py
new file mode 100644
index 00000000..2f3a794f
--- /dev/null
+++ b/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py
@@ -0,0 +1,88 @@
+# Copyright (c) 2026, Frappe and Contributors
+# See license.txt
+
+import frappe
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+class UnitTestLMSGoogleMeetSettings(UnitTestCase):
+	"""
+	Unit tests for LMSGoogleMeetSettings.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestLMSGoogleMeetSettings(IntegrationTestCase):
+	"""
+	Integration tests for LMSGoogleMeetSettings.
+	"""
+
+	def setUp(self):
+		self.cleanup_items = []
+
+	def tearDown(self):
+		for item_type, item_name in reversed(self.cleanup_items):
+			if frappe.db.exists(item_type, item_name):
+				try:
+					frappe.delete_doc(item_type, item_name, force=True)
+				except Exception:
+					pass
+
+	def _create_google_calendar(self, name="Test Google Calendar"):
+		if frappe.db.exists("Google Calendar", name):
+			return frappe.get_doc("Google Calendar", name)
+
+		calendar = frappe.get_doc(
+			{
+				"doctype": "Google Calendar",
+				"calendar_name": name,
+				"user": "Administrator",
+				"google_account": "test@gmail.com",
+			}
+		)
+		calendar.insert(ignore_permissions=True)
+		self.cleanup_items.append(("Google Calendar", calendar.name))
+		return calendar
+
+	def test_create_google_meet_settings_with_valid_data(self):
+		calendar = self._create_google_calendar()
+		settings = frappe.get_doc(
+			{
+				"doctype": "LMS Google Meet Settings",
+				"account_name": f"Test Meet Account {frappe.generate_hash(length=6)}",
+				"member": "Administrator",
+				"google_calendar": calendar.name,
+				"enabled": 1,
+			}
+		)
+		settings.insert(ignore_permissions=True)
+		self.cleanup_items.append(("LMS Google Meet Settings", settings.name))
+
+		self.assertTrue(frappe.db.exists("LMS Google Meet Settings", settings.name))
+		self.assertEqual(settings.enabled, 1)
+		self.assertEqual(settings.google_calendar, calendar.name)
+
+	def test_create_google_meet_settings_without_calendar_raises_error(self):
+		with self.assertRaises(frappe.exceptions.MandatoryError):
+			settings = frappe.get_doc(
+				{
+					"doctype": "LMS Google Meet Settings",
+					"account_name": f"Test No Calendar {frappe.generate_hash(length=6)}",
+					"member": "Administrator",
+				}
+			)
+			settings.insert(ignore_permissions=True)
+
+	def test_create_google_meet_settings_without_member_raises_error(self):
+		calendar = self._create_google_calendar()
+		with self.assertRaises(frappe.exceptions.MandatoryError):
+			settings = frappe.get_doc(
+				{
+					"doctype": "LMS Google Meet Settings",
+					"account_name": f"Test No Member {frappe.generate_hash(length=6)}",
+					"google_calendar": calendar.name,
+				}
+			)
+			settings.insert(ignore_permissions=True)
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.json b/lms/lms/doctype/lms_live_class/lms_live_class.json
index 0aaab5ac..0cf97c1b 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.json
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.json
@@ -10,7 +10,9 @@
  "field_order": [
   "title",
   "host",
+  "conferencing_provider",
   "zoom_account",
+  "google_meet_account",
   "batch_name",
   "column_break_astv",
   "date",
@@ -107,6 +109,7 @@
    "read_only": 1
   },
   {
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
    "fieldname": "password",
    "fieldtype": "Password",
    "label": "Password"
@@ -125,6 +128,7 @@
   },
   {
    "default": "No Recording",
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
    "fieldname": "auto_recording",
    "fieldtype": "Select",
    "label": "Auto Recording",
@@ -137,14 +141,30 @@
    "options": "Event",
    "read_only": 1
   },
+  {
+   "fieldname": "conferencing_provider",
+   "fieldtype": "Select",
+   "label": "Conferencing Provider",
+   "options": "Zoom\nGoogle Meet"
+  },
   {
    "fieldname": "zoom_account",
    "fieldtype": "Link",
    "label": "Zoom Account",
    "options": "LMS Zoom Settings",
-   "reqd": 1
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
+   "mandatory_depends_on": "eval:doc.conferencing_provider=='Zoom'"
   },
   {
+   "fieldname": "google_meet_account",
+   "fieldtype": "Link",
+   "label": "Google Meet Account",
+   "options": "LMS Google Meet Settings",
+   "depends_on": "eval:doc.conferencing_provider=='Google Meet'",
+   "mandatory_depends_on": "eval:doc.conferencing_provider=='Google Meet'"
+  },
+  {
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
    "fieldname": "meeting_id",
    "fieldtype": "Data",
    "label": "Meeting ID"
@@ -160,6 +180,7 @@
    "fieldtype": "Section Break"
   },
   {
+   "depends_on": "eval:doc.conferencing_provider=='Zoom'",
    "fieldname": "uuid",
    "fieldtype": "Data",
    "label": "UUID"
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index d91e3e99..a28f54f6 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -15,6 +15,43 @@ from lms.lms.doctype.lms_batch.lms_batch import authenticate
 
 class LMSLiveClass(Document):
 	def after_insert(self):
+		if self.conferencing_provider == "Google Meet":
+			self._create_google_meet_event()
+		else:
+			self._create_calendar_event()
+
+	def on_update(self):
+		if not self.event:
+			return
+
+		if not self.has_value_changed("date") and not self.has_value_changed("time") \
+				and not self.has_value_changed("duration") and not self.has_value_changed("title"):
+			return
+
+		self._update_linked_event()
+
+	def on_trash(self):
+		if self.event and frappe.db.exists("Event", self.event):
+			frappe.delete_doc("Event", self.event, ignore_permissions=True)
+
+	def _update_linked_event(self):
+		event = frappe.get_doc("Event", self.event)
+		start = f"{self.date} {self.time}"
+
+		event.subject = f"Live Class on {self.title}"
+		event.starts_on = start
+		event.ends_on = get_datetime(start) + timedelta(minutes=cint(self.duration))
+
+		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
+		if self.join_url:
+			description += f" Click on this link to join. {self.join_url}."
+		if self.description:
+			description += f" {self.description}"
+		event.description = description
+
+		event.save(ignore_permissions=True)
+
+	def _create_calendar_event(self):
 		calendar = frappe.db.get_value("Google Calendar", {"user": frappe.session.user, "enable": 1}, "name")
 
 		if calendar:
@@ -22,6 +59,92 @@ class LMSLiveClass(Document):
 			self.add_event_participants(event, calendar)
 			frappe.db.set_value(self.doctype, self.name, "event", event.name)
 
+	def _create_google_meet_event(self):
+		google_meet_settings = frappe.get_doc("LMS Google Meet Settings", self.google_meet_account)
+		calendar = google_meet_settings.google_calendar
+
+		if not calendar:
+			frappe.throw(_("Google Calendar is not configured for this Google Meet account."))
+
+		event = self.create_event()
+
+		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
+		if self.description:
+			description += f" {self.description}"
+
+		event.reload()
+		event.update(
+			{
+				"sync_with_google_calendar": 1,
+				"add_video_conferencing": 1,
+				"google_calendar": calendar,
+				"description": description,
+			}
+		)
+		event.save()
+		event.reload()
+
+		meet_link = event.google_meet_link
+		frappe.db.set_value(
+			self.doctype,
+			self.name,
+			{
+				"event": event.name,
+				"join_url": meet_link or "",
+				"start_url": meet_link or "",
+			},
+		)
+
+		if not meet_link:
+			frappe.msgprint(
+				_("The Meet link is not yet available. It will be generated once Google Calendar syncs the event. Please refresh the page after a few moments."),
+				indicator="orange",
+				alert=True,
+			)
+
+		self._add_google_meet_participants(event, calendar)
+
+	def _add_google_meet_participants(self, event, calendar):
+		from frappe.integrations.doctype.google_calendar.google_calendar import get_google_calendar_object
+
+		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
+		instructors = frappe.get_all(
+			"Course Instructor", {"parenttype": "LMS Batch", "parent": self.batch_name}, pluck="instructor"
+		)
+
+		participants.append(frappe.session.user)
+		participants.extend(instructors)
+		participants = list(set(participants))
+
+		attendees = []
+		for participant in participants:
+			email = frappe.db.get_value("User", participant, "email")
+			if not email:
+				continue
+			attendees.append({"email": email})
+
+		if not attendees:
+			return
+
+		try:
+			google_calendar_api, account = get_google_calendar_object(calendar)
+			google_calendar_api.events().patch(
+				calendarId=event.google_calendar_id,
+				eventId=event.google_calendar_event_id,
+				body={
+					"attendees": attendees,
+					"guestsCanSeeOtherGuests": False,
+				},
+				sendUpdates="all",
+			).execute()
+		except Exception:
+			frappe.log_error(title=_("Google Meet - Failed to add participants to calendar event"))
+			frappe.msgprint(
+				_("Live class was created but calendar invites could not be sent to participants. You may need to share the Meet link manually."),
+				indicator="orange",
+				alert=True,
+			)
+
 	def create_event(self):
 		start = f"{self.date} {self.time}"
 
@@ -37,7 +160,7 @@ class LMSLiveClass(Document):
 		event.save()
 		return event
 
-	def add_event_participants(self, event, calendar):
+	def add_event_participants(self, event, calendar, add_video_conferencing=False):
 		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
 		instructors = frappe.get_all(
 			"Course Instructor", {"parenttype": "LMS Batch", "parent": self.batch_name}, pluck="instructor"
@@ -61,14 +184,23 @@ class LMSLiveClass(Document):
 			).save()
 
 		event.reload()
-		event.update(
-			{
-				"sync_with_google_calendar": 1,
-				"google_calendar": calendar,
-				"description": f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}. Click on this link to join. {self.join_url}. {self.description}",
-			}
-		)
 
+		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
+		if self.join_url:
+			description += f" Click on this link to join. {self.join_url}."
+		if self.description:
+			description += f" {self.description}"
+
+		update_data = {
+			"sync_with_google_calendar": 1,
+			"google_calendar": calendar,
+			"description": description,
+		}
+
+		if add_video_conferencing:
+			update_data["add_video_conferencing"] = 1
+
+		event.update(update_data)
 		event.save()
 
 
@@ -118,6 +250,7 @@ def update_attendance():
 		{
 			"uuid": ["is", "set"],
 			"attendees": ["is", "not set"],
+			"conferencing_provider": ["!=", "Google Meet"],
 		},
 		["name", "uuid", "zoom_account"],
 	)
@@ -171,6 +304,36 @@ def get_minutes(duration_in_seconds):
 	return 0
 
 
+@frappe.whitelist()
+def mark_manual_attendance(live_class, members):
+	if isinstance(members, str):
+		members = json.loads(members)
+
+	live_class_doc = frappe.get_doc("LMS Live Class", live_class)
+	start = get_datetime(f"{live_class_doc.date} {live_class_doc.time}")
+	end = start + timedelta(minutes=cint(live_class_doc.duration))
+
+	# Remove existing manual attendance records for this class
+	existing = frappe.get_all(
+		"LMS Live Class Participant",
+		{"live_class": live_class},
+		pluck="name",
+	)
+	for record in existing:
+		frappe.delete_doc("LMS Live Class Participant", record, ignore_permissions=True)
+
+	for member in members:
+		doc = frappe.new_doc("LMS Live Class Participant")
+		doc.live_class = live_class
+		doc.member = member
+		doc.joined_at = start
+		doc.left_at = end
+		doc.duration = cint(live_class_doc.duration)
+		doc.insert(ignore_permissions=True)
+
+	frappe.db.set_value("LMS Live Class", live_class, "attendees", len(members))
+
+
 def has_permission(doc, ptype="read", user=None):
 	user = user or frappe.session.user
 	roles = frappe.get_roles(user)
diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index 9345684d..0342dbee 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -1,9 +1,371 @@
 # Copyright (c) 2023, Frappe and Contributors
 # See license.txt
 
-# import frappe
-from frappe.tests import UnitTestCase
+import json
+from unittest.mock import MagicMock, patch
+
+import frappe
+from frappe.utils import add_days, nowdate
+
+from lms.lms.test_helpers import BaseTestUtils
 
 
-class TestLMSLiveClass(UnitTestCase):
-	pass
+class TestLMSLiveClass(BaseTestUtils):
+	"""Tests for LMS Live Class including Google Meet integration."""
+
+	def setUp(self):
+		super().setUp()
+		self._setup_course_flow()
+		self._setup_batch_flow()
+		self._setup_google_meet()
+
+	def _setup_google_meet(self):
+		"""Create Google Calendar and Google Meet Settings for testing."""
+		calendar_name = f"Test GCal {frappe.generate_hash(length=6)}"
+		if not frappe.db.exists("Google Calendar", calendar_name):
+			calendar = frappe.get_doc(
+				{
+					"doctype": "Google Calendar",
+					"calendar_name": calendar_name,
+					"user": "Administrator",
+					"google_account": "test@gmail.com",
+				}
+			)
+			calendar.insert(ignore_permissions=True)
+			self.cleanup_items.append(("Google Calendar", calendar.name))
+			self.google_calendar = calendar
+		else:
+			self.google_calendar = frappe.get_doc("Google Calendar", calendar_name)
+
+		account_name = f"Test Meet {frappe.generate_hash(length=6)}"
+		self.google_meet_settings = frappe.get_doc(
+			{
+				"doctype": "LMS Google Meet Settings",
+				"account_name": account_name,
+				"member": "Administrator",
+				"google_calendar": self.google_calendar.name,
+				"enabled": 1,
+			}
+		)
+		self.google_meet_settings.insert(ignore_permissions=True)
+		self.cleanup_items.append(("LMS Google Meet Settings", self.google_meet_settings.name))
+
+	def _create_live_class(self, provider="Google Meet", **kwargs):
+		"""Helper to create a live class for testing."""
+		data = {
+			"doctype": "LMS Live Class",
+			"title": f"Test Class {frappe.generate_hash(length=6)}",
+			"host": "Administrator",
+			"date": add_days(nowdate(), 1),
+			"time": "10:00:00",
+			"duration": 60,
+			"timezone": "Asia/Kolkata",
+			"batch_name": self.batch.name,
+			"conferencing_provider": provider,
+		}
+		if provider == "Google Meet":
+			data["google_meet_account"] = self.google_meet_settings.name
+		data.update(kwargs)
+
+		live_class = frappe.get_doc(data)
+		live_class.insert(ignore_permissions=True)
+		self.cleanup_items.append(("LMS Live Class", live_class.name))
+		return live_class
+
+	# --- T9: Unit tests for Google Meet live class creation ---
+
+	def test_google_meet_live_class_creates_event(self):
+		"""Creating a Google Meet live class should create a linked Frappe Event."""
+		live_class = self._create_live_class()
+		live_class.reload()
+
+		self.assertTrue(live_class.event)
+		self.assertTrue(frappe.db.exists("Event", live_class.event))
+
+		event = frappe.get_doc("Event", live_class.event)
+		self.assertEqual(event.sync_with_google_calendar, 1)
+		self.assertEqual(event.add_video_conferencing, 1)
+		self.assertEqual(event.google_calendar, self.google_calendar.name)
+
+	def test_google_meet_live_class_event_has_correct_times(self):
+		"""The linked Event should have correct start and end times."""
+		live_class = self._create_live_class()
+		live_class.reload()
+
+		event = frappe.get_doc("Event", live_class.event)
+		self.assertIn("10:00", str(event.starts_on))
+		self.assertIn("11:00", str(event.ends_on))
+
+	def test_google_meet_disabled_account_raises_error(self):
+		"""Creating a live class with a disabled Google Meet account should raise an error."""
+		from lms.lms.doctype.lms_batch.lms_batch import create_google_meet_live_class
+
+		self.google_meet_settings.enabled = 0
+		self.google_meet_settings.save()
+
+		with self.assertRaises(frappe.exceptions.ValidationError):
+			create_google_meet_live_class(
+				batch_name=self.batch.name,
+				google_meet_account=self.google_meet_settings.name,
+				title="Test Disabled",
+				duration=30,
+				date=add_days(nowdate(), 1),
+				time="10:00:00",
+				timezone="Asia/Kolkata",
+			)
+
+		self.google_meet_settings.enabled = 1
+		self.google_meet_settings.save()
+
+	def test_google_meet_missing_calendar_raises_error(self):
+		"""Creating a live class with a Google Meet account without a calendar should raise an error."""
+		from lms.lms.doctype.lms_batch.lms_batch import create_google_meet_live_class
+
+		old_calendar = self.google_meet_settings.google_calendar
+		self.google_meet_settings.google_calendar = ""
+		self.google_meet_settings.save(ignore_mandatory=True)
+
+		with self.assertRaises(frappe.exceptions.ValidationError):
+			create_google_meet_live_class(
+				batch_name=self.batch.name,
+				google_meet_account=self.google_meet_settings.name,
+				title="Test No Calendar",
+				duration=30,
+				date=add_days(nowdate(), 1),
+				time="10:00:00",
+				timezone="Asia/Kolkata",
+			)
+
+		self.google_meet_settings.google_calendar = old_calendar
+		self.google_meet_settings.save()
+
+	def test_zoom_live_class_not_affected(self):
+		"""Creating a Zoom-style live class should still work (regression test)."""
+		live_class = frappe.get_doc(
+			{
+				"doctype": "LMS Live Class",
+				"title": f"Zoom Class {frappe.generate_hash(length=6)}",
+				"host": "Administrator",
+				"date": add_days(nowdate(), 1),
+				"time": "14:00:00",
+				"duration": 45,
+				"timezone": "Asia/Kolkata",
+				"batch_name": self.batch.name,
+				"conferencing_provider": "Zoom",
+				"join_url": "https://zoom.us/j/123456",
+				"start_url": "https://zoom.us/s/123456",
+			}
+		)
+		live_class.insert(ignore_permissions=True)
+		self.cleanup_items.append(("LMS Live Class", live_class.name))
+
+		self.assertTrue(frappe.db.exists("LMS Live Class", live_class.name))
+		self.assertEqual(live_class.join_url, "https://zoom.us/j/123456")
+
+	# --- T10: Unit tests for event update and cancellation sync ---
+
+	def test_update_live_class_date_updates_event(self):
+		"""Rescheduling a live class should update the linked Event."""
+		live_class = self._create_live_class()
+		live_class.reload()
+		event_name = live_class.event
+
+		new_date = add_days(nowdate(), 5)
+		live_class.date = new_date
+		live_class.save(ignore_permissions=True)
+
+		event = frappe.get_doc("Event", event_name)
+		self.assertIn(str(new_date), str(event.starts_on))
+
+	def test_update_live_class_time_updates_event(self):
+		"""Changing the time of a live class should update the linked Event."""
+		live_class = self._create_live_class()
+		live_class.reload()
+		event_name = live_class.event
+
+		live_class.time = "15:00:00"
+		live_class.save(ignore_permissions=True)
+
+		event = frappe.get_doc("Event", event_name)
+		self.assertIn("15:00", str(event.starts_on))
+
+	def test_update_live_class_title_updates_event(self):
+		"""Changing the title of a live class should update the linked Event subject."""
+		live_class = self._create_live_class()
+		live_class.reload()
+		event_name = live_class.event
+
+		live_class.title = "Updated Title"
+		live_class.save(ignore_permissions=True)
+
+		event = frappe.get_doc("Event", event_name)
+		self.assertIn("Updated Title", event.subject)
+
+	def test_update_live_class_duration_updates_event(self):
+		"""Changing the duration should update the linked Event's end time."""
+		live_class = self._create_live_class()
+		live_class.reload()
+		event_name = live_class.event
+
+		live_class.duration = 120
+		live_class.save(ignore_permissions=True)
+
+		event = frappe.get_doc("Event", event_name)
+		self.assertIn("12:00", str(event.ends_on))
+
+	def test_delete_live_class_deletes_event(self):
+		"""Deleting a live class should delete the linked Frappe Event."""
+		live_class = self._create_live_class()
+		live_class.reload()
+		event_name = live_class.event
+
+		self.assertTrue(frappe.db.exists("Event", event_name))
+
+		# Remove from cleanup since we're deleting manually
+		self.cleanup_items = [
+			(t, n) for t, n in self.cleanup_items if not (t == "LMS Live Class" and n == live_class.name)
+		]
+		frappe.delete_doc("LMS Live Class", live_class.name, force=True)
+
+		self.assertFalse(frappe.db.exists("Event", event_name))
+
+	def test_delete_zoom_live_class_with_event(self):
+		"""Deleting a Zoom live class with a linked event should also delete the event (regression)."""
+		live_class = self._create_live_class(provider="Zoom")
+		# Zoom classes created via direct insert won't have an event from calendar flow,
+		# but if one is set manually, on_trash should clean it up
+		event = frappe.get_doc(
+			{
+				"doctype": "Event",
+				"subject": "Test Zoom Event",
+				"event_type": "Public",
+				"starts_on": f"{add_days(nowdate(), 1)} 14:00:00",
+				"ends_on": f"{add_days(nowdate(), 1)} 15:00:00",
+			}
+		)
+		event.insert(ignore_permissions=True)
+		self.cleanup_items.append(("Event", event.name))
+
+		frappe.db.set_value("LMS Live Class", live_class.name, "event", event.name)
+		live_class.reload()
+
+		self.cleanup_items = [
+			(t, n) for t, n in self.cleanup_items if not (t == "LMS Live Class" and n == live_class.name)
+		]
+		# Remove event from cleanup too since on_trash will delete it
+		self.cleanup_items = [
+			(t, n) for t, n in self.cleanup_items if not (t == "Event" and n == event.name)
+		]
+		frappe.delete_doc("LMS Live Class", live_class.name, force=True)
+
+		self.assertFalse(frappe.db.exists("Event", event.name))
+
+	# --- T11: Integration tests for end-to-end workflow ---
+
+	def test_batch_validation_google_meet_without_account(self):
+		"""Saving a batch with Google Meet provider but no account should fail."""
+		self.batch.conferencing_provider = "Google Meet"
+		self.batch.google_meet_account = ""
+		with self.assertRaises(frappe.exceptions.ValidationError):
+			self.batch.save()
+
+		# Reset
+		self.batch.reload()
+
+	def test_batch_validation_google_meet_with_valid_account(self):
+		"""Saving a batch with Google Meet and a valid account should succeed."""
+		self.batch.conferencing_provider = "Google Meet"
+		self.batch.google_meet_account = self.google_meet_settings.name
+		self.batch.save()
+		self.batch.reload()
+
+		self.assertEqual(self.batch.conferencing_provider, "Google Meet")
+		self.assertEqual(self.batch.google_meet_account, self.google_meet_settings.name)
+
+		# Reset
+		self.batch.conferencing_provider = ""
+		self.batch.google_meet_account = ""
+		self.batch.save()
+
+	def test_batch_validation_zoom_without_account(self):
+		"""Saving a batch with Zoom provider but no account should fail."""
+		self.batch.conferencing_provider = "Zoom"
+		self.batch.zoom_account = ""
+		with self.assertRaises(frappe.exceptions.ValidationError):
+			self.batch.save()
+
+		# Reset
+		self.batch.reload()
+
+	def test_manual_attendance_marking(self):
+		"""Manual attendance marking should create participant records."""
+		from lms.lms.doctype.lms_live_class.lms_live_class import mark_manual_attendance
+
+		live_class = self._create_live_class()
+		members = [self.student1.email, self.student2.email]
+		mark_manual_attendance(live_class.name, json.dumps(members))
+
+		participants = frappe.get_all(
+			"LMS Live Class Participant",
+			{"live_class": live_class.name},
+			pluck="member",
+		)
+		for p in participants:
+			self.cleanup_items.append(("LMS Live Class Participant", frappe.db.get_value(
+				"LMS Live Class Participant", {"live_class": live_class.name, "member": p}
+			)))
+
+		self.assertEqual(len(participants), 2)
+		self.assertIn(self.student1.email, participants)
+		self.assertIn(self.student2.email, participants)
+
+		live_class.reload()
+		self.assertEqual(live_class.attendees, 2)
+
+	def test_manual_attendance_replaces_existing(self):
+		"""Re-marking attendance should replace previous records."""
+		from lms.lms.doctype.lms_live_class.lms_live_class import mark_manual_attendance
+
+		live_class = self._create_live_class()
+
+		# First marking with 2 students
+		mark_manual_attendance(live_class.name, json.dumps([self.student1.email, self.student2.email]))
+
+		# Second marking with only 1 student
+		mark_manual_attendance(live_class.name, json.dumps([self.student1.email]))
+
+		participants = frappe.get_all(
+			"LMS Live Class Participant",
+			{"live_class": live_class.name},
+			pluck="member",
+		)
+		for p in participants:
+			self.cleanup_items.append(("LMS Live Class Participant", frappe.db.get_value(
+				"LMS Live Class Participant", {"live_class": live_class.name, "member": p}
+			)))
+
+		self.assertEqual(len(participants), 1)
+		self.assertIn(self.student1.email, participants)
+
+		live_class.reload()
+		self.assertEqual(live_class.attendees, 1)
+
+	def test_update_attendance_skips_google_meet(self):
+		"""The Zoom attendance scheduler should skip Google Meet classes."""
+		from lms.lms.doctype.lms_live_class.lms_live_class import update_attendance
+
+		live_class = self._create_live_class()
+		live_class.reload()
+
+		# The update_attendance function filters out Google Meet classes
+		# It should not raise an error or attempt to call Zoom API for Google Meet classes
+		past_classes = frappe.get_all(
+			"LMS Live Class",
+			{
+				"uuid": ["is", "set"],
+				"attendees": ["is", "not set"],
+				"conferencing_provider": ["!=", "Google Meet"],
+			},
+			pluck="name",
+		)
+		self.assertNotIn(live_class.name, past_classes)

From 559338da59750066552c9fd573bd480dda4f1209 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Tue, 24 Feb 2026 23:55:33 +0530
Subject: [PATCH 02/17] fix: include conferencing_provider and
 google_meet_account in batch details API

---
 frontend/components.d.ts | 3 +++
 lms/lms/utils.py         | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 42b89f05..a0ef7c6b 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -60,6 +60,8 @@ declare module 'vue' {
     ExplanationVideos: typeof import('./src/components/Modals/ExplanationVideos.vue')['default']
     FeedbackModal: typeof import('./src/components/Modals/FeedbackModal.vue')['default']
     FrappeCloudIcon: typeof import('./src/components/Icons/FrappeCloudIcon.vue')['default']
+    GoogleMeetAccountModal: typeof import('./src/components/Modals/GoogleMeetAccountModal.vue')['default']
+    GoogleMeetSettings: typeof import('./src/components/Settings/GoogleMeetSettings.vue')['default']
     IconPicker: typeof import('./src/components/Controls/IconPicker.vue')['default']
     IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
     InlineLessonMenu: typeof import('./src/components/Notes/InlineLessonMenu.vue')['default']
@@ -73,6 +75,7 @@ declare module 'vue' {
     LiveClassAttendance: typeof import('./src/components/Modals/LiveClassAttendance.vue')['default']
     LiveClassModal: typeof import('./src/components/Modals/LiveClassModal.vue')['default']
     LMSLogo: typeof import('./src/components/Icons/LMSLogo.vue')['default']
+    ManualAttendance: typeof import('./src/components/Modals/ManualAttendance.vue')['default']
     Members: typeof import('./src/components/Settings/Members.vue')['default']
     MobileLayout: typeof import('./src/components/MobileLayout.vue')['default']
     MultiSelect: typeof import('./src/components/Controls/MultiSelect.vue')['default']
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 9e3afc8e..b09ccc78 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1128,6 +1128,8 @@ def get_batch_details(batch: str):
 			"timezone",
 			"category",
 			"zoom_account",
+			"conferencing_provider",
+			"google_meet_account",
 		],
 		as_dict=True,
 	)

From 898a8722320ccd29a8ccc848993299b1abe9f76a Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Wed, 25 Feb 2026 16:56:02 +0530
Subject: [PATCH 03/17] fix: make conferencing provider optional during batch
 creation

The conferencing_provider Select field defaulted to "Zoom" (first option)
when not explicitly set, causing batch creation to fail with
"Please select a Zoom account for this batch" since no zoom_account
is provided at creation time.
---
 frontend/src/pages/Batches/BatchForm.vue | 4 ++++
 lms/lms/doctype/lms_batch/lms_batch.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Batches/BatchForm.vue b/frontend/src/pages/Batches/BatchForm.vue
index 9e838a49..8dabab12 100644
--- a/frontend/src/pages/Batches/BatchForm.vue
+++ b/frontend/src/pages/Batches/BatchForm.vue
@@ -483,6 +483,10 @@ const trashBatch = (close) => {
 
 const conferencingOptions = computed(() => {
 	return [
+		{
+			label: '',
+			value: '',
+		},
 		{
 			label: 'Zoom',
 			value: 'Zoom',
diff --git a/lms/lms/doctype/lms_batch/lms_batch.json b/lms/lms/doctype/lms_batch/lms_batch.json
index ef1fd637..2f554d19 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.json
+++ b/lms/lms/doctype/lms_batch/lms_batch.json
@@ -366,7 +366,7 @@
    "fieldname": "conferencing_provider",
    "fieldtype": "Select",
    "label": "Conferencing Provider",
-   "options": "Zoom\nGoogle Meet"
+   "options": "\nZoom\nGoogle Meet"
   },
   {
    "depends_on": "eval:doc.conferencing_provider=='Zoom'",

From 4be47af3efcee0aef7f61bfaed149685f8354ae6 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Wed, 25 Feb 2026 16:59:23 +0530
Subject: [PATCH 04/17] fix: skip conferencing provider validation on batch
 creation

Frappe sets Select field default to the first option ("Zoom") even
when the field isn't in the creation form. Skip validation for new
batches since conferencing is configured after creation.
---
 lms/lms/doctype/lms_batch/lms_batch.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index 95501515..23de5615 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -128,6 +128,9 @@ class LMSBatch(Document):
 				frappe.throw(_("Row #{0} Date cannot be outside the batch duration.").format(schedule.idx))
 
 	def validate_conferencing_provider(self):
+		if self.is_new() or not self.conferencing_provider:
+			return
+
 		if self.conferencing_provider == "Google Meet":
 			if not self.google_meet_account:
 				frappe.throw(_("Please select a Google Meet account for this batch."))

From 08b6a9d0910d28ef81c18d8213c9fcff073ed97b Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Wed, 25 Feb 2026 17:05:38 +0530
Subject: [PATCH 05/17] fix: use str() instead of get_time_str() for time field
 comparison

get_time_str() expects a timedelta but batch start_time is a
datetime.time object, causing AttributeError on batch details page.
---
 lms/lms/utils.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index b09ccc78..513512ba 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -19,7 +19,6 @@ from frappe.utils import (
 	get_datetime,
 	get_frappe_version,
 	get_fullname,
-	get_time_str,
 	getdate,
 	nowtime,
 	pretty_date,
@@ -1140,7 +1139,7 @@ def get_batch_details(batch: str):
 	if (
 		not batch_details.accept_enrollments
 		and batch_details.start_date == getdate()
-		and get_time_str(batch_details.start_time) > nowtime()
+		and str(batch_details.start_time) > nowtime()
 	):
 		batch_details.accept_enrollments = True
 
@@ -1176,7 +1175,7 @@ def categorize_batches(batches: list) -> dict:
 			private.append(batch)
 		elif getdate(batch.start_date) < getdate():
 			archived.append(batch)
-		elif getdate(batch.start_date) == getdate() and get_time_str(batch.start_time) < nowtime():
+		elif getdate(batch.start_date) == getdate() and str(batch.start_time) < nowtime():
 			archived.append(batch)
 		else:
 			upcoming.append(batch)
@@ -2158,14 +2157,14 @@ def filter_batches_based_on_start_time(batches: list, filters: dict) -> list:
 		batches_to_remove = [
 			batch
 			for batch in batches
-			if getdate(batch.start_date) == getdate() and get_time_str(batch.start_time) < nowtime()
+			if getdate(batch.start_date) == getdate() and str(batch.start_time) < nowtime()
 		]
 		batches = [batch for batch in batches if batch not in batches_to_remove]
 	elif batchType == "archived":
 		batches_to_remove = [
 			batch
 			for batch in batches
-			if getdate(batch.start_date) == getdate() and get_time_str(batch.start_time) >= nowtime()
+			if getdate(batch.start_date) == getdate() and str(batch.start_time) >= nowtime()
 		]
 		batches = [batch for batch in batches if batch not in batches_to_remove]
 	return batches

From 8ea178fcad513a0f195219a08f1f2428367e9215 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Thu, 26 Feb 2026 18:38:55 +0530
Subject: [PATCH 06/17] refactor: remove manual attendance feature for Google
 Meet classes

Manual attendance marking is not required for Google Meet live classes.
This removes the ManualAttendance modal, the mark_manual_attendance API
endpoint, and associated tests.
---
 .../components/Modals/ManualAttendance.vue    | 113 ------------------
 .../pages/Batches/components/LiveClass.vue    |  19 +--
 .../doctype/lms_live_class/lms_live_class.py  |  31 -----
 .../lms_live_class/test_lms_live_class.py     |  54 ---------
 4 files changed, 3 insertions(+), 214 deletions(-)
 delete mode 100644 frontend/src/components/Modals/ManualAttendance.vue

diff --git a/frontend/src/components/Modals/ManualAttendance.vue b/frontend/src/components/Modals/ManualAttendance.vue
deleted file mode 100644
index 963bb0bf..00000000
--- a/frontend/src/components/Modals/ManualAttendance.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Mark Attendance - {0}').format(live_class?.title),
-			size: '2xl',
-			actions: [
-				{
-					label: __('Save'),
-					variant: 'solid',
-					onClick: () => saveAttendance(),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div v-if="enrollments.data?.length" class="divide-y">
-				<label
-					v-for="student in enrollments.data"
-					:key="student.member"
-					class="flex items-center space-x-3 py-2 cursor-pointer hover:bg-surface-gray-2 px-2 rounded"
-				>
-					<input
-						type="checkbox"
-						:value="student.member"
-						v-model="selectedMembers"
-						class="rounded border-outline-gray-3"
-					/>
-					<Avatar
-						:image="student.member_image"
-						:label="student.member_name"
-						size="lg"
-					/>
-					<div>
-						<div class="font-medium text-ink-gray-9">
-							{{ student.member_name }}
-						</div>
-						<div class="text-sm text-ink-gray-5">
-							{{ student.member }}
-						</div>
-					</div>
-				</label>
-			</div>
-			<div v-else class="text-sm text-ink-gray-5 italic py-4">
-				{{ __('No students enrolled in this batch.') }}
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Avatar, createListResource, createResource, Dialog, toast } from 'frappe-ui'
-import { ref, onMounted } from 'vue'
-
-const show = defineModel()
-const emit = defineEmits(['saved'])
-
-const props = defineProps({
-	live_class: {
-		type: Object,
-		required: true,
-	},
-	batch: {
-		type: String,
-		required: true,
-	},
-})
-
-const selectedMembers = ref([])
-
-const enrollments = createListResource({
-	doctype: 'LMS Batch Enrollment',
-	filters: {
-		batch: props.batch,
-	},
-	fields: ['member', 'member_name', 'member_image'],
-	auto: true,
-})
-
-const existingAttendance = createListResource({
-	doctype: 'LMS Live Class Participant',
-	filters: {
-		live_class: props.live_class?.name,
-	},
-	fields: ['member'],
-	auto: true,
-	onSuccess(data) {
-		selectedMembers.value = data.map((d) => d.member)
-	},
-})
-
-const markAttendance = createResource({
-	url: 'lms.lms.doctype.lms_live_class.lms_live_class.mark_manual_attendance',
-})
-
-const saveAttendance = () => {
-	markAttendance.submit(
-		{
-			live_class: props.live_class?.name,
-			members: JSON.stringify(selectedMembers.value),
-		},
-		{
-			onSuccess() {
-				toast.success(__('Attendance saved successfully'))
-				emit('saved')
-				show.value = false
-			},
-			onError(err) {
-				toast.error(err.messages?.[0] || err)
-			},
-		}
-	)
-}
-</script>
diff --git a/frontend/src/pages/Batches/components/LiveClass.vue b/frontend/src/pages/Batches/components/LiveClass.vue
index 690fbf58..689640ce 100644
--- a/frontend/src/pages/Batches/components/LiveClass.vue
+++ b/frontend/src/pages/Batches/components/LiveClass.vue
@@ -35,7 +35,7 @@
 				v-for="cls in liveClasses.data"
 				class="flex flex-col border rounded-md h-full text-ink-gray-7 hover:border-outline-gray-3 p-3"
 				:class="{
-					'cursor-pointer': isAdmin() && (cls.attendees > 0 || cls.conferencing_provider === 'Google Meet'),
+					'cursor-pointer': isAdmin() && cls.attendees > 0,
 				}"
 				@click="
 					() => {
@@ -131,13 +131,6 @@
 		:live_class="attendanceFor"
 	/>
 
-	<ManualAttendance
-		v-if="showManualAttendance"
-		v-model="showManualAttendance"
-		:live_class="attendanceFor"
-		:batch="batch.data?.name"
-		@saved="liveClasses.reload()"
-	/>
 </template>
 <script setup>
 import { createListResource, Button, Tooltip } from 'frappe-ui'
@@ -154,14 +147,12 @@ import { inject, ref } from 'vue'
 import { formatTime } from '@/utils/'
 import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
 import LiveClassAttendance from '@/components/Modals/LiveClassAttendance.vue'
-import ManualAttendance from '@/components/Modals/ManualAttendance.vue'
 
 const user = inject('$user')
 const showLiveClassModal = ref(false)
 const dayjs = inject('$dayjs')
 const readOnlyMode = window.read_only_mode
 const showAttendance = ref(false)
-const showManualAttendance = ref(false)
 const attendanceFor = ref(null)
 
 const props = defineProps({
@@ -238,13 +229,9 @@ const hasClassEnded = (cls) => {
 
 const openAttendanceModal = (cls) => {
 	if (!isAdmin()) return
+	if (cls.attendees <= 0) return
 	attendanceFor.value = cls
-	if (cls.conferencing_provider === 'Google Meet') {
-		showManualAttendance.value = true
-	} else {
-		if (cls.attendees <= 0) return
-		showAttendance.value = true
-	}
+	showAttendance.value = true
 }
 </script>
 <style>
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index a28f54f6..9b9cce6e 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2023, Frappe and contributors
 # For license information, please see license.txt
 
-import json
 from datetime import timedelta
 
 import frappe
@@ -304,36 +303,6 @@ def get_minutes(duration_in_seconds):
 	return 0
 
 
-@frappe.whitelist()
-def mark_manual_attendance(live_class, members):
-	if isinstance(members, str):
-		members = json.loads(members)
-
-	live_class_doc = frappe.get_doc("LMS Live Class", live_class)
-	start = get_datetime(f"{live_class_doc.date} {live_class_doc.time}")
-	end = start + timedelta(minutes=cint(live_class_doc.duration))
-
-	# Remove existing manual attendance records for this class
-	existing = frappe.get_all(
-		"LMS Live Class Participant",
-		{"live_class": live_class},
-		pluck="name",
-	)
-	for record in existing:
-		frappe.delete_doc("LMS Live Class Participant", record, ignore_permissions=True)
-
-	for member in members:
-		doc = frappe.new_doc("LMS Live Class Participant")
-		doc.live_class = live_class
-		doc.member = member
-		doc.joined_at = start
-		doc.left_at = end
-		doc.duration = cint(live_class_doc.duration)
-		doc.insert(ignore_permissions=True)
-
-	frappe.db.set_value("LMS Live Class", live_class, "attendees", len(members))
-
-
 def has_permission(doc, ptype="read", user=None):
 	user = user or frappe.session.user
 	roles = frappe.get_roles(user)
diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index 0342dbee..d6a50a07 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2023, Frappe and Contributors
 # See license.txt
 
-import json
 from unittest.mock import MagicMock, patch
 
 import frappe
@@ -297,59 +296,6 @@ class TestLMSLiveClass(BaseTestUtils):
 		# Reset
 		self.batch.reload()
 
-	def test_manual_attendance_marking(self):
-		"""Manual attendance marking should create participant records."""
-		from lms.lms.doctype.lms_live_class.lms_live_class import mark_manual_attendance
-
-		live_class = self._create_live_class()
-		members = [self.student1.email, self.student2.email]
-		mark_manual_attendance(live_class.name, json.dumps(members))
-
-		participants = frappe.get_all(
-			"LMS Live Class Participant",
-			{"live_class": live_class.name},
-			pluck="member",
-		)
-		for p in participants:
-			self.cleanup_items.append(("LMS Live Class Participant", frappe.db.get_value(
-				"LMS Live Class Participant", {"live_class": live_class.name, "member": p}
-			)))
-
-		self.assertEqual(len(participants), 2)
-		self.assertIn(self.student1.email, participants)
-		self.assertIn(self.student2.email, participants)
-
-		live_class.reload()
-		self.assertEqual(live_class.attendees, 2)
-
-	def test_manual_attendance_replaces_existing(self):
-		"""Re-marking attendance should replace previous records."""
-		from lms.lms.doctype.lms_live_class.lms_live_class import mark_manual_attendance
-
-		live_class = self._create_live_class()
-
-		# First marking with 2 students
-		mark_manual_attendance(live_class.name, json.dumps([self.student1.email, self.student2.email]))
-
-		# Second marking with only 1 student
-		mark_manual_attendance(live_class.name, json.dumps([self.student1.email]))
-
-		participants = frappe.get_all(
-			"LMS Live Class Participant",
-			{"live_class": live_class.name},
-			pluck="member",
-		)
-		for p in participants:
-			self.cleanup_items.append(("LMS Live Class Participant", frappe.db.get_value(
-				"LMS Live Class Participant", {"live_class": live_class.name, "member": p}
-			)))
-
-		self.assertEqual(len(participants), 1)
-		self.assertIn(self.student1.email, participants)
-
-		live_class.reload()
-		self.assertEqual(live_class.attendees, 1)
-
 	def test_update_attendance_skips_google_meet(self):
 		"""The Zoom attendance scheduler should skip Google Meet classes."""
 		from lms.lms.doctype.lms_live_class.lms_live_class import update_attendance

From 1eb13c9378a98fd204b43efcc26da1fb36262542 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 11:55:33 +0530
Subject: [PATCH 07/17] chore: remove unused component declaration from
 components.d.ts

---
 frontend/components.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index a0ef7c6b..3877a523 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -75,7 +75,6 @@ declare module 'vue' {
     LiveClassAttendance: typeof import('./src/components/Modals/LiveClassAttendance.vue')['default']
     LiveClassModal: typeof import('./src/components/Modals/LiveClassModal.vue')['default']
     LMSLogo: typeof import('./src/components/Icons/LMSLogo.vue')['default']
-    ManualAttendance: typeof import('./src/components/Modals/ManualAttendance.vue')['default']
     Members: typeof import('./src/components/Settings/Members.vue')['default']
     MobileLayout: typeof import('./src/components/MobileLayout.vue')['default']
     MultiSelect: typeof import('./src/components/Controls/MultiSelect.vue')['default']

From f5551603a50742ce190de9a3c0ab6ab62dfeba81 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 12:08:09 +0530
Subject: [PATCH 08/17] fix: resolve ruff-format and prettier linting errors

---
 .../src/pages/Batches/components/LiveClass.vue   |  7 +++++--
 lms/lms/doctype/lms_batch/lms_batch.py           | 16 +++++++++++++---
 lms/lms/doctype/lms_live_class/lms_live_class.py | 16 ++++++++++++----
 .../lms_live_class/test_lms_live_class.py        |  4 +---
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/Batches/components/LiveClass.vue b/frontend/src/pages/Batches/components/LiveClass.vue
index 689640ce..fd4f450c 100644
--- a/frontend/src/pages/Batches/components/LiveClass.vue
+++ b/frontend/src/pages/Batches/components/LiveClass.vue
@@ -130,7 +130,6 @@
 		v-model="showAttendance"
 		:live_class="attendanceFor"
 	/>
-
 </template>
 <script setup>
 import { createListResource, Button, Tooltip } from 'frappe-ui'
@@ -191,7 +190,11 @@ const openLiveClassModal = () => {
 const hasProviderAccount = () => {
 	const data = props.batch.data
 	if (data?.conferencing_provider === 'Zoom' && data?.zoom_account) return true
-	if (data?.conferencing_provider === 'Google Meet' && data?.google_meet_account) return true
+	if (
+		data?.conferencing_provider === 'Google Meet' &&
+		data?.google_meet_account
+	)
+		return true
 	return false
 }
 
diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index 23de5615..1b794d9b 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -137,10 +137,16 @@ class LMSBatch(Document):
 
 			google_meet_settings = frappe.get_doc("LMS Google Meet Settings", self.google_meet_account)
 			if not google_meet_settings.enabled:
-				frappe.throw(_("The selected Google Meet account is disabled. Please enable it or select another account."))
+				frappe.throw(
+					_(
+						"The selected Google Meet account is disabled. Please enable it or select another account."
+					)
+				)
 
 			if not google_meet_settings.google_calendar:
-				frappe.throw(_("The selected Google Meet account does not have a Google Calendar configured."))
+				frappe.throw(
+					_("The selected Google Meet account does not have a Google Calendar configured.")
+				)
 
 		elif self.conferencing_provider == "Zoom":
 			if not self.zoom_account:
@@ -298,7 +304,11 @@ def create_google_meet_live_class(
 		frappe.throw(_("Please enable the Google Meet account to use this feature."))
 
 	if not google_meet_settings.google_calendar:
-		frappe.throw(_("The Google Meet account does not have a Google Calendar configured. Please set up a Google Calendar first."))
+		frappe.throw(
+			_(
+				"The Google Meet account does not have a Google Calendar configured. Please set up a Google Calendar first."
+			)
+		)
 
 	class_details = frappe.get_doc(
 		{
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index 9b9cce6e..7c5e3249 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -23,8 +23,12 @@ class LMSLiveClass(Document):
 		if not self.event:
 			return
 
-		if not self.has_value_changed("date") and not self.has_value_changed("time") \
-				and not self.has_value_changed("duration") and not self.has_value_changed("title"):
+		if (
+			not self.has_value_changed("date")
+			and not self.has_value_changed("time")
+			and not self.has_value_changed("duration")
+			and not self.has_value_changed("title")
+		):
 			return
 
 		self._update_linked_event()
@@ -96,7 +100,9 @@ class LMSLiveClass(Document):
 
 		if not meet_link:
 			frappe.msgprint(
-				_("The Meet link is not yet available. It will be generated once Google Calendar syncs the event. Please refresh the page after a few moments."),
+				_(
+					"The Meet link is not yet available. It will be generated once Google Calendar syncs the event. Please refresh the page after a few moments."
+				),
 				indicator="orange",
 				alert=True,
 			)
@@ -139,7 +145,9 @@ class LMSLiveClass(Document):
 		except Exception:
 			frappe.log_error(title=_("Google Meet - Failed to add participants to calendar event"))
 			frappe.msgprint(
-				_("Live class was created but calendar invites could not be sent to participants. You may need to share the Meet link manually."),
+				_(
+					"Live class was created but calendar invites could not be sent to participants. You may need to share the Meet link manually."
+				),
 				indicator="orange",
 				alert=True,
 			)
diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index d6a50a07..dd6dcdad 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -252,9 +252,7 @@ class TestLMSLiveClass(BaseTestUtils):
 			(t, n) for t, n in self.cleanup_items if not (t == "LMS Live Class" and n == live_class.name)
 		]
 		# Remove event from cleanup too since on_trash will delete it
-		self.cleanup_items = [
-			(t, n) for t, n in self.cleanup_items if not (t == "Event" and n == event.name)
-		]
+		self.cleanup_items = [(t, n) for t, n in self.cleanup_items if not (t == "Event" and n == event.name)]
 		frappe.delete_doc("LMS Live Class", live_class.name, force=True)
 
 		self.assertFalse(frappe.db.exists("Event", event.name))

From 4925c5bc45aefca75638eea4e19cccd55ef8177e Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 12:47:59 +0530
Subject: [PATCH 09/17] refactor: extract shared helpers to reduce code
 duplication in lms_live_class

Extract _get_participants() and _build_event_description() to eliminate
duplicated participant-gathering and description-building logic across
Zoom and Google Meet code paths.
---
 .../doctype/lms_live_class/lms_live_class.py  | 61 +++++++------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index 7c5e3249..d690a010 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -37,6 +37,23 @@ class LMSLiveClass(Document):
 		if self.event and frappe.db.exists("Event", self.event):
 			frappe.delete_doc("Event", self.event, ignore_permissions=True)
 
+	def _get_participants(self):
+		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
+		instructors = frappe.get_all(
+			"Course Instructor", {"parenttype": "LMS Batch", "parent": self.batch_name}, pluck="instructor"
+		)
+		participants.append(frappe.session.user)
+		participants.extend(instructors)
+		return list(set(participants))
+
+	def _build_event_description(self):
+		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
+		if self.join_url:
+			description += f" Click on this link to join. {self.join_url}."
+		if self.description:
+			description += f" {self.description}"
+		return description
+
 	def _update_linked_event(self):
 		event = frappe.get_doc("Event", self.event)
 		start = f"{self.date} {self.time}"
@@ -44,13 +61,7 @@ class LMSLiveClass(Document):
 		event.subject = f"Live Class on {self.title}"
 		event.starts_on = start
 		event.ends_on = get_datetime(start) + timedelta(minutes=cint(self.duration))
-
-		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
-		if self.join_url:
-			description += f" Click on this link to join. {self.join_url}."
-		if self.description:
-			description += f" {self.description}"
-		event.description = description
+		event.description = self._build_event_description()
 
 		event.save(ignore_permissions=True)
 
@@ -71,17 +82,13 @@ class LMSLiveClass(Document):
 
 		event = self.create_event()
 
-		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
-		if self.description:
-			description += f" {self.description}"
-
 		event.reload()
 		event.update(
 			{
 				"sync_with_google_calendar": 1,
 				"add_video_conferencing": 1,
 				"google_calendar": calendar,
-				"description": description,
+				"description": self._build_event_description(),
 			}
 		)
 		event.save()
@@ -112,17 +119,8 @@ class LMSLiveClass(Document):
 	def _add_google_meet_participants(self, event, calendar):
 		from frappe.integrations.doctype.google_calendar.google_calendar import get_google_calendar_object
 
-		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
-		instructors = frappe.get_all(
-			"Course Instructor", {"parenttype": "LMS Batch", "parent": self.batch_name}, pluck="instructor"
-		)
-
-		participants.append(frappe.session.user)
-		participants.extend(instructors)
-		participants = list(set(participants))
-
 		attendees = []
-		for participant in participants:
+		for participant in self._get_participants():
 			email = frappe.db.get_value("User", participant, "email")
 			if not email:
 				continue
@@ -168,16 +166,7 @@ class LMSLiveClass(Document):
 		return event
 
 	def add_event_participants(self, event, calendar, add_video_conferencing=False):
-		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
-		instructors = frappe.get_all(
-			"Course Instructor", {"parenttype": "LMS Batch", "parent": self.batch_name}, pluck="instructor"
-		)
-
-		participants.append(frappe.session.user)
-		participants.extend(instructors)
-		participants = list(set(participants))
-
-		for participant in participants:
+		for participant in self._get_participants():
 			frappe.get_doc(
 				{
 					"doctype": "Event Participants",
@@ -192,16 +181,10 @@ class LMSLiveClass(Document):
 
 		event.reload()
 
-		description = f"A Live Class has been scheduled on {format_date(self.date, 'medium')} at {format_time(self.time, 'hh:mm a')}."
-		if self.join_url:
-			description += f" Click on this link to join. {self.join_url}."
-		if self.description:
-			description += f" {self.description}"
-
 		update_data = {
 			"sync_with_google_calendar": 1,
 			"google_calendar": calendar,
-			"description": description,
+			"description": self._build_event_description(),
 		}
 
 		if add_video_conferencing:

From 2fab297745d8b6e78a31c744c38b3fcb1bfa9961 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 12:56:55 +0530
Subject: [PATCH 10/17] fix: add patch to set conferencing provider for
 existing Zoom records

Sets conferencing_provider to "Zoom" for all existing LMS Batch and
LMS Live Class records that have a zoom_account linked.
---
 lms/patches.txt                                  |  3 ++-
 .../v2_0/set_conferencing_provider_for_zoom.py   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 lms/patches/v2_0/set_conferencing_provider_for_zoom.py

diff --git a/lms/patches.txt b/lms/patches.txt
index 005be9f4..32558c2b 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -119,4 +119,5 @@ lms.patches.v2_0.open_to_work
 lms.patches.v2_0.share_enrollment
 lms.patches.v2_0.give_user_list_permission #11-02-2026
 lms.patches.v2_0.rename_badge_assignment_event
-lms.patches.v2_0.enable_allow_job_posting
\ No newline at end of file
+lms.patches.v2_0.enable_allow_job_posting
+lms.patches.v2_0.set_conferencing_provider_for_zoom
\ No newline at end of file
diff --git a/lms/patches/v2_0/set_conferencing_provider_for_zoom.py b/lms/patches/v2_0/set_conferencing_provider_for_zoom.py
new file mode 100644
index 00000000..cd7b02ab
--- /dev/null
+++ b/lms/patches/v2_0/set_conferencing_provider_for_zoom.py
@@ -0,0 +1,16 @@
+import frappe
+
+
+def execute():
+	frappe.db.set_value(
+		"LMS Batch",
+		{"zoom_account": ["is", "set"]},
+		"conferencing_provider",
+		"Zoom",
+	)
+	frappe.db.set_value(
+		"LMS Live Class",
+		{"zoom_account": ["is", "set"]},
+		"conferencing_provider",
+		"Zoom",
+	)

From cd9a6831a73535760f5df21f4b76c1849f3ae556 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 19:52:07 +0530
Subject: [PATCH 11/17] fix: add type annotations and role validation to
 create_google_meet_live_class

Add type hints to match create_live_class signature. Add
frappe.only_for role check to prevent unauthorized access.
---
 lms/lms/doctype/lms_batch/lms_batch.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index 1b794d9b..bf3a0789 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -290,15 +290,17 @@ def create_live_class(
 
 @frappe.whitelist()
 def create_google_meet_live_class(
-	batch_name,
-	google_meet_account,
-	title,
-	duration,
-	date,
-	time,
-	timezone,
-	description=None,
+	batch_name: str,
+	google_meet_account: str,
+	title: str,
+	duration: int,
+	date: str,
+	time: str,
+	timezone: str,
+	description: str = None,
 ):
+	frappe.only_for(["Moderator", "Batch Evaluator"])
+
 	google_meet_settings = frappe.get_doc("LMS Google Meet Settings", google_meet_account)
 	if not google_meet_settings.enabled:
 		frappe.throw(_("Please enable the Google Meet account to use this feature."))

From 507938425c5579e6a5982356f36a030654c02775 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 19:55:29 +0530
Subject: [PATCH 12/17] refactor: move conferencing fields to separate section
 and translate labels

Move Conferencing Provider, Zoom Account, and Google Meet Account
fields into their own "Conferencing" section. Wrap option labels
with __() for i18n translation.
---
 frontend/src/pages/Batches/BatchForm.vue | 82 +++++++++++++-----------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/frontend/src/pages/Batches/BatchForm.vue b/frontend/src/pages/Batches/BatchForm.vue
index 8dabab12..08d202a0 100644
--- a/frontend/src/pages/Batches/BatchForm.vue
+++ b/frontend/src/pages/Batches/BatchForm.vue
@@ -165,42 +165,48 @@
 								"
 							/>
 						</div>
-						<div class="space-y-5">
-							<FormControl
-								v-model="batchDetail.doc.conferencing_provider"
-								type="select"
-								:options="conferencingOptions"
-								:label="__('Conferencing Provider')"
-							/>
-							<Link
-								v-if="batchDetail.doc.conferencing_provider === 'Zoom'"
-								doctype="LMS Zoom Settings"
-								:label="__('Zoom Account')"
-								v-model="batchDetail.doc.zoom_account"
-								:onCreate="
-									(value, close) => {
-										openSettings('Zoom Accounts', close)
-									}
-								"
-							/>
-							<Link
-								v-if="batchDetail.doc.conferencing_provider === 'Google Meet'"
-								doctype="LMS Google Meet Settings"
-								:label="__('Google Meet Account')"
-								v-model="batchDetail.doc.google_meet_account"
-								:onCreate="
-									(value, close) => {
-										openSettings('Google Meet Accounts', close)
-									}
-								"
-							/>
-							<Uploader
-								v-model="batchDetail.doc.video_link"
-								:label="__('Preview Video')"
-								type="video"
-								:required="false"
-							/>
-						</div>
+						<Uploader
+							v-model="batchDetail.doc.video_link"
+							:label="__('Preview Video')"
+							type="video"
+							:required="false"
+						/>
+					</div>
+				</div>
+
+				<div class="px-5 pb-5 space-y-5 border-b mb-5">
+					<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+						{{ __('Conferencing') }}
+					</div>
+					<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
+						<FormControl
+							v-model="batchDetail.doc.conferencing_provider"
+							type="select"
+							:options="conferencingOptions"
+							:label="__('Conferencing Provider')"
+						/>
+						<Link
+							v-if="batchDetail.doc.conferencing_provider === 'Zoom'"
+							doctype="LMS Zoom Settings"
+							:label="__('Zoom Account')"
+							v-model="batchDetail.doc.zoom_account"
+							:onCreate="
+								(value, close) => {
+									openSettings('Zoom Accounts', close)
+								}
+							"
+						/>
+						<Link
+							v-if="batchDetail.doc.conferencing_provider === 'Google Meet'"
+							doctype="LMS Google Meet Settings"
+							:label="__('Google Meet Account')"
+							v-model="batchDetail.doc.google_meet_account"
+							:onCreate="
+								(value, close) => {
+									openSettings('Google Meet Accounts', close)
+								}
+							"
+						/>
 					</div>
 				</div>
 
@@ -488,11 +494,11 @@ const conferencingOptions = computed(() => {
 			value: '',
 		},
 		{
-			label: 'Zoom',
+			label: __('Zoom'),
 			value: 'Zoom',
 		},
 		{
-			label: 'Google Meet',
+			label: __('Google Meet'),
 			value: 'Google Meet',
 		},
 	]

From c5998f95ee50bb945dfee6a3bb572faba9d30c04 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 19:55:50 +0530
Subject: [PATCH 13/17] refactor: move GoogleMeetAccountModal to Settings
 folder

Move GoogleMeetAccountModal.vue from Modals to Settings directory
to colocate it with GoogleMeetSettings.vue. Update import path.
---
 .../components/{Modals => Settings}/GoogleMeetAccountModal.vue  | 0
 frontend/src/components/Settings/GoogleMeetSettings.vue         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename frontend/src/components/{Modals => Settings}/GoogleMeetAccountModal.vue (100%)

diff --git a/frontend/src/components/Modals/GoogleMeetAccountModal.vue b/frontend/src/components/Settings/GoogleMeetAccountModal.vue
similarity index 100%
rename from frontend/src/components/Modals/GoogleMeetAccountModal.vue
rename to frontend/src/components/Settings/GoogleMeetAccountModal.vue
diff --git a/frontend/src/components/Settings/GoogleMeetSettings.vue b/frontend/src/components/Settings/GoogleMeetSettings.vue
index 2cb738a2..9fb1ac4e 100644
--- a/frontend/src/components/Settings/GoogleMeetSettings.vue
+++ b/frontend/src/components/Settings/GoogleMeetSettings.vue
@@ -116,7 +116,7 @@ import { computed, inject, onMounted, ref } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
 import { cleanError } from '@/utils'
 import { User } from '@/components/Settings/types'
-import GoogleMeetAccountModal from '@/components/Modals/GoogleMeetAccountModal.vue'
+import GoogleMeetAccountModal from '@/components/Settings/GoogleMeetAccountModal.vue'
 
 const user = inject<User | null>('$user')
 const showForm = ref(false)

From 1086d2219b35ea539144fc02293f28d1ecc6d996 Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 19:56:13 +0530
Subject: [PATCH 14/17] fix: add console.error to error handlers in
 GoogleMeetAccountModal

---
 frontend/src/components/Settings/GoogleMeetAccountModal.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/components/Settings/GoogleMeetAccountModal.vue b/frontend/src/components/Settings/GoogleMeetAccountModal.vue
index 59b9522a..fecf75ad 100644
--- a/frontend/src/components/Settings/GoogleMeetAccountModal.vue
+++ b/frontend/src/components/Settings/GoogleMeetAccountModal.vue
@@ -144,6 +144,7 @@ const createAccount = (close: () => void) => {
 				toast.success(__('Google Meet Account created successfully'))
 			},
 			onError(err) {
+				console.error(err)
 				close()
 				toast.error(
 					cleanError(err.messages[0]) ||
@@ -183,6 +184,7 @@ const setValue = (close: () => void) => {
 				toast.success(__('Google Meet Account updated successfully'))
 			},
 			onError(err: any) {
+				console.error(err)
 				close()
 				toast.error(
 					cleanError(err.messages[0]) ||

From 3f116a37c2dd197c9d2ed4b1af48326fcb69842d Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Fri, 27 Feb 2026 19:56:33 +0530
Subject: [PATCH 15/17] fix: remove unnecessary "Meet link generating" block
 from LiveClass

---
 frontend/src/pages/Batches/components/LiveClass.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/pages/Batches/components/LiveClass.vue b/frontend/src/pages/Batches/components/LiveClass.vue
index fd4f450c..466bb08d 100644
--- a/frontend/src/pages/Batches/components/LiveClass.vue
+++ b/frontend/src/pages/Batches/components/LiveClass.vue
@@ -86,15 +86,6 @@
 							{{ __('Join') }}
 						</a>
 					</div>
-					<div
-						v-else-if="canAccessClass(cls) && !cls.join_url"
-						class="flex items-center space-x-2 text-ink-amber-3 w-fit"
-					>
-						<Info class="w-4 h-4 stroke-1.5" />
-						<span class="text-sm">
-							{{ __('Meet link generating...') }}
-						</span>
-					</div>
 					<Tooltip
 						v-else-if="hasClassEnded(cls)"
 						:text="__('This class has ended')"

From f0d35ec1d16afe470c0a54f7da449ed6d1c26cef Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Sat, 28 Feb 2026 13:55:37 +0530
Subject: [PATCH 16/17] fix: enable Google API in test setup to fix CI server
 tests

Google Calendar validation requires Google API to be enabled in Google
Settings. Without this, all LMS Live Class tests fail in CI with
"Enable Google API in Google Settings" error.
---
 .../lms_live_class/test_lms_live_class.py     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index dd6dcdad..2e37c640 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -1,8 +1,6 @@
 # Copyright (c) 2023, Frappe and Contributors
 # See license.txt
 
-from unittest.mock import MagicMock, patch
-
 import frappe
 from frappe.utils import add_days, nowdate
 
@@ -18,8 +16,27 @@ class TestLMSLiveClass(BaseTestUtils):
 		self._setup_batch_flow()
 		self._setup_google_meet()
 
+	def tearDown(self):
+		super().tearDown()
+		if hasattr(self, "_original_google_settings"):
+			google_settings = frappe.get_doc("Google Settings")
+			google_settings.enable = self._original_google_settings["enable"]
+			google_settings.client_id = self._original_google_settings["client_id"]
+			google_settings.client_secret = ""
+			google_settings.save(ignore_permissions=True)
+
 	def _setup_google_meet(self):
 		"""Create Google Calendar and Google Meet Settings for testing."""
+		google_settings = frappe.get_doc("Google Settings")
+		self._original_google_settings = {
+			"enable": google_settings.enable,
+			"client_id": google_settings.client_id,
+		}
+		google_settings.enable = 1
+		google_settings.client_id = "test-client-id"
+		google_settings.client_secret = "test-client-secret"
+		google_settings.save(ignore_permissions=True)
+
 		calendar_name = f"Test GCal {frappe.generate_hash(length=6)}"
 		if not frappe.db.exists("Google Calendar", calendar_name):
 			calendar = frappe.get_doc(

From a29e1a58a4ffc0970ae54f65c794d5d17077187f Mon Sep 17 00:00:00 2001
From: Vaibhav Rathore <vaibhav@coloredcow.com>
Date: Tue, 3 Mar 2026 17:34:34 +0530
Subject: [PATCH 17/17] fix: resolve server test failures for Google Meet
 integration

- Mock get_google_calendar_object in live class tests to prevent real
  Google API calls in CI (no OAuth tokens available)
- Fix on_trash to clear event link before deleting Event to avoid
  LinkExistsError
- Fix test query to avoid PostgreSQL-incompatible integer filter
- Add Google Settings setup to Google Meet Settings integration tests
---
 .../test_lms_google_meet_settings.py          | 17 ++++++++
 .../doctype/lms_live_class/lms_live_class.py  |  4 +-
 .../lms_live_class/test_lms_live_class.py     | 39 +++++++++++++++----
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py b/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py
index 2f3a794f..b9d218cb 100644
--- a/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py
+++ b/lms/lms/doctype/lms_google_meet_settings/test_lms_google_meet_settings.py
@@ -22,6 +22,16 @@ class IntegrationTestLMSGoogleMeetSettings(IntegrationTestCase):
 	def setUp(self):
 		self.cleanup_items = []
 
+		google_settings = frappe.get_doc("Google Settings")
+		self._original_google_settings = {
+			"enable": google_settings.enable,
+			"client_id": google_settings.client_id,
+		}
+		google_settings.enable = 1
+		google_settings.client_id = "test-client-id"
+		google_settings.client_secret = "test-client-secret"
+		google_settings.save(ignore_permissions=True)
+
 	def tearDown(self):
 		for item_type, item_name in reversed(self.cleanup_items):
 			if frappe.db.exists(item_type, item_name):
@@ -30,6 +40,13 @@ class IntegrationTestLMSGoogleMeetSettings(IntegrationTestCase):
 				except Exception:
 					pass
 
+		if hasattr(self, "_original_google_settings"):
+			google_settings = frappe.get_doc("Google Settings")
+			google_settings.enable = self._original_google_settings["enable"]
+			google_settings.client_id = self._original_google_settings["client_id"]
+			google_settings.client_secret = ""
+			google_settings.save(ignore_permissions=True)
+
 	def _create_google_calendar(self, name="Test Google Calendar"):
 		if frappe.db.exists("Google Calendar", name):
 			return frappe.get_doc("Google Calendar", name)
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index d690a010..6d1554ac 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -35,7 +35,9 @@ class LMSLiveClass(Document):
 
 	def on_trash(self):
 		if self.event and frappe.db.exists("Event", self.event):
-			frappe.delete_doc("Event", self.event, ignore_permissions=True)
+			event_name = self.event
+			frappe.db.set_value("LMS Live Class", self.name, "event", "")
+			frappe.delete_doc("Event", event_name, ignore_permissions=True)
 
 	def _get_participants(self):
 		participants = frappe.get_all("LMS Batch Enrollment", {"batch": self.batch_name}, pluck="member")
diff --git a/lms/lms/doctype/lms_live_class/test_lms_live_class.py b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
index 2e37c640..5351db79 100644
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -1,23 +1,50 @@
 # Copyright (c) 2023, Frappe and Contributors
 # See license.txt
 
+from unittest.mock import MagicMock, patch
+
 import frappe
 from frappe.utils import add_days, nowdate
 
 from lms.lms.test_helpers import BaseTestUtils
 
+GOOGLE_CALENDAR_MODULE = "frappe.integrations.doctype.google_calendar.google_calendar"
+
 
 class TestLMSLiveClass(BaseTestUtils):
 	"""Tests for LMS Live Class including Google Meet integration."""
 
 	def setUp(self):
 		super().setUp()
+
+		# Mock get_google_calendar_object to prevent Frappe's Event hooks
+		# from calling the real Google Calendar API (no OAuth tokens in CI).
+		mock_api = MagicMock()
+		mock_api.events.return_value.insert.return_value.execute.return_value = {
+			"id": "test-gcal-event-id",
+			"hangoutLink": "https://meet.google.com/test-link",
+			"status": "confirmed",
+		}
+		mock_api.events.return_value.update.return_value.execute.return_value = {
+			"id": "test-gcal-event-id",
+			"hangoutLink": "https://meet.google.com/test-link",
+		}
+		mock_api.events.return_value.patch.return_value.execute.return_value = {}
+		mock_api.events.return_value.delete.return_value.execute.return_value = None
+
+		self._gcal_patcher = patch(
+			f"{GOOGLE_CALENDAR_MODULE}.get_google_calendar_object",
+			return_value=(mock_api, MagicMock()),
+		)
+		self._gcal_patcher.start()
+
 		self._setup_course_flow()
 		self._setup_batch_flow()
 		self._setup_google_meet()
 
 	def tearDown(self):
 		super().tearDown()
+		self._gcal_patcher.stop()
 		if hasattr(self, "_original_google_settings"):
 			google_settings = frappe.get_doc("Google Settings")
 			google_settings.enable = self._original_google_settings["enable"]
@@ -139,7 +166,8 @@ class TestLMSLiveClass(BaseTestUtils):
 
 		old_calendar = self.google_meet_settings.google_calendar
 		self.google_meet_settings.google_calendar = ""
-		self.google_meet_settings.save(ignore_mandatory=True)
+		self.google_meet_settings.flags.ignore_mandatory = True
+		self.google_meet_settings.save()
 
 		with self.assertRaises(frappe.exceptions.ValidationError):
 			create_google_meet_live_class(
@@ -313,18 +341,15 @@ class TestLMSLiveClass(BaseTestUtils):
 
 	def test_update_attendance_skips_google_meet(self):
 		"""The Zoom attendance scheduler should skip Google Meet classes."""
-		from lms.lms.doctype.lms_live_class.lms_live_class import update_attendance
-
 		live_class = self._create_live_class()
 		live_class.reload()
 
-		# The update_attendance function filters out Google Meet classes
-		# It should not raise an error or attempt to call Zoom API for Google Meet classes
+		# The update_attendance function uses conferencing_provider != "Google Meet"
+		# to filter out Google Meet classes from Zoom attendance processing.
+		# Verify a Google Meet class is excluded by that filter.
 		past_classes = frappe.get_all(
 			"LMS Live Class",
 			{
-				"uuid": ["is", "set"],
-				"attendees": ["is", "not set"],
 				"conferencing_provider": ["!=", "Google Meet"],
 			},
 			pluck="name",