chore(release): Bumped to Version 2.11.0

fix: misc issues

cypress.config.js

@@ -13,6 +13,6 @@ module.exports = defineConfig({
 		openMode: 0,
 	},
 	e2e: {
-		baseUrl: "http://test_site_ui:8000",
+		baseUrl: "http://test:8000",
 	},
 });

cypress/e2e/course_creation.cy.js

@@ -5,7 +5,7 @@ describe("Course Creation", () => {
 		cy.visit("/lms/courses");
 
 		// Create a course
-		cy.get("a").contains("New").click();
+		cy.get("header").children().last().children().last().click();
 		cy.wait(1000);
 		cy.url().should("include", "/courses/new/edit");
 
@@ -73,7 +73,7 @@ describe("Course Creation", () => {
 			.should("be.visible")
 			.within(() => {
 				cy.get("label").contains("Title").type("Test Chapter");
-				cy.button("Add Chapter").click();
+				cy.button("Create").click();
 			});
 
 		// Add Lesson

frontend/package.json

@@ -23,7 +23,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.69",
+    "frappe-ui": "^0.1.72",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",

frontend/src/components/Annoucements.vue

@@ -25,7 +25,7 @@
 	</div>
 </template>
 <script setup>
-import { createListResource, Avatar } from 'frappe-ui'
+import { createResource, Avatar } from 'frappe-ui'
 import { timeAgo } from '@/utils'
 
 const props = defineProps({
@@ -35,24 +35,15 @@ const props = defineProps({
 	},
 })
 
-const communications = createListResource({
+const communications = createResource({
-	doctype: 'Communication',
+	url: 'lms.lms.api.get_announcements',
-	fields: [
+	makeParams(value) {
-		'subject',
+		return {
-		'content',
+			batch: props.batch,
-		'recipients',
+		}
-		'cc',
-		'communication_date',
-		'sender',
-		'sender_full_name',
-	],
-	filters: {
-		reference_doctype: 'LMS Batch',
-		reference_name: props.batch,
 	},
-	orderBy: 'communication_date desc',
 	auto: true,
-	cache: ['batch', props.batch],
+	cache: ['announcement', props.batch],
 })
 </script>
 <style>

frontend/src/components/Controls/Link.vue

@@ -2,6 +2,7 @@
 	<div class="space-y-1.5">
 		<label class="block" :class="labelClasses" v-if="attrs.label">
 			{{ attrs.label }}
+			<span class="text-red-500" v-if="attrs.required">*</span>
 		</label>
 		<Autocomplete
 			ref="autocomplete"

frontend/src/components/Controls/MultiSelect.vue

@@ -2,6 +2,7 @@
 	<div>
 		<label class="block mb-1" :class="labelClasses" v-if="label">
 			{{ label }}
+			<span class="text-red-500" v-if="required">*</span>
 		</label>
 		<div class="grid grid-cols-3 gap-1">
 			<Button
@@ -115,6 +116,9 @@ const props = defineProps({
 		type: Function,
 		default: (value) => `${value} is an Invalid value`,
 	},
+	required: {
+		type: Boolean,
+	},
 })
 
 const values = defineModel()
@@ -152,24 +156,11 @@ const filterOptions = createResource({
 	url: 'frappe.desk.search.search_link',
 	method: 'POST',
 	cache: [text.value, props.doctype],
+	auto: true,
 	params: {
 		txt: text.value,
 		doctype: props.doctype,
 	},
-	/* transform: (data) => {
-        let allData = data
-            .filter((c) => {
-                return c.description.split(', ')[1]
-            })
-            .map((option) => {
-                let email = option.description.split(', ')[1]
-                return {
-                    label: option.label || email,
-                    value: email,
-                }
-            })
-        return allData
-    }, */
 })
 
 const options = computed(() => {

frontend/src/components/CourseCard.vue

@@ -10,13 +10,13 @@
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
 			<div
-				class="flex items-center flex-wrap space-y-1 space-x-1 relative top-4 px-2 w-fit"
+				class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
 			>
 				<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
 					{{ __('Featured') }}
 				</Badge>
 				<Badge
-					variant="outline"
+					variant="subtle"
 					theme="gray"
 					size="md"
 					v-for="tag in course.tags"
@@ -30,29 +30,29 @@
 		</div>
 		<div class="flex flex-col flex-auto p-4">
 			<div class="flex items-center justify-between mb-2">
-				<div v-if="course.lesson_count">
+				<div v-if="course.lessons">
 					<Tooltip :text="__('Lessons')">
 						<span class="flex items-center">
 							<BookOpen class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.lesson_count }}
+							{{ course.lessons }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.enrollment_count">
+				<div v-if="course.enrollments">
 					<Tooltip :text="__('Enrolled Students')">
 						<span class="flex items-center">
 							<Users class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.enrollment_count }}
+							{{ course.enrollments }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.avg_rating">
+				<div v-if="course.rating">
 					<Tooltip :text="__('Average Rating')">
 						<span class="flex items-center">
 							<Star class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.avg_rating }}
+							{{ course.rating }}
 						</span>
 					</Tooltip>
 				</div>

frontend/src/components/CourseCardOverlay.vue

@@ -93,21 +93,19 @@
 			<div class="flex items-center mb-3">
 				<BookOpen class="h-5 w-5 stroke-1.5 text-gray-600" />
 				<span class="ml-2">
-					{{ course.data.lesson_count }} {{ __('Lessons') }}
+					{{ course.data.lessons }} {{ __('Lessons') }}
 				</span>
 			</div>
 			<div class="flex items-center mb-3">
 				<Users class="h-5 w-5 stroke-1.5 text-gray-600" />
 				<span class="ml-2">
-					{{ course.data.enrollment_count_formatted }}
+					{{ formatAmount(course.data.enrollments) }}
 					{{ __('Enrolled Students') }}
 				</span>
 			</div>
 			<div class="flex items-center">
 				<Star class="h-5 w-5 stroke-1.5 fill-orange-500 text-gray-50" />
-				<span class="ml-2">
+				<span class="ml-2"> {{ course.data.rating }} {{ __('Rating') }} </span>
-					{{ course.data.avg_rating }} {{ __('Rating') }}
-				</span>
 			</div>
 		</div>
 	</div>
@@ -116,7 +114,7 @@
 import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
-import { showToast } from '@/utils/'
+import { showToast, formatAmount } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 

frontend/src/components/CourseReviews.vue

@@ -76,7 +76,7 @@ const props = defineProps({
 		required: true,
 	},
 	avg_rating: {
-		type: Number,
+		type: String,
 		required: true,
 	},
 	membership: {

frontend/src/components/LessonHelp.vue

@@ -21,7 +21,7 @@
 
 		<div class="space-y-2">
 			<div
-				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
+				class="flex text-sm font-medium space-x-2 cursor-pointer"
 				@click="openHelpDialog('upload')"
 			>
 				<span class="leading-5">
@@ -56,6 +56,21 @@
 				}}
 			</div>
 		</div>
+
+		<div class="space-y-2">
+			<div class="flex items-center text-sm font-medium space-x-2">
+				<span>
+					{{ __('What does include in preview mean?') }}
+				</span>
+			</div>
+			<div class="text-xs text-gray-600 mb-1 leading-5">
+				{{
+					__(
+						'If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users.'
+					)
+				}}
+			</div>
+		</div>
 	</div>
 	<ExplanationVideos v-model="showExplanation" :type="type" />
 </template>

frontend/src/components/LiveClass.vue

@@ -37,6 +37,7 @@
 			</div>
 			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
 				<a
+					v-if="user.data?.is_moderator || user.data?.is_evaluator"
 					:href="cls.start_url"
 					target="_blank"
 					class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
@@ -45,9 +46,10 @@
 					{{ __('Start') }}
 				</a>
 				<a
+					v-if="cls.date <= dayjs().format('YYYY-MM-DD')"
 					:href="cls.join_url"
 					target="_blank"
-					class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+					class="w-full cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
 				>
 					<Video class="h-4 w-4 stroke-1.5" />
 					{{ __('Join') }}

frontend/src/components/Modals/AnnouncementModal.vue

@@ -18,6 +18,7 @@
 				<div class="">
 					<div class="mb-1.5 text-sm text-gray-600">
 						{{ __('Subject') }}
+						<span class="text-red-500">*</span>
 					</div>
 					<Input type="text" v-model="announcement.subject" />
 				</div>
@@ -44,7 +45,7 @@
 <script setup>
 import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
-import { createToast } from '@/utils/'
+import { showToast } from '@/utils/'
 
 const show = defineModel()
 
@@ -94,22 +95,14 @@ const makeAnnouncement = (close) => {
 			},
 			onSuccess() {
 				close()
-				createToast({
+				showToast(
-					title: 'Success',
+					__('Success'),
-					text: 'Announcement has been sent successfully',
+					__('Announcement has been sent successfully'),
-					icon: 'Check',
+					'check'
-					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				)
-				})
 			},
 			onError(err) {
-				createToast({
+				showToast(__('Error'), __(err.messages?.[0] || err), 'check')
-					title: 'Error',
-					text: err.messages?.[0] || err,
-					icon: 'x',
-					iconClasses: 'bg-red-600 text-white rounded-md p-px',
-					position: 'top-center',
-					timeout: 10,
-				})
 			},
 		}
 	)

frontend/src/components/Modals/BatchCourseModal.vue

@@ -14,7 +14,12 @@
 		}"
 	>
 		<template #body-content>
-			<Link doctype="LMS Course" v-model="course" :label="__('Course')" />
+			<Link
+				doctype="LMS Course"
+				v-model="course"
+				:label="__('Course')"
+				:required="true"
+			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"

frontend/src/components/Modals/ChapterModal.vue

@@ -2,11 +2,11 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			title: __('Add Chapter'),
+			title: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
 			size: 'lg',
 			actions: [
 				{
-					label: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
+					label: chapterDetail ? __('Edit') : __('Create'),
 					variant: 'solid',
 					onClick: (close) =>
 						chapterDetail ? editChapter(close) : addChapter(close),
@@ -20,6 +20,7 @@
 				label="Title"
 				v-model="chapter.title"
 				class="mb-4"
+				:required="true"
 			/>
 		</template>
 	</Dialog>

frontend/src/components/Modals/EditProfile.vue

@@ -69,7 +69,18 @@
 					:label="__('Headline')"
 					class="mb-4"
 				/>
-				<FormControl type="textarea" v-model="profile.bio" :label="__('Bio')" />
+
+				<div class="mb-4">
+					<div class="mb-1.5 text-sm text-gray-600">
+						{{ __('Bio') }}
+					</div>
+					<TextEditor
+						:fixedMenu="true"
+						@change="(val) => (profile.bio = val)"
+						:content="profile.bio"
+						editorClass="prose-sm py-2 px-2 min-h-[200px] border-gray-300 hover:border-gray-400 rounded-md bg-gray-200"
+					/>
+				</div>
 			</div>
 		</template>
 	</Dialog>
@@ -81,6 +92,7 @@ import {
 	FileUploader,
 	Button,
 	createResource,
+	TextEditor,
 } from 'frappe-ui'
 import { reactive, watch, defineModel } from 'vue'
 import { FileText, X } from 'lucide-vue-next'

frontend/src/components/Modals/EvaluationModal.vue

@@ -154,11 +154,13 @@ function submitEvaluation(close) {
 const getCourses = () => {
 	let courses = []
 	for (const course of props.courses) {
+		if (course.evaluator) {
 			courses.push({
 				label: course.title,
 				value: course.course,
 			})
 		}
+	}
 	return courses
 }
 

frontend/src/components/Modals/LiveClassModal.vue

@@ -22,6 +22,7 @@
 							v-model="liveClass.title"
 							:label="__('Title')"
 							class="mb-4"
+							:required="true"
 						/>
 						<Tooltip
 							:text="
@@ -35,6 +36,7 @@
 								type="time"
 								:label="__('Time')"
 								class="mb-4"
+								:required="true"
 							/>
 						</Tooltip>
 						<FormControl
@@ -42,6 +44,7 @@
 							type="select"
 							:options="getTimezoneOptions()"
 							:label="__('Timezone')"
+							:required="true"
 						/>
 					</div>
 					<div>
@@ -50,6 +53,7 @@
 							type="date"
 							class="mb-4"
 							:label="__('Date')"
+							:required="true"
 						/>
 						<Tooltip :text="__('Duration of the live class in minutes')">
 							<FormControl
@@ -57,6 +61,7 @@
 								v-model="liveClass.duration"
 								:label="__('Duration')"
 								class="mb-4"
+								:required="true"
 							/>
 						</Tooltip>
 						<FormControl

frontend/src/components/Quiz.vue

@@ -1,7 +1,7 @@
 <template>
 	<div v-if="quiz.data">
 		<div
-			class="bg-blue-100 space-y-1 py-2 px-2 rounded-md text-sm text-blue-800"
+			class="bg-blue-100 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-blue-800"
 		>
 			<div class="leading-5">
 				{{

frontend/src/components/VideoBlock.vue

@@ -4,6 +4,7 @@
 			@timeupdate="updateTime"
 			@ended="videoEnded"
 			@click="togglePlay"
+			oncontextmenu="return false"
 			class="rounded-lg border border-gray-100 group cursor-pointer"
 			ref="videoRef"
 		>

frontend/src/pages/Batch.vue

@@ -15,7 +15,11 @@
 		</header>
 		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
 			<div class="border-r-2">
-				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-y-hidden">
+				<Tabs
+					v-model="tabIndex"
+					:tabs="tabs"
+					tablistClass="overflow-y-hidden sticky top-11 bg-white z-10"
+				>
 					<template #tab="{ tab, selected }" class="overflow-x-hidden">
 						<div>
 							<button
@@ -236,7 +240,7 @@ const breadcrumbs = computed(() => {
 const isStudent = computed(() => {
 	return (
 		user?.data &&
-		batch.data?.students.length &&
+		batch.data?.students?.length &&
 		batch.data?.students.includes(user.data.name)
 	)
 })

frontend/src/pages/BatchForm.vue

@@ -15,7 +15,11 @@
 				</div>
 				<div class="grid grid-cols-2 gap-10 mb-4 space-y-2">
 					<div>
-						<FormControl v-model="batch.title" :label="__('Title')" />
+						<FormControl
+							v-model="batch.title"
+							:label="__('Title')"
+							:required="true"
+						/>
 					</div>
 					<div class="flex flex-col space-y-2">
 						<FormControl
@@ -32,42 +36,50 @@
 				</div>
 			</div>
 			<div class="mb-4">
-				<div>
+				<div class="text-xs text-gray-600 mb-2">
+					{{ __('Meta Image') }}
+				</div>
 				<FileUploader
 					v-if="!batch.image"
-						class="mt-4"
 					:fileTypes="['image/*']"
 					:validateFile="validateFile"
 					@success="(file) => saveImage(file)"
 				>
 					<template v-slot="{ file, progress, uploading, openFileSelector }">
-							<div class="mb-4">
+						<div class="flex items-center">
-								<Button @click="openFileSelector" :loading="uploading">
+							<div class="border rounded-md w-fit py-5 px-20">
-									{{ uploading ? `Uploading ${progress}%` : 'Upload an image' }}
+								<Image class="size-5 stroke-1 text-gray-700" />
+							</div>
+							<div class="ml-4">
+								<Button @click="openFileSelector">
+									{{ __('Upload') }}
 								</Button>
+								<div class="mt-2 text-gray-600 text-sm">
+									{{
+										__(
+											'Appears when the batch URL is shared on any online platform'
+										)
+									}}
+								</div>
+							</div>
 						</div>
 					</template>
 				</FileUploader>
 				<div v-else class="mb-4">
-						<div class="text-xs text-gray-600 mb-1">
-							{{ __('Meta Image') }}
-						</div>
 					<div class="flex items-center">
-							<div class="border rounded-md p-2 mr-2">
+						<img :src="batch.image.file_url" class="border rounded-md w-40" />
-								<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+						<div class="ml-4">
+							<Button @click="removeImage()">
+								{{ __('Remove') }}
+							</Button>
+							<div class="mt-2 text-gray-600 text-sm">
+								{{
+									__(
+										'Appears when the batch URL is shared on any online platform'
+									)
+								}}
 							</div>
-							<div class="flex flex-col">
-								<span>
-									{{ batch.image.file_name }}
-								</span>
-								<span class="text-sm text-gray-500 mt-1">
-									{{ getFileSize(batch.image.file_size) }}
-								</span>
 						</div>
-							<X
-								@click="removeImage()"
-								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
-							/>
 					</div>
 				</div>
 			</div>
@@ -75,18 +87,22 @@
 				v-model="instructors"
 				doctype="User"
 				:label="__('Instructors')"
+				:required="true"
+				:filters="{ ignore_user_type: 1 }"
 			/>
-			</div>
 			<div class="mb-4">
 				<FormControl
 					v-model="batch.description"
 					:label="__('Description')"
 					type="textarea"
 					class="my-4"
+					:placeholder="__('Short description of the batch')"
+					:required="true"
 				/>
 				<div>
 					<label class="block text-sm text-gray-600 mb-1">
 						{{ __('Batch Details') }}
+						<span class="text-red-500">*</span>
 					</label>
 					<TextEditor
 						:content="batch.batch_details"
@@ -108,12 +124,14 @@
 							:label="__('Start Date')"
 							type="date"
 							class="mb-4"
+							:required="true"
 						/>
 						<FormControl
 							v-model="batch.end_date"
 							:label="__('End Date')"
 							type="date"
 							class="mb-4"
+							:required="true"
 						/>
 					</div>
 					<div>
@@ -122,18 +140,22 @@
 							:label="__('Start Time')"
 							type="time"
 							class="mb-4"
+							:required="true"
 						/>
 						<FormControl
 							v-model="batch.end_time"
 							:label="__('End Time')"
 							type="time"
 							class="mb-4"
+							:required="true"
 						/>
 						<FormControl
 							v-model="batch.timezone"
 							:label="__('Timezone')"
 							type="text"
+							:placeholder="__('Example: IST (+5:30)')"
 							class="mb-4"
+							:required="true"
 						/>
 					</div>
 				</div>
@@ -149,6 +171,7 @@
 							:label="__('Seat Count')"
 							type="number"
 							class="mb-4"
+							:placeholder="__('Number of seats available')"
 						/>
 						<FormControl
 							v-model="batch.evaluation_end_date"
@@ -228,11 +251,11 @@ import {
 	createResource,
 } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
-import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import { useRouter } from 'vue-router'
-import { getFileSize, showToast } from '../utils'
+import { showToast } from '../utils'
-import { X, FileText } from 'lucide-vue-next'
+import { Image } from 'lucide-vue-next'
 import { capture } from '@/telemetry'
+import MultiSelect from '@/components/Controls/MultiSelect.vue'
 
 const router = useRouter()
 const user = inject('$user')

frontend/src/pages/Batches.vue

@@ -40,6 +40,7 @@
 				{{ __('Loading Batches...') }}
 			</div>
 			<Tabs
+				v-if="hasBatches"
 				v-model="tabIndex"
 				:tabs="makeTabs"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
@@ -79,24 +80,63 @@
 							<BatchCard :batch="batch" />
 						</router-link>
 					</div>
-					<div
+					<div v-else class="p-5 italic text-gray-500">
-						v-else
+						{{ __('No {0} batches').format(tab.label.toLowerCase()) }}
-						class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
-					>
-						<div class="flex flex-col items-center justify-center mt-4">
-							<div>
-								{{ __('No {0} batches found').format(tab.label.toLowerCase()) }}
-							</div>
-						</div>
 					</div>
 				</template>
 			</Tabs>
+			<div
+				v-else-if="
+					!batches.loading &&
+					!hasBatches &&
+					(user.data?.is_instructor || user.data?.is_moderator)
+				"
+				class="grid grid-cols-3 p-5"
+			>
+				<router-link
+					:to="{
+						name: 'BatchForm',
+						params: {
+							batchName: 'new',
+						},
+					}"
+				>
+					<div class="bg-gray-50 py-32 px-5 rounded-md">
+						<div class="flex flex-col items-center text-center space-y-2">
+							<Plus
+								class="size-10 stroke-1 text-gray-800 p-1 rounded-full border bg-white"
+							/>
+							<div class="font-medium">
+								{{ __('Create a Batch') }}
+							</div>
+							<span class="text-gray-700 text-sm leading-4">
+								{{ __('You can link courses and assessments to it.') }}
+							</span>
+						</div>
+					</div>
+				</router-link>
+			</div>
+			<div
+				v-else-if="!batches.loading && !hasBatches"
+				class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
+			>
+				<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
+				<div class="text-xl font-medium">
+					{{ __('No batches found') }}
+				</div>
+				<div>
+					{{
+						__(
+							'There are no batches available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
+						)
+					}}
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
 <script setup>
 import {
-	createListResource,
 	createResource,
 	Breadcrumbs,
 	Button,
@@ -104,13 +144,14 @@ import {
 	Badge,
 	Select,
 } from 'frappe-ui'
-import { Plus } from 'lucide-vue-next'
+import { BookOpen, Plus } from 'lucide-vue-next'
 import BatchCard from '@/components/BatchCard.vue'
 import { inject, ref, computed, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const currentCategory = ref(null)
+const hasBatches = ref(false)
 
 onMounted(() => {
 	let queries = new URLSearchParams(location.search)
@@ -119,10 +160,10 @@ onMounted(() => {
 	}
 })
 
-const batches = createListResource({
+const batches = createResource({
 	doctype: 'LMS Batch',
 	url: 'lms.lms.utils.get_batches',
-	cache: ['batches', user?.data?.email],
+	cache: ['batches', user.data?.email],
 	auto: true,
 })
 
@@ -183,6 +224,14 @@ const addToTabs = (label) => {
 	})
 }
 
+watch(batches, () => {
+	Object.keys(batches.data).forEach((key) => {
+		if (batches.data[key].length) {
+			hasBatches.value = true
+		}
+	})
+})
+
 watch(
 	() => currentCategory.value,
 	() => {

frontend/src/pages/CourseDetail.vue

@@ -16,16 +16,16 @@
 					</div>
 					<div class="flex items-center">
 						<Tooltip
-							v-if="course.data.avg_rating"
+							v-if="course.data.rating"
 							:text="__('Average Rating')"
 							class="flex items-center"
 						>
 							<Star class="h-5 w-5 text-gray-100 fill-orange-500" />
 							<span class="ml-1">
-								{{ course.data.avg_rating }}
+								{{ course.data.rating }}
 							</span>
 						</Tooltip>
-						<span v-if="course.data.avg_rating" class="mx-3">&middot;</span>
+						<span v-if="course.data.rating" class="mx-3">&middot;</span>
 						<Tooltip
 							v-if="course.data.enrollment_count"
 							:text="__('Enrolled Students')"
@@ -67,14 +67,14 @@
 					<CourseCardOverlay :course="course" class="md:hidden mb-4" />
 					<div
 						v-html="course.data.description"
-						class="course-description"
+						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal"
 					></div>
 					<div class="mt-10">
 						<CourseOutline :courseName="course.data.name" :showOutline="true" />
 					</div>
 					<CourseReviews
 						:courseName="course.data.name"
-						:avg_rating="course.data.avg_rating"
+						:avg_rating="course.data.rating"
 						:membership="course.data.membership"
 					/>
 				</div>
@@ -116,7 +116,7 @@ const breadcrumbs = computed(() => {
 	let items = [{ label: 'All Courses', route: { name: 'Courses' } }]
 	items.push({
 		label: course?.data?.title,
-		route: { name: 'CourseDetail', params: { course: course?.data?.name } },
+		route: { name: 'CourseDetail', params: { courseName: course?.data?.name } },
 	})
 	return items
 })
@@ -131,26 +131,6 @@ const pageMeta = computed(() => {
 updateDocumentTitle(pageMeta)
 </script>
 <style>
-.course-description p {
-	margin-bottom: 1rem;
-	line-height: 1.7;
-}
-.course-description li {
-	line-height: 1.7;
-}
-
-.course-description ol {
-	list-style: auto;
-	margin: revert;
-	padding: revert;
-}
-
-.course-description ul {
-	list-style: disc;
-	margin: revert;
-	padding: revert;
-}
-
 .avatar-group {
 	display: inline-flex;
 	align-items: center;

frontend/src/pages/CourseForm.vue

@@ -7,6 +7,14 @@
 				>
 					<Breadcrumbs class="h-7" :items="breadcrumbs" />
 					<div class="flex items-center mt-3 md:mt-0">
+						<Button v-if="courseResource.data?.name" @click="trashCourse()">
+							<template #prefix>
+								<Trash2 class="w-4 h-4 stroke-1.5" />
+							</template>
+							<span>
+								{{ __('Delete') }}
+							</span>
+						</Button>
 						<Button variant="solid" @click="submitCourse()" class="ml-2">
 							<span>
 								{{ __('Save') }}
@@ -23,15 +31,23 @@
 							v-model="course.title"
 							:label="__('Title')"
 							class="mb-4"
+							:required="true"
 						/>
 						<FormControl
 							v-model="course.short_introduction"
 							:label="__('Short Introduction')"
+							:placeholder="
+								__(
+									'A one line introduction to the course that appears on the course card'
+								)
+							"
 							class="mb-4"
+							:required="true"
 						/>
 						<div class="mb-4">
-							<div class="mb-1.5 text-sm text-gray-700">
+							<div class="mb-1.5 text-sm text-gray-600">
 								{{ __('Course Description') }}
+								<span class="text-red-500">*</span>
 							</div>
 							<TextEditor
 								:content="course.description"
@@ -41,6 +57,11 @@
 								editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
 							/>
 						</div>
+						<div class="mb-4">
+							<div class="text-xs text-gray-600 mb-2">
+								{{ __('Course Image') }}
+								<span class="text-red-500">*</span>
+							</div>
 							<FileUploader
 								v-if="!course.course_image"
 								:fileTypes="['image/*']"
@@ -50,40 +71,48 @@
 								<template
 									v-slot="{ file, progress, uploading, openFileSelector }"
 								>
-								<div class="mb-4">
+									<div class="flex items-center">
-									<Button @click="openFileSelector" :loading="uploading">
+										<div class="border rounded-md w-fit py-5 px-20">
-										{{
+											<Image class="size-5 stroke-1 text-gray-700" />
-											uploading ? `Uploading ${progress}%` : 'Upload an image'
+										</div>
-										}}
+										<div class="ml-4">
+											<Button @click="openFileSelector">
+												{{ __('Upload') }}
 											</Button>
+											<div class="mt-2 text-gray-600 text-sm">
+												{{
+													__('Appears on the course card in the course list')
+												}}
+											</div>
+										</div>
 									</div>
 								</template>
 							</FileUploader>
 							<div v-else class="mb-4">
-							<div class="text-xs text-gray-600 mb-1">
-								{{ __('Course Image') }}
-							</div>
 								<div class="flex items-center">
-								<div class="border rounded-md p-2 mr-2">
+									<img
-									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+										:src="course.course_image.file_url"
-								</div>
+										class="border rounded-md w-40"
-								<div class="flex flex-col">
-									<span>
-										{{ course.course_image.file_name }}
-									</span>
-									<span class="text-sm text-gray-500 mt-1">
-										{{ getFileSize(course.course_image.file_size) }}
-									</span>
-								</div>
-								<X
-									@click="removeImage()"
-									class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
 									/>
+									<div class="ml-4">
+										<Button @click="removeImage()">
+											{{ __('Remove') }}
+										</Button>
+										<div class="mt-2 text-gray-600 text-sm">
+											{{ __('Appears on the course card in the course list') }}
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
 						<FormControl
 							v-model="course.video_link"
 							:label="__('Preview Video')"
+							:placeholder="
+								__(
+									'Paste the youtube link of a short video introducing the course'
+								)
+							"
 							class="mb-4"
 						/>
 						<div class="mb-4">
@@ -104,6 +133,8 @@
 								</div>
 								<FormControl
 									v-model="newTag"
+									:placeholder="__('Keywords for the course')"
+									class="w-52"
 									@keyup.enter="updateTags()"
 									id="tags"
 								/>
@@ -121,6 +152,8 @@
 							v-model="instructors"
 							doctype="User"
 							:label="__('Instructors')"
+							:filters="{ ignore_user_type: 1 }"
+							:required="true"
 						/>
 					</div>
 					<div class="container border-t">
@@ -130,7 +163,7 @@
 						<div class="grid grid-cols-3 gap-10 mb-4">
 							<div
 								v-if="user.data?.is_moderator"
-								class="flex flex-col space-y-3"
+								class="flex flex-col space-y-4"
 							>
 								<FormControl
 									type="checkbox"
@@ -223,15 +256,11 @@ import {
 	ref,
 	reactive,
 	watch,
+	getCurrentInstance,
 } from 'vue'
-import {
+import { showToast, updateDocumentTitle } from '@/utils'
-	convertToTitleCase,
-	showToast,
-	getFileSize,
-	updateDocumentTitle,
-} from '@/utils'
 import Link from '@/components/Controls/Link.vue'
-import { FileText, X } from 'lucide-vue-next'
+import { Image, Trash2, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -243,6 +272,8 @@ const newTag = ref('')
 const router = useRouter()
 const instructors = ref([])
 const settingsStore = useSettings()
+const app = getCurrentInstance()
+const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
 	courseName: {
@@ -415,23 +446,37 @@ const submitCourse = () => {
 	}
 }
 
-const validateMandatoryFields = () => {
+const deleteCourse = createResource({
-	const mandatory_fields = [
+	url: 'lms.lms.api.delete_course',
-		'title',
+	makeParams(values) {
-		'short_introduction',
+		return {
-		'description',
+			course: props.courseName,
-		'video_link',
-		'course_image',
-	]
-	for (const field of mandatory_fields) {
-		if (!course[field]) {
-			let fieldLabel = convertToTitleCase(field.split('_').join(' '))
-			return `${fieldLabel} is mandatory`
-		}
-	}
-	if (course.paid_course && (!course.course_price || !course.currency)) {
-		return __('Course price and currency are mandatory for paid courses')
 		}
+	},
+	onSuccess() {
+		showToast(__('Success'), __('Course deleted successfully'), 'check')
+		router.push({ name: 'Courses' })
+	},
+})
+
+const trashCourse = () => {
+	$dialog({
+		title: __('Delete Course'),
+		message: __(
+			'Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?'
+		),
+		actions: [
+			{
+				label: __('Delete'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(close) {
+					deleteCourse.submit()
+					close()
+				},
+			},
+		],
+	})
 }
 
 watch(

frontend/src/pages/Courses.vue

@@ -8,7 +8,7 @@
 				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
 			/>
 			<div class="flex space-x-2 justify-end">
-				<div class="w-46 md:w-44">
+				<div class="w-40 md:w-44">
 					<FormControl
 						v-if="categories.data?.length"
 						type="select"
@@ -48,6 +48,7 @@
 		</header>
 		<div class="">
 			<Tabs
+				v-if="hasCourses"
 				v-model="tabIndex"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
 				:tabs="makeTabs"
@@ -101,18 +102,57 @@
 							<CourseCard :course="course" />
 						</router-link>
 					</div>
-					<div
+					<div v-else class="p-5 italic text-gray-500">
-						v-else
+						{{ __('No {0} courses').format(tab.label.toLowerCase()) }}
-						class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
-					>
-						<div class="flex flex-col items-center justify-center mt-4">
-							<div>
-								{{ __('No {0} courses found').format(tab.label.toLowerCase()) }}
-							</div>
-						</div>
 					</div>
 				</template>
 			</Tabs>
+			<div
+				v-else-if="
+					!courses.loading &&
+					(user.data?.is_moderator || user.data?.is_instructor)
+				"
+				class="grid grid-cols-3 p-5"
+			>
+				<router-link
+					:to="{
+						name: 'CourseForm',
+						params: {
+							courseName: 'new',
+						},
+					}"
+				>
+					<div class="bg-gray-50 py-32 px-5 rounded-md">
+						<div class="flex flex-col items-center text-center space-y-2">
+							<Plus
+								class="size-10 stroke-1 text-gray-800 p-1 rounded-full border bg-white"
+							/>
+							<div class="font-medium">
+								{{ __('Create a Course') }}
+							</div>
+							<span class="text-gray-700 text-sm leading-4">
+								{{ __('You can add chapters and lessons to it.') }}
+							</span>
+						</div>
+					</div>
+				</router-link>
+			</div>
+			<div
+				v-else-if="!courses.loading && !hasCourses"
+				class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
+			>
+				<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
+				<div class="text-xl font-medium">
+					{{ __('No courses found') }}
+				</div>
+				<div class="leading-5">
+					{{
+						__(
+							'There are no courses available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
+						)
+					}}
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
@@ -127,13 +167,14 @@ import {
 	createResource,
 } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
-import { Plus, Search } from 'lucide-vue-next'
+import { BookOpen, Plus, Search } from 'lucide-vue-next'
 import { ref, computed, inject, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const searchQuery = ref('')
 const currentCategory = ref(null)
+const hasCourses = ref(false)
 
 onMounted(() => {
 	let queries = new URLSearchParams(location.search)
@@ -223,6 +264,16 @@ const categories = createResource({
 	},
 })
 
+watch(courses, () => {
+	if (courses.data) {
+		Object.keys(courses.data).forEach((section) => {
+			if (courses.data[section].length) {
+				hasCourses.value = true
+			}
+		})
+	}
+})
+
 watch(
 	() => currentCategory.value,
 	() => {

frontend/src/pages/Lesson.vue

@@ -17,14 +17,9 @@
 						)
 					}}
 				</p>
-				<router-link
+				<Button v-if="user.data" @click="enrollStudent()" variant="solid">
-					v-if="user.data"
-					:to="{ name: 'CourseDetail', params: { courseName: courseName } }"
-				>
-					<Button variant="solid">
 					{{ __('Start Learning') }}
 				</Button>
-				</router-link>
 				<Button v-else @click="redirectToLogin()">
 					{{ __('Login') }}
 				</Button>
@@ -194,7 +189,7 @@ import { createResource, Breadcrumbs, Button } from 'frappe-ui'
 import { computed, watch, inject, ref, onMounted, onBeforeUnmount } from 'vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import { ChevronLeft, ChevronRight } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
 import { getEditorTools, updateDocumentTitle } from '../utils'
@@ -204,6 +199,7 @@ import CourseInstructors from '@/components/CourseInstructors.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 
 const user = inject('$user')
+const router = useRouter()
 const route = useRoute()
 const allowDiscussions = ref(false)
 const editor = ref(null)
@@ -243,6 +239,10 @@ const lesson = createResource({
 	},
 	auto: true,
 	onSuccess(data) {
+		if (Object.keys(data).length === 0) {
+			router.push({ name: 'Courses' })
+			return
+		}
 		lessonProgress.value = data.membership?.progress
 		if (data.content) editor.value = renderEditor('editor', data.content)
 		if (
@@ -279,7 +279,7 @@ const renderEditor = (holder, content) => {
 }
 
 const markProgress = () => {
-	if (user.data && !lesson.data?.progress) {
+	if (user.data && lesson.data && !lesson.data.progress) {
 		progress.submit()
 	}
 }
@@ -301,14 +301,14 @@ const breadcrumbs = computed(() => {
 	let items = [{ label: 'All Courses', route: { name: 'Courses' } }]
 	items.push({
 		label: lesson?.data?.course_title,
-		route: { name: 'CourseDetail', params: { course: props.courseName } },
+		route: { name: 'CourseDetail', params: { courseName: props.courseName } },
 	})
 	items.push({
 		label: lesson?.data?.title,
 		route: {
 			name: 'Lesson',
 			params: {
-				course: props.courseName,
+				courseName: props.courseName,
 				chapterNumber: props.chapterNumber,
 				lessonNumber: props.lessonNumber,
 			},
@@ -379,6 +379,30 @@ const allowInstructorContent = () => {
 	return false
 }
 
+const enrollment = createResource({
+	url: 'frappe.client.insert',
+	makeParams() {
+		return {
+			doc: {
+				doctype: 'LMS Enrollment',
+				course: props.courseName,
+				member: user.data?.name,
+			},
+		}
+	},
+})
+
+const enrollStudent = () => {
+	enrollment.submit(
+		{},
+		{
+			onSuccess() {
+				window.location.reload()
+			},
+		}
+	)
+}
+
 const redirectToLogin = () => {
 	window.location.href = `/login?redirect-to=/lms/courses/${props.courseName}`
 }

frontend/src/pages/LessonForm.vue

@@ -12,7 +12,12 @@
 				</header>
 				<div class="py-5">
 					<div class="w-5/6 mx-auto">
-						<FormControl v-model="lesson.title" label="Title" class="mb-4" />
+						<FormControl
+							v-model="lesson.title"
+							label="Title"
+							class="mb-4"
+							:required="true"
+						/>
 						<FormControl
 							v-model="lesson.include_in_preview"
 							type="checkbox"
@@ -69,7 +74,7 @@
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
+import { Breadcrumbs, Button, createResource, FormControl } from 'frappe-ui'
 import {
 	computed,
 	reactive,

frontend/src/pages/Quizzes.vue

@@ -47,6 +47,22 @@
 			</ListRows>
 		</ListView>
 	</div>
+	<div
+		v-else
+		class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
+	>
+		<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
+		<div class="text-xl font-medium">
+			{{ __('No quizzes found') }}
+		</div>
+		<div class="leading-5">
+			{{
+				__(
+					'You have not created any quizzes yet. To create a new quiz, click on the "New Quiz" button above.'
+				)
+			}}
+		</div>
+	</div>
 </template>
 <script setup>
 import {
@@ -61,7 +77,7 @@ import {
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { computed, inject, onMounted } from 'vue'
-import { Plus } from 'lucide-vue-next'
+import { BookOpen, Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')

frontend/src/utils/index.js

@@ -57,6 +57,15 @@ export function formatNumberIntoCurrency(number, currency) {
 	return ''
 }
 
+// create a function that formats numbers in thousands to k
+
+export function formatAmount(amount) {
+	if (amount > 999) {
+		return (amount / 1000).toFixed(1) + 'k'
+	}
+	return amount
+}
+
 export function convertToTitleCase(str) {
 	if (!str) {
 		return ''

frontend/src/utils/quiz.js

@@ -51,7 +51,7 @@ export class Quiz {
 			app.mount(this.wrapper)
 			return
 		}
-		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center mb-2'>
+		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center bg-gray-50 mb-2'>
             <span class="font-medium">
                 Quiz: ${quiz}
             </span>

frontend/yarn.lock

@@ -1224,10 +1224,10 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.69:
+frappe-ui@^0.1.72:
-  version "0.1.69"
+  version "0.1.72"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.69.tgz#bfc6d19dff97d2666c36da63f5de62f819539406"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.72.tgz#f5550056ddee7ad4341f2c1825d046404d221820"
-  integrity sha512-MKHYTcRvmccZwTYlIcmf4OCbJQH5eqKXsq3Cj2lbnmoWuuTh9m7T3AoRKEwOIlZ0mSGCH9yzaF2BINBXGpIJdQ==
+  integrity sha512-XWYKmCjw3ViD+/+tZMUiYqwHFlMGMsVuazOYiN5bKlE+aiheJsnHlOOUyQswYX1Y7jNxuC7gGpSLNg2ZpXA7hA==
   dependencies:
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"

lms/__init__.py

@@ -1 +1 @@
-__version__ = "2.9.0"
+__version__ = "2.11.0"

lms/hooks.py

@@ -110,7 +110,8 @@ doc_events = {
 # ---------------
 scheduler_events = {
 	"hourly": [
-		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.schedule_evals"
+		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.schedule_evals",
+		"lms.lms.api.update_course_statistics",
 	],
 	"daily": ["lms.job.doctype.job_opportunity.job_opportunity.update_job_openings"],
 }
@@ -185,6 +186,7 @@ jinja = {
 		"lms.lms.utils.get_lesson_url",
 		"lms.page_renderers.get_profile_url",
 		"lms.overrides.user.get_palette",
+		"lms.lms.utils.is_instructor",
 	],
 	"filters": [],
 }

lms/install.py

@@ -1,10 +1,12 @@
 import frappe
 from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
+from lms.lms.api import give_dicussions_permission
 
 
 def after_install():
 	add_pages_to_nav()
 	create_batch_source()
+	give_dicussions_permission()
 
 
 def after_sync():

lms/lms/api.py

@@ -1,13 +1,15 @@
 """API methods for the LMS.
 """
 
+import json
 import frappe
 from frappe.translate import get_all_translations
 from frappe import _
 from frappe.query_builder import DocType
 from frappe.query_builder.functions import Count
-from frappe.utils import time_diff, now_datetime, get_datetime
+from frappe.utils import time_diff, now_datetime, get_datetime, flt
 from typing import Optional
+from lms.lms.utils import get_average_rating, get_lesson_count
 
 
 @frappe.whitelist()
@@ -294,7 +296,8 @@ def get_branding():
 
 	for field in image_fields:
 		if website_settings.get(field):
-			website_settings.update({field: get_file_info(website_settings.get(field))})
+			file_info = get_file_info(website_settings.get(field))
+			website_settings.update({field: json.loads(json.dumps(file_info))})
 		else:
 			website_settings.update({field: None})
 
@@ -489,7 +492,15 @@ def delete_sidebar_item(webpage):
 
 @frappe.whitelist()
 def delete_lesson(lesson, chapter):
-	frappe.db.delete("Lesson Reference", {"parent": chapter, "lesson": lesson})
+	# Delete Reference
+	chapter = frappe.get_doc("Course Chapter", chapter)
+	chapter.lessons = [row for row in chapter.lessons if row.lesson != lesson]
+	chapter.save()
+
+	# Delete progress
+	frappe.db.delete("LMS Course Progress", {"lesson": lesson})
+
+	# Delete Lesson
 	frappe.db.delete("Course Lesson", lesson)
 
 
@@ -760,3 +771,108 @@ def get_payment_gateway_details(payment_gateway):
 		"doctype": doctype,
 		"docname": docname,
 	}
+
+
+def update_course_statistics():
+	courses = frappe.get_all("LMS Course", fields=["name"])
+
+	for course in courses:
+		lessons = get_lesson_count(course.name)
+
+		enrollments = frappe.db.count(
+			"LMS Enrollment", {"course": course.name, "member_type": "Student"}
+		)
+
+		avg_rating = get_average_rating(course.name) or 0
+		avg_rating = flt(avg_rating, frappe.get_system_settings("float_precision") or 3)
+
+		frappe.db.set_value(
+			"LMS Course",
+			course.name,
+			{"lessons": lessons, "enrollments": enrollments, "rating": avg_rating},
+		)
+
+
+@frappe.whitelist()
+def get_announcements(batch):
+	return frappe.get_all(
+		"Communication",
+		filters={
+			"reference_doctype": "LMS Batch",
+			"reference_name": batch,
+		},
+		fields=[
+			"subject",
+			"content",
+			"recipients",
+			"cc",
+			"communication_date",
+			"sender",
+			"sender_full_name",
+		],
+		order_by="communication_date desc",
+	)
+
+
+@frappe.whitelist()
+def delete_course(course):
+
+	chapters = frappe.get_all("Course Chapter", {"course": course}, pluck="name")
+
+	chapter_references = frappe.get_all(
+		"Chapter Reference", {"parent": course}, pluck="name"
+	)
+
+	for chapter in chapters:
+		lessons = frappe.get_all("Course Lesson", {"chapter": chapter}, pluck="name")
+
+		lesson_references = frappe.get_all(
+			"Lesson Reference", {"parent": chapter}, pluck="name"
+		)
+
+		for lesson in lesson_references:
+			frappe.delete_doc("Lesson Reference", lesson)
+
+		for lesson in lessons:
+			frappe.db.delete("LMS Course Progress", {"lesson": lesson})
+
+			topics = frappe.get_all(
+				"Discussion Topic",
+				{"reference_doctype": "Course Lesson", "reference_docname": lesson},
+				pluck="name",
+			)
+
+			for topic in topics:
+				frappe.db.delete("Discussion Reply", {"topic": topic})
+
+				frappe.db.delete("Discussion Topic", topic)
+
+			frappe.delete_doc("Course Lesson", lesson)
+
+	for chapter in chapter_references:
+		frappe.delete_doc("Chapter Reference", chapter)
+
+	for chapter in chapters:
+		frappe.delete_doc("Course Chapter", chapter)
+
+	frappe.db.delete("LMS Enrollment", {"course": course})
+	frappe.delete_doc("LMS Course", course)
+
+
+def give_dicussions_permission():
+	doctypes = ["Discussion Topic", "Discussion Reply"]
+	roles = ["LMS Student", "Course Creator", "Moderator", "Batch Evaluator"]
+	for doctype in doctypes:
+		for role in roles:
+			if not frappe.db.exists("Custom DocPerm", {"parent": doctype, "role": role}):
+				frappe.get_doc(
+					{
+						"doctype": "Custom DocPerm",
+						"parent": doctype,
+						"role": role,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
+				).save(ignore_permissions=True)

lms/lms/doctype/batch_student/batch_student.py

@@ -7,17 +7,3 @@ from frappe.model.document import Document
 
 class BatchStudent(Document):
 	pass
-
-
-@frappe.whitelist()
-def enroll_batch(batch_name):
-	if frappe.db.exists(
-		"Batch Student", {"student": frappe.session.user, "parent": batch_name}
-	):
-		frappe.throw("You are already enrolled in this batch")
-	enrollment = frappe.new_doc("Batch Student")
-	enrollment.student = frappe.session.user
-	enrollment.parent = batch_name
-	enrollment.parentfield = "students"
-	enrollment.parenttype = "LMS Batch"
-	enrollment.save(ignore_permissions=True)

lms/lms/doctype/course_chapter/course_chapter.json

@@ -9,9 +9,8 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
-  "title",
   "column_break_3",
-  "description",
+  "title",
   "section_break_5",
   "lessons"
  ],
@@ -35,11 +34,6 @@
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "label": "Description"
-  },
   {
    "fieldname": "section_break_5",
    "fieldtype": "Section Break"
@@ -59,7 +53,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2023-09-29 17:03:58.013819",
+ "modified": "2024-10-29 16:54:20.904683",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Chapter",

lms/lms/doctype/course_chapter/course_chapter.py

@@ -1,10 +1,27 @@
 # Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
-from frappe.utils.telemetry import capture
+from lms.lms.utils import get_course_progress
+from lms.lms.api import update_course_statistics
 
 
 class CourseChapter(Document):
-	pass
+	def on_update(self):
+		self.recalculate_course_progress()
+		update_course_statistics()
+
+	def recalculate_course_progress(self):
+		previous_lessons = (
+			self.get_doc_before_save() and self.get_doc_before_save().as_dict().lessons
+		)
+		current_lessons = self.lessons
+
+		if previous_lessons and previous_lessons != current_lessons:
+			enrolled_members = frappe.get_all(
+				"LMS Enrollment", {"course": self.course}, ["member", "name"]
+			)
+			for enrollment in enrolled_members:
+				new_progress = get_course_progress(self.course, enrollment.member)
+				frappe.db.set_value("LMS Enrollment", enrollment.name, "progress", new_progress)

lms/lms/doctype/lms_batch/lms_batch.py

@@ -33,6 +33,7 @@ class LMSBatch(Document):
 		self.validate_timetable()
 		self.send_confirmation_mail()
 		self.validate_evaluation_end_date()
+		self.add_students_to_live_class()
 
 	def validate_batch_end_date(self):
 		if self.end_date < self.start_date:
@@ -139,6 +140,27 @@ class LMSBatch(Document):
 		if cint(self.seat_count) < len(self.students):
 			frappe.throw(_("There are no seats available in this batch."))
 
+	def add_students_to_live_class(self):
+		for student in self.students:
+			if student.is_new():
+				live_classes = frappe.get_all(
+					"LMS Live Class", {"batch_name": self.name}, ["name", "event"]
+				)
+
+				for live_class in live_classes:
+					if live_class.event:
+						frappe.get_doc(
+							{
+								"doctype": "Event Participants",
+								"reference_doctype": "User",
+								"reference_docname": student.student,
+								"email": student.student,
+								"parent": live_class.event,
+								"parenttype": "Event",
+								"parentfield": "event_participants",
+							}
+						).save()
+
 	def validate_timetable(self):
 		for schedule in self.timetable:
 			if schedule.start_time and schedule.end_time:

lms/lms/doctype/lms_course/lms_course.json

@@ -48,7 +48,12 @@
   "certification_section",
   "enable_certification",
   "column_break_rxww",
-  "expiry"
+  "expiry",
+  "tab_4_tab",
+  "statistics_section",
+  "enrollments",
+  "lessons",
+  "rating"
  ],
  "fields": [
   {
@@ -249,6 +254,36 @@
    "fieldtype": "Link",
    "label": "Category",
    "options": "LMS Category"
+  },
+  {
+   "fieldname": "tab_4_tab",
+   "fieldtype": "Tab Break",
+   "label": "Statistics"
+  },
+  {
+   "fieldname": "statistics_section",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "enrollments",
+   "fieldtype": "Data",
+   "label": "Enrollments",
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "lessons",
+   "fieldtype": "Data",
+   "label": "Lessons",
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "rating",
+   "fieldtype": "Data",
+   "label": "Rating",
+   "read_only": 1
   }
  ],
  "is_published_field": "published",
@@ -275,7 +310,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2024-09-21 10:23:58.633912",
+ "modified": "2024-10-30 23:08:31.842860",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

lms/lms/doctype/lms_course/lms_course.py

@@ -187,192 +187,3 @@ def reindex_exercises(doc):
 	course = frappe.get_doc("LMS Course", course_data["name"])
 	course.reindex_exercises()
 	frappe.msgprint("All exercises in this course have been re-indexed.")
-
-
-@frappe.whitelist(allow_guest=True)
-def search_course(text):
-	courses = frappe.get_all(
-		"LMS Course",
-		filters={"published": True},
-		or_filters={
-			"title": ["like", f"%{text}%"],
-			"tags": ["like", f"%{text}%"],
-			"short_introduction": ["like", f"%{text}%"],
-			"description": ["like", f"%{text}%"],
-		},
-		fields=["name", "title"],
-	)
-	return courses
-
-
-@frappe.whitelist()
-def submit_for_review(course):
-	chapters = frappe.get_all("Chapter Reference", {"parent": course})
-	if not len(chapters):
-		return "No Chp"
-	frappe.db.set_value("LMS Course", course, "status", "Under Review")
-	return "OK"
-
-
-@frappe.whitelist()
-def save_course(
-	tags,
-	title,
-	short_introduction,
-	video_link,
-	description,
-	course,
-	published,
-	upcoming,
-	image=None,
-	paid_course=False,
-	course_price=None,
-	currency=None,
-):
-	if not can_create_courses(course):
-		return
-
-	if course:
-		doc = frappe.get_doc("LMS Course", course)
-	else:
-		doc = frappe.get_doc({"doctype": "LMS Course"})
-
-	doc.update(
-		{
-			"title": title,
-			"short_introduction": short_introduction,
-			"video_link": video_link,
-			"image": image,
-			"description": description,
-			"tags": tags,
-			"published": cint(published),
-			"upcoming": cint(upcoming),
-			"paid_course": cint(paid_course),
-			"course_price": course_price,
-			"currency": currency,
-		}
-	)
-	doc.save(ignore_permissions=True)
-	return doc.name
-
-
-@frappe.whitelist()
-def save_chapter(course, title, chapter_description, idx, chapter):
-	if chapter:
-		doc = frappe.get_doc("Course Chapter", chapter)
-	else:
-		doc = frappe.get_doc({"doctype": "Course Chapter"})
-
-	doc.update({"course": course, "title": title, "description": chapter_description})
-	doc.save(ignore_permissions=True)
-
-	if chapter:
-		chapter_reference = frappe.get_doc("Chapter Reference", {"chapter": chapter})
-	else:
-		chapter_reference = frappe.get_doc(
-			{
-				"doctype": "Chapter Reference",
-				"parent": course,
-				"parenttype": "LMS Course",
-				"parentfield": "chapters",
-				"idx": idx,
-			}
-		)
-
-	chapter_reference.update({"chapter": doc.name})
-	chapter_reference.save(ignore_permissions=True)
-
-	return doc.name
-
-
-@frappe.whitelist()
-def save_lesson(
-	title,
-	body,
-	chapter,
-	preview,
-	idx,
-	lesson,
-	instructor_notes=None,
-	youtube=None,
-	quiz_id=None,
-	question=None,
-	file_type=None,
-):
-	if lesson:
-		doc = frappe.get_doc("Course Lesson", lesson)
-	else:
-		doc = frappe.get_doc({"doctype": "Course Lesson"})
-
-	doc.update(
-		{
-			"chapter": chapter,
-			"title": title,
-			"body": body,
-			"instructor_notes": instructor_notes,
-			"include_in_preview": preview,
-			"youtube": youtube,
-			"quiz_id": quiz_id,
-			"question": question,
-			"file_type": file_type,
-		}
-	)
-	doc.save(ignore_permissions=True)
-
-	if lesson:
-		lesson_reference = frappe.get_doc("Lesson Reference", {"lesson": lesson})
-	else:
-		lesson_reference = frappe.get_doc(
-			{
-				"doctype": "Lesson Reference",
-				"parent": chapter,
-				"parenttype": "Course Chapter",
-				"parentfield": "lessons",
-				"idx": idx,
-			}
-		)
-
-	lesson_reference.update({"lesson": doc.name})
-	lesson_reference.save(ignore_permissions=True)
-
-	return doc.name
-
-
-@frappe.whitelist()
-def reorder_lesson(old_chapter, old_lesson_array, new_chapter, new_lesson_array):
-	if old_chapter == new_chapter:
-		sort_lessons(new_chapter, new_lesson_array)
-	else:
-		sort_lessons(old_chapter, old_lesson_array)
-		sort_lessons(new_chapter, new_lesson_array)
-
-
-def sort_lessons(chapter, lesson_array):
-	lesson_array = json.loads(lesson_array)
-	for les in lesson_array:
-		ref = frappe.get_all("Lesson Reference", {"lesson": les}, ["name", "idx"])
-		if ref:
-			frappe.db.set_value(
-				"Lesson Reference",
-				ref[0].name,
-				{
-					"parent": chapter,
-					"idx": lesson_array.index(les) + 1,
-				},
-			)
-
-
-@frappe.whitelist()
-def reorder_chapter(chapter_array):
-	chapter_array = json.loads(chapter_array)
-
-	for chap in chapter_array:
-		ref = frappe.get_all("Chapter Reference", {"chapter": chap}, ["name", "idx"])
-		if ref:
-			frappe.db.set_value(
-				"Chapter Reference",
-				ref[0].name,
-				{
-					"idx": chapter_array.index(chap) + 1,
-				},
-			)

lms/lms/doctype/lms_enrollment/lms_enrollment.json

@@ -75,7 +75,8 @@
    "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course",
-   "reqd": 1
+   "reqd": 1,
+   "search_index": 1
   },
   {
    "fieldname": "current_lesson",
@@ -126,7 +127,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-05-14 14:50:08.405033",
+ "modified": "2024-10-30 12:44:16.103598",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Enrollment",

lms/lms/doctype/lms_live_class/lms_live_class.json

@@ -10,19 +10,20 @@
   "title",
   "host",
   "batch_name",
+  "event",
   "column_break_astv",
-  "date",
-  "time",
-  "duration",
-  "section_break_glxh",
   "description",
+  "section_break_glxh",
+  "date",
+  "duration",
   "column_break_spvt",
+  "time",
   "timezone",
-  "password",
-  "auto_recording",
   "section_break_yrpq",
+  "password",
   "start_url",
   "column_break_yokr",
+  "auto_recording",
   "join_url"
  ],
  "fields": [
@@ -122,11 +123,19 @@
    "fieldtype": "Select",
    "label": "Auto Recording",
    "options": "No Recording\nLocal\nCloud"
+  },
+  {
+   "fieldname": "event",
+   "fieldtype": "Link",
+   "label": "Event",
+   "options": "Event",
+   "read_only": 1
   }
  ],
+ "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-09 11:22:33.272341",
+ "modified": "2024-11-11 18:59:26.396111",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Live Class",

lms/lms/doctype/lms_live_class/lms_live_class.py

@@ -16,6 +16,7 @@ class LMSLiveClass(Document):
 		if calendar:
 			event = self.create_event()
 			self.add_event_participants(event, calendar)
+			frappe.db.set_value(self.doctype, self.name, "event", event.name)
 
 	def create_event(self):
 		start = f"{self.date} {self.time}"

lms/lms/doctype/lms_payment/lms_payment.json

@@ -76,6 +76,7 @@
    "default": "0",
    "fieldname": "payment_received",
    "fieldtype": "Check",
+   "in_standard_filter": 1,
    "label": "Payment Received"
   },
   {
@@ -140,7 +141,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-10-26 16:54:12.408274",
+ "modified": "2024-10-31 15:33:39.420366",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Payment",

lms/lms/doctype/lms_quiz/lms_quiz.py

@@ -57,7 +57,8 @@ class LMSQuiz(Document):
 		types = [question.type for question in self.questions]
 		types = set(types)
 
-		if "Open Ended" in types and len(types) > 1:
+		if "Open Ended" in types:
+			if len(types) > 1:
 				frappe.throw(
 					_(
 						"If you want open ended questions then make sure each question in the quiz is of open ended type."

lms/lms/report/course_progress_summary/course_progress_summary.py

@@ -86,32 +86,32 @@ def get_charts(data):
 
 	completed = 0
 	less_than_hundred = 0
-	less_than_seventy = 0
+	less_than_seventy_one = 0
-	less_than_forty = 0
+	less_than_forty_one = 0
-	less_than_ten = 0
+	less_than_eleven = 0
 
 	for row in data:
 		if row.progress == 100:
 			completed += 1
 		elif row.progress < 100 and row.progress > 70:
 			less_than_hundred += 1
-		elif row.progress < 70 and row.progress > 40:
+		elif row.progress < 71 and row.progress > 40:
-			less_than_seventy += 1
+			less_than_seventy_one += 1
-		elif row.progress < 40 and row.progress > 10:
+		elif row.progress < 41 and row.progress > 10:
-			less_than_forty += 1
+			less_than_forty_one += 1
-		elif row.progress < 10:
+		elif row.progress < 11:
-			less_than_ten += 1
+			less_than_eleven += 1
 
 	charts = {
 		"data": {
-			"labels": ["0-10", "10-40", "40-70", "70-99", "100"],
+			"labels": ["0-10", "11-40", "41-70", "71-99", "100"],
 			"datasets": [
 				{
 					"name": "Progress (%)",
 					"values": [
-						less_than_ten,
+						less_than_eleven,
-						less_than_forty,
+						less_than_forty_one,
-						less_than_seventy,
+						less_than_seventy_one,
 						less_than_hundred,
 						completed,
 					],

lms/lms/utils.py

@@ -109,7 +109,7 @@ def get_chapters(course):
 		chapter_details = frappe.db.get_value(
 			"Course Chapter",
 			{"name": chapter.chapter},
-			["name", "title", "description"],
+			["name", "title"],
 			as_dict=True,
 		)
 		chapter.update(chapter_details)
@@ -157,11 +157,12 @@ def get_lesson_details(chapter, progress=False):
 				"file_type",
 				"instructor_notes",
 				"course",
+				"content",
 			],
 			as_dict=True,
 		)
 		lesson_details.number = f"{chapter.idx}.{row.idx}"
-		lesson_details.icon = get_lesson_icon(lesson_details.body)
+		lesson_details.icon = get_lesson_icon(lesson_details.body, lesson_details.content)
 
 		if progress:
 			lesson_details.is_complete = get_progress(lesson_details.course, lesson_details.name)
@@ -170,20 +171,38 @@ def get_lesson_details(chapter, progress=False):
 	return lessons
 
 
-def get_lesson_icon(content):
+def get_lesson_icon(body, content):
-	icon = None
+	if content:
-	macros = find_macros(content)
+		content = json.loads(content)
 
+		for block in content.get("blocks"):
+			if block.get("type") == "upload" and block.get("data").get("file_type").lower() in [
+				"mp4",
+				"webm",
+				"ogg",
+				"mov",
+			]:
+				return "icon-youtube"
+
+			if block.get("type") == "embed" and block.get("data").get("service") in [
+				"youtube",
+				"vimeo",
+			]:
+				return "icon-youtube"
+
+			if block.get("type") == "quiz":
+				return "icon-quiz"
+
+		return "icon-list"
+
+	macros = find_macros(body)
 	for macro in macros:
 		if macro[0] == "YouTubeVideo" or macro[0] == "Video":
-			icon = "icon-youtube"
+			return "icon-youtube"
 		elif macro[0] == "Quiz":
-			icon = "icon-quiz"
+			return "icon-quiz"
 
-	if not icon:
+	return "icon-list"
-		icon = "icon-list"
-
-	return icon
 
 
 @frappe.whitelist(allow_guest=True)
@@ -484,11 +503,6 @@ def first_lesson_exists(course):
 	return True
 
 
-def redirect_to_courses_list():
-	frappe.local.flags.redirect_location = "/lms/courses"
-	raise frappe.Redirect
-
-
 def has_course_instructor_role(member=None):
 	return frappe.db.get_value(
 		"Has Role",
@@ -1027,23 +1041,13 @@ def get_course_details(course):
 			"currency",
 			"amount_usd",
 			"enable_certification",
+			"lessons",
+			"enrollments",
+			"rating",
 		],
 		as_dict=1,
 	)
 	course_details.tags = course_details.tags.split(",") if course_details.tags else []
-	course_details.lesson_count = get_lesson_count(course_details.name)
-
-	course_details.enrollment_count = frappe.db.count(
-		"LMS Enrollment", {"course": course_details.name, "member_type": "Student"}
-	)
-	course_details.enrollment_count_formatted = format_number(
-		course_details.enrollment_count
-	)
-
-	avg_rating = get_average_rating(course_details.name) or 0
-	course_details.avg_rating = flt(
-		avg_rating, frappe.get_system_settings("float_precision") or 3
-	)
 
 	course_details.instructors = get_instructors(course_details.name)
 	if course_details.paid_course:
@@ -1092,14 +1096,14 @@ def get_categorized_courses(courses):
 		):
 			new.append(course)
 
-		if course.membership and course.published:
+		if course.membership:
 			enrolled.append(course)
 		elif course.is_instructor:
 			created.append(course)
 
 		categories = [live, enrolled, created]
 		for category in categories:
-			category.sort(key=lambda x: x.enrollment_count, reverse=True)
+			category.sort(key=lambda x: cint(x.enrollments), reverse=True)
 
 		live.sort(key=lambda x: x.featured, reverse=True)
 
@@ -1124,7 +1128,7 @@ def get_course_outline(course, progress=False):
 		chapter_details = frappe.db.get_value(
 			"Course Chapter",
 			chapter.chapter,
-			["name", "title", "description"],
+			["name", "title"],
 			as_dict=True,
 		)
 		chapter_details["idx"] = chapter.idx
@@ -1144,6 +1148,9 @@ def get_lesson(course, chapter, lesson):
 	lesson_details = frappe.db.get_value(
 		"Course Lesson", lesson_name, ["include_in_preview", "title"], as_dict=1
 	)
+	if not lesson_details:
+		return {}
+
 	membership = get_membership(course)
 	course_title = frappe.db.get_value("LMS Course", course, "title")
 	if (
@@ -1258,7 +1265,7 @@ def get_batch_details(batch):
 	batch_details.instructors = get_instructors(batch)
 
 	batch_details.courses = frappe.get_all(
-		"Batch Course", filters={"parent": batch}, fields=["course", "title"]
+		"Batch Course", filters={"parent": batch}, fields=["course", "title", "evaluator"]
 	)
 	batch_details.students = frappe.get_all(
 		"Batch Student", {"parent": batch}, pluck="student"

lms/lms/web_form/add_a_new_batch/add_a_new_batch.js

@@ -1,49 +0,0 @@
-frappe.ready(function () {
-	frappe.web_form.after_save = () => {
-		let data = frappe.web_form.get_values();
-		let slug = new URLSearchParams(window.location.search).get("slug");
-		frappe.msgprint({
-			message: __("Batch {0} has been successfully created!", [
-				data.title,
-			]),
-			clear: true,
-		});
-		setTimeout(function () {
-			window.location.href = `courses/${slug}`;
-		}, 2000);
-	};
-
-	frappe.web_form.validate = () => {
-		let sysdefaults = frappe.boot.sysdefaults;
-		let time_format =
-			sysdefaults && sysdefaults.time_format
-				? sysdefaults.time_format
-				: "HH:mm:ss";
-		let data = frappe.web_form.get_values();
-
-		data.start_time = moment(data.start_time, time_format).format(
-			time_format
-		);
-		data.end_time = moment(data.end_time, time_format).format(time_format);
-
-		if (data.start_date < frappe.datetime.nowdate()) {
-			frappe.msgprint(__("Start date cannot be a past date."));
-			return false;
-		}
-
-		if (
-			!frappe.datetime.validate(data.start_time) ||
-			!frappe.datetime.validate(data.end_time)
-		) {
-			frappe.msgprint(__("Invalid Start or End Time."));
-			return false;
-		}
-
-		if (data.start_time > data.end_time) {
-			frappe.msgprint(__("Start Time should be less than End Time."));
-			return false;
-		}
-
-		return true;
-	};
-});

lms/lms/web_form/add_a_new_batch/add_a_new_batch.json

@@ -1,114 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 0,
- "allow_incomplete": 0,
- "allow_multiple": 0,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "apply_document_permissions": 0,
- "button_label": "Save",
- "creation": "2021-04-20 11:37:49.135114",
- "custom_css": ".datepicker.active {\n    background-color: white;\n}\n\n[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
- "doc_type": "LMS Batch Old",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2021-06-15 18:49:50.530002",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "add-a-new-batch",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "add-a-new-batch",
- "route_to_success_link": 0,
- "show_attachments": 0,
- "show_in_grid": 0,
- "show_sidebar": 0,
- "sidebar_items": [],
- "success_url": "/add-a-new-batch",
- "title": "Add a new batch",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "course",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Course",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "LMS Course",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Title",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "start_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "label": "Start Date",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "description": "",
-   "fieldname": "sessions_on",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Sessions On Days",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "start_time",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Start Time",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "end_time",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "End Time",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  }
- ]
-}

lms/lms/web_form/add_a_new_batch/add_a_new_batch.py

@@ -1,6 +0,0 @@
-import frappe
-
-
-def get_context(context):
-	# do your magic here
-	pass

lms/lms/web_form/evaluation/evaluation.js

@@ -1,10 +0,0 @@
-frappe.ready(function () {
-	frappe.web_form.after_save = () => {
-		let data = frappe.web_form.get_values();
-		if (data.class) {
-			setTimeout(() => {
-				window.location.href = `/batches/${data.class}`;
-			}, 2000);
-		}
-	};
-});

lms/lms/web_form/evaluation/evaluation.json

@@ -1,189 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 0,
- "allow_incomplete": 0,
- "allow_multiple": 1,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "anonymous": 0,
- "apply_document_permissions": 0,
- "button_label": "Save",
- "creation": "2022-11-23 11:59:33.533053",
- "doc_type": "LMS Certificate Evaluation",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 1,
- "introduction_text": "",
- "is_standard": 1,
- "list_columns": [],
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2023-08-23 14:37:03.086305",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "evaluation",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "evaluation",
- "show_attachments": 0,
- "show_list": 1,
- "show_sidebar": 0,
- "title": "Evaluation",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 1,
-   "fieldname": "member",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Member",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "User",
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 1,
-   "fieldname": "course",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Course",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "LMS Course",
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "batch_name",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Batch Name",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "LMS Batch",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "label": "",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "label": "Date",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "start_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "label": "Start Time",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "end_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "label": "End Time",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "Evaluation Details",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "rating",
-   "fieldtype": "Rating",
-   "hidden": 0,
-   "label": "Rating",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "label": "Status",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Pass\nFail",
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "label": "",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "summary",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "label": "Summary",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

lms/lms/web_form/evaluation/evaluation.py

@@ -1,6 +0,0 @@
-import frappe
-from frappe import _
-
-
-def get_context(context):
-	pass

lms/lms/web_form/profile/profile.js

@@ -1,98 +0,0 @@
-frappe.ready(function () {
-	frappe.web_form.after_load = () => {
-		redirect_to_user_profile_form();
-		add_listener_for_current_company();
-		add_listener_for_certificate_expiry();
-		add_listener_for_skill_add_rows();
-		add_listener_for_functions_add_rows();
-		add_listener_for_industries_add_rows();
-	};
-
-	frappe.web_form.validate = () => {
-		let information_missing;
-		const data = frappe.web_form.get_values();
-		if (data && data.work_experience && data.work_experience.length) {
-			data.work_experience.forEach((exp) => {
-				if (!exp.current && !exp.to_date) {
-					information_missing = true;
-					frappe.msgprint(
-						__("To Date is mandatory in Work Experience.")
-					);
-				}
-			});
-		}
-
-		if (information_missing) return false;
-		return true;
-	};
-
-	frappe.web_form.after_save = () => {
-		setTimeout(() => {
-			window.location.href = `/profile_/${frappe.web_form.get_value([
-				"username",
-			])}`;
-		});
-	};
-});
-
-const redirect_to_user_profile_form = () => {
-	if (!frappe.utils.get_url_arg("name")) {
-		window.location.href = `/edit-profile?name=${frappe.session.user}`;
-	}
-};
-
-const add_listener_for_current_company = () => {
-	$(document).on("click", "input[data-fieldname='current']", (e) => {
-		if ($(e.currentTarget).prop("checked"))
-			$("div[data-fieldname='to_date']").addClass("hide");
-		else $("div[data-fieldname='to_date']").removeClass("hide");
-	});
-};
-
-const add_listener_for_certificate_expiry = () => {
-	$(document).on("click", "input[data-fieldname='expire']", (e) => {
-		if ($(e.currentTarget).prop("checked"))
-			$("div[data-fieldname='expiration_date']").addClass("hide");
-		else $("div[data-fieldname='expiration_date']").removeClass("hide");
-	});
-};
-
-const add_listener_for_skill_add_rows = () => {
-	$('[data-fieldname="skill"]')
-		.find(".grid-add-row")
-		.click((e) => {
-			if ($('[data-fieldname="skill"]').find(".grid-row").length > 5) {
-				$('[data-fieldname="skill"]').find(".grid-add-row").hide();
-			}
-		});
-};
-
-const add_listener_for_functions_add_rows = () => {
-	$('[data-fieldname="preferred_functions"]')
-		.find(".grid-add-row")
-		.click((e) => {
-			if (
-				$('[data-fieldname="preferred_functions"]').find(".grid-row")
-					.length > 3
-			) {
-				$('[data-fieldname="preferred_functions"]')
-					.find(".grid-add-row")
-					.hide();
-			}
-		});
-};
-
-const add_listener_for_industries_add_rows = () => {
-	$('[data-fieldname="preferred_industries"]')
-		.find(".grid-add-row")
-		.click((e) => {
-			if (
-				$('[data-fieldname="preferred_industries"]').find(".grid-row")
-					.length > 3
-			) {
-				$('[data-fieldname="preferred_industries"]')
-					.find(".grid-add-row")
-					.hide();
-			}
-		});
-};

lms/lms/web_form/profile/profile.json

@@ -1,341 +0,0 @@
-{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 1,
- "allow_incomplete": 0,
- "allow_multiple": 0,
- "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "apply_document_permissions": 0,
- "breadcrumbs": "",
- "button_label": "Save",
- "client_script": "",
- "creation": "2021-06-30 13:48:13.682851",
- "custom_css": "",
- "doc_type": "User",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "is_standard": 1,
- "list_columns": [],
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2023-01-09 15:45:11.411692",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "profile",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "published": 1,
- "route": "edit-profile",
- "show_attachments": 0,
- "show_list": 0,
- "show_sidebar": 0,
- "success_url": "/profile",
- "title": "Profile",
- "web_form_fields": [
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "first_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "First Name",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "last_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Last Name",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "username",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Username",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 1,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "description": "Get your globally recognized avatar from Gravatar.com",
-   "fieldname": "user_image",
-   "fieldtype": "Attach Image",
-   "hidden": 0,
-   "label": "User Image",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "description": "",
-   "fieldname": "cover_image",
-   "fieldtype": "Attach Image",
-   "hidden": 0,
-   "label": "Cover Image",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "city",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "City",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "mobile_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Mobile No",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Phone",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "label": "",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "headline",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Headline",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "linkedin",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "LinkedIn ID",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "github",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Github ID",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "medium",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Medium ID",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "looking_for_job",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "label": "I am looking for a job",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "bio",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "label": "Bio",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Page Break",
-   "hidden": 0,
-   "label": "",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "education",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Education",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Education Detail",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "work_experience_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "Work Experience",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "work_experience",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Work Experience",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Work Experience",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "internship",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Volunteering or Internship",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Work Experience",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "certification_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "Certification Details",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "certification",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Certification",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Certification",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "skill_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "label": "Skill Details",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "skill",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Skill",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Skills",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  }
- ]
-}

lms/lms/web_form/profile/profile.py

@@ -1,6 +0,0 @@
-import frappe
-
-
-def get_context(context):
-	# do your magic here
-	pass

lms/patches.txt

@@ -91,3 +91,6 @@ lms.patches.v2_0.fix_progress_percentage
 lms.patches.v2_0.add_discussion_topic_titles
 lms.patches.v2_0.sidebar_settings
 lms.patches.v2_0.delete_certificate_request_notification #18-09-2024
+lms.patches.v2_0.add_course_statistics #21-10-2024
+lms.patches.v2_0.give_discussions_permissions
+lms.patches.v2_0.delete_web_forms

lms/patches/v2_0/add_course_statistics.py

@@ -0,0 +1,6 @@
+import frappe
+from lms.lms.api import update_course_statistics
+
+
+def execute():
+	update_course_statistics()

lms/patches/v2_0/delete_web_forms.py

@@ -0,0 +1,5 @@
+import frappe
+
+
+def execute():
+	frappe.db.delete("Web Form", {"module": "LMS"})

lms/patches/v2_0/give_discussions_permissions.py

@@ -0,0 +1,6 @@
+import frappe
+from lms.lms.api import give_dicussions_permission
+
+
+def execute():
+	give_dicussions_permission()