chore: update POT file

README.md

@@ -1,156 +1,115 @@
-<div align="center" markdown="1">
+<p align="center">
+  <a href="https://www.frappelms.com/">
+    <img src="https://frappe.io/files/lms.png" alt="Frappe LMS" width="50px" height="50px">
+  </a>
+  <p align="center">Easy to use, open source, learning management system.</p>
+</p>
 
-<img src=".github/lms-logo.png" alt="Frappe Learning logo" width="100"/>
-<h1>Frappe Learning</h1>
 
-**Easy to use, open source, Learning Management System**
+&nbsp;
 
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/lms)
+<p align="center">
-![Tests](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress)
+    <a href="https://www.producthunt.com/posts/frappe-lms?utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-frappe&#0045;lms" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=396079&theme=dark&period=weekly&topic_id=204" alt="Frappe&#0032;LMS - Easy&#0032;to&#0032;use&#0044;&#0032;100&#0037;&#0032;open&#0032;source&#0032;learning&#0032;management&#0032;system | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</p>
 
+
+<div align="center" style="max-height: 40px;">
+    <a href="https://frappecloud.com/lms/signup">
+        <img src=".github/try-on-f-cloud.svg" height="40">
+    </a>
 </div>
 
+&nbsp;
 
-<div align="center">
+<p align="center">
-	<img src=".github/hero.png?v=5" alt="Hero Image" width="72%" />
+	<a href="https://dashboard.cypress.io/projects/vandxn/runs">
-</div>
+    <img alt="cypress" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress">
-<br />
+  </a>
-<div align="center">
+  <a href="https://github.com/frappe/lms/blob/main/LICENSE">
-	<a href="https://frappe.io/learning">Website</a>
+    <img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
-	-
+  </a>
-	<a href="https://docs.frappe.io/learning">Documentation</a>
+</p>
-</div>
 
-## Frappe Learning
+<img width="1402" alt="Lesson" src="https://frappelms.com/files/banner.png">
-Frappe Learning is an easy-to-use learning system that helps you bring structure to your content.
 
-## Motivation
+<details>
-In 2021, we were looking for a Learning Management System to launch [Mon.School](https://mon.school) for FOSS United. We checked out Moodle, but it didn’t feel right. The forms were unnecessarily lengthy and the UI was confusing. It shouldn't be this hard to create a course right? So I started making a learning system for Mon.School which soon became a product in itself. The aim is to have a simple platform that anyone can use to launch a course of their own and make knowledge sharing easier.
+	<summary>Show more screenshots</summary>
+	<img width="1520" alt="ss1" src="https://user-images.githubusercontent.com/31363128/210056046-584bc8aa-d28c-4514-b031-73817012837d.png">
+	<img width="830" alt="ss2" src="https://user-images.githubusercontent.com/31363128/210056097-36849182-6db0-43a2-8c62-5333cd2aedf4.png">
+	<img width="941" alt="ss3" src="https://user-images.githubusercontent.com/31363128/210056134-01a7c429-1ef4-434e-9d43-128dda35d7e5.png">
+</details>
 
-## Key Features
+Frappe LMS is an easy-to-use, open-source learning management system. You can use it to create and share online courses. The app has a clear UI that helps students focus only on what's important and assists in distraction-free learning.
 
-- **Structured Learning**: Design a course with a 3-level hierarchy, where your courses have chapters and you can group your lessons within these chapters. This ensures that the context of the lesson is set by the chapter.
+You can create courses and lessons through simple forms. Lessons can be in the form of text, videos, quizzes or a combination of all these. You can keep your students engaged with quizzes to help revise and test the concepts learned. Course Instructors and Students can reach out to each other through the discussions section available for each lesson and get queries resolved.
 
-- **Live Classes**: Group learners into batches based on courses and duration. You can then create Zoom live class for these batches right from the app. Learners get to see the list of live classes they have to take as a part of this batch.
+## Features
+- Create online courses. 📚
+- Add detailed descriptions and preview videos to the course. 🎬
+- Add videos, quizzes, and assignments to your lessons and make them interesting and interactive 📝
+- Discussions section below each lesson where instructors and students can interact with each other. 💬
+- Create batches to group your students based on courses and track their progress 🏛
+- Statistics dashboard that provides all important numbers at a glimpse. 📈
+- Job Board where users can post and look for jobs. 💼
+- People directory with each person's profile page 👨‍👩‍👧‍👦
+- Set cover image, profile photo, short bio, and other professional information. 🦹🏼‍♀️
+- Simple layout that optimizes readability 🤓
+- Delightful user experience in overall usage ✨
 
-- **Quizzes and Assignments**: Create quizzes where questions can have single-choice, multiple-choice options, or can be open ended. Instructors can also add assignments which learners can submit as PDF's or Documents.
+## Tech Stack
 
-- **Getting Certified**: Once a learner has completed the course or batch, you can grant them a certificate. The app provides an inbuilt certificate template. You can use this or else create a template of your own and use that instead.
+Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web framework.
+These are some of the tools it's built on:
+- [Python](https://www.python.org)
+- [Redis](https://redis.io/)
+- [MariaDB](https://mariadb.org/)
+- [Socket.io](https://socket.io/)
 
-### Batches to group learners
+## Local Setup
-
-![Batch](.github/batches.png)
-
-### Quiz to evaluate them
-
-![Quiz](.github/quiz.png)
-
-### Certificate to authenticate their knowledge
-
-![Cerficicate](.github/certificate.png)
-
-## Under the Hood
-
-- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
-
-- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework.
-
-
-## Production Setup
-
-### Managed Hosting
-
-You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications with peace of mind.
-
-It takes care of installation, setup, upgrades, monitoring, maintenance and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
-
-<div>
-	<a href="https://frappecloud.com/lms/signup" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
-			<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
-		</picture>
-	</a>
-</div>
-
-### Self Hosting
-
-Follow these steps to set up Frappe Learning in production:
-
-**Step 1**: Download the easy install script
-
-```bash
-wget https://frappe.io/easy-install.py
-```
-
-**Step 2**: Run the deployment command
-
-```bash
-python3 ./easy-install.py deploy \
-    --project=learning_prod_setup \
-    --email=your_email.example.com \
-    --image=ghcr.io/frappe/learning \
-    --version=stable \
-    --app=learning \
-    --sitename subdomain.domain.tld
-```
-
-Replace the following parameters with your values:
-- `your_email.example.com`: Your email address
-- `subdomain.domain.tld`: Your domain name where Insights will be hosted
-
-The script will set up a production-ready instance of Frappe Learning with all the necessary configurations in about 5 minutes.
-
-## Development Setup
 
 ### Docker
+You need Docker, docker-compose, and git setup on your machine. Refer to [Docker documentation](https://docs.docker.com/). After that, run the following commands:
+```
+git clone https://github.com/frappe/lms
+cd apps/lms/docker
+docker-compose up
+```
 
-You need Docker, docker-compose and git setup on your machine. Refer [Docker documentation](https://docs.docker.com/). After that, follow below steps:
+Wait for some time until the setup script creates a site. After that, you can access `http://localhost:8000` in your browser and the app's login screen should appear.
+You'll have to go through the setup wizard to set up the website the first time you access it. Log in using the following credentials to complete the setup wizard.
 
-**Step 1**: Setup folder and download the required files
+```
+Username: Administrator
+password: admin
+```
 
-    mkdir frappe-learning
+### Frappe Bench
-    cd frappe-learning
 
-    # Download the docker-compose file
+Currently, this app depends on the `develop` branch of [frappe](https://github.com/frappe/frappe).
-    wget -O docker-compose.yml https://raw.githubusercontent.com/frappe/insights/develop/docker/docker-compose.yml
 
-    # Download the setup script
+1. Setup frappe-bench by following [this guide](https://frappeframework.com/docs/v14/user/en/installation)
-    wget -O init.sh https://raw.githubusercontent.com/frappe/insights/develop/docker/init.sh
+1. In the frappe-bench directory, run `bench start` and keep it running. Open a new terminal session and cd into the `frappe-bench` directory.
+1. Run the following commands:
+    ```sh
+    bench new-site lms.test
+    bench get-app lms
+    bench --site lms.test install-app lms
+    bench --site lms.test add-to-hosts
 
-**Step 2**: Run the container and daemonize it
+ 1. Now, you can access the site at `http://lms.test:8000`
 
-    docker compose up -d
 
-**Step 3**: The site [http://lms.localhost:8000/insights](http://lms.localhost:8000/lms) should now be available. The default credentials are:
+## Deployment
-- Username: Administrator
+Frappe LMS is an app built on top of the Frappe Framework. So, you can follow any deployment guide for hosting a Frappe Framework-based site.
-- Password: admin
 
-### Local
+### Managed Hosting
+Frappe LMS can be deployed in a few clicks on [Frappe Cloud](https://frappecloud.com/marketplace/apps/lms).
 
-To setup the repository locally follow the steps mentioned below:
+### Self-hosting
+If you want to self-host, you can follow official [Frappe Bench Installation](https://github.com/frappe/bench#installation) instructions.
 
-1. Install bench and setup a `frappe-bench` directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation)
+## Bugs and Feature Requests
-1. Start the server by running `bench start`
+If you find any bugs or have a feature idea for the app, feel free to report them here on [GitHub Issues](https://github.com/frappe/lms/issues). Make sure you share enough information (app screenshots, browser console screenshots, stack traces, etc) for project maintainers.
-1. In a separate terminal window, create a new site by running `bench new-site learning.test`
-1. Map your site to localhost with the command `bench --site learning.test add-to-hosts`
-1. Get the Insights app. Run `bench get-app https://github.com/frappe/lms`
-1. Run `bench --site learning.test install-app lms`.
-1. Now open the URL `http://learning.test:8000/lms` in your browser, you should see the app running
 
-## Learn and connect
+## License
-
+Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
-- [Telegram Public Group](https://t.me/frappelms)
-- [Discuss Forum](https://discuss.frappe.io/c/lms/70)
-- [Documentation](https://docs.frappe.io/learning)
-- [YouTube](https://www.youtube.com/channel/UCn3bV5kx77HsVwtnlCeEi_A)
-
-<h2></h2>
-<div align="center" style="padding-top: 0.75rem;">
-	<a href="https://frappe.io" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
-			<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
-		</picture>
-	</a>
-</div>

cypress.config.js

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

cypress/e2e/course_creation.cy.js

@@ -5,7 +5,7 @@ describe("Course Creation", () => {
 		cy.visit("/lms/courses");
 
 		// Create a course
-		cy.get("header").children().last().children().last().click();
+		cy.get("a").contains("New").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("Create").click();
+				cy.button("Add Chapter").click();
 			});
 
 		// Add Lesson

frontend/package.json

@@ -18,19 +18,17 @@
     "@editorjs/nested-list": "^1.4.2",
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
-    "@editorjs/table": "^2.4.2",
     "ace-builds": "^1.36.2",
     "chart.js": "^4.4.1",
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.89",
+    "frappe-ui": "^0.1.69",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",
     "socket.io-client": "^4.7.2",
     "tailwindcss": "^3.3.3",
-    "typescript": "^5.7.2",
     "vue": "^3.4.23",
     "vue-chartjs": "^5.3.0",
     "vue-draggable-next": "^2.2.1",

frontend/src/components/Annoucements.vue

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

frontend/src/components/AppSidebar.vue

@@ -1,18 +1,18 @@
 <template>
 	<div
 		class="flex h-full flex-col justify-between transition-all duration-300 ease-in-out bg-gray-50"
-		:class="sidebarStore.isSidebarCollapsed ? 'w-14' : 'w-56'"
+		:class="isSidebarCollapsed ? 'w-14' : 'w-56'"
 	>
 		<div
 			class="flex flex-col overflow-hidden"
-			:class="sidebarStore.isSidebarCollapsed ? 'items-center' : ''"
+			:class="isSidebarCollapsed ? 'items-center' : ''"
 		>
-			<UserDropdown :isCollapsed="sidebarStore.isSidebarCollapsed" />
+			<UserDropdown :isCollapsed="isSidebarCollapsed" />
 			<div class="flex flex-col" v-if="sidebarSettings.data">
 				<SidebarLink
 					v-for="link in sidebarLinks"
 					:link="link"
-					:isCollapsed="sidebarStore.isSidebarCollapsed"
+					:isCollapsed="isSidebarCollapsed"
 					class="mx-2 my-0.5"
 				/>
 			</div>
@@ -22,11 +22,11 @@
 			>
 				<div
 					class="flex items-center justify-between pr-2 cursor-pointer"
-					:class="sidebarStore.isSidebarCollapsed ? 'pl-3' : 'pl-4'"
+					:class="isSidebarCollapsed ? 'pl-3' : 'pl-4'"
 					@click="showWebPages = !showWebPages"
 				>
 					<div
-						v-if="!sidebarStore.isSidebarCollapsed"
+						v-if="!isSidebarCollapsed"
 						class="flex items-center text-sm text-gray-600 my-1"
 					>
 						<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
@@ -53,7 +53,7 @@
 					<SidebarLink
 						v-for="link in sidebarSettings.data.web_pages"
 						:link="link"
-						:isCollapsed="sidebarStore.isSidebarCollapsed"
+						:isCollapsed="isSidebarCollapsed"
 						class="mx-2 my-0.5"
 						:showControls="isModerator ? true : false"
 						@openModal="openPageModal"
@@ -64,19 +64,17 @@
 		</div>
 		<SidebarLink
 			:link="{
-				label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
+				label: isSidebarCollapsed ? 'Expand' : 'Collapse',
 			}"
-			:isCollapsed="sidebarStore.isSidebarCollapsed"
+			:isCollapsed="isSidebarCollapsed"
-			@click="toggleSidebar()"
+			@click="isSidebarCollapsed = !isSidebarCollapsed"
 			class="m-2"
 		>
 			<template #icon>
 				<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
 					<CollapseSidebar
 						class="h-4.5 w-4.5 text-gray-700 duration-300 ease-in-out"
-						:class="{
+						:class="{ '[transform:rotateY(180deg)]': isSidebarCollapsed }"
-							'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
-						}"
 					/>
 				</span>
 			</template>
@@ -98,15 +96,12 @@ import { ref, onMounted, inject, watch } from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
-import { useSidebar } from '@/stores/sidebar'
-import { useSettings } from '@/stores/settings'
 import { ChevronRight, Plus } from 'lucide-vue-next'
 import { createResource, Button } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
 
 const { user, sidebarSettings } = sessionStore()
 const { userResource } = usersStore()
-let sidebarStore = useSidebar()
 const socket = inject('$socket')
 const unreadCount = ref(0)
 const sidebarLinks = ref(getSidebarLinks())
@@ -115,7 +110,6 @@ const isModerator = ref(false)
 const isInstructor = ref(false)
 const pageToEdit = ref(null)
 const showWebPages = ref(false)
-const settingsStore = useSettings()
 
 onMounted(() => {
 	socket.on('publish_lms_notifications', (data) => {
@@ -185,37 +179,6 @@ const addQuizzes = () => {
 	}
 }
 
-const addPrograms = () => {
-	let activeFor = ['Programs', 'ProgramForm']
-	let index = 1
-	let canAddProgram = false
-
-	if (
-		!isInstructor.value &&
-		!isModerator.value &&
-		settingsStore.learningPaths.data
-	) {
-		sidebarLinks.value = sidebarLinks.value.filter(
-			(link) => link.label !== 'Courses'
-		)
-		activeFor.push('CourseDetail')
-		activeFor.push('Lesson')
-		index = 0
-		canAddProgram = true
-	} else if (isInstructor.value || isModerator.value) {
-		canAddProgram = true
-	}
-
-	if (canAddProgram) {
-		sidebarLinks.value.splice(index, 0, {
-			label: 'Programs',
-			icon: 'Route',
-			to: 'Programs',
-			activeFor: activeFor,
-		})
-	}
-}
-
 const openPageModal = (link) => {
 	showPageModal.value = true
 	pageToEdit.value = link
@@ -248,11 +211,8 @@ watch(userResource, () => {
 		isModerator.value = userResource.data.is_moderator
 		isInstructor.value = userResource.data.is_instructor
 		addQuizzes()
-		addPrograms()
 	}
 })
 
-const toggleSidebar = () => {
+let isSidebarCollapsed = ref(getSidebarFromStorage())
-	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
-}
 </script>

frontend/src/components/Controls/Autocomplete.vue

@@ -92,7 +92,7 @@
 													{{ option.label }}
 												</div>
 												<div
-													v-if="option.description"
+													v-if="option.label != option.description"
 													class="text-xs text-gray-700"
 													v-html="option.description"
 												></div>

frontend/src/components/Controls/Link.vue

@@ -2,7 +2,6 @@
 	<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"
@@ -44,7 +43,6 @@
 				</div>
 			</template>
 		</Autocomplete>
-		<p v-if="description" class="text-sm text-gray-600">{{ description }}</p>
 	</div>
 </template>
 
@@ -68,10 +66,6 @@ const props = defineProps({
 		type: String,
 		default: '',
 	},
-	description: {
-		type: String,
-		default: '',
-	},
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
@@ -123,7 +117,7 @@ const options = createResource({
 	transform: (data) => {
 		return data.map((option) => {
 			return {
-				label: option.label || option.value,
+				label: option.value,
 				value: option.value,
 				description: option.description,
 			}

frontend/src/components/Controls/MultiSelect.vue

@@ -2,7 +2,6 @@
 	<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
@@ -116,9 +115,6 @@ const props = defineProps({
 		type: Function,
 		default: (value) => `${value} is an Invalid value`,
 	},
-	required: {
-		type: Boolean,
-	},
 })
 
 const values = defineModel()

frontend/src/components/CourseCard.vue

@@ -10,13 +10,13 @@
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
 			<div
-				class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
+				class="flex items-center flex-wrap space-y-1 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="subtle"
+					variant="outline"
 					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.lessons">
+				<div v-if="course.lesson_count">
 					<Tooltip :text="__('Lessons')">
 						<span class="flex items-center">
 							<BookOpen class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.lessons }}
+							{{ course.lesson_count }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.enrollments">
+				<div v-if="course.enrollment_count">
 					<Tooltip :text="__('Enrolled Students')">
 						<span class="flex items-center">
 							<Users class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.enrollments }}
+							{{ course.enrollment_count }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.rating">
+				<div v-if="course.avg_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.rating }}
+							{{ course.avg_rating }}
 						</span>
 					</Tooltip>
 				</div>

frontend/src/components/CourseCardOverlay.vue

@@ -93,19 +93,21 @@
 			<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.lessons }} {{ __('Lessons') }}
+					{{ course.data.lesson_count }} {{ __('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">
-					{{ formatAmount(course.data.enrollments) }}
+					{{ course.data.enrollment_count_formatted }}
 					{{ __('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"> {{ course.data.rating }} {{ __('Rating') }} </span>
+				<span class="ml-2">
+					{{ course.data.avg_rating }} {{ __('Rating') }}
+				</span>
 			</div>
 		</div>
 	</div>
@@ -114,7 +116,7 @@
 import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
-import { showToast, formatAmount } from '@/utils/'
+import { showToast } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 
@@ -140,7 +142,7 @@ function enrollStudent() {
 		showToast(
 			__('Please Login'),
 			__('You need to login first to enroll for this course'),
-			'alert-circle'
+			'circle-warn'
 		)
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`

frontend/src/components/CourseInstructors.vue

@@ -1,5 +1,5 @@
 <template>
-	<span v-if="instructors?.length == 1">
+	<span v-if="instructors.length == 1">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -9,7 +9,7 @@
 			{{ instructors[0].full_name }}
 		</router-link>
 	</span>
-	<span v-if="instructors?.length == 2">
+	<span v-if="instructors.length == 2">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -28,7 +28,7 @@
 			{{ instructors[1].first_name }}
 		</router-link>
 	</span>
-	<span v-if="instructors?.length > 2">
+	<span v-if="instructors.length > 2">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -37,7 +37,7 @@
 		>
 			{{ instructors[0].first_name }}
 		</router-link>
-		and {{ instructors?.length - 1 }} others
+		and {{ instructors.length - 1 }} others
 	</span>
 </template>
 <script setup>

frontend/src/components/CourseOutline.vue

@@ -16,7 +16,7 @@
 		</div>
 		<div
 			:class="{
-				'shadow rounded-md py-2 px-2': showOutline && outline.data?.length,
+				'shadow rounded-md pt-2 px-2': showOutline && outline.data?.length,
 			}"
 		>
 			<Disclosure
@@ -25,42 +25,21 @@
 				:key="chapter.name"
 				:defaultOpen="openChapterDetail(chapter.idx)"
 			>
-				<DisclosureButton ref="" class="flex items-center w-full p-2 group">
+				<DisclosureButton ref="" class="flex w-full p-2">
 					<ChevronRight
 						:class="{
 							'rotate-90 transform duration-200': open,
 							'duration-200': !open,
-							hidden: chapter.is_scorm_package,
 							open: index == 1,
 						}"
-						class="h-4 w-4 text-gray-900 stroke-1"
+						class="h-4 w-4 text-gray-900 stroke-1 mr-2"
 					/>
-					<div
+					<div class="text-base text-left font-medium leading-5">
-						class="text-base text-left font-medium leading-5 ml-2"
-						@click="redirectToChapter(chapter)"
-					>
 						{{ chapter.title }}
 					</div>
-					<div class="flex ml-auto space-x-4">
-						<Tooltip :text="__('Edit Chapter')" placement="bottom">
-							<FilePenLine
-								v-if="allowEdit"
-								@click.prevent="openChapterModal(chapter)"
-								class="h-4 w-4 text-gray-900 invisible group-hover:visible"
-							/>
-						</Tooltip>
-						<Tooltip :text="__('Delete Chapter')" placement="bottom">
-							<Trash2
-								v-if="allowEdit"
-								@click.prevent="trashChapter(chapter.name)"
-								class="h-4 w-4 text-red-500 invisible group-hover:visible"
-							/>
-						</Tooltip>
-					</div>
 				</DisclosureButton>
-				<DisclosurePanel v-if="!chapter.is_scorm_package">
+				<DisclosurePanel>
 					<Draggable
-						v-if="!chapter.is_scorm_package"
 						:list="chapter.lessons"
 						:disabled="!allowEdit"
 						item-key="name"
@@ -110,7 +89,6 @@
 					</Draggable>
 					<div v-if="allowEdit" class="flex mt-2 mb-4 pl-8">
 						<router-link
-							v-if="!chapter.is_scorm_package"
 							:to="{
 								name: 'LessonForm',
 								params: {
@@ -124,6 +102,9 @@
 								{{ __('Add Lesson') }}
 							</Button>
 						</router-link>
+						<Button class="ml-2" @click="openChapterModal(chapter)">
+							{{ __('Edit Chapter') }}
+						</Button>
 					</div>
 				</DisclosurePanel>
 			</Disclosure>
@@ -137,26 +118,24 @@
 	/>
 </template>
 <script setup>
-import { Button, createResource, Tooltip } from 'frappe-ui'
+import { Button, createResource } from 'frappe-ui'
-import { getCurrentInstance, inject, ref } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
-	Check,
 	ChevronRight,
-	FileText,
-	FilePenLine,
-	HelpCircle,
 	MonitorPlay,
+	HelpCircle,
+	FileText,
+	Check,
 	Trash2,
 } from 'lucide-vue-next'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'
 import { showToast } from '@/utils'
 
 const route = useRoute()
-const router = useRouter()
+const expandAll = ref(true)
-const user = inject('$user')
 const showChapterModal = ref(false)
 const currentChapter = ref(null)
 const app = getCurrentInstance()
@@ -226,10 +205,8 @@ const updateLessonIndex = createResource({
 
 const trashLesson = (lessonName, chapterName) => {
 	$dialog({
-		title: __('Delete this lesson?'),
+		title: __('Delete Lesson'),
-		message: __(
+		message: __('Are you sure you want to delete this lesson?'),
-			'Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?'
-		),
 		actions: [
 			{
 				label: __('Delete'),
@@ -268,61 +245,6 @@ const updateOutline = (e) => {
 		idx: e.newIndex,
 	})
 }
-
-const deleteChapter = createResource({
-	url: 'lms.lms.api.delete_chapter',
-	makeParams(values) {
-		return {
-			chapter: values.chapter,
-		}
-	},
-	onSuccess() {
-		outline.reload()
-		showToast('Success', 'Chapter deleted successfully', 'check')
-	},
-})
-
-const trashChapter = (chapterName) => {
-	$dialog({
-		title: __('Delete this chapter?'),
-		message: __(
-			'Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?'
-		),
-		actions: [
-			{
-				label: __('Delete'),
-				theme: 'red',
-				variant: 'solid',
-				onClick(close) {
-					deleteChapter.submit({ chapter: chapterName })
-					close()
-				},
-			},
-		],
-	})
-}
-
-const redirectToChapter = (chapter) => {
-	if (!chapter.is_scorm_package) return
-	event.preventDefault()
-	if (props.allowEdit) return
-	if (!user.data) {
-		showToast(
-			__('You are not enrolled'),
-			__('Please enroll for this course to view this lesson'),
-			'alert-circle'
-		)
-		return
-	}
-
-	router.push({
-		name: 'SCORMChapter',
-		params: {
-			courseName: props.courseName,
-			chapterName: chapter.name,
-		},
-	})
-}
 </script>
 <style>
 .outline-lesson:has(.router-link-active) {

frontend/src/components/CourseReviews.vue

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

frontend/src/components/LessonContent.vue

@@ -9,7 +9,7 @@
 			allowfullscreen
 		></iframe>
 	</div>
-	<div v-for="block in content?.split('\n\n')">
+	<div v-for="block in content.split('\n\n')">
 		<div v-if="block.includes('{{ YouTubeVideo')">
 			<iframe
 				class="youtube-video"

frontend/src/components/LessonHelp.vue

@@ -21,11 +21,11 @@
 
 		<div class="space-y-2">
 			<div
-				class="flex text-sm font-medium space-x-2 cursor-pointer"
+				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
 				@click="openHelpDialog('upload')"
 			>
 				<span class="leading-5">
-					{{ __(contentMap['upload']) }}
+					{{ __('How to upload content from your system?') }}
 				</span>
 				<Info class="w-3 h-3 text-gray-700" />
 			</div>
@@ -44,7 +44,7 @@
 				@click="openHelpDialog('youtube')"
 			>
 				<span>
-					{{ __(contentMap['youtube']) }}
+					{{ __('How to add a YouTube Video?') }}
 				</span>
 				<Info class="w-3 h-3 text-gray-700" />
 			</div>
@@ -56,23 +56,8 @@
 				}}
 			</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" :title="title" :type="type" />
+	<ExplanationVideos v-model="showExplanation" :type="type" />
 </template>
 <script setup>
 import { Info } from 'lucide-vue-next'
@@ -81,16 +66,9 @@ import ExplanationVideos from '@/components/Modals/ExplanationVideos.vue'
 
 const showExplanation = ref(false)
 const type = ref(null)
-const title = ref(null)
-const contentMap = {
-	quiz: 'How to add a Quiz?',
-	upload: 'How to upload content from your system?',
-	youtube: 'How to add a YouTube Video?',
-}
 
 const openHelpDialog = (contentType) => {
 	type.value = contentType
-	title.value = contentMap[contentType]
 	showExplanation.value = true
 }
 </script>

frontend/src/components/LiveClass.vue

@@ -46,10 +46,9 @@
 					{{ __('Start') }}
 				</a>
 				<a
-					v-if="cls.date <= dayjs().format('YYYY-MM-DD')"
 					:href="cls.join_url"
 					target="_blank"
-					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"
+					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"
 				>
 					<Video class="h-4 w-4 stroke-1.5" />
 					{{ __('Join') }}

frontend/src/components/Members.vue

@@ -66,19 +66,8 @@
 									<div class="text-gray-900">
 										{{ member.full_name }}
 									</div>
-									<div
+									<div v-if="getRole(member)">
-										class="px-1"
+										{{ getRole(member) }}
-										v-if="member.role && getRole(member.role) !== 'Student'"
-									>
-										<Badge
-											:variant="'subtle'"
-											:ref_for="true"
-											theme="blue"
-											size="sm"
-											label="Badge"
-										>
-											{{ getRole(member.role) }}
-										</Badge>
 									</div>
 								</div>
 								<div class="text-sm text-gray-700">
@@ -110,7 +99,7 @@
 	</div>
 </template>
 <script setup lang="ts">
-import { createResource, Avatar, Button, FormControl, Badge } from 'frappe-ui'
+import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, X } from 'lucide-vue-next'

frontend/src/components/Modals/AnnouncementModal.vue

@@ -18,7 +18,6 @@
 				<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>
@@ -45,7 +44,7 @@
 <script setup>
 import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
-import { showToast } from '@/utils/'
+import { createToast } from '@/utils/'
 
 const show = defineModel()
 
@@ -95,14 +94,22 @@ const makeAnnouncement = (close) => {
 			},
 			onSuccess() {
 				close()
-				showToast(
+				createToast({
-					__('Success'),
+					title: 'Success',
-					__('Announcement has been sent successfully'),
+					text: 'Announcement has been sent successfully',
-					'check'
+					icon: 'Check',
-				)
+					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				})
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'check')
+				createToast({
+					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,12 +14,7 @@
 		}"
 	>
 		<template #body-content>
-			<Link
+			<Link doctype="LMS Course" v-model="course" :label="__('Course')" />
-				doctype="LMS Course"
-				v-model="course"
-				:label="__('Course')"
-				:required="true"
-			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"

frontend/src/components/Modals/BulkCertificates.vue

@@ -1,132 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Generate Certificates'),
-			size: 'lg',
-			actions: [
-				{
-					label: 'Create',
-					variant: 'solid',
-					onClick: ({ close }) => {
-						generateCertificates(close)
-					},
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div class="space-y-4">
-				<FormControl
-					type="select"
-					v-model="details.course"
-					:label="__('Course')"
-					:options="getCourses()"
-				/>
-				<Link
-					v-model="details.evaluator"
-					:label="__('Evaluator')"
-					doctype="Course Evaluator"
-				/>
-				<FormControl
-					type="date"
-					v-model="details.issue_date"
-					:label="__('Issue Date')"
-				/>
-				<FormControl
-					type="date"
-					v-model="details.expiry_date"
-					:label="__('Expiry Date')"
-				/>
-				<Link
-					v-model="details.template"
-					:label="__('Template')"
-					doctype="Print Format"
-					:filters="{
-						doc_type: 'LMS Certificate',
-					}"
-				/>
-				<Switch
-					size="sm"
-					:label="__('Published')"
-					:description="
-						__(
-							'Enabling this will publish the certificate on the certified participants page.'
-						)
-					"
-					v-model="details.published"
-				/>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { inject, reactive } from 'vue'
-import { createResource, Dialog, FormControl, Switch } from 'frappe-ui'
-import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
-
-const show = defineModel()
-const dayjs = inject('$dayjs')
-const details = reactive({
-	issue_date: dayjs().format('YYYY-MM-DD'),
-	expiry_date: null,
-	template: null,
-	evaluator: null,
-	published: true,
-})
-
-const props = defineProps({
-	batch: {
-		type: [Object, null],
-		required: true,
-	},
-})
-
-const createCertificate = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Certificate',
-				issue_date: details.issue_date,
-				expiry_date: details.expiry_date,
-				template: details.template,
-				published: details.published,
-				course: values.course,
-				batch: values.batch,
-				member: values.member,
-				evaluator: details.evaluator,
-			},
-		}
-	},
-})
-
-const generateCertificates = (close) => {
-	props.batch?.students.forEach((student) => {
-		createCertificate.submit(
-			{
-				course: details.course,
-				batch: props.batch.name,
-				member: student,
-			},
-			{
-				onError(err) {
-					showToast(__('Error'), err.messages?.[0] || err, 'x')
-				},
-			}
-		)
-	})
-	close()
-	showToast(__('Success'), __('Certificates generated successfully'), 'check')
-}
-
-const getCourses = () => {
-	return props.batch?.courses.map((course) => {
-		return {
-			label: course.course,
-			value: course.course,
-		}
-	})
-}
-</script>

frontend/src/components/Modals/ChapterModal.vue

@@ -2,11 +2,11 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			title: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
+			title: __('Add Chapter'),
 			size: 'lg',
 			actions: [
 				{
-					label: chapterDetail ? __('Edit') : __('Create'),
+					label: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
 					variant: 'solid',
 					onClick: (close) =>
 						chapterDetail ? editChapter(close) : addChapter(close),
@@ -15,77 +15,24 @@
 		}"
 	>
 		<template #body-content>
-			<div class="space-y-4 text-base">
+			<FormControl
-				<FormControl label="Title" v-model="chapter.title" :required="true" />
+				ref="chapterInput"
-				<Switch
+				label="Title"
-					size="sm"
+				v-model="chapter.title"
-					:label="__('SCORM Package')"
+				class="mb-4"
-					:description="
+			/>
-						__(
-							'Enable this only if you want to upload a SCORM package as a chapter.'
-						)
-					"
-					v-model="chapter.is_scorm_package"
-				/>
-				<div v-if="chapter.is_scorm_package">
-					<FileUploader
-						v-if="!chapter.scorm_package"
-						:fileTypes="['.zip']"
-						:validateFile="validateFile"
-						@success="(file) => (chapter.scorm_package = file)"
-					>
-						<template v-slot="{ file, progress, uploading, openFileSelector }">
-							<div class="mb-4">
-								<Button @click="openFileSelector" :loading="uploading">
-									{{
-										uploading ? `Uploading ${progress}%` : 'Upload an zip file'
-									}}
-								</Button>
-							</div>
-						</template>
-					</FileUploader>
-					<div v-else class="">
-						<div class="flex items-center">
-							<div class="border rounded-md p-2 mr-2">
-								<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
-							</div>
-							<div class="flex flex-col">
-								<span>
-									{{ chapter.scorm_package.file_name }}
-								</span>
-								<span class="text-sm text-gray-500 mt-1">
-									{{ getFileSize(chapter.scorm_package.file_size) }}
-								</span>
-							</div>
-							<X
-								@click="() => (chapter.scorm_package = null)"
-								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import {
+import { Dialog, FormControl, createResource } from 'frappe-ui'
-	Button,
+import { defineModel, reactive, watch, ref } from 'vue'
-	createResource,
+import { createToast } from '@/utils/'
-	Dialog,
-	FileUploader,
-	FormControl,
-	Switch,
-} from 'frappe-ui'
-import { defineModel, reactive, watch } from 'vue'
-import { showToast, getFileSize } from '@/utils/'
 import { capture } from '@/telemetry'
-import { FileText, X } from 'lucide-vue-next'
-import { useSettings } from '@/stores/settings'
 
 const show = defineModel()
 const outline = defineModel('outline')
-const settingsStore = useSettings()
+const chapterInput = ref(null)
 
 const props = defineProps({
 	course: {
@@ -99,19 +46,30 @@ const props = defineProps({
 
 const chapter = reactive({
 	title: '',
-	is_scorm_package: 0,
-	scorm_package: null,
 })
 
 const chapterResource = createResource({
-	url: 'lms.lms.api.upsert_chapter',
+	url: 'frappe.client.insert',
 	makeParams(values) {
 		return {
-			title: chapter.title,
+			doc: {
-			course: props.course,
+				doctype: 'Course Chapter',
-			is_scorm_package: chapter.is_scorm_package,
+				title: chapter.title,
-			scorm_package: chapter.scorm_package,
+				description: chapter.description,
+				course: props.course,
+			},
+		}
+	},
+})
+
+const chapterEditResource = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		return {
+			doctype: 'Course Chapter',
 			name: props.chapterDetail?.name,
+			fieldname: 'title',
+			value: chapter.title,
 		}
 	},
 })
@@ -131,12 +89,14 @@ const chapterReference = createResource({
 	},
 })
 
-const addChapter = async (close) => {
+const addChapter = (close) => {
 	chapterResource.submit(
 		{},
 		{
 			validate() {
-				return validateChapter()
+				if (!chapter.title) {
+					return 'Title is required'
+				}
 			},
 			onSuccess: (data) => {
 				capture('chapter_created')
@@ -144,48 +104,30 @@ const addChapter = async (close) => {
 					{ name: data.name },
 					{
 						onSuccess(data) {
-							cleanChapter()
+							chapter.title = ''
-							if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							}
 							outline.value.reload()
-							showToast(
+							createToast({
-								__('Success'),
+								text: 'Chapter added successfully',
-								__('Chapter added successfully'),
+								icon: 'check',
-								'check'
+								iconClasses: 'bg-green-600 text-white rounded-md p-px',
-							)
+							})
 						},
 						onError(err) {
-							showToast(__('Error'), err.messages?.[0] || err, 'x')
+							showError(err)
 						},
 					}
 				)
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				showError(err)
 			},
 		}
 	)
 }
 
-const validateChapter = () => {
-	if (!chapter.title) {
-		return __('Title is required')
-	}
-	if (chapter.is_scorm_package && !chapter.scorm_package) {
-		return __('Please upload a SCORM package')
-	}
-}
-
-const cleanChapter = () => {
-	chapter.title = ''
-	chapter.is_scorm_package = 0
-	chapter.scorm_package = null
-}
-
 const editChapter = (close) => {
-	chapterResource.submit(
+	chapterEditResource.submit(
 		{},
 		{
 			validate() {
@@ -195,29 +137,43 @@ const editChapter = (close) => {
 			},
 			onSuccess() {
 				outline.value.reload()
-				showToast(__('Success'), __('Chapter updated successfully'), 'check')
+				createToast({
+					text: 'Chapter updated successfully',
+					icon: 'check',
+					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				})
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				showError(err)
 			},
 		}
 	)
 }
 
+const showError = (err) => {
+	createToast({
+		title: 'Error',
+		text: err.messages?.[0] || err,
+		icon: 'x',
+		iconClasses: 'bg-red-600 text-white rounded-md p-px',
+		position: 'top-center',
+		timeout: 10,
+	})
+}
+
 watch(
 	() => props.chapterDetail,
 	(newChapter) => {
 		chapter.title = newChapter?.title
-		chapter.is_scorm_package = newChapter?.is_scorm_package
-		chapter.scorm_package = newChapter?.scorm_package
 	}
 )
 
-const validateFile = (file) => {
+watch(show, () => {
-	let extension = file.name.split('.').pop().toLowerCase()
+	if (show.value) {
-	if (extension !== 'zip') {
+		setTimeout(() => {
-		return __('Only zip files are allowed')
+			chapterInput.value.$el.querySelector('input').focus()
+		}, 100)
 	}
-}
+})
 </script>

frontend/src/components/Modals/EditProfile.vue

@@ -69,18 +69,7 @@
 					: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>
@@ -92,7 +81,6 @@ 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,12 +154,10 @@ function submitEvaluation(close) {
 const getCourses = () => {
 	let courses = []
 	for (const course of props.courses) {
-		if (course.evaluator) {
+		courses.push({
-			courses.push({
+			label: course.title,
-				label: course.title,
+			value: course.course,
-				value: course.course,
+		})
-			})
-		}
 	}
 	return courses
 }

frontend/src/components/Modals/ExplanationVideos.vue

@@ -3,11 +3,10 @@
 		v-model="show"
 		:options="{
 			size: '4xl',
-			title: title,
 		}"
 	>
-		<template #body-content>
+		<template #body>
-			<div>
+			<div class="p-4">
 				<VideoBlock :file="file" />
 			</div>
 		</template>
@@ -25,10 +24,6 @@ const props = defineProps({
 		type: [String, null],
 		required: true,
 	},
-	title: {
-		type: String,
-		required: true,
-	},
 })
 
 const file = computed(() => {

frontend/src/components/Modals/LiveClassModal.vue

@@ -22,7 +22,6 @@
 							v-model="liveClass.title"
 							:label="__('Title')"
 							class="mb-4"
-							:required="true"
 						/>
 						<Tooltip
 							:text="
@@ -36,7 +35,6 @@
 								type="time"
 								:label="__('Time')"
 								class="mb-4"
-								:required="true"
 							/>
 						</Tooltip>
 						<FormControl
@@ -44,7 +42,6 @@
 							type="select"
 							:options="getTimezoneOptions()"
 							:label="__('Timezone')"
-							:required="true"
 						/>
 					</div>
 					<div>
@@ -53,7 +50,6 @@
 							type="date"
 							class="mb-4"
 							:label="__('Date')"
-							:required="true"
 						/>
 						<Tooltip :text="__('Duration of the live class in minutes')">
 							<FormControl
@@ -61,7 +57,6 @@
 								v-model="liveClass.duration"
 								:label="__('Duration')"
 								class="mb-4"
-								:required="true"
 							/>
 						</Tooltip>
 						<FormControl
@@ -161,34 +156,25 @@ const submitLiveClass = (close) => {
 	return createLiveClass.submit(liveClass, {
 		validate() {
 			if (!liveClass.title) {
-				return __('Please enter a title.')
+				return 'Please enter a title.'
 			}
 			if (!liveClass.date) {
-				return __('Please select a date.')
+				return 'Please select a date.'
+			}
+			if (dayjs(liveClass.date).isSameOrBefore(dayjs(), 'day')) {
+				return 'Please select a future date.'
 			}
 			if (!liveClass.time) {
-				return __('Please select a time.')
+				return 'Please select a time.'
-			}
-			if (!liveClass.timezone) {
-				return __('Please select a timezone.')
 			}
 			if (!valideTime()) {
-				return __('Please enter a valid time in the format HH:mm.')
+				return 'Please enter a valid time in the format HH:mm.'
-			}
-			const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz(
-				liveClass.timezone,
-				true
-			)
-			if (
-				liveClassDateTime.isSameOrBefore(
-					dayjs().tz(liveClass.timezone, false),
-					'minute'
-				)
-			) {
-				return __('Please select a future date and time.')
 			}
 			if (!liveClass.duration) {
-				return __('Please select a duration.')
+				return 'Please select a duration.'
+			}
+			if (!liveClass.timezone) {
+				return 'Please select a timezone.'
 			}
 		},
 		onSuccess() {

frontend/src/components/Modals/Question.vue

@@ -12,9 +12,9 @@
 							id="existing"
 							value="existing"
 							v-model="questionType"
-							class="w-3 h-3 cursor-pointer"
+							class="w-3 h-3 accent-gray-900"
 						/>
-						<label for="existing" class="cursor-pointer">
+						<label for="existing">
 							{{ __('Add an existing question') }}
 						</label>
 					</div>
@@ -25,9 +25,9 @@
 							id="new"
 							value="new"
 							v-model="questionType"
-							class="w-3 h-3 cursor-pointer"
+							class="w-3 h-3"
 						/>
-						<label for="new" class="cursor-pointer">
+						<label for="new">
 							{{ __('Create a new question') }}
 						</label>
 					</div>
@@ -56,14 +56,12 @@
 						type="select"
 						:options="['Choices', 'User Input', 'Open Ended']"
 						class="pb-2"
-						:required="true"
 					/>
 					<div v-if="question.type == 'Choices'" class="divide-y border-t">
 						<div v-for="n in 4" class="space-y-4 py-2">
 							<FormControl
 								:label="__('Option') + ' ' + n"
 								v-model="question[`option_${n}`]"
-								:required="n <= 2 ? true : false"
 							/>
 							<FormControl
 								:label="__('Explanation')"
@@ -84,7 +82,6 @@
 						<FormControl
 							:label="__('Possibility') + ' ' + n"
 							v-model="question[`possibility_${n}`]"
-							:required="n == 1 ? true : false"
 						/>
 					</div>
 				</div>
@@ -130,7 +127,7 @@ const populateFields = () => {
 	let counter = 1
 	fields.forEach((field) => {
 		while (counter <= 4) {
-			question[`${field}_${counter}`] = field === 'is_correct' ? false : null
+			question[`${field}_${counter}`] = field === 'is_correct' ? false : ''
 			counter++
 		}
 	})

frontend/src/components/Modals/Settings.vue

@@ -108,31 +108,9 @@ const tabsStructure = computed(() => {
 			hideLabel: true,
 			items: [
 				{
-					label: 'General',
+					label: 'Members',
-					icon: 'Wrench',
+					description: 'Manage the members of your learning system',
-					fields: [
+					icon: 'UserRoundPlus',
-						{
-							label: 'Enable Learning Paths',
-							name: 'enable_learning_paths',
-							description:
-								'This will enforce students to go through programs assigned to them in the correct order.',
-							type: 'checkbox',
-						},
-						{
-							label: 'Send calendar invite for evaluations',
-							name: 'send_calendar_invite_for_evaluations',
-							description:
-								'If enabled, it sends google calendar invite to the student for evaluations.',
-							type: 'checkbox',
-						},
-						{
-							label: 'Unsplash Access Key',
-							name: 'unsplash_access_key',
-							description:
-								'Optional. If this is set, students can pick a cover image from the unsplash library for their profile page. https://unsplash.com/documentation#getting-started.',
-							type: 'text',
-						},
-					],
 				},
 			],
 		},
@@ -178,14 +156,9 @@ const tabsStructure = computed(() => {
 			],
 		},
 		{
-			label: 'Lists',
+			label: 'Settings',
-			hideLabel: false,
+			hideLabel: true,
 			items: [
-				{
-					label: 'Members',
-					description: 'Manage the members of your learning system',
-					icon: 'UserRoundPlus',
-				},
 				{
 					label: 'Categories',
 					description: 'Manage the members of your learning system',

frontend/src/components/OnboardingBanner.vue

@@ -1,151 +0,0 @@
-<template>
-	<div v-if="showOnboardingBanner && onboardingDetails.data">
-		<Tooltip :text="__('Skip Onboarding')" placement="left">
-			<X
-				class="w-4 h-4 stroke-1 absolute top-2 right-2 cursor-pointer mr-1"
-				@click="skipOnboarding.reload()"
-			/>
-		</Tooltip>
-		<div class="flex items-center justify-evenly bg-gray-100 p-10">
-			<div
-				@click="redirectToCourseForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer': !onboardingDetails.data.course_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.course_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span v-else class="font-semibold bg-white px-2 py-1 rounded-full">
-					1
-				</span>
-				<span class="text-lg font-semibold">
-					{{ __('Create a course') }}
-				</span>
-			</div>
-			<div
-				@click="redirectToChapterForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer':
-						onboardingDetails.data.course_created?.length &&
-						!onboardingDetails.data.chapter_created?.length,
-					'text-gray-400': !onboardingDetails.data.course_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.chapter_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span v-else class="font-semibold bg-white px-2 py-1 rounded-full">
-					2
-				</span>
-				<span class="text-lg font-semibold">
-					{{ __('Add a chapter') }}
-				</span>
-			</div>
-			<div
-				@click="redirectToLessonForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer':
-						onboardingDetails.data.course_created?.length &&
-						onboardingDetails.data.chapter_created?.length,
-					'text-gray-400':
-						!onboardingDetails.data.course_created?.length ||
-						!onboardingDetails.data.chapter_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.lesson_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span class="font-semibold bg-white px-2 py-1 rounded-full"> 3 </span>
-				<span class="text-lg font-semibold">
-					{{ __('Add a lesson') }}
-				</span>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { Check, X } from 'lucide-vue-next'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
-import { createResource, Tooltip } from 'frappe-ui'
-
-const showOnboardingBanner = ref(false)
-const settings = useSettings()
-const onboardingDetails = settings.onboardingDetails
-const router = useRouter()
-
-watch(onboardingDetails, () => {
-	if (!onboardingDetails.data?.is_onboarded) {
-		showOnboardingBanner.value = true
-	} else {
-		showOnboardingBanner.value = false
-	}
-})
-
-const redirectToCourseForm = () => {
-	if (onboardingDetails.data?.course_created.length) {
-		return
-	} else {
-		router.push({ name: 'CourseForm', params: { courseName: 'new' } })
-	}
-}
-
-const redirectToChapterForm = () => {
-	if (!onboardingDetails.data?.course_created.length) {
-		return
-	} else {
-		router.push({
-			name: 'CourseForm',
-			params: {
-				courseName: onboardingDetails.data?.first_course,
-			},
-		})
-	}
-}
-
-const redirectToLessonForm = () => {
-	if (!onboardingDetails.data?.course_created.length) {
-		return
-	} else if (!onboardingDetails.data?.chapter_created.length) {
-		return
-	} else {
-		router.push({
-			name: 'LessonForm',
-			params: {
-				courseName: onboardingDetails.data?.first_course,
-				chapterNumber: 1,
-				lessonNumber: 1,
-			},
-		})
-	}
-}
-
-const skipOnboarding = createResource({
-	url: 'frappe.client.set_value',
-	makeParams() {
-		return {
-			doctype: 'LMS Settings',
-			name: 'LMS Settings',
-			fieldname: 'is_onboarding_complete',
-			value: 1,
-		}
-	},
-	onSuccess(data) {
-		onboardingDetails.reload()
-	},
-})
-</script>

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 mb-4 rounded-md text-sm text-blue-800"
+			class="bg-blue-100 space-y-1 py-2 px-2 rounded-md text-sm text-blue-800"
 		>
 			<div class="leading-5">
 				{{
@@ -397,9 +397,6 @@ const attempts = createResource({
 watch(
 	() => quiz.data,
 	() => {
-		if (quiz.data) {
-			populateQuestions()
-		}
 		if (quiz.data && quiz.data.max_attempts) {
 			attempts.reload()
 			resetQuiz()

frontend/src/components/SettingDetails.vue

@@ -29,7 +29,6 @@
 <script setup>
 import { Button, Badge } from 'frappe-ui'
 import SettingFields from '@/components/SettingFields.vue'
-import { showToast } from '@/utils'
 
 const props = defineProps({
 	fields: {
@@ -55,14 +54,7 @@ const update = () => {
 			props.data.doc[f.name] = f.value
 		}
 	})
-	props.data.save.submit(
+	props.data.save.submit()
-		{},
-		{
-			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
-			},
-		}
-	)
 }
 </script>
 

frontend/src/components/SettingFields.vue

@@ -90,7 +90,6 @@
 						:type="field.type"
 						:rows="field.rows"
 						:options="field.options"
-						:description="field.description"
 					/>
 				</div>
 			</div>
@@ -101,7 +100,7 @@
 import { FormControl, FileUploader, Button, Switch } from 'frappe-ui'
 import { computed } from 'vue'
 import { getFileSize, validateFile } from '@/utils'
-import { X } from 'lucide-vue-next'
+import { X, FileText } from 'lucide-vue-next'
 import Link from '@/components/Controls/Link.vue'
 import CodeEditor from '@/components/Controls/CodeEditor.vue'
 

frontend/src/components/SidebarLink.vue

@@ -7,7 +7,7 @@
 	>
 		<div
 			class="flex items-center w-full duration-300 ease-in-out group"
-			:class="isCollapsed ? 'p-1 relative' : 'px-2 py-1'"
+			:class="isCollapsed ? 'p-1' : 'px-2 py-1'"
 		>
 			<Tooltip :text="link.label" placement="right">
 				<slot name="icon">
@@ -29,15 +29,7 @@
 			>
 				{{ __(link.label) }}
 			</span>
-			<span
+			<span v-if="link.count" class="!ml-auto block text-xs text-gray-600">
-				v-if="link.count"
-				class="!ml-auto block text-xs text-gray-600"
-				:class="
-					isCollapsed && link.count > 9
-						? 'absolute top-[2px] right-0 bg-white'
-						: ''
-				"
-			>
 				{{ link.count }}
 			</span>
 			<div

frontend/src/components/VideoBlock.vue

@@ -4,7 +4,6 @@
 			@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

@@ -4,30 +4,18 @@
 			class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 		>
 			<Breadcrumbs class="h-7" :items="breadcrumbs" />
-			<div class="flex items-center space-x-2">
+			<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
-				<Button
+				<span>
-					v-if="user.data?.is_moderator"
+					{{ __('Make an Announcement') }}
-					@click="openCertificateDialog = true"
+				</span>
-				>
+				<template #suffix>
-					{{ __('Generate Certificates') }}
+					<SendIcon class="h-4 stroke-1.5" />
-				</Button>
+				</template>
-				<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
+			</Button>
-					<span>
-						{{ __('Make an Announcement') }}
-					</span>
-					<template #suffix>
-						<SendIcon class="h-4 stroke-1.5" />
-					</template>
-				</Button>
-			</div>
 		</header>
 		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
 			<div class="border-r-2">
-				<Tabs
+				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-y-hidden">
-					v-model="tabIndex"
-					:tabs="tabs"
-					tablistClass="overflow-y-hidden bg-white"
-				>
 					<template #tab="{ tab, selected }" class="overflow-x-hidden">
 						<div>
 							<button
@@ -177,7 +165,6 @@
 			</div>
 		</div>
 	</div>
-	<BulkCertificates v-model="openCertificateDialog" :batch="batch.data" />
 </template>
 <script setup>
 import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
@@ -206,11 +193,9 @@ import Announcements from '@/components/Annoucements.vue'
 import AnnouncementModal from '@/components/Modals/AnnouncementModal.vue'
 import Discussions from '@/components/Discussions.vue'
 import DateRange from '@/components/Common/DateRange.vue'
-import BulkCertificates from '@/components/Modals/BulkCertificates.vue'
 
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
-const openCertificateDialog = ref(false)
 
 const props = defineProps({
 	batchName: {
@@ -251,7 +236,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,11 +15,7 @@
 				</div>
 				<div class="grid grid-cols-2 gap-10 mb-4 space-y-2">
 					<div>
-						<FormControl
+						<FormControl v-model="batch.title" :label="__('Title')" />
-							v-model="batch.title"
-							:label="__('Title')"
-							:required="true"
-						/>
 					</div>
 					<div class="flex flex-col space-y-2">
 						<FormControl
@@ -36,73 +32,61 @@
 				</div>
 			</div>
 			<div class="mb-4">
-				<div class="text-xs text-gray-600 mb-2">
+				<div>
-					{{ __('Meta Image') }}
+					<FileUploader
-				</div>
+						v-if="!batch.image"
-				<FileUploader
+						class="mt-4"
-					v-if="!batch.image"
+						:fileTypes="['image/*']"
-					:fileTypes="['image/*']"
+						:validateFile="validateFile"
-					:validateFile="validateFile"
+						@success="(file) => saveImage(file)"
-					@success="(file) => saveImage(file)"
+					>
-				>
+						<template v-slot="{ file, progress, uploading, openFileSelector }">
-					<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>
+						</template>
+					</FileUploader>
+					<div v-else class="mb-4">
+						<div class="text-xs text-gray-600 mb-1">
+							{{ __('Meta Image') }}
 						</div>
-					</template>
+						<div class="flex items-center">
-				</FileUploader>
+							<div class="border rounded-md p-2 mr-2">
-				<div v-else class="mb-4">
+								<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
-					<div class="flex items-center">
-						<img :src="batch.image.file_url" class="border rounded-md w-40" />
-						<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>
+				<MultiSelect
+					v-model="instructors"
+					doctype="User"
+					:label="__('Instructors')"
+				/>
 			</div>
-			<MultiSelect
-				v-model="instructors"
-				doctype="User"
-				:label="__('Instructors')"
-				:required="true"
-				:filters="{ ignore_user_type: 1 }"
-			/>
 			<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"
@@ -124,14 +108,12 @@
 							: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>
@@ -140,22 +122,18 @@
 							: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>
@@ -171,7 +149,6 @@
 							:label="__('Seat Count')"
 							type="number"
 							class="mb-4"
-							:placeholder="__('Number of seats available')"
 						/>
 						<FormControl
 							v-model="batch.evaluation_end_date"
@@ -251,11 +228,11 @@ import {
 	createResource,
 } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
-import { useRouter } from 'vue-router'
-import { showToast } from '../utils'
-import { Image } from 'lucide-vue-next'
-import { capture } from '@/telemetry'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import { useRouter } from 'vue-router'
+import { getFileSize, showToast } from '../utils'
+import { X, FileText } from 'lucide-vue-next'
+import { capture } from '@/telemetry'
 
 const router = useRouter()
 const user = inject('$user')

frontend/src/pages/Batches.vue

@@ -40,7 +40,6 @@
 				{{ __('Loading Batches...') }}
 			</div>
 			<Tabs
-				v-if="hasBatches"
 				v-model="tabIndex"
 				:tabs="makeTabs"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
@@ -80,63 +79,24 @@
 							<BatchCard :batch="batch" />
 						</router-link>
 					</div>
-					<div v-else class="p-5 italic text-gray-500">
+					<div
-						{{ __('No {0} batches').format(tab.label.toLowerCase()) }}
+						v-else
+						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,
@@ -144,14 +104,13 @@ import {
 	Badge,
 	Select,
 } from 'frappe-ui'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { 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)
@@ -160,10 +119,10 @@ onMounted(() => {
 	}
 })
 
-const batches = createResource({
+const batches = createListResource({
 	doctype: 'LMS Batch',
 	url: 'lms.lms.utils.get_batches',
-	cache: ['batches', user.data?.email],
+	cache: ['batches', user?.data?.email],
 	auto: true,
 })
 
@@ -224,14 +183,6 @@ 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.rating"
+							v-if="course.data.avg_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.rating }}
+								{{ course.data.avg_rating }}
 							</span>
 						</Tooltip>
-						<span v-if="course.data.rating" class="mx-3">&middot;</span>
+						<span v-if="course.data.avg_rating" class="mx-3">&middot;</span>
 						<Tooltip
 							v-if="course.data.enrollment_count"
 							:text="__('Enrolled Students')"
@@ -67,18 +67,14 @@
 					<CourseCardOverlay :course="course" class="md:hidden mb-4" />
 					<div
 						v-html="course.data.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"
+						class="course-description"
 					></div>
 					<div class="mt-10">
-						<CourseOutline
+						<CourseOutline :courseName="course.data.name" :showOutline="true" />
-							:title="__('Course Outline')"
-							:courseName="course.data.name"
-							:showOutline="true"
-						/>
 					</div>
 					<CourseReviews
 						:courseName="course.data.name"
-						:avg_rating="course.data.rating"
+						:avg_rating="course.data.avg_rating"
 						:membership="course.data.membership"
 					/>
 				</div>
@@ -120,7 +116,7 @@ const breadcrumbs = computed(() => {
 	let items = [{ label: 'All Courses', route: { name: 'Courses' } }]
 	items.push({
 		label: course?.data?.title,
-		route: { name: 'CourseDetail', params: { courseName: course?.data?.name } },
+		route: { name: 'CourseDetail', params: { course: course?.data?.name } },
 	})
 	return items
 })
@@ -135,6 +131,26 @@ 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,14 +7,6 @@
 				>
 					<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') }}
@@ -31,23 +23,15 @@
 							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-600">
+							<div class="mb-1.5 text-sm text-gray-700">
 								{{ __('Course Description') }}
-								<span class="text-red-500">*</span>
 							</div>
 							<TextEditor
 								:content="course.description"
@@ -57,62 +41,49 @@
 								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">
+						<FileUploader
-							<div class="text-xs text-gray-600 mb-2">
+							v-if="!course.course_image"
-								{{ __('Course Image') }}
+							:fileTypes="['image/*']"
-								<span class="text-red-500">*</span>
+							:validateFile="validateFile"
-							</div>
+							@success="(file) => saveImage(file)"
-							<FileUploader
+						>
-								v-if="!course.course_image"
+							<template
-								:fileTypes="['image/*']"
+								v-slot="{ file, progress, uploading, openFileSelector }"
-								:validateFile="validateFile"
-								@success="(file) => saveImage(file)"
 							>
-								<template
+								<div class="mb-4">
-									v-slot="{ file, progress, uploading, openFileSelector }"
+									<Button @click="openFileSelector" :loading="uploading">
-								>
+										{{
-									<div class="flex items-center">
+											uploading ? `Uploading ${progress}%` : 'Upload an image'
-										<div class="border rounded-md w-fit py-5 px-20">
+										}}
-											<Image class="size-5 stroke-1 text-gray-700" />
+									</Button>
-										</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="flex items-center">
-									<img
-										:src="course.course_image.file_url"
-										class="border rounded-md w-40"
-									/>
-									<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>
+							</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">
+									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+								</div>
+								<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>
 						</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">
@@ -133,8 +104,6 @@
 								</div>
 								<FormControl
 									v-model="newTag"
-									:placeholder="__('Keywords for the course')"
-									class="w-52"
 									@keyup.enter="updateTags()"
 									id="tags"
 								/>
@@ -152,8 +121,6 @@
 							v-model="instructors"
 							doctype="User"
 							:label="__('Instructors')"
-							:filters="{ ignore_user_type: 1 }"
-							:required="true"
 						/>
 					</div>
 					<div class="container border-t">
@@ -163,7 +130,7 @@
 						<div class="grid grid-cols-3 gap-10 mb-4">
 							<div
 								v-if="user.data?.is_moderator"
-								class="flex flex-col space-y-4"
+								class="flex flex-col space-y-3"
 							>
 								<FormControl
 									type="checkbox"
@@ -256,11 +223,15 @@ import {
 	ref,
 	reactive,
 	watch,
-	getCurrentInstance,
 } from 'vue'
-import { showToast, updateDocumentTitle } from '@/utils'
+import {
+	convertToTitleCase,
+	showToast,
+	getFileSize,
+	updateDocumentTitle,
+} from '@/utils'
 import Link from '@/components/Controls/Link.vue'
-import { Image, Trash2, X } from 'lucide-vue-next'
+import { FileText, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -272,8 +243,6 @@ 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: {
@@ -434,9 +403,6 @@ const submitCourse = () => {
 			onSuccess(data) {
 				capture('course_created')
 				showToast('Success', 'Course created successfully', 'check')
-				if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-					settingsStore.onboardingDetails.reload()
-				}
 				router.push({
 					name: 'CourseForm',
 					params: { courseName: data.name },
@@ -449,37 +415,23 @@ const submitCourse = () => {
 	}
 }
 
-const deleteCourse = createResource({
+const validateMandatoryFields = () => {
-	url: 'lms.lms.api.delete_course',
+	const mandatory_fields = [
-	makeParams(values) {
+		'title',
-		return {
+		'short_introduction',
-			course: props.courseName,
+		'description',
+		'video_link',
+		'course_image',
+	]
+	for (const field of mandatory_fields) {
+		if (!course[field]) {
+			let fieldLabel = convertToTitleCase(field.split('_').join(' '))
+			return `${fieldLabel} is mandatory`
 		}
-	},
+	}
-	onSuccess() {
+	if (course.paid_course && (!course.course_price || !course.currency)) {
-		showToast(__('Success'), __('Course deleted successfully'), 'check')
+		return __('Course price and currency are mandatory for paid courses')
-		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-40 md:w-44">
+				<div class="w-46 md:w-44">
 					<FormControl
 						v-if="categories.data?.length"
 						type="select"
@@ -30,7 +30,6 @@
 					</FormControl>
 				</div>
 				<router-link
-					v-if="user.data?.is_moderator || user.data?.is_instructor"
 					:to="{
 						name: 'CourseForm',
 						params: {
@@ -38,7 +37,7 @@
 						},
 					}"
 				>
-					<Button variant="solid">
+					<Button v-if="user.data?.is_moderator" variant="solid">
 						<template #prefix>
 							<Plus class="h-4 w-4" />
 						</template>
@@ -49,7 +48,6 @@
 		</header>
 		<div class="">
 			<Tabs
-				v-if="hasCourses"
 				v-model="tabIndex"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
 				:tabs="makeTabs"
@@ -103,102 +101,47 @@
 							<CourseCard :course="course" />
 						</router-link>
 					</div>
-					<div v-else class="p-5 italic text-gray-500">
+					<div
-						{{ __('No {0} courses').format(tab.label.toLowerCase()) }}
+						v-else
+						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>
 
 <script setup>
 import {
-	Badge,
 	Breadcrumbs,
-	Button,
-	call,
-	createResource,
-	FormControl,
 	Tabs,
+	Badge,
+	Button,
+	FormControl,
+	createResource,
 } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
-import { BookOpen, Plus, Search } from 'lucide-vue-next'
+import { Plus, Search } from 'lucide-vue-next'
 import { ref, computed, inject, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
 const searchQuery = ref('')
 const currentCategory = ref(null)
-const hasCourses = ref(false)
-const router = useRouter()
-const settings = useSettings()
 
 onMounted(() => {
-	checkLearningPath()
 	let queries = new URLSearchParams(location.search)
 	if (queries.has('category')) {
 		currentCategory.value = queries.get('category')
 	}
 })
 
-const checkLearningPath = () => {
-	if (
-		settings.learningPaths.data &&
-		(!user.data?.is_moderator || !user.data?.is_instructor)
-	) {
-		router.push({ name: 'Programs' })
-	}
-}
-
 const courses = createResource({
 	url: 'lms.lms.utils.get_courses',
 	cache: ['courses', user.data?.email],
@@ -280,16 +223,6 @@ 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/JobCreation.vue

@@ -19,13 +19,8 @@
 							v-model="job.job_title"
 							:label="__('Title')"
 							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="job.location"
-							:label="__('Location')"
-							:required="true"
 						/>
+						<FormControl v-model="job.location" :label="__('Location')" />
 					</div>
 					<div>
 						<FormControl
@@ -34,21 +29,18 @@
 							type="select"
 							:options="jobTypes"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="job.status"
 							:label="__('Status')"
 							type="select"
 							:options="jobStatuses"
-							:required="true"
 						/>
 					</div>
 				</div>
 				<div class="mt-4">
 					<label class="block text-gray-600 text-xs mb-1">
 						{{ __('Description') }}
-						<span class="text-red-500">*</span>
 					</label>
 					<TextEditor
 						:content="job.description"
@@ -69,12 +61,10 @@
 							v-model="job.company_name"
 							:label="__('Company Name')"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="job.company_website"
 							:label="__('Company Website')"
-							:required="true"
 						/>
 					</div>
 					<div>
@@ -82,11 +72,9 @@
 							v-model="job.company_email_address"
 							:label="__('Company Email Address')"
 							class="mb-4"
-							:required="true"
 						/>
 						<label class="block text-gray-600 text-xs mb-1 mt-4">
 							{{ __('Company Logo') }}
-							<span class="text-red-500">*</span>
 						</label>
 						<FileUploader
 							v-if="!job.image"

frontend/src/pages/Jobs.vue

@@ -7,22 +7,7 @@
 				class="h-7"
 				:items="[{ label: __('Jobs'), route: { name: 'Jobs' } }]"
 			/>
-			<div class="flex space-x-2">
+			<div class="flex">
-				<div class="w-40 md:w-44">
-					<FormControl
-						v-model="jobType"
-						type="select"
-						:options="jobTypes"
-						:placeholder="__('Type')"
-					/>
-				</div>
-				<div class="w-28 md:w-36">
-					<FormControl type="text" placeholder="Search" v-model="searchQuery">
-						<template #prefix>
-							<Search class="w-4 h-4 stroke-1.5 text-gray-600" name="search" />
-						</template>
-					</FormControl>
-				</div>
 				<router-link
 					v-if="user.data?.name"
 					:to="{
@@ -41,9 +26,9 @@
 				</router-link>
 			</div>
 		</header>
-		<div v-if="jobsList?.length">
+		<div v-if="jobs.data?.length">
 			<div class="divide-y lg:w-3/4 mx-auto p-5">
-				<div v-for="job in jobsList">
+				<div v-for="job in jobs.data">
 					<router-link
 						:to="{
 							name: 'JobDetail',
@@ -62,22 +47,13 @@
 	</div>
 </template>
 <script setup>
-import { Button, Breadcrumbs, createResource, FormControl } from 'frappe-ui'
+import { Button, Breadcrumbs, createResource } from 'frappe-ui'
-import { Plus, Search } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
-import { inject, computed, ref, onMounted } from 'vue'
+import { inject, computed } from 'vue'
 import JobCard from '@/components/JobCard.vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
-const jobType = ref(null)
-const searchQuery = ref('')
-
-onMounted(() => {
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('type')) {
-		jobType.value = queries.get('type')
-	}
-})
 
 const jobs = createResource({
 	url: 'lms.lms.api.get_job_opportunities',
@@ -92,32 +68,5 @@ const pageMeta = computed(() => {
 	}
 })
 
-const jobsList = computed(() => {
-	let jobData = jobs.data
-	if (jobType.value && jobType.value != '') {
-		jobData = jobData.filter((job) => job.type == jobType.value)
-	}
-	if (searchQuery.value) {
-		let query = searchQuery.value.toLowerCase()
-		jobData = jobData.filter(
-			(job) =>
-				job.job_title.toLowerCase().includes(query) ||
-				job.company_name.toLowerCase().includes(query) ||
-				job.location.toLowerCase().includes(query)
-		)
-	}
-	return jobData
-})
-
-const jobTypes = computed(() => {
-	return [
-		'',
-		{ label: __('Full Time'), value: 'Full Time' },
-		{ label: __('Part Time'), value: 'Part Time' },
-		{ label: __('Contract'), value: 'Contract' },
-		{ label: __('Freelance'), value: 'Freelance' },
-	]
-})
-
 updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Lesson.vue

@@ -17,9 +17,14 @@
 						)
 					}}
 				</p>
-				<Button v-if="user.data" @click="enrollStudent()" variant="solid">
+				<router-link
-					{{ __('Start Learning') }}
+					v-if="user.data"
-				</Button>
+					:to="{ name: 'CourseDetail', params: { courseName: courseName } }"
+				>
+					<Button variant="solid">
+						{{ __('Start Learning') }}
+					</Button>
+				</router-link>
 				<Button v-else @click="redirectToLogin()">
 					{{ __('Login') }}
 				</Button>
@@ -103,7 +108,7 @@
 					<span
 						class="h-6 mr-1"
 						:class="{
-							'avatar-group overlap': lesson.data.instructors?.length > 1,
+							'avatar-group overlap': lesson.data.instructors.length > 1,
 						}"
 					>
 						<UserAvatar
@@ -111,10 +116,7 @@
 							:user="instructor"
 						/>
 					</span>
-					<CourseInstructors
+					<CourseInstructors :instructors="lesson.data.instructors" />
-						v-if="lesson.data?.instructors"
-						:instructors="lesson.data.instructors"
-					/>
 				</div>
 				<div
 					v-if="
@@ -149,7 +151,6 @@
 					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 mt-5"
 				>
 					<LessonContent
-						v-if="lesson.data?.body"
 						:content="lesson.data.body"
 						:youtube="lesson.data.youtube"
 						:quizId="lesson.data.quiz_id"
@@ -193,7 +194,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 { useRouter, useRoute } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ChevronLeft, ChevronRight } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
 import { getEditorTools, updateDocumentTitle } from '../utils'
@@ -203,7 +204,6 @@ 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,13 +243,6 @@ const lesson = createResource({
 	},
 	auto: true,
 	onSuccess(data) {
-		if (Object.keys(data).length === 0) {
-			router.push({
-				name: 'CourseDetail',
-				params: { courseName: props.courseName },
-			})
-			return
-		}
 		lessonProgress.value = data.membership?.progress
 		if (data.content) editor.value = renderEditor('editor', data.content)
 		if (
@@ -308,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: { courseName: props.courseName } },
+		route: { name: 'CourseDetail', params: { course: props.courseName } },
 	})
 	items.push({
 		label: lesson?.data?.title,
 		route: {
 			name: 'Lesson',
 			params: {
-				courseName: props.courseName,
+				course: props.courseName,
 				chapterNumber: props.chapterNumber,
 				lessonNumber: props.lessonNumber,
 			},
@@ -376,40 +369,16 @@ const checkIfDiscussionsAllowed = () => {
 
 const allowEdit = () => {
 	if (user.data?.is_moderator) return true
-	if (lesson.data?.instructors?.includes(user.data?.name)) return true
+	if (lesson.data?.instructors.includes(user.data?.name)) return true
 	return false
 }
 
 const allowInstructorContent = () => {
 	if (user.data?.is_moderator) return true
-	if (lesson.data?.instructors?.includes(user.data?.name)) return true
+	if (lesson.data?.instructors.includes(user.data?.name)) return true
 	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

@@ -6,22 +6,13 @@
 					class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b overflow-hidden bg-white px-3 py-2.5 sm:px-5"
 				>
 					<Breadcrumbs class="text-ellipsis" :items="breadcrumbs" />
-					<Button
+					<Button variant="solid" @click="saveLesson()" class="mt-3 md:mt-0">
-						variant="solid"
-						@click="saveLesson({ showSuccessMessage: true })"
-						class="mt-3 md:mt-0"
-					>
 						{{ __('Save') }}
 					</Button>
 				</header>
 				<div class="py-5">
 					<div class="w-5/6 mx-auto">
-						<FormControl
+						<FormControl v-model="lesson.title" label="Title" class="mb-4" />
-							v-model="lesson.title"
-							label="Title"
-							class="mb-4"
-							:required="true"
-						/>
 						<FormControl
 							v-model="lesson.include_in_preview"
 							type="checkbox"
@@ -78,7 +69,7 @@
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, Button, createResource, FormControl } from 'frappe-ui'
+import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
 import {
 	computed,
 	reactive,
@@ -92,15 +83,12 @@ import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
 import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
 
 const editor = ref(null)
 const instructorEditor = ref(null)
 const user = inject('$user')
 const openInstructorEditor = ref(false)
-const settingsStore = useSettings()
 let autoSaveInterval
-let showSuccessMessage = false
 
 const props = defineProps({
 	courseName: {
@@ -124,7 +112,6 @@ onMounted(() => {
 	capture('lesson_form_opened')
 	editor.value = renderEditor('content')
 	instructorEditor.value = renderEditor('instructor-notes')
-	window.addEventListener('keydown', keyboardShortcut)
 })
 
 const renderEditor = (holder) => {
@@ -194,24 +181,12 @@ const addInstructorNotes = (data) => {
 
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
-		saveLesson({ showSuccessMessage: false })
+		saveLesson()
 	}, 10000)
 }
 
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		saveLesson({ showSuccessMessage: true })
-		e.preventDefault()
-	}
-}
-
 onBeforeUnmount(() => {
 	clearInterval(autoSaveInterval)
-	window.removeEventListener('keydown', keyboardShortcut)
 })
 
 const newLessonResource = createResource({
@@ -363,11 +338,7 @@ const convertToJSON = (lessonData) => {
 	return blocks
 }
 
-const saveLesson = (e) => {
+const saveLesson = () => {
-	showSuccessMessage = false
-	if (typeof e != 'undefined' && e.showSuccessMessage) {
-		showSuccessMessage = true
-	}
 	editor.value.save().then((outputData) => {
 		lesson.content = JSON.stringify(outputData)
 		instructorEditor.value.save().then((outputData) => {
@@ -395,9 +366,6 @@ const createNewLesson = () => {
 						onSuccess() {
 							capture('lesson_created')
 							showToast('Success', 'Lesson created successfully', 'check')
-							if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							}
 							lessonDetails.reload()
 						},
 					}
@@ -419,11 +387,6 @@ const editCurrentLesson = () => {
 			validate() {
 				return validateLesson()
 			},
-			onSuccess() {
-				showSuccessMessage
-					? showToast('Success', 'Lesson updated successfully', 'check')
-					: ''
-			},
 			onError(err) {
 				showToast('Error', err.message, 'x')
 			},

frontend/src/pages/ProgramForm.vue

@@ -1,367 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="breadbrumbs" />
-		<Button variant="solid" @click="saveProgram()">
-			{{ __('Save') }}
-		</Button>
-	</header>
-	<div v-if="program.doc" class="pt-5 px-5 w-3/4 mx-auto space-y-10">
-		<FormControl v-model="program.doc.title" :label="__('Title')" />
-
-		<!-- Courses -->
-		<div>
-			<div class="flex items-center justify-between mb-2">
-				<div class="text-lg font-semibold">
-					{{ __('Program Courses') }}
-				</div>
-				<Button
-					@click="
-						() => {
-							currentForm = 'course'
-							showDialog = true
-						}
-					"
-				>
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('Add') }}
-				</Button>
-			</div>
-
-			<ListView
-				:columns="courseColumns"
-				:rows="program.doc.program_courses"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in courseColumns" />
-				</ListHeader>
-				<ListRows>
-					<Draggable
-						:list="program.doc.program_courses"
-						item-key="name"
-						group="items"
-						@end="updateOrder"
-						class="cursor-move"
-					>
-						<template #item="{ element: row }">
-							<ListRow :row="row" />
-						</template>
-					</Draggable>
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="remove(selections, unselectAll, 'program_courses')"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-
-		<!-- Members -->
-		<div>
-			<div class="flex items-center justify-between mb-2">
-				<div class="text-lg font-semibold">
-					{{ __('Program Members') }}
-				</div>
-				<Button
-					@click="
-						() => {
-							currentForm = 'member'
-							showDialog = true
-						}
-					"
-				>
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('Add') }}
-				</Button>
-			</div>
-
-			<ListView
-				:columns="memberColumns"
-				:rows="program.doc.program_members"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in memberColumns" />
-				</ListHeader>
-				<ListRows>
-					<ListRow :row="row" v-for="row in program.doc.program_members" />
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="remove(selections, unselectAll, 'program_members')"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-	</div>
-
-	<Dialog
-		v-model="showDialog"
-		:options="{
-			title:
-				currentForm == 'course'
-					? __('New Program Course')
-					: __('New Program Member'),
-			actions: [
-				{
-					label: __('Add'),
-					variant: 'solid',
-					onClick: () =>
-						currentForm == 'course'
-							? addProgramCourse(close)
-							: addProgramMember(close),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<Link
-				v-if="currentForm == 'course'"
-				v-model="course"
-				doctype="LMS Course"
-				:filters="{
-					disable_self_learning: 1,
-				}"
-				:label="__('Program Course')"
-				:description="
-					__(
-						'Only courses for which self learning is disabled can be added to program.'
-					)
-				"
-			/>
-
-			<Link
-				v-if="currentForm == 'member'"
-				v-model="member"
-				doctype="User"
-				:filters="{
-					ignore_user_type: 1,
-				}"
-				:label="__('Program Member')"
-			/>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	Button,
-	call,
-	createDocumentResource,
-	Dialog,
-	FormControl,
-	ListView,
-	ListRows,
-	ListRow,
-	ListHeader,
-	ListHeaderItem,
-	ListSelectBanner,
-} from 'frappe-ui'
-import { computed, ref } from 'vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
-import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils/'
-import Draggable from 'vuedraggable'
-import { useRouter } from 'vue-router'
-
-const showDialog = ref(false)
-const currentForm = ref(null)
-const course = ref(null)
-const member = ref(null)
-const router = useRouter()
-
-const props = defineProps({
-	programName: {
-		type: String,
-		required: true,
-	},
-})
-
-const program = createDocumentResource({
-	doctype: 'LMS Program',
-	name: props.programName,
-	auto: true,
-	cache: ['program', props.programName],
-})
-
-const addProgramCourse = () => {
-	program.setValue.submit(
-		{
-			program_courses: [
-				...program.doc.program_courses,
-				{ course: course.value },
-			],
-		},
-		{
-			onSuccess(data) {
-				showDialog.value = false
-				course.value = null
-				showToast(__('Success'), __('Course added to program'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const addProgramMember = () => {
-	program.setValue.submit(
-		{
-			program_members: [
-				...program.doc.program_members,
-				{ member: member.value },
-			],
-		},
-		{
-			onSuccess(data) {
-				showDialog.value = false
-				member.value = null
-				showToast(__('Success'), __('Member added to program'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const remove = (selections, unselectAll, doctype) => {
-	selections = Array.from(selections)
-	program.setValue.submit(
-		{
-			[doctype]: program.doc[doctype].filter(
-				(row) => !selections.includes(row.name)
-			),
-		},
-		{
-			onSuccess(data) {
-				unselectAll()
-				showToast(__('Success'), __('Items removed successfully'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const updateOrder = (e) => {
-	let sourceIdx = e.from.dataset.idx
-	let targetIdx = e.to.dataset.idx
-	let courses = program.doc.program_courses
-	courses.splice(targetIdx, 0, courses.splice(sourceIdx, 1)[0])
-
-	courses.forEach((course, index) => {
-		course.idx = index + 1
-	})
-
-	program.setValue.submit(
-		{
-			program_courses: courses,
-		},
-		{
-			onSuccess(data) {
-				showToast(__('Success'), __('Course moved successfully'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const saveProgram = () => {
-	call('frappe.model.rename_doc.update_document_title', {
-		doctype: 'LMS Program',
-		docname: program.doc.name,
-		name: program.doc.title,
-	}).then((data) => {
-		router.push({ name: 'ProgramForm', params: { programName: data } })
-	})
-}
-
-const courseColumns = computed(() => {
-	return [
-		{
-			label: 'Title',
-			key: 'course_title',
-			width: 3,
-		},
-		{
-			label: 'ID',
-			key: 'course',
-			width: 3,
-		},
-	]
-})
-
-const memberColumns = computed(() => {
-	return [
-		{
-			label: 'Member',
-			key: 'member',
-			width: 3,
-			align: 'left',
-		},
-		{
-			label: 'Full Name',
-			key: 'full_name',
-			width: 3,
-			align: 'left',
-		},
-		{
-			label: 'Progress (%)',
-			key: 'progress',
-			width: 3,
-			align: 'right',
-		},
-	]
-})
-
-const breadbrumbs = computed(() => {
-	return [
-		{
-			label: 'Programs',
-			route: { name: 'Programs' },
-		},
-		{
-			label: props.programName === 'new' ? 'New Program' : props.programName,
-		},
-	]
-})
-</script>

frontend/src/pages/Programs.vue

@@ -1,215 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="breadbrumbs" />
-		<Button
-			v-if="user.data?.is_moderator || user.data?.is_instructor"
-			@click="showDialog = true"
-			variant="solid"
-		>
-			<template #prefix>
-				<Plus class="h-4 w-4 stroke-1.5" />
-			</template>
-			{{ __('New') }}
-		</Button>
-	</header>
-	<div v-if="programs.data?.length" class="pt-5 px-5">
-		<div v-for="program in programs.data" class="mb-10">
-			<div class="flex items-center justify-between">
-				<div class="text-xl font-semibold">
-					{{ program.name }}
-				</div>
-				<div class="flex items-center space-x-2">
-					<Badge
-						v-if="program.members"
-						variant="subtle"
-						theme="green"
-						size="lg"
-					>
-						{{ program.members }}
-						{{
-							program.members == 1 ? __(singularize('members')) : __('members')
-						}}
-					</Badge>
-					<Badge
-						v-if="program.progress"
-						variant="subtle"
-						theme="blue"
-						size="lg"
-					>
-						{{ program.progress }}{{ __('% completed') }}
-					</Badge>
-
-					<router-link
-						v-if="user.data?.is_moderator || user.data?.is_instructor"
-						:to="{
-							name: 'ProgramForm',
-							params: { programName: program.name },
-						}"
-					>
-						<Button>
-							<template #prefix>
-								<Edit class="h-4 w-4 stroke-1.5" />
-							</template>
-							{{ __('Edit') }}
-						</Button>
-					</router-link>
-				</div>
-			</div>
-			<div
-				v-if="program.courses?.length"
-				class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5 mt-5"
-			>
-				<div v-for="course in program.courses" class="relative group">
-					<CourseCard
-						:course="course"
-						@click="enrollMember(program.name, course.name)"
-						class="cursor-pointer"
-					/>
-					<div
-						v-if="lockCourse(course)"
-						class="absolute inset-0 bg-black-overlay-500 opacity-60 rounded-md"
-					></div>
-					<div
-						v-if="lockCourse(course)"
-						class="absolute inset-0 flex items-center justify-center"
-					>
-						<LockKeyhole class="size-10 text-white" />
-					</div>
-				</div>
-			</div>
-			<div v-else class="text-sm italic text-gray-600 mt-4">
-				{{ __('No courses in this program') }}
-			</div>
-		</div>
-	</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 programs found') }}
-		</div>
-		<div class="leading-5">
-			{{
-				__(
-					'There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-				)
-			}}
-		</div>
-	</div>
-
-	<Dialog
-		v-model="showDialog"
-		:options="{
-			title: __('New Program'),
-			actions: [
-				{
-					label: __('Create'),
-					variant: 'solid',
-					onClick: () => createProgram(close),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<FormControl :label="__('Title')" v-model="title" />
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import {
-	Badge,
-	Breadcrumbs,
-	Button,
-	call,
-	createResource,
-	Dialog,
-	FormControl,
-} from 'frappe-ui'
-import { computed, inject, onMounted, ref } from 'vue'
-import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
-import CourseCard from '@/components/CourseCard.vue'
-import { useRouter } from 'vue-router'
-import { showToast, singularize } from '@/utils'
-import { useSettings } from '@/stores/settings'
-
-const user = inject('$user')
-const showDialog = ref(false)
-const router = useRouter()
-const title = ref('')
-const settings = useSettings()
-
-onMounted(() => {
-	if (
-		!settings.learningPaths.data &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-})
-
-const programs = createResource({
-	url: 'lms.lms.utils.get_programs',
-	auto: true,
-	cache: 'programs',
-})
-
-const createProgram = (close) => {
-	call('frappe.client.insert', {
-		doc: {
-			doctype: 'LMS Program',
-			title: title.value,
-		},
-	}).then((res) => {
-		router.push({ name: 'ProgramForm', params: { programName: res.name } })
-	})
-}
-
-const enrollMember = (program, course) => {
-	call('lms.lms.utils.enroll_in_program_course', {
-		program: program,
-		course: course,
-	})
-		.then((data) => {
-			if (data.current_lesson) {
-				router.push({
-					name: 'Lesson',
-					params: {
-						courseName: course,
-						chapterNumber: data.current_lesson.split('-')[0],
-						lessonNumber: data.current_lesson.split('-')[1],
-					},
-				})
-			} else if (data) {
-				router.push({
-					name: 'Lesson',
-					params: {
-						courseName: course,
-						chapterNumber: 1,
-						lessonNumber: 1,
-					},
-				})
-			}
-		})
-		.catch((err) => {
-			showToast('Error', err.messages?.[0] || err, 'x')
-		})
-}
-
-const lockCourse = (course) => {
-	if (user.data?.is_moderator || user.data?.is_instructor) return false
-	if (course.membership) return false
-	if (course.eligible) return false
-	return true
-}
-
-const breadbrumbs = computed(() => [
-	{
-		label: 'Programs',
-	},
-])
-</script>

frontend/src/pages/QuizForm.vue

@@ -48,7 +48,6 @@
 						? __('Title')
 						: __('Enter a title and save the quiz to proceed')
 				"
-				:required="true"
 			/>
 			<div v-if="quizDetails.data?.name">
 				<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
@@ -142,7 +141,6 @@
 								v-slot="{ idx, column, item }"
 								v-for="row in quiz.questions"
 								@click="openQuestionModal(row)"
-								class="cursor-pointer"
 							>
 								<ListRowItem :item="item">
 									<div
@@ -206,6 +204,7 @@ import {
 	inject,
 	onBeforeUnmount,
 	watch,
+	isReactive,
 } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
 import Question from '@/components/Modals/Question.vue'

frontend/src/pages/QuizSubmission.vue

@@ -15,45 +15,38 @@
 			</Button>
 		</div>
 	</header>
-	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-5">
+	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-4">
-		<div class="text-xl font-semibold">
+		<div class="grid grid-cols-2 gap-5">
-			{{ submisisonDetails.doc.member_name }}
+			<FormControl
+				v-model="submisisonDetails.doc.quiz_title"
+				:label="__('Quiz')"
+				:disabled="true"
+			/>
+			<FormControl
+				v-model="submisisonDetails.doc.member_name"
+				:label="__('Member')"
+				:disabled="true"
+			/>
 		</div>
-		<div class="space-y-4 border p-5 rounded-md">
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl
-					v-model="submisisonDetails.doc.quiz_title"
-					:label="__('Quiz')"
-					:disabled="true"
-				/>
-				<FormControl
-					v-model="submisisonDetails.doc.member_name"
-					:label="__('Member')"
-					:disabled="true"
-				/>
-			</div>
 
-			<div class="grid grid-cols-2 gap-5">
+		<div class="grid grid-cols-2 gap-5">
-				<FormControl
+			<FormControl
-					v-model="submisisonDetails.doc.score"
+				v-model="submisisonDetails.doc.score"
-					:label="__('Score')"
+				:label="__('Score')"
-					:disabled="true"
+				:disabled="true"
-				/>
+			/>
-				<FormControl
+			<FormControl
-					v-model="submisisonDetails.doc.percentage"
+				v-model="submisisonDetails.doc.percentage"
-					:label="__('Percentage')"
+				:label="__('Percentage')"
-					:disabled="true"
+				:disabled="true"
-				/>
+			/>
-			</div>
 		</div>
 
 		<div
 			v-for="row in submisisonDetails.doc.result"
 			class="border p-5 rounded-md space-y-4"
 		>
-			<div class="flex space-x-1 font-semibold">
+			<div class="font-semibold">{{ row.idx }}. {{ row.question }}</div>
-				<span class="leading-5" v-html="row.question"> </span>
-			</div>
 			<div v-html="row.answer" class="leading-5"></div>
 			<div class="grid grid-cols-2 gap-5">
 				<FormControl v-model="row.marks" :label="__('Marks')" />
@@ -74,7 +67,7 @@ import {
 	Button,
 	Badge,
 } from 'frappe-ui'
-import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
+import { computed, onMounted, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { showToast } from '@/utils'
 
@@ -84,25 +77,8 @@ const user = inject('$user')
 onMounted(() => {
 	if (!user.data?.is_instructor && !user.data?.is_moderator)
 		router.push({ name: 'Courses' })
-
-	window.addEventListener('keydown', keyboardShortcut)
 })
 
-onBeforeUnmount(() => {
-	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		saveSubmission()
-		e.preventDefault()
-	}
-}
-
 const props = defineProps({
 	submission: {
 		type: String,

frontend/src/pages/Quizzes.vue

@@ -47,22 +47,6 @@
 			</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 {
@@ -77,7 +61,7 @@ import {
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { computed, inject, onMounted } from 'vue'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')

frontend/src/pages/SCORMChapter.vue

@@ -1,208 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs class="h-7" :items="breadcrumbs" />
-	</header>
-	<div
-		v-if="
-			readyToRender &&
-			(enrollment.data?.length ||
-				user.data?.is_moderator ||
-				user.data?.is_instructor)
-		"
-	>
-		<iframe :src="chapter.doc.launch_file" class="w-full h-screen" />
-	</div>
-	<div v-else-if="!enrollment.data?.length">
-		<div class="text-center pt-10 px-5 md:px-0 pb-10">
-			<div class="text-center">
-				<div class="mb-4">
-					{{
-						__(
-							'You are not enrolled in this course. Please enroll to access this lesson.'
-						)
-					}}
-				</div>
-				<Button variant="solid" @click="enrollStudent()">
-					{{ __('Start Learning') }}
-				</Button>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	Button,
-	call,
-	createDocumentResource,
-	createListResource,
-	createResource,
-} from 'frappe-ui'
-import { computed, inject, onBeforeMount, ref } from 'vue'
-import { useSidebar } from '@/stores/sidebar'
-import { updateDocumentTitle } from '@/utils'
-
-const sidebarStore = useSidebar()
-const user = inject('$user')
-const readyToRender = ref(false)
-
-const props = defineProps({
-	courseName: {
-		type: String,
-		required: true,
-	},
-	chapterName: {
-		type: String,
-		required: true,
-	},
-})
-
-onBeforeMount(() => {
-	sidebarStore.isSidebarCollapsed = true
-	setupSCORMAPI()
-})
-
-const chapter = createDocumentResource({
-	doctype: 'Course Chapter',
-	name: props.chapterName,
-	auto: true,
-	cache: ['chapter', props.chapterName],
-	onSuccess(data) {
-		progress.submit()
-	},
-})
-
-const enrollment = createListResource({
-	doctype: 'LMS Enrollment',
-	fields: ['member', 'course'],
-	filters: {
-		course: props.courseName,
-		member: user.data?.name,
-	},
-	auto: true,
-	cache: ['enrollments', props.courseName, user.data?.name],
-})
-
-const getDataFromLMS = (key) => {
-	if (key == 'cmi.core.lesson_status') {
-		if (progress.data?.status == 'Complete') {
-			return 'passed'
-		}
-		return 'incomplete'
-	}
-	return ''
-}
-
-const saveDataToLMS = (key, value) => {
-	if (key == 'cmi.core.lesson_status' && value == 'passed') {
-		saveProgress()
-	}
-}
-
-const saveProgress = () => {
-	call('lms.lms.doctype.course_lesson.course_lesson.save_progress', {
-		lesson: chapter.doc.lessons[0].lesson,
-		course: props.courseName,
-	})
-}
-
-const progress = createResource({
-	url: 'frappe.client.get_value',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Course Progress',
-			fieldname: 'status',
-			filters: {
-				member: user.data?.name,
-				lesson: chapter.doc.lessons[0].lesson,
-				chapter: chapter.doc.name,
-				course: chapter.doc?.course,
-			},
-		}
-	},
-	onSuccess(data) {
-		readyToRender.value = true
-	},
-})
-
-const enrollStudent = () => {
-	enrollment.insert.submit(
-		{
-			course: props.courseName,
-			member: user.data?.name,
-		},
-		{
-			onSuccess(data) {
-				window.location.reload()
-			},
-		}
-	)
-}
-
-const setupSCORMAPI = () => {
-	window.API_1484_11 = {
-		Initialize: () => 'true',
-		Terminate: () => 'true',
-		GetValue: (key) => {
-			console.log(`GET: ${key}`)
-			return getDataFromLMS(key)
-		},
-		SetValue: (key, value) => {
-			console.log(`SET: ${key} to value: ${value}`)
-
-			saveDataToLMS(key, value)
-			return 'true'
-		},
-		Commit: () => 'true',
-		GetLastError: () => '0',
-		GetErrorString: () => '',
-		GetDiagnostic: () => '',
-	}
-	window.API = {
-		LMSInitialize: () => 'true',
-		LMSFinish: () => 'true',
-		LMSGetValue: (key) => {
-			console.log(`GET: ${key}`)
-			return getDataFromLMS(key)
-		},
-		LMSSetValue: (key, value) => {
-			console.log(`SET: ${key} to value: ${value}`)
-			saveDataToLMS(key, value)
-			return 'true'
-		},
-		LMSCommit: () => 'true',
-		LMSGetLastError: () => '0',
-		LMSGetErrorString: () => '',
-		LMSGetDiagnostic: () => '',
-	}
-}
-
-const breadcrumbs = computed(() => {
-	return [
-		{
-			label: 'Courses',
-			route: { name: 'Courses' },
-		},
-		{
-			label: chapter.doc?.course_title,
-			route: { name: 'CourseDetail', params: { courseName: props.courseName } },
-		},
-		{
-			label: chapter.doc?.title,
-		},
-	]
-})
-
-const pageMeta = computed(() => {
-	return {
-		title: chapter?.doc?.title,
-		description: __('This is a chapter in the course {0}').format(
-			chapter?.doc?.course_title
-		),
-	}
-})
-
-updateDocumentTitle(pageMeta)
-</script>

frontend/src/router.js

@@ -27,12 +27,6 @@ const routes = [
 		component: () => import('@/pages/Lesson.vue'),
 		props: true,
 	},
-	{
-		path: '/courses/:courseName/learn/:chapterName',
-		name: 'SCORMChapter',
-		component: () => import('@/pages/SCORMChapter.vue'),
-		props: true,
-	},
 	{
 		path: '/batches',
 		name: 'Batches',
@@ -182,17 +176,6 @@ const routes = [
 		component: () => import('@/pages/QuizSubmission.vue'),
 		props: true,
 	},
-	{
-		path: '/programs/:programName',
-		name: 'ProgramForm',
-		component: () => import('@/pages/ProgramForm.vue'),
-		props: true,
-	},
-	{
-		path: '/programs',
-		name: 'Programs',
-		component: () => import('@/pages/Programs.vue'),
-	},
 ]
 
 let router = createRouter({

frontend/src/stores/settings.js

@@ -1,32 +1,12 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
-import { createResource } from 'frappe-ui'
 
 export const useSettings = defineStore('settings', () => {
 	const isSettingsOpen = ref(false)
 	const activeTab = ref(null)
-	const learningPaths = createResource({
-		url: 'frappe.client.get_single_value',
-		makeParams(values) {
-			return {
-				doctype: 'LMS Settings',
-				field: 'enable_learning_paths',
-			}
-		},
-		auto: true,
-		cache: ['learningPaths'],
-	})
-
-	const onboardingDetails = createResource({
-		url: 'lms.lms.utils.is_onboarding_complete',
-		auto: true,
-		cache: ['onboardingDetails'],
-	})
 
 	return {
 		isSettingsOpen,
 		activeTab,
-		learningPaths,
-		onboardingDetails,
 	}
 })

frontend/src/stores/sidebar.js

@@ -1,10 +0,0 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-export const useSidebar = defineStore('sidebar', () => {
-	const isSidebarCollapsed = ref(false)
-
-	return {
-		isSidebarCollapsed,
-	}
-})

frontend/src/utils/dayjs.js

@@ -5,8 +5,6 @@ import updateLocale from 'dayjs/esm/plugin/updateLocale'
 import isToday from 'dayjs/esm/plugin/isToday'
 import isSameOrBefore from 'dayjs/esm/plugin/isSameOrBefore'
 import isSameOrAfter from 'dayjs/esm/plugin/isSameOrAfter'
-import utc from 'dayjs/esm/plugin/utc'
-import timezone from 'dayjs/esm/plugin/timezone'
 
 dayjs.extend(updateLocale)
 dayjs.extend(relativeTime)
@@ -14,7 +12,5 @@ dayjs.extend(localizedFormat)
 dayjs.extend(isToday)
 dayjs.extend(isSameOrBefore)
 dayjs.extend(isSameOrAfter)
-dayjs.extend(utc)
-dayjs.extend(timezone)
 
 export default dayjs

frontend/src/utils/index.js

@@ -11,7 +11,6 @@ import { watch } from 'vue'
 import dayjs from '@/utils/dayjs'
 import Embed from '@editorjs/embed'
 import SimpleImage from '@editorjs/simple-image'
-import Table from '@editorjs/table'
 
 export function createToast(options) {
 	toast({
@@ -58,15 +57,6 @@ 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 ''
@@ -94,7 +84,7 @@ export function showToast(title, text, icon, iconClasses = null) {
 	if (!iconClasses) {
 		if (icon == 'check') {
 			iconClasses = 'bg-green-600 text-white rounded-md p-px'
-		} else if (icon == 'alert-circle') {
+		} else if (icon == 'circle-warn') {
 			iconClasses = 'bg-yellow-600 text-white rounded-md p-px'
 		} else {
 			iconClasses = 'bg-red-600 text-white rounded-md p-px'
@@ -151,7 +141,6 @@ export function getEditorTools() {
 		quiz: Quiz,
 		upload: Upload,
 		image: SimpleImage,
-		table: Table,
 		paragraph: {
 			class: Paragraph,
 			inlineToolbar: true,

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 bg-gray-50 mb-2'>
+		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center mb-2'>
             <span class="font-medium">
                 Quiz: ${quiz}
             </span>
@@ -60,9 +60,6 @@ export class Quiz {
 	}
 
 	renderQuizModal() {
-		if (this.readOnly) {
-			return
-		}
 		const app = createApp(QuizPlugin, {
 			onQuizAddition: (quiz) => {
 				this.data.quiz = quiz

lms/__init__.py

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

lms/hooks.py

@@ -110,8 +110,7 @@ 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"],
 }
@@ -225,7 +224,6 @@ page_renderer = [
 	"lms.page_renderers.ProfileRedirectPage",
 	"lms.page_renderers.ProfilePage",
 	"lms.page_renderers.CoursePage",
-	"lms.page_renderers.SCORMRenderer",
 ]
 
 # set this to "/" to have profiles on the top-level

lms/install.py

@@ -1,12 +1,10 @@
 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():
@@ -66,9 +64,7 @@ def delete_lms_roles():
 
 
 def create_course_creator_role():
-	if frappe.db.exists("Role", "Course Creator"):
+	if not frappe.db.exists("Role", "Course Creator"):
-		frappe.db.set_value("Role", "Course Creator", "desk_access", 0)
-	else:
 		role = frappe.get_doc(
 			{
 				"doctype": "Role",
@@ -81,9 +77,7 @@ def create_course_creator_role():
 
 
 def create_moderator_role():
-	if frappe.db.exists("Role", "Moderator"):
+	if not frappe.db.exists("Role", "Moderator"):
-		frappe.db.set_value("Role", "Moderator", "desk_access", 0)
-	else:
 		role = frappe.get_doc(
 			{
 				"doctype": "Role",
@@ -96,9 +90,7 @@ def create_moderator_role():
 
 
 def create_evaluator_role():
-	if frappe.db.exists("Role", "Batch Evaluator"):
+	if not frappe.db.exists("Role", "Batch Evaluator"):
-		frappe.db.set_value("Role", "Batch Evaluator", "desk_access", 0)
-	else:
 		role = frappe.new_doc("Role")
 		role.update(
 			{
@@ -111,9 +103,7 @@ def create_evaluator_role():
 
 
 def create_lms_student_role():
-	if frappe.db.exists("Role", "LMS Student"):
+	if not frappe.db.exists("Role", "LMS Student"):
-		frappe.db.set_value("Role", "LMS Student", "desk_access", 0)
-	else:
 		role = frappe.new_doc("Role")
 		role.update(
 			{

lms/lms/api.py

@@ -1,22 +1,13 @@
 """API methods for the LMS.
 """
 
-import json
 import frappe
-import zipfile
-import os
-import re
-import shutil
-import requests
-import xml.etree.ElementTree as ET
 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, flt
+from frappe.utils import time_diff, now_datetime, get_datetime
 from typing import Optional
-from lms.lms.utils import get_average_rating, get_lesson_count
-from xml.dom.minidom import parseString
 
 
 @frappe.whitelist()
@@ -303,8 +294,7 @@ def get_branding():
 
 	for field in image_fields:
 		if website_settings.get(field):
-			file_info = get_file_info(website_settings.get(field))
+			website_settings.update({field: get_file_info(website_settings.get(field))})
-			website_settings.update({field: json.loads(json.dumps(file_info))})
 		else:
 			website_settings.update({field: None})
 
@@ -499,15 +489,7 @@ def delete_sidebar_item(webpage):
 
 @frappe.whitelist()
 def delete_lesson(lesson, chapter):
-	# Delete Reference
+	frappe.db.delete("Lesson Reference", {"parent": chapter, "lesson": lesson})
-	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)
 
 
@@ -592,7 +574,7 @@ def get_categories(doctype, filters):
 def get_members(start=0, search=""):
 	"""Get members for the given search term and start index.
 	Args: start (int): Start index for the query.
-	        search (str): Search term to filter the results.
+	    search (str): Search term to filter the results.
 	Returns: List of members.
 	"""
 
@@ -778,254 +760,3 @@ 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)
-
-
-@frappe.whitelist()
-def upsert_chapter(title, course, is_scorm_package, scorm_package, name=None):
-	values = frappe._dict(
-		{"title": title, "course": course, "is_scorm_package": is_scorm_package}
-	)
-
-	if is_scorm_package:
-		scorm_package = frappe._dict(scorm_package)
-		extract_path = extract_package(course, title, scorm_package)
-
-		values.update(
-			{
-				"scorm_package": scorm_package.name,
-				"scorm_package_path": extract_path.split("public")[1],
-				"manifest_file": get_manifest_file(extract_path).split("public")[1],
-				"launch_file": get_launch_file(extract_path).split("public")[1],
-			}
-		)
-
-	if name:
-		chapter = frappe.get_doc("Course Chapter", name)
-	else:
-		chapter = frappe.new_doc("Course Chapter")
-
-	chapter.update(values)
-	chapter.save()
-
-	if is_scorm_package and not len(chapter.lessons):
-		add_lesson(title, chapter.name, course)
-
-	return chapter
-
-
-def extract_package(course, title, scorm_package):
-	package = frappe.get_doc("File", scorm_package.name)
-	zip_path = package.get_full_path()
-	# check_for_malicious_code(zip_path)
-	extract_path = frappe.get_site_path("public", "scorm", course, title)
-	zipfile.ZipFile(zip_path).extractall(extract_path)
-	return extract_path
-
-
-def check_for_malicious_code(zip_path):
-	suspicious_patterns = [
-		# Unsafe inline JavaScript
-		r'on(click|load|mouseover|error|submit|focus|blur|change|keyup|keydown|keypress|resize)=".*?"',  # Inline event handlers (e.g., onerror, onclick)
-		r'<script.*?src=["\']http',  # External script tags
-		r"eval\(",  # Usage of eval()
-		r"Function\(",  # Usage of Function constructor
-		r"(btoa|atob)\(",  # Base64 encoding/decoding
-		# Dangerous XML patterns
-		r"<!ENTITY",  # XXE-related
-		r"<\?xml-stylesheet .*?>",  # External stylesheets in XML
-	]
-
-	with zipfile.ZipFile(zip_path, "r") as zf:
-		for file_name in zf.namelist():
-			if file_name.endswith((".html", ".js", ".xml")):
-				with zf.open(file_name) as file:
-					content = file.read().decode("utf-8", errors="ignore")
-					for pattern in suspicious_patterns:
-						if re.search(pattern, content):
-							frappe.throw(
-								_("Suspicious pattern found in {0}: {1}").format(file_name, pattern)
-							)
-
-
-def get_manifest_file(extract_path):
-	manifest_file = None
-	for root, dirs, files in os.walk(extract_path):
-		for file in files:
-			if file == "imsmanifest.xml":
-				manifest_file = os.path.join(root, file)
-				break
-		if manifest_file:
-			break
-	return manifest_file
-
-
-def get_launch_file(extract_path):
-	launch_file = None
-	manifest_file = get_manifest_file(extract_path)
-
-	if manifest_file:
-		with open(manifest_file) as file:
-			data = file.read()
-			dom = parseString(data)
-			resource = dom.getElementsByTagName("resource")
-			for res in resource:
-				if (
-					res.getAttribute("adlcp:scormtype") == "sco"
-					or res.getAttribute("adlcp:scormType") == "sco"
-				):
-					launch_file = res.getAttribute("href")
-					break
-
-		if launch_file:
-			launch_file = os.path.join(os.path.dirname(manifest_file), launch_file)
-
-	return launch_file
-
-
-def add_lesson(title, chapter, course):
-	lesson = frappe.new_doc("Course Lesson")
-	lesson.update(
-		{
-			"title": title,
-			"chapter": chapter,
-			"course": course,
-		}
-	)
-	lesson.insert()
-
-	lesson_reference = frappe.new_doc("Lesson Reference")
-	lesson_reference.update(
-		{
-			"lesson": lesson.name,
-			"parent": chapter,
-			"parenttype": "Course Chapter",
-			"parentfield": "lessons",
-		}
-	)
-	lesson_reference.insert()
-
-
-@frappe.whitelist()
-def delete_chapter(chapter):
-	chapterInfo = frappe.db.get_value(
-		"Course Chapter", chapter, ["is_scorm_package", "scorm_package_path"], as_dict=True
-	)
-
-	if chapterInfo.is_scorm_package:
-		delete_scorm_package(chapterInfo.scorm_package_path)
-
-	frappe.db.delete("Chapter Reference", {"chapter": chapter})
-	frappe.db.delete("Lesson Reference", {"parent": chapter})
-	frappe.db.delete("Course Lesson", {"chapter": chapter})
-	frappe.db.delete("Course Chapter", chapter)
-
-
-def delete_scorm_package(scorm_package_path):
-	scorm_package_path = frappe.get_site_path("public", scorm_package_path[1:])
-	if os.path.exists(scorm_package_path):
-		shutil.rmtree(scorm_package_path)

lms/lms/doctype/batch_student/batch_student.py

@@ -7,3 +7,17 @@ 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

@@ -8,17 +8,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "course",
   "title",
   "column_break_3",
-  "course",
+  "description",
-  "course_title",
-  "scorm_section",
-  "is_scorm_package",
-  "scorm_package",
-  "scorm_package_path",
-  "column_break_dlnw",
-  "manifest_file",
-  "launch_file",
   "section_break_5",
   "lessons"
  ],
@@ -42,6 +35,11 @@
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
   },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
+  },
   {
    "fieldname": "section_break_5",
    "fieldtype": "Section Break"
@@ -51,56 +49,6 @@
    "fieldtype": "Table",
    "label": "Lessons",
    "options": "Lesson Reference"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_scorm_package",
-   "fieldtype": "Check",
-   "label": "Is SCORM Package"
-  },
-  {
-   "depends_on": "is_scorm_package",
-   "fieldname": "manifest_file",
-   "fieldtype": "Code",
-   "label": "Manifest File",
-   "read_only": 1
-  },
-  {
-   "depends_on": "is_scorm_package",
-   "fieldname": "launch_file",
-   "fieldtype": "Code",
-   "label": "Launch File",
-   "read_only": 1
-  },
-  {
-   "fieldname": "scorm_section",
-   "fieldtype": "Section Break",
-   "label": "SCORM"
-  },
-  {
-   "fieldname": "scorm_package",
-   "fieldtype": "Link",
-   "label": "SCORM Package",
-   "options": "File",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_dlnw",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "is_scorm_package",
-   "fieldname": "scorm_package_path",
-   "fieldtype": "Code",
-   "label": "SCORM Package Path",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "course.title",
-   "fieldname": "course_title",
-   "fieldtype": "Data",
-   "label": "Course Title",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
@@ -111,7 +59,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2024-11-15 12:03:31.370943",
+ "modified": "2023-09-29 17:03:58.013819",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Chapter",
@@ -131,14 +79,17 @@
    "write": 1
   },
   {
+   "create": 1,
    "email": 1,
    "export": 1,
+   "if_owner": 1,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "LMS Student",
    "select": 1,
-   "share": 1
+   "share": 1,
+   "write": 1
   }
  ],
  "search_fields": "title",

lms/lms/doctype/course_chapter/course_chapter.py

@@ -1,27 +1,10 @@
 # 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 lms.lms.utils import get_course_progress
+from frappe.utils.telemetry import capture
-from lms.lms.api import update_course_statistics
 
 
 class CourseChapter(Document):
-	def on_update(self):
+	pass
-		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/course_lesson/course_lesson.json

@@ -8,18 +8,12 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "chapter",
+  "course",
+  "column_break_4",
   "title",
   "include_in_preview",
-  "column_break_4",
+  "index_label",
-  "chapter",
-  "is_scorm_package",
-  "course",
-  "section_break_11",
-  "content",
-  "body",
-  "column_break_cjmf",
-  "instructor_content",
-  "instructor_notes",
   "section_break_6",
   "youtube",
   "column_break_9",
@@ -28,7 +22,13 @@
   "question",
   "column_break_15",
   "file_type",
-  "column_break_syza",
+  "section_break_11",
+  "content",
+  "body",
+  "column_break_cjmf",
+  "instructor_content",
+  "instructor_notes",
+  "help_section",
   "help"
  ],
  "fields": [
@@ -59,6 +59,12 @@
    "label": "Title",
    "reqd": 1
   },
+  {
+   "fieldname": "index_label",
+   "fieldtype": "Data",
+   "label": "Index Label",
+   "read_only": 1
+  },
   {
    "fieldname": "section_break_6",
    "fieldtype": "Section Break",
@@ -68,7 +74,14 @@
    "fieldname": "body",
    "fieldtype": "Markdown Editor",
    "ignore_xss_filter": 1,
-   "label": "Body"
+   "label": "Body",
+   "reqd": 1
+  },
+  {
+   "fieldname": "help_section",
+   "fieldtype": "Section Break",
+   "hidden": 1,
+   "label": "Help"
   },
   {
    "fieldname": "help",
@@ -145,23 +158,11 @@
    "fieldname": "instructor_content",
    "fieldtype": "Text",
    "label": "Instructor Content"
-  },
-  {
-   "fieldname": "column_break_syza",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fetch_from": "chapter.is_scorm_package",
-   "fieldname": "is_scorm_package",
-   "fieldtype": "Check",
-   "label": "Is SCORM Package",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-14 13:46:56.838659",
+ "modified": "2024-10-08 11:04:54.748773",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Lesson",

lms/lms/doctype/course_lesson/course_lesson.py

@@ -52,6 +52,7 @@ class CourseLesson(Document):
 			ex.lesson = None
 			ex.course = None
 			ex.index_ = 0
+			ex.index_label = ""
 			ex.save(ignore_permissions=True)
 
 	def check_and_create_folder(self):
@@ -93,15 +94,15 @@ def save_progress(lesson, course):
 
 	frappe.db.set_value("LMS Enrollment", membership, "current_lesson", lesson)
 
+	quiz_completed = get_quiz_progress(lesson)
+	if not quiz_completed:
+		return 0
+
 	if frappe.db.exists(
 		"LMS Course Progress", {"lesson": lesson, "member": frappe.session.user}
 	):
 		return
 
-	quiz_completed = get_quiz_progress(lesson)
-	if not quiz_completed:
-		return 0
-
 	frappe.get_doc(
 		{
 			"doctype": "LMS Course Progress",

lms/lms/doctype/lms_batch/lms_batch.json

@@ -193,15 +193,13 @@
    "depends_on": "paid_batch",
    "fieldname": "amount",
    "fieldtype": "Currency",
-   "label": "Amount",
+   "label": "Amount"
-   "mandatory_depends_on": "paid_batch"
   },
   {
    "depends_on": "paid_batch",
    "fieldname": "currency",
    "fieldtype": "Link",
    "label": "Currency",
-   "mandatory_depends_on": "paid_batch",
    "options": "Currency"
   },
   {
@@ -330,7 +328,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-18 16:28:41.336928",
+ "modified": "2024-07-18 18:06:37.229885",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch",

lms/lms/doctype/lms_batch/lms_batch.py

@@ -28,13 +28,11 @@ class LMSBatch(Document):
 		self.validate_duplicate_courses()
 		self.validate_duplicate_students()
 		self.validate_payments_app()
-		self.validate_amount_and_currency()
 		self.validate_duplicate_assessments()
 		self.validate_membership()
 		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:
@@ -65,10 +63,6 @@ class LMSBatch(Document):
 			if "payments" not in installed_apps:
 				frappe.throw(_("Please install the Payments app to create a paid batches."))
 
-	def validate_amount_and_currency(self):
-		if self.paid_batch and (not self.amount or not self.currency):
-			frappe.throw(_("Amount and currency are required for paid batches."))
-
 	def validate_duplicate_assessments(self):
 		assessments = [row.assessment_name for row in self.assessment]
 		for assessment in self.assessment:
@@ -145,27 +139,6 @@ 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_certificate/lms_certificate.json

@@ -114,7 +114,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-11 11:37:20.419956",
+ "modified": "2024-09-11 11:37:20.419955",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate",

lms/lms/doctype/lms_course/lms_course.json

@@ -48,12 +48,7 @@
   "certification_section",
   "enable_certification",
   "column_break_rxww",
-  "expiry",
+  "expiry"
-  "tab_4_tab",
-  "statistics_section",
-  "enrollments",
-  "lessons",
-  "rating"
  ],
  "fields": [
   {
@@ -254,36 +249,6 @@
    "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",
@@ -310,7 +275,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2024-10-30 23:08:31.842860",
+ "modified": "2024-09-21 10:23:58.633912",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

lms/lms/doctype/lms_course/lms_course.py

@@ -19,7 +19,6 @@ class LMSCourse(Document):
 		self.validate_video_link()
 		self.validate_status()
 		self.validate_payments_app()
-		self.validate_amount_and_currency()
 		self.image = validate_image(self.image)
 
 	def validate_published(self):
@@ -52,10 +51,6 @@ class LMSCourse(Document):
 			if "payments" not in installed_apps:
 				frappe.throw(_("Please install the Payments app to create a paid courses."))
 
-	def validate_amount_and_currency(self):
-		if self.paid_course and (not self.course_price and not self.currency):
-			frappe.throw(_("Amount and currency are required for paid courses."))
-
 	def on_update(self):
 		if not self.upcoming and self.has_value_changed("upcoming"):
 			self.send_email_to_interested_users()
@@ -192,3 +187,192 @@ 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,8 +75,7 @@
    "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course",
-   "reqd": 1,
+   "reqd": 1
-   "search_index": 1
   },
   {
    "fieldname": "current_lesson",
@@ -127,7 +126,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-10-30 12:44:16.103598",
+ "modified": "2024-05-14 14:50:08.405033",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Enrollment",

lms/lms/doctype/lms_enrollment/lms_enrollment.py

@@ -4,7 +4,6 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import ceil
 
 
 class LMSEnrollment(Document):
@@ -12,9 +11,6 @@ class LMSEnrollment(Document):
 		self.validate_membership_in_same_batch()
 		self.validate_membership_in_different_batch_same_course()
 
-	def on_update(self):
-		self.update_program_progress()
-
 	def validate_membership_in_same_batch(self):
 		filters = {"member": self.member, "course": self.course, "name": ["!=", self.name]}
 		if self.batch_old:
@@ -59,26 +55,6 @@ class LMSEnrollment(Document):
 				)
 			)
 
-	def update_program_progress(self):
-		programs = frappe.get_all(
-			"LMS Program Member", {"member": self.member}, ["parent", "name"]
-		)
-
-		for program in programs:
-			total_progress = 0
-			courses = frappe.get_all(
-				"LMS Program Course", {"parent": program.parent}, pluck="course"
-			)
-			for course in courses:
-				progress = frappe.db.get_value(
-					"LMS Enrollment", {"course": course, "member": self.member}, "progress"
-				)
-				progress = progress or 0
-				total_progress += progress
-
-			average_progress = ceil(total_progress / len(courses))
-			frappe.db.set_value("LMS Program Member", program.name, "progress", average_progress)
-
 
 @frappe.whitelist()
 def create_membership(

lms/lms/doctype/lms_live_class/lms_live_class.json

@@ -10,20 +10,19 @@
   "title",
   "host",
   "batch_name",
-  "event",
   "column_break_astv",
-  "description",
-  "section_break_glxh",
   "date",
-  "duration",
-  "column_break_spvt",
   "time",
+  "duration",
+  "section_break_glxh",
+  "description",
+  "column_break_spvt",
   "timezone",
-  "section_break_yrpq",
   "password",
+  "auto_recording",
+  "section_break_yrpq",
   "start_url",
   "column_break_yokr",
-  "auto_recording",
   "join_url"
  ],
  "fields": [
@@ -123,19 +122,11 @@
    "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-11-11 18:59:26.396111",
+ "modified": "2024-01-09 11:22:33.272341",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Live Class",

lms/lms/doctype/lms_live_class/lms_live_class.py

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

lms/lms/doctype/lms_program/lms_program.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2024, Frappe and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("LMS Program", {
-// 	refresh(frm) {
-
-// 	},
-// });

lms/lms/doctype/lms_program/lms_program.json

@@ -1,85 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "autoname": "field:title",
- "creation": "2024-11-18 12:27:13.283169",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "program_courses",
-  "program_members"
- ],
- "fields": [
-  {
-   "fieldname": "program_courses",
-   "fieldtype": "Table",
-   "label": "Program Courses",
-   "options": "LMS Program Course"
-  },
-  {
-   "fieldname": "program_members",
-   "fieldtype": "Table",
-   "label": "Program Members",
-   "options": "LMS Program Member"
-  },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1,
-   "unique": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2024-11-28 22:06:16.742867",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Program",
- "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,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Course Creator",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}

lms/lms/doctype/lms_program/lms_program.py

@@ -1,32 +0,0 @@
-# Copyright (c) 2024, Frappe and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-
-class LMSProgram(Document):
-	def validate(self):
-		self.validate_program_courses()
-		self.validate_program_members()
-
-	def validate_program_courses(self):
-		courses = [row.course for row in self.program_courses]
-		duplicates = {course for course in courses if courses.count(course) > 1}
-		if len(duplicates):
-			frappe.throw(
-				_("Course {0} has already been added to this batch.").format(
-					frappe.bold(next(iter(duplicates)))
-				)
-			)
-
-	def validate_program_members(self):
-		members = [row.member for row in self.program_members]
-		duplicates = {member for member in members if members.count(member) > 1}
-		if len(duplicates):
-			frappe.throw(
-				_("Member {0} has already been added to this batch.").format(
-					frappe.bold(next(iter(duplicates)))
-				)
-			)

lms/lms/doctype/lms_program/test_lms_program.py

@@ -1,21 +0,0 @@
-# Copyright (c) 2024, Frappe and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests import IntegrationTestCase, UnitTestCase
-
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record depdendencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class TestLMSProgram(UnitTestCase):
-	"""
-	Unit tests for LMSProgram.
-	Use this class for testing individual functions and methods.
-	"""
-
-	pass

lms/lms/doctype/lms_program_course/lms_program_course.json

@@ -1,42 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-11-18 12:27:37.030302",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "course",
-  "course_title"
- ],
- "fields": [
-  {
-   "fieldname": "course",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Course",
-   "options": "LMS Course",
-   "reqd": 1
-  },
-  {
-   "fetch_from": "course.title",
-   "fieldname": "course_title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Course Title",
-   "read_only": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2024-11-18 12:43:46.800199",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Program Course",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}

lms/lms/doctype/lms_program_course/lms_program_course.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2024, Frappe and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class LMSProgramCourse(Document):
-	pass

lms/lms/doctype/lms_program_member/lms_program_member.json

@@ -1,50 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-11-18 12:29:13.615014",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "member",
-  "full_name",
-  "progress"
- ],
- "fields": [
-  {
-   "fieldname": "member",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Member",
-   "options": "User",
-   "reqd": 1
-  },
-  {
-   "fetch_from": "member.full_name",
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Full Name",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "progress",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Progress"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2024-11-21 12:51:31.882576",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Program Member",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}

lms/lms/doctype/lms_program_member/lms_program_member.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2024, Frappe and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class LMSProgramMember(Document):
-	pass

lms/lms/doctype/lms_question/lms_question.py

@@ -16,7 +16,6 @@ class LMSQuestion(Document):
 def validate_correct_answers(question):
 	if question.type == "Choices":
 		validate_duplicate_options(question)
-		validate_minimum_options(question)
 		validate_correct_options(question)
 	elif question.type == "User Input":
 		validate_possible_answer(question)
@@ -43,11 +42,6 @@ def validate_correct_options(question):
 		frappe.throw(_("At least one option must be correct for this question."))
 
 
-def validate_minimum_options(question):
-	if question.type == "Choices" and (not question.option_1 or not question.option_2):
-		frappe.throw(_("Minimum two options are required for multiple choice questions."))
-
-
 def validate_possible_answer(question):
 	possible_answers = []
 	possible_answers_fields = [

lms/lms/doctype/lms_quiz/lms_quiz.py

@@ -57,15 +57,14 @@ class LMSQuiz(Document):
 		types = [question.type for question in self.questions]
 		types = set(types)
 
-		if "Open Ended" in types:
+		if "Open Ended" in types and len(types) > 1:
-			if len(types) > 1:
+			frappe.throw(
-				frappe.throw(
+				_(
-					_(
+					"If you want open ended questions then make sure each question in the quiz is of open ended type."
-						"If you want open ended questions then make sure each question in the quiz is of open ended type."
-					)
 				)
-			else:
+			)
-				self.show_answers = 0
+		else:
+			self.show_answers = 0
 
 	def autoname(self):
 		if not self.name:
@@ -134,6 +133,7 @@ def quiz_summary(quiz, results):
 			result["marks"] = marks
 			score += marks
 
+			del result["question_name"]
 		else:
 			result["is_correct"] = 0
 			is_open_ended = True

lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py

@@ -5,7 +5,6 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
 from frappe import _
-from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
 
 
 class LMSQuizSubmission(Document):
@@ -13,9 +12,6 @@ class LMSQuizSubmission(Document):
 		self.validate_marks()
 		self.set_percentage()
 
-	def on_update(self):
-		self.notify_member()
-
 	def validate_marks(self):
 		for row in self.result:
 			if cint(row.marks) > cint(row.marks_out_of):
@@ -30,24 +26,3 @@ class LMSQuizSubmission(Document):
 	def set_percentage(self):
 		if self.score and self.score_out_of:
 			self.percentage = (self.score / self.score_out_of) * 100
-
-	def notify_member(self):
-		if self.score != 0 and self.has_value_changed("score"):
-			notification = frappe._dict(
-				{
-					"subject": _("You have got a score of {0} for the quiz {1}").format(
-						self.score, self.quiz_title
-					),
-					"email_content": _(
-						"There has been an update on your submission. You have got a score of {0} for the quiz {1}"
-					).format(self.score, self.quiz_title),
-					"document_type": self.doctype,
-					"document_name": self.name,
-					"for_user": self.member,
-					"from_user": "Administrator",
-					"type": "Alert",
-					"link": "",
-				}
-			)
-
-			make_notification_logs(notification, [self.member])

lms/lms/doctype/lms_settings/lms_settings.json

@@ -5,15 +5,13 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "general_tab",
   "default_home",
-  "send_calendar_invite_for_evaluations",
   "is_onboarding_complete",
   "column_break_zdel",
-  "enable_learning_paths",
   "unsplash_access_key",
   "livecode_url",
   "section_break_szgq",
+  "send_calendar_invite_for_evaluations",
   "show_day_view",
   "column_break_2",
   "show_dashboard",
@@ -82,7 +80,6 @@
   {
    "fieldname": "mentor_request_section",
    "fieldtype": "Section Break",
-   "hidden": 1,
    "label": "Mentor Request"
   },
   {
@@ -130,7 +127,6 @@
   {
    "fieldname": "section_break_szgq",
    "fieldtype": "Section Break",
-   "hidden": 1,
    "label": "Batch Settings"
   },
   {
@@ -340,23 +336,12 @@
    "fieldname": "payments_app_is_not_installed",
    "fieldtype": "HTML",
    "label": "Payments app is not installed"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_learning_paths",
-   "fieldtype": "Check",
-   "label": "Enable Learning Paths"
-  },
-  {
-   "fieldname": "general_tab",
-   "fieldtype": "Tab Break",
-   "label": "General"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-11-20 11:55:05.358421",
+ "modified": "2024-10-01 12:15:49.800242",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Settings",
@@ -371,13 +356,6 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "role": "LMS Student",
-   "share": 1
   }
  ],
  "sort_field": "modified",

lms/lms/models.py

@@ -0,0 +1,6 @@
+"""Handy module to make access to all doctypes from a single place.
+"""
+from .doctype.lms_enrollment.lms_enrollment import (
+	LMSBatchMembership as Membership,
+)
+from .doctype.lms_course.lms_course import LMSCourse as Course

lms/lms/payments.py

@@ -1,4 +1,5 @@
 import frappe
+from payments.utils import get_payment_gateway_controller
 
 
 def get_payment_gateway():
@@ -6,10 +7,7 @@ def get_payment_gateway():
 
 
 def get_controller(payment_gateway):
-	if "payments" in frappe.get_installed_apps():
+	return get_payment_gateway_controller(payment_gateway)
-		from payments.utils import get_payment_gateway_controller
-
-		return get_payment_gateway_controller(payment_gateway)
 
 
 def validate_currency(payment_gateway, currency):

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_one = 0
+	less_than_seventy = 0
-	less_than_forty_one = 0
+	less_than_forty = 0
-	less_than_eleven = 0
+	less_than_ten = 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 < 71 and row.progress > 40:
+		elif row.progress < 70 and row.progress > 40:
-			less_than_seventy_one += 1
+			less_than_seventy += 1
-		elif row.progress < 41 and row.progress > 10:
+		elif row.progress < 40 and row.progress > 10:
-			less_than_forty_one += 1
+			less_than_forty += 1
-		elif row.progress < 11:
+		elif row.progress < 10:
-			less_than_eleven += 1
+			less_than_ten += 1
 
 	charts = {
 		"data": {
-			"labels": ["0-10", "11-40", "41-70", "71-99", "100"],
+			"labels": ["0-10", "10-40", "40-70", "70-99", "100"],
 			"datasets": [
 				{
 					"name": "Progress (%)",
 					"values": [
-						less_than_eleven,
+						less_than_ten,
-						less_than_forty_one,
+						less_than_forty,
-						less_than_seventy_one,
+						less_than_seventy,
 						less_than_hundred,
 						completed,
 					],

lms/lms/utils.py

@@ -6,7 +6,11 @@ import razorpay
 import requests
 from frappe import _
 from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_result
-from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
+from frappe.desk.doctype.notification_log.notification_log import (
+	make_notification_logs,
+	enqueue_create_notification,
+	get_title,
+)
 from frappe.desk.search import get_user_groups
 from frappe.desk.notifications import extract_mentions
 from frappe.utils import (
@@ -105,7 +109,7 @@ def get_chapters(course):
 		chapter_details = frappe.db.get_value(
 			"Course Chapter",
 			{"name": chapter.chapter},
-			["name", "title"],
+			["name", "title", "description"],
 			as_dict=True,
 		)
 		chapter.update(chapter_details)
@@ -153,12 +157,11 @@ 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.content)
+		lesson_details.icon = get_lesson_icon(lesson_details.body)
 
 		if progress:
 			lesson_details.is_complete = get_progress(lesson_details.course, lesson_details.name)
@@ -167,38 +170,20 @@ def get_lesson_details(chapter, progress=False):
 	return lessons
 
 
-def get_lesson_icon(body, content):
+def get_lesson_icon(content):
-	if content:
+	icon = None
-		content = json.loads(content)
+	macros = find_macros(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":
-			return "icon-youtube"
+			icon = "icon-youtube"
 		elif macro[0] == "Quiz":
-			return "icon-quiz"
+			icon = "icon-quiz"
 
-	return "icon-list"
+	if not icon:
+		icon = "icon-list"
+
+	return icon
 
 
 @frappe.whitelist(allow_guest=True)
@@ -499,6 +484,11 @@ 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",
@@ -851,11 +841,7 @@ def get_telemetry_boot_info():
 	}
 
 
-@frappe.whitelist()
 def is_onboarding_complete():
-	if not has_course_moderator_role():
-		return {"is_onboarded": True}
-
 	course_created = frappe.db.a_row_exists("LMS Course")
 	chapter_created = frappe.db.a_row_exists("Course Chapter")
 	lesson_created = frappe.db.a_row_exists("Course Lesson")
@@ -1041,13 +1027,23 @@ 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:
@@ -1096,14 +1092,14 @@ def get_categorized_courses(courses):
 		):
 			new.append(course)
 
-		if course.membership:
+		if course.membership and course.published:
 			enrolled.append(course)
 		elif course.is_instructor:
 			created.append(course)
 
 		categories = [live, enrolled, created]
 		for category in categories:
-			category.sort(key=lambda x: cint(x.enrollments), reverse=True)
+			category.sort(key=lambda x: x.enrollment_count, reverse=True)
 
 		live.sort(key=lambda x: x.featured, reverse=True)
 
@@ -1128,20 +1124,11 @@ def get_course_outline(course, progress=False):
 		chapter_details = frappe.db.get_value(
 			"Course Chapter",
 			chapter.chapter,
-			["name", "title", "is_scorm_package", "launch_file", "scorm_package"],
+			["name", "title", "description"],
 			as_dict=True,
 		)
 		chapter_details["idx"] = chapter.idx
 		chapter_details.lessons = get_lessons(course, chapter_details, progress=progress)
-
-		if chapter_details.is_scorm_package:
-			chapter_details.scorm_package = frappe.db.get_value(
-				"File",
-				chapter_details.scorm_package,
-				["file_name", "file_size", "file_url"],
-				as_dict=1,
-			)
-
 		outline.append(chapter_details)
 	return outline
 
@@ -1155,14 +1142,8 @@ def get_lesson(course, chapter, lesson):
 		"Lesson Reference", {"parent": chapter_name, "idx": lesson}, "lesson"
 	)
 	lesson_details = frappe.db.get_value(
-		"Course Lesson",
+		"Course Lesson", lesson_name, ["include_in_preview", "title"], as_dict=1
-		lesson_name,
-		["include_in_preview", "title", "is_scorm_package"],
-		as_dict=1,
 	)
-	if not lesson_details or lesson_details.is_scorm_package:
-		return {}
-
 	membership = get_membership(course)
 	course_title = frappe.db.get_value("LMS Course", course, "title")
 	if (
@@ -1277,7 +1258,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", "evaluator"]
+		"Batch Course", filters={"parent": batch}, fields=["course", "title"]
 	)
 	batch_details.students = frappe.get_all(
 		"Batch Student", {"parent": batch}, pluck="student"
@@ -1751,91 +1732,3 @@ def enroll_in_batch(batch, payment_name=None):
 			)
 
 		student.save(ignore_permissions=True)
-
-
-@frappe.whitelist()
-def get_programs():
-	if (
-		has_course_moderator_role()
-		or has_course_instructor_role()
-		or has_course_evaluator_role()
-	):
-		programs = frappe.get_all("LMS Program", fields=["name"])
-	else:
-		programs = frappe.get_all(
-			"LMS Program Member", {"member": frappe.session.user}, ["parent as name", "progress"]
-		)
-
-	for program in programs:
-		program_courses = frappe.get_all(
-			"LMS Program Course", {"parent": program.name}, ["course"], order_by="idx"
-		)
-		program.courses = []
-		previous_progress = 0
-		for i, course in enumerate(program_courses):
-			details = get_course_details(course.course)
-			if i == 0:
-				details.eligible = True
-			elif previous_progress == 100:
-				details.eligible = True
-			else:
-				details.eligible = False
-
-			previous_progress = details.membership.progress if details.membership else 0
-			program.courses.append(details)
-
-		program.members = frappe.db.count("LMS Program Member", {"parent": program.name})
-
-	return programs
-
-
-@frappe.whitelist()
-def enroll_in_program_course(program, course):
-	enrollment = frappe.db.exists(
-		"LMS Enrollment", {"member": frappe.session.user, "course": course}
-	)
-
-	if enrollment:
-		enrollment = frappe.db.get_value(
-			"LMS Enrollment", enrollment, ["name", "current_lesson"], as_dict=1
-		)
-		enrollment.current_lesson = get_lesson_index(enrollment.current_lesson)
-		return enrollment
-
-	program_courses = frappe.get_all(
-		"LMS Program Course", {"parent": program}, ["course", "idx"], order_by="idx"
-	)
-	current_course_idx = [
-		program_course.idx
-		for program_course in program_courses
-		if program_course.course == course
-	][0]
-
-	for program_course in program_courses:
-		if program_course.idx < current_course_idx:
-			enrollment = frappe.db.get_value(
-				"LMS Enrollment",
-				{"member": frappe.session.user, "course": program_course.course},
-				["name", "progress"],
-				as_dict=1,
-			)
-			if enrollment and enrollment.progress != 100:
-				frappe.throw(
-					_("Please complete the previous courses in the program to enroll in this course.")
-				)
-			elif not enrollment:
-				frappe.throw(
-					_("Please complete the previous courses in the program to enroll in this course.")
-				)
-			else:
-				continue
-
-	enrollment = frappe.new_doc("LMS Enrollment")
-	enrollment.update(
-		{
-			"member": frappe.session.user,
-			"course": course,
-		}
-	)
-	enrollment.save()
-	return enrollment

lms/lms/web_form/add_a_new_batch/add_a_new_batch.js

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,114 @@
+{
+ "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
+  }
+ ]
+}