chore: update POT file

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "frappe-ui"]
 	path = frappe-ui
-	url = https://github.com/frappe/frappe-ui
+	url = https://github.com/pateljannat/frappe-ui

cypress/e2e/course_creation.cy.js

@@ -31,35 +31,12 @@ describe("Course Creation", () => {
 			.contains("Preview Video")
 			.type("https://www.youtube.com/embed/-LPmw2Znl2c");
 		cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
-		cy.get("label")
-			.contains("Category")
-			.parent()
-			.within(() => {
-				cy.get("button").click();
-			});
+		cy.get(".search-input").click().type("frappe");
+		cy.wait(1000);
 		cy.get("[id^=headlessui-combobox-option-")
 			.should("be.visible")
 			.first()
 			.click();
-
-		/* Instructor */
-		cy.get("label")
-			.contains("Instructors")
-			.parent()
-			.within(() => {
-				cy.get("input").click().type("frappe");
-				cy.get("input")
-					.invoke("attr", "aria-controls")
-					.as("instructor_list_id");
-			});
-		cy.get("@instructor_list_id").then((instructor_list_id) => {
-			cy.get(`[id^=${instructor_list_id}`)
-				.should("be.visible")
-				.within(() => {
-					cy.get("[id^=headlessui-combobox-option-").first().click();
-				});
-		});
-
 		cy.get("label").contains("Published").click();
 		cy.get("label").contains("Published On").type("2021-01-01");
 		cy.button("Save").click();
@@ -84,7 +61,21 @@ describe("Course Creation", () => {
 		cy.wait(1000);
 
 		cy.get("label").contains("Title").type("Test Lesson");
+		/* cy.get("#content .ce-block")
+			.click()
+			.invoke("text", "https://www.youtube.com/watch?v=GoDtyItReto"); */
+		/* cy.get("#content .ce-block")
+			.click()
+			.paste("https://www.youtube.com/watch?v=GoDtyItReto"); */
 
+		cy.fixture("Youtube.mov", "base64").then((fileContent) => {
+			cy.get('input[type="file"]').attachFile({
+				fileContent,
+				fileName: "Youtube.mov",
+				mimeType: "image/png",
+				encoding: "base64",
+			});
+		});
 		cy.get("#content .ce-block").type(
 			"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
 		);
@@ -128,6 +119,12 @@ describe("Course Creation", () => {
 		cy.url().should("include", "/learn/1-1");
 		cy.get("div").contains("Test Lesson");
 
+		cy.get("video")
+			.should("be.visible")
+			.children("source")
+			.invoke("attr", "src")
+			.should("include", "/files/Youtube");
+
 		cy.get("div").contains(
 			"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
 		);

frontend/package.json

@@ -19,10 +19,9 @@
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
     "chart.js": "^4.4.1",
-    "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.69",
+    "frappe-ui": "^0.1.56",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",

frontend/src/components/Assessments.vue

@@ -1,15 +1,7 @@
 <template>
 	<div>
-		<div class="flex items-center justify-between">
-			<div class="text-lg font-semibold mb-4">
-				{{ __('Assessments') }}
-			</div>
-			<Button v-if="canSeeAddButton()" @click="showModal = true">
-				<template #prefix>
-					<Plus class="h-4 w-4" />
-				</template>
-				{{ __('Add') }}
-			</Button>
+		<div class="text-lg font-semibold mb-4">
+			{{ __('Assessments') }}
 		</div>
 		<div v-if="assessments.data?.length">
 			<ListView
@@ -17,76 +9,41 @@
 				:rows="assessments.data"
 				row-key="name"
 				:options="{
+					selectable: false,
 					showTooltip: false,
-					getRowRoute: (row) => getRowRoute(row),
+					getRowRoute: (row) => {
+						if (row.submission) {
+							return {
+								name: 'AssignmentSubmission',
+								params: {
+									assignmentName: row.assessment_name,
+									submissionName: row.submission.name,
+								},
+							}
+						} else {
+							return {
+								name: 'AssignmentSubmission',
+								params: {
+									assignmentName: row.assessment_name,
+									submissionName: 'new',
+								},
+							}
+						}
+					},
 				}"
 			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in getAssessmentColumns()">
-						<template #prefix="{ item }">
-							<component
-								v-if="item.icon"
-								:is="item.icon"
-								class="h-4 w-4 stroke-1.5 ml-4"
-							/>
-						</template>
-					</ListHeaderItem>
-				</ListHeader>
-				<ListRows>
-					<ListRow :row="row" v-for="row in assessments.data">
-						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
-								<div>
-									{{ row[column.key] }}
-								</div>
-							</ListRowItem>
-						</template>
-					</ListRow>
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="removeAssessments(selections, unselectAll)"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
 			</ListView>
 		</div>
 		<div v-else class="text-sm italic text-gray-600">
 			{{ __('No Assessments') }}
 		</div>
 	</div>
-	<AssessmentModal
-		v-model="showModal"
-		v-model:assessments="assessments"
-		:batch="props.batch"
-	/>
 </template>
 <script setup>
-import {
-	ListView,
-	ListRow,
-	ListRows,
-	ListHeader,
-	ListHeaderItem,
-	ListRowItem,
-	ListSelectBanner,
-	createResource,
-	Button,
-} from 'frappe-ui'
-import { inject, ref } from 'vue'
-import AssessmentModal from '@/components/Modals/AssessmentModal.vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
+import { ListView, createResource } from 'frappe-ui'
+import { inject } from 'vue'
 
 const user = inject('$user')
-const showModal = ref(false)
 
 const props = defineProps({
 	batch: {
@@ -117,61 +74,6 @@ const assessments = createResource({
 	auto: true,
 })
 
-const deleteAssessments = createResource({
-	url: 'lms.lms.api.delete_documents',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Assessment',
-			documents: values.assessments,
-		}
-	},
-})
-
-const removeAssessments = (selections, unselectAll) => {
-	deleteAssessments.submit(
-		{ assessments: Array.from(selections) },
-		{
-			onSuccess(data) {
-				assessments.reload()
-				unselectAll()
-			},
-		}
-	)
-}
-
-const getRowRoute = (row) => {
-	if (row.assessment_type == 'LMS Assignment') {
-		if (row.submission) {
-			return {
-				name: 'AssignmentSubmission',
-				params: {
-					assignmentName: row.assessment_name,
-					submissionName: row.submission.name,
-				},
-			}
-		} else {
-			return {
-				name: 'AssignmentSubmission',
-				params: {
-					assignmentName: row.assessment_name,
-					submissionName: 'new',
-				},
-			}
-		}
-	} else {
-		return {
-			name: 'Quiz',
-			params: {
-				quizID: row.assessment_name,
-			},
-		}
-	}
-}
-
-const canSeeAddButton = () => {
-	return user.data?.is_moderator || user.data?.is_evaluator
-}
-
 const getAssessmentColumns = () => {
 	let columns = [
 		{

frontend/src/components/BatchCourses.vue

@@ -4,11 +4,15 @@
 			<div class="text-xl font-semibold">
 				{{ __('Courses') }}
 			</div>
-			<Button v-if="canSeeAddButton()" @click="openCourseModal()">
+			<Button
+				v-if="user.data?.is_moderator"
+				variant="solid"
+				@click="openCourseModal()"
+			>
 				<template #prefix>
 					<Plus class="h-4 w-4" />
 				</template>
-				{{ __('Add') }}
+				{{ __('Add Course') }}
 			</Button>
 		</div>
 		<div v-if="courses.data?.length">
@@ -84,7 +88,6 @@ import {
 	ListRowItem,
 } from 'frappe-ui'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import { showToast } from '@/utils'
 
 const showCourseModal = ref(false)
 const user = inject('$user')
@@ -129,32 +132,23 @@ const getCoursesColumns = () => {
 	]
 }
 
-const deleteCourses = createResource({
-	url: 'lms.lms.api.delete_documents',
+const removeCourse = createResource({
+	url: 'frappe.client.delete',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Course',
-			documents: values.courses,
+			name: values.course,
 		}
 	},
 })
 
 const removeCourses = (selections, unselectAll) => {
-	deleteCourses.submit(
-		{
-			courses: Array.from(selections),
-		},
-		{
-			onSuccess(data) {
-				courses.reload()
-				showToast(__('Success'), __('Courses deleted successfully'), 'check')
-				unselectAll()
-			},
-		}
-	)
-}
-
-const canSeeAddButton = () => {
-	return user.data?.is_moderator || user.data?.is_evaluator
+	selections.forEach(async (course) => {
+		removeCourse.submit({ course })
+	})
+	setTimeout(() => {
+		courses.reload()
+		unselectAll()
+	}, 1000)
 }
 </script>

frontend/src/components/BatchStudents.vue

@@ -1,9 +1,9 @@
 <template>
-	<Button class="float-right mb-3" @click="openStudentModal()">
+	<Button class="float-right mb-3" variant="solid" @click="openStudentModal()">
 		<template #prefix>
 			<Plus class="h-4 w-4" />
 		</template>
-		{{ __('Add') }}
+		{{ __('Add Student') }}
 	</Button>
 	<div class="text-lg font-semibold mb-4">
 		{{ __('Students') }}
@@ -88,7 +88,6 @@ import {
 import { Trash2, Plus } from 'lucide-vue-next'
 import { ref } from 'vue'
 import StudentModal from '@/components/Modals/StudentModal.vue'
-import { showToast } from '@/utils'
 
 const showStudentModal = ref(false)
 
@@ -136,28 +135,23 @@ const openStudentModal = () => {
 	showStudentModal.value = true
 }
 
-const deleteStudents = createResource({
-	url: 'lms.lms.api.delete_documents',
+const removeStudent = createResource({
+	url: 'frappe.client.delete',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Student',
-			documents: values.students,
+			name: values.student,
 		}
 	},
 })
 
 const removeStudents = (selections, unselectAll) => {
-	deleteStudents.submit(
-		{
-			students: Array.from(selections),
-		},
-		{
-			onSuccess(data) {
-				students.reload()
-				showToast(__('Success'), __('Students deleted successfully'), 'check')
-				unselectAll()
-			},
-		}
-	)
+	selections.forEach(async (student) => {
+		removeStudent.submit({ student })
+	})
+	setTimeout(() => {
+		students.reload()
+		unselectAll()
+	}, 500)
 }
 </script>

frontend/src/components/Categories.vue

@@ -1,151 +0,0 @@
-<template>
-	<div class="flex flex-col min-h-0">
-		<div class="flex items-center justify-between">
-			<div class="text-xl font-semibold mb-1">
-				{{ label }}
-			</div>
-			<Button @click="() => showCategoryForm()">
-				<template #icon>
-					<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
-					<X v-else class="h-3 w-3 stroke-1.5" />
-				</template>
-			</Button>
-		</div>
-
-		<div
-			v-if="showForm"
-			class="flex items-center justify-between my-4 space-x-2"
-		>
-			<FormControl
-				ref="categoryInput"
-				v-model="category"
-				:placeholder="__('Category Name')"
-				class="flex-1"
-			/>
-			<Button @click="addCategory()" variant="subtle">
-				{{ __('Add') }}
-			</Button>
-		</div>
-
-		<div class="overflow-y-scroll">
-			<div class="text-base divide-y">
-				<FormControl
-					:value="cat.category"
-					type="text"
-					v-for="cat in categories.data"
-					class="form-control"
-					@change.stop="(e) => update(cat.name, e.target.value)"
-				/>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Button,
-	FormControl,
-	createListResource,
-	createResource,
-	debounce,
-} from 'frappe-ui'
-import { Plus, X } from 'lucide-vue-next'
-import { ref } from 'vue'
-
-const showForm = ref(false)
-const category = ref(null)
-const categoryInput = ref(null)
-
-const props = defineProps({
-	label: {
-		type: String,
-		required: true,
-	},
-	description: {
-		type: String,
-		default: '',
-	},
-})
-
-const categories = createListResource({
-	doctype: 'LMS Category',
-	fields: ['name', 'category'],
-	auto: true,
-})
-
-const newCategory = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Category',
-				category: category.value,
-			},
-		}
-	},
-})
-
-const addCategory = () => {
-	newCategory.submit(
-		{},
-		{
-			onSuccess(data) {
-				categories.reload()
-				category.value = null
-			},
-		}
-	)
-}
-
-const showCategoryForm = () => {
-	showForm.value = !showForm.value
-	setTimeout(() => {
-		categoryInput.value.$el.querySelector('input').focus()
-	}, 0)
-}
-
-const updateCategory = createResource({
-	url: 'frappe.client.rename_doc',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Category',
-			old_name: values.name,
-			new_name: values.category,
-		}
-	},
-})
-
-const update = (name, value) => {
-	updateCategory.submit(
-		{
-			name: name,
-			category: value,
-		},
-		{
-			onSuccess() {
-				categories.reload()
-			},
-		}
-	)
-}
-</script>
-<style>
-.form-control input {
-	padding: 1.25rem 0;
-	border-color: transparent;
-	background: white;
-}
-
-.form-control input:focus {
-	outline: transparent;
-	background: white;
-	box-shadow: none;
-	border-color: transparent;
-}
-
-.form-control input:hover {
-	outline: transparent;
-	background: white;
-	box-shadow: none;
-	border-color: transparent;
-}
-</style>

frontend/src/components/Controls/Link.vue

@@ -108,7 +108,6 @@ const options = createResource({
 	url: 'frappe.desk.search.search_link',
 	cache: [props.doctype, text.value],
 	method: 'POST',
-	auto: true,
 	params: {
 		txt: text.value,
 		doctype: props.doctype,

frontend/src/components/Controls/Rating.vue

@@ -1,27 +1,18 @@
 <template>
-	<div class="space-y-1">
-		<label class="block text-xs text-gray-600" v-if="props.label">
-			{{ props.label }}
-		</label>
-		<div class="flex text-center">
-			<div
-				v-for="index in 5"
-				@mouseover="hoveredRating = index"
-				@mouseleave="hoveredRating = 0"
-			>
-				<Star
-					class="fill-gray-400 text-gray-50 stroke-1 mr-1 cursor-pointer"
-					:class="iconClasses(index)"
-					@click="markRating(index)"
-				/>
-			</div>
+	<div class="flex text-center">
+		<div v-for="index in 5">
+			<Star
+				:class="index <= rating ? 'fill-orange-500' : ''"
+				class="h-6 w-6 fill-gray-400 text-gray-50 mr-1 cursor-pointer"
+				@click="markRating(index)"
+			/>
 		</div>
 	</div>
 </template>
 
 <script setup>
 import { Star } from 'lucide-vue-next'
-import { computed, ref, watch } from 'vue'
+import { ref } from 'vue'
 
 const props = defineProps({
 	id: {
@@ -32,36 +23,10 @@ const props = defineProps({
 		type: Number,
 		default: 0,
 	},
-	label: {
-		type: String,
-		default: '',
-	},
-	size: {
-		type: String,
-		default: 'md',
-	},
 })
 
-const iconClasses = (index) => {
-	let classes = [
-		{
-			sm: 'size-4',
-			md: 'size-5',
-			lg: 'size-6',
-			xl: 'size-7',
-		}[props.size],
-	]
-	if (index <= hoveredRating.value && index > rating.value) {
-		classes.push('fill-yellow-200')
-	} else if (index <= rating.value) {
-		classes.push('fill-yellow-500')
-	}
-	return classes.join(' ')
-}
-
 const emit = defineEmits(['update:modelValue'])
-const rating = ref(props.modelValue)
-const hoveredRating = ref(0)
+let rating = ref(props.modelValue)
 
 let emitChange = (value) => {
 	emit('update:modelValue', value)
@@ -71,11 +36,4 @@ function markRating(index) {
 	emitChange(index)
 	rating.value = index
 }
-
-watch(
-	() => props.modelValue,
-	(newVal) => {
-		rating.value = newVal
-	}
-)
 </script>

frontend/src/components/CourseCardOverlay.vue

@@ -117,7 +117,6 @@ import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
 import { createToast } from '@/utils/'
-import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -156,9 +155,6 @@ function enrollStudent() {
 				course: props.course.data.name,
 			})
 			.then(() => {
-				capture('enrolled_in_course', {
-					course: props.course.data.name,
-				})
 				createToast({
 					title: 'Enrolled Successfully',
 					icon: 'check',

frontend/src/components/CourseOutline.vue

@@ -4,7 +4,7 @@
 			v-if="title && (outline.data?.length || allowEdit)"
 			class="grid grid-cols-[70%,30%] mb-4 px-2"
 		>
-			<div class="font-semibold text-lg leading-5">
+			<div class="font-semibold text-lg">
 				{{ __(title) }}
 			</div>
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">

frontend/src/components/LessonHelp.vue

@@ -1,74 +0,0 @@
-<template>
-	<div class="space-y-5">
-		<div class="space-y-2">
-			<div
-				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
-				@click="openHelpDialog('quiz')"
-			>
-				<span>
-					{{ __('How to add a Quiz?') }}
-				</span>
-				<Info class="w-3 h-3 text-gray-700" />
-			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
-				{{
-					__(
-						'Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page.'
-					)
-				}}
-			</div>
-		</div>
-
-		<div class="space-y-2">
-			<div
-				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
-				@click="openHelpDialog('upload')"
-			>
-				<span class="leading-5">
-					{{ __('How to upload content from your system?') }}
-				</span>
-				<Info class="w-3 h-3 text-gray-700" />
-			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
-				{{
-					__(
-						'To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson.'
-					)
-				}}
-			</div>
-		</div>
-
-		<div class="space-y-2">
-			<div
-				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
-				@click="openHelpDialog('youtube')"
-			>
-				<span>
-					{{ __('How to add a YouTube Video?') }}
-				</span>
-				<Info class="w-3 h-3 text-gray-700" />
-			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
-				{{
-					__(
-						'Copy the URL of the video from YouTube and paste it in the editor.'
-					)
-				}}
-			</div>
-		</div>
-	</div>
-	<ExplanationVideos v-model="showExplanation" :type="type" />
-</template>
-<script setup>
-import { Info } from 'lucide-vue-next'
-import { ref } from 'vue'
-import ExplanationVideos from '@/components/Modals/ExplanationVideos.vue'
-
-const showExplanation = ref(false)
-const type = ref(null)
-
-const openHelpDialog = (contentType) => {
-	type.value = contentType
-	showExplanation.value = true
-}
-</script>

frontend/src/components/LessonPlugins.vue

@@ -0,0 +1,174 @@
+<template>
+	<div class="text-lg font-semibold">
+		{{ __('Components') }}
+	</div>
+	<div class="mt-5 space-y-4">
+		<Tooltip
+			:text="
+				__(
+					'Content such as quiz, video and image will be added in the editor you select.'
+				)
+			"
+			placement="bottom"
+		>
+			<div class="">
+				<div class="text-xs text-gray-600 mb-1">
+					{{ __('Select an Editor') }}
+				</div>
+				<Select v-model="currentEditor" :options="getEditorOptions()" />
+			</div>
+		</Tooltip>
+		<div class="flex">
+			<Link
+				:value="quiz"
+				class="flex-1"
+				doctype="LMS Quiz"
+				:label="__('Add an existing quiz')"
+				@change="(option) => addQuiz(option)"
+			/>
+			<router-link
+				:to="{
+					name: 'QuizCreation',
+					params: {
+						quizID: 'new',
+					},
+				}"
+				class="self-end ml-2"
+			>
+				<Button>
+					<template #icon>
+						<Plus class="h-4 w-4 stroke-1.5" />
+					</template>
+				</Button>
+			</router-link>
+		</div>
+		<div class="">
+			<div class="text-xs text-gray-600 mb-1">
+				{{ __('Add an image, video, pdf or audio.') }}
+			</div>
+			<div class="flex">
+				<FileUploader
+					v-if="!file"
+					:fileTypes="['image/*', 'video/*', 'audio/*', '.pdf']"
+					:validateFile="validateFile"
+					@success="(data) => addFile(data)"
+				>
+					<template v-slot="{ file, progress, uploading, openFileSelector }">
+						<div class="">
+							<Button @click="openFileSelector" :loading="uploading">
+								{{
+									uploading
+										? __('Uploading {0}%').format(progress)
+										: __('Upload a 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-4 w-4 stroke-1.5 text-gray-700" />
+						</div>
+						<div class="flex flex-col">
+							<span class="text-xs">
+								{{ file.file_name }}
+							</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="">
+			<div class="text-xs text-gray-600 mb-1">
+				{{
+					__(
+						'To add a YouTube video, paste the URL of the video in the editor.'
+					)
+				}}
+			</div>
+			<YouTubeExplanation>
+				<template v-slot="{ togglePopover }">
+					<div
+						@click="togglePopover()"
+						class="flex items-center text-sm underline cursor-pointer"
+					>
+						<Info class="w-3 h-3 stroke-1.5 text-gray-700 mr-1" />
+						{{ __('Learn More') }}
+					</div>
+				</template>
+			</YouTubeExplanation>
+		</div>
+	</div>
+</template>
+<script setup>
+import Link from '@/components/Controls/Link.vue'
+import { FileUploader, Button, Select, Tooltip } from 'frappe-ui'
+import { Plus, FileText, Info } from 'lucide-vue-next'
+import { ref, watch } from 'vue'
+import YouTubeExplanation from '@/components/Modals/YouTubeExplanation.vue'
+
+const quiz = ref(null)
+const file = ref(null)
+const lessonEditor = ref(null)
+const instructorEditor = ref(null)
+const currentEditor = ref('Lesson Content')
+
+const props = defineProps({
+	editor: {
+		required: true,
+	},
+	notesEditor: {
+		required: true,
+	},
+})
+
+const addQuiz = (value) => {
+	getCurrentEditor().caret.setToLastBlock('end', 0)
+	if (value) {
+		getCurrentEditor().blocks.insert('quiz', {
+			quiz: value,
+		})
+		quiz.value = null
+	}
+}
+
+const addFile = (data) => {
+	getCurrentEditor().caret.setToLastBlock('end', 0)
+	getCurrentEditor().blocks.insert('upload', data)
+}
+
+const validateFile = (file) => {
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (!['jpg', 'jpeg', 'png', 'mp4', 'mov', 'mp3', 'pdf'].includes(extension)) {
+		return 'Only image and video files are allowed.'
+	}
+}
+
+const getEditorOptions = () => {
+	return [
+		{
+			label: 'Lesson Content',
+			value: 'Lesson Content',
+		},
+		{
+			label: 'Instructor Content',
+			value: 'Instructor Content',
+		},
+	]
+}
+
+const getCurrentEditor = () => {
+	return currentEditor.value == 'Lesson Content'
+		? lessonEditor.value
+		: instructorEditor.value
+}
+
+watch(
+	() => [props.editor, props.notesEditor],
+	([newEditor, newNotesEditor], [oldEditor, oldNotesEditor]) => {
+		lessonEditor.value = newEditor
+		instructorEditor.value = newNotesEditor
+	}
+)
+</script>

frontend/src/components/Members.vue

@@ -1,13 +1,13 @@
 <template>
-	<div class="flex min-h-0 flex-col text-base">
+	<div class="text-base p-4">
 		<div class="flex items-center justify-between">
 			<div>
-				<div class="text-xl font-semibold mb-1">
+				<div class="font-semibold mb-1">
 					{{ __(label) }}
 				</div>
-				<!-- <div class="text-xs text-gray-600">
+				<div class="text-xs text-gray-600">
 					{{ __(description) }}
-				</div> -->
+				</div>
 			</div>
 			<div class="flex item-center space-x-2">
 				<FormControl
@@ -16,93 +16,74 @@
 					type="text"
 					:debounce="300"
 				/>
-				<Button @click="() => (showForm = !showForm)">
+				<Button @click="() => (showForm = true)">
 					<template #icon>
-						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
-						<X v-else class="h-3 w-3 stroke-1.5" />
+						<Plus class="h-3 w-3 stroke-1.5" />
 					</template>
 				</Button>
 			</div>
 		</div>
+		<div class="my-4">
+			<!-- Form to add new member -->
+			<div v-if="showForm" class="flex items-center space-x-2 mb-4">
+				<FormControl
+					v-model="member.email"
+					:placeholder="__('Email')"
+					type="email"
+					class="w-full"
+				/>
+				<FormControl
+					v-model="member.first_name"
+					:placeholder="__('First Name')"
+					type="test"
+					class="w-full"
+				/>
+				<Button @click="addMember()" variant="subtle">
+					{{ __('Add') }}
+				</Button>
+			</div>
 
-		<!-- Form to add new member -->
-		<div v-if="showForm" class="flex items-center space-x-2 my-4">
-			<FormControl
-				v-model="member.email"
-				:placeholder="__('Email')"
-				type="email"
-				class="w-full"
-			/>
-			<FormControl
-				v-model="member.first_name"
-				:placeholder="__('First Name')"
-				type="test"
-				class="w-full"
-			/>
-			<Button @click="addMember()" variant="subtle">
-				{{ __('Add') }}
-			</Button>
-		</div>
-
-		<div class="mt-2 pb-10 overflow-auto">
 			<!-- Member list -->
-			<div class="overflow-y-scroll">
-				<ul class="divide-y">
-					<li
-						v-for="member in memberList"
-						class="grid grid-cols-3 gap-10 py-2 cursor-pointer"
-					>
-						<div
-							@click="openProfile(member.username)"
-							class="flex items-center space-x-3 col-span-2"
-						>
-							<Avatar
-								:image="member.user_image"
-								:label="member.full_name"
-								size="lg"
-							/>
-							<div class="space-y-1">
-								<div class="flex">
-									<div class="text-gray-900">
-										{{ member.full_name }}
-									</div>
-									<div v-if="getRole(member)">
-										{{ getRole(member) }}
-									</div>
-								</div>
-								<div class="text-sm text-gray-700">
-									{{ member.name }}
-								</div>
-							</div>
-						</div>
-						<div class="flex items-center justify-center text-gray-700 text-sm">
-							<div v-if="member.last_active">
-								{{ dayjs(member.last_active).format('DD MMM, YYYY HH:mm a') }}
-							</div>
-							<div v-else>-</div>
-						</div>
-					</li>
-				</ul>
-			</div>
 			<div
-				v-if="memberList.length && hasNextPage"
-				class="flex justify-center mt-4"
+				v-for="member in memberList"
+				class="grid grid-cols-5 grid-flow-row py-2 cursor-pointer"
 			>
-				<Button @click="members.reload()">
-					<template #prefix>
-						<RefreshCw class="h-3 w-3 stroke-1.5" />
-					</template>
-					{{ __('Load More') }}
-				</Button>
+				<div
+					@click="openProfile(member.username)"
+					class="flex items-center space-x-2 col-span-2"
+				>
+					<Avatar
+						:image="member.user_image"
+						:label="member.full_name"
+						size="sm"
+					/>
+					<div>
+						{{ member.full_name }}
+					</div>
+				</div>
+				<div class="text-sm text-gray-700 col-span-2">
+					{{ member.name }}
+				</div>
+				<div class="text-sm text-gray-700 justify-self-end">
+					{{ getRole(member.role) }}
+				</div>
 			</div>
 		</div>
+		<div v-if="hasNextPage" class="flex justify-center">
+			<Button variant="solid" @click="members.reload()">
+				<template #prefix>
+					<RefreshCw class="h-3 w-3 stroke-1.5" />
+				</template>
+				{{ __('Load More') }}
+			</Button>
+		</div>
 	</div>
 </template>
 <script setup lang="ts">
 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'
+import { ref, watch, reactive } from 'vue'
+import { RefreshCw, Plus } from 'lucide-vue-next'
 
 const router = useRouter()
 const show = defineModel('show')
@@ -111,7 +92,6 @@ const start = ref(0)
 const memberList = ref([])
 const hasNextPage = ref(false)
 const showForm = ref(false)
-const dayjs = inject('$dayjs')
 
 const member = reactive({
 	email: '',

frontend/src/components/Modals/AssessmentModal.vue

@@ -1,86 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Add an assessment'),
-			size: 'sm',
-			actions: [
-				{
-					label: __('Submit'),
-					variant: 'solid',
-					onClick: (close) => addAssessment(close),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div class="space-y-4">
-				<FormControl
-					type="select"
-					:options="assessmentTypes"
-					v-model="assessmentType"
-					:label="__('Type')"
-				/>
-				<Link
-					v-model="assessment"
-					:doctype="assessmentType"
-					:label="__('Assessment')"
-				/>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Dialog, FormControl, createResource } from 'frappe-ui'
-import Link from '@/components/Controls/Link.vue'
-import { computed, ref } from 'vue'
-import { showToast } from '@/utils'
-
-const show = defineModel()
-const assessmentType = ref(null)
-const assessment = ref(null)
-const assessments = defineModel('assessments')
-
-const props = defineProps({
-	batch: {
-		type: String,
-		default: null,
-	},
-})
-
-const assessmentResource = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Assessment',
-				parent: props.batch,
-				parenttype: 'LMS Batch',
-				parentfield: 'assessment',
-				assessment_type: assessmentType.value,
-				assessment_name: assessment.value,
-			},
-		}
-	},
-})
-
-const addAssessment = (close) => {
-	assessmentResource.submit(
-		{},
-		{
-			onSuccess(data) {
-				assessments.value.reload()
-				showToast(__('Success'), __('Assessment added successfully'), 'check')
-				close()
-			},
-		}
-	)
-}
-
-const assessmentTypes = computed(() => {
-	return [
-		{ label: 'Quiz', value: 'LMS Quiz' },
-		{ label: 'Assignment', value: 'LMS Assignment' },
-	]
-})
-</script>

frontend/src/components/Modals/ChapterModal.vue

@@ -15,24 +15,18 @@
 		}"
 	>
 		<template #body-content>
-			<FormControl
-				ref="chapterInput"
-				label="Title"
-				v-model="chapter.title"
-				class="mb-4"
-			/>
+			<FormControl label="Title" v-model="chapter.title" class="mb-4" />
 		</template>
 	</Dialog>
 </template>
 <script setup>
 import { Dialog, FormControl, createResource } from 'frappe-ui'
-import { defineModel, reactive, watch, ref } from 'vue'
+import { defineModel, reactive, watch } from 'vue'
 import { createToast } from '@/utils/'
 import { capture } from '@/telemetry'
 
 const show = defineModel()
 const outline = defineModel('outline')
-const chapterInput = ref(null)
 
 const props = defineProps({
 	course: {
@@ -43,7 +37,6 @@ const props = defineProps({
 		type: Object,
 	},
 })
-
 const chapter = reactive({
 	title: '',
 })
@@ -104,7 +97,6 @@ const addChapter = (close) => {
 					{ name: data.name },
 					{
 						onSuccess(data) {
-							chapter.title = ''
 							outline.value.reload()
 							createToast({
 								text: 'Chapter added successfully',
@@ -168,12 +160,4 @@ watch(
 		chapter.title = newChapter?.title
 	}
 )
-
-watch(show, () => {
-	if (show.value) {
-		setTimeout(() => {
-			chapterInput.value.$el.querySelector('input').focus()
-		}, 100)
-	}
-})
 </script>

frontend/src/components/Modals/Event.vue

@@ -1,378 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: '2xl',
-		}"
-	>
-		<template #body>
-			<div class="flex text-base">
-				<div class="flex flex-col w-1/2 p-5">
-					<div class="text-lg font-semibold mb-4">
-						{{ event.title }}
-					</div>
-
-					<div class="flex flex-col space-y-4 text-sm text-gray-800">
-						<Tooltip :text="__('Email ID')">
-							<div class="flex items-center space-x-2 w-fit">
-								<User class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ event.member }}
-								</span>
-							</div>
-						</Tooltip>
-						<Tooltip :text="__('Course')">
-							<div class="flex items-center space-x-2 w-fit">
-								<BookOpen class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ event.course_title }}
-								</span>
-							</div>
-						</Tooltip>
-						<Tooltip v-if="event.batch_title" :text="__('Batch')">
-							<div class="flex items-center space-x-2 w-fit">
-								<Users class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ event.batch_title }}
-								</span>
-							</div>
-						</Tooltip>
-						<Tooltip :text="__('Date')">
-							<div class="flex items-center space-x-2 w-fit">
-								<Calendar class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ dayjs(event.date).format('DD MMM YYYY') }}
-								</span>
-							</div>
-						</Tooltip>
-						<Tooltip :text="__('Time')">
-							<div class="flex items-center space-x-2 w-fit">
-								<Clock class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ formatTime(event.start_time) }} -
-									{{ formatTime(event.end_time) }}
-								</span>
-							</div>
-						</Tooltip>
-					</div>
-					<div class="flex items-center space-x-2 mt-auto">
-						<Button
-							v-if="certificate.name"
-							@click="openCertificate(certificate)"
-							class="w-full"
-						>
-							<template #prefix>
-								<FileText class="h-4 w-4 stroke-1.5" />
-							</template>
-							{{ __('View Certificate') }}
-						</Button>
-						<Button v-else @click="openCallLink(event.venue)" class="w-full">
-							<template #prefix>
-								<Video class="h-4 w-4 stroke-1.5" />
-							</template>
-							<span>
-								{{ __('Join Meeting') }}
-							</span>
-						</Button>
-					</div>
-				</div>
-				<Tabs :tabs="tabs" v-model="tabIndex" class="border-l w-1/2">
-					<template #default="{ tab }">
-						<div
-							v-if="tab.label == 'Evaluation'"
-							class="flex flex-col space-y-4 p-5"
-						>
-							<div class="flex items-center justify-between">
-								<Rating v-model="evaluation.rating" :label="__('Rating')" />
-								<FormControl
-									type="select"
-									:options="statusOptions"
-									v-model="evaluation.status"
-									:label="__('Status')"
-									class="w-1/2"
-								/>
-							</div>
-							<Textarea
-								v-model="evaluation.summary"
-								:label="__('Summary')"
-								:rows="7"
-							/>
-							<Button variant="solid" @click="saveEvaluation()">
-								{{ __('Save') }}
-							</Button>
-						</div>
-						<div v-else class="flex flex-col space-y-4 p-5">
-							<FormControl
-								type="checkbox"
-								v-model="certificate.published"
-								:label="__('Published')"
-							/>
-							<Link
-								v-model="certificate.template"
-								:label="__('Template')"
-								doctype="Print Format"
-								:filters="{
-									doc_type: 'LMS Certificate',
-								}"
-							/>
-							<FormControl
-								type="date"
-								v-model="certificate.issue_date"
-								:label="__('Issue Date')"
-							/>
-							<FormControl
-								type="date"
-								v-model="certificate.expiry_date"
-								:label="__('Expiry Date')"
-							/>
-							<Button variant="solid" @click="saveCertificate()">
-								{{ __('Save') }}
-							</Button>
-						</div>
-					</template>
-				</Tabs>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import {
-	Dialog,
-	Button,
-	FormControl,
-	createResource,
-	Tabs,
-	Tooltip,
-	Textarea,
-} from 'frappe-ui'
-import {
-	User,
-	Calendar,
-	Clock,
-	Video,
-	BookOpen,
-	FileText,
-	GraduationCap,
-	Users,
-	ClipboardList,
-} from 'lucide-vue-next'
-import { inject, reactive, watch, ref, computed } from 'vue'
-import { formatTime, showToast } from '@/utils'
-import Rating from '@/components/Controls/Rating.vue'
-import Link from '@/components/Controls/Link.vue'
-
-const show = defineModel()
-const dayjs = inject('$dayjs')
-const tabIndex = ref(0)
-const showCertification = ref(false)
-
-const props = defineProps({
-	event: {
-		type: [Object, null],
-		required: true,
-	},
-})
-
-const evaluation = reactive({})
-
-const certificate = reactive({})
-
-const defaultTemplate = createResource({
-	url: 'frappe.client.get_value',
-	makeParams(values) {
-		return {
-			doctype: 'Property Setter',
-			fieldname: 'value',
-			filters: {
-				doc_type: 'LMS Certificate',
-				property: 'default_print_format',
-			},
-		}
-	},
-	auto: true,
-	onSuccess(data) {
-		certificate.template = data.value
-	},
-})
-
-const openCallLink = (link) => {
-	window.open(link, '_blank')
-}
-
-const evaluationResource = createResource({
-	url: 'lms.lms.api.save_evaluation_details',
-	makeParams(values) {
-		return {
-			member: props.event.member,
-			course: props.event.course,
-			batch_name: props.event.batch_name,
-			date: props.event.date,
-			start_time: props.event.start_time,
-			end_time: props.event.end_time,
-			status: evaluation.status,
-			rating: evaluation.rating,
-			summary: evaluation.summary,
-			evaluator: props.event.evaluator,
-		}
-	},
-	auto: false,
-	onSuccess(data) {
-		evaluation.name = data.name
-	},
-})
-
-const evaluationDetails = createResource({
-	url: 'frappe.client.get',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Certificate Evaluation',
-			filters: {
-				member: props.event.member,
-				course: props.event.course,
-			},
-		}
-	},
-	onSuccess(data) {
-		for (const key in data) {
-			if (key in evaluation) evaluation[key] = data[key]
-			if (key == 'rating') evaluation.rating = data.rating * 5
-			if (evaluation.status == 'Pass') showCertification.value = true
-		}
-	},
-	auto: false,
-})
-
-const saveEvaluation = () => {
-	evaluationResource.submit(
-		{},
-		{
-			onSuccess: () => {
-				if (evaluation.status == 'Pass') {
-					showCertification.value = true
-				} else {
-					show.value = false
-				}
-				showToast(__('Success'), __('Evaluation saved successfully'), 'check')
-			},
-		}
-	)
-}
-
-const certificateResource = createResource({
-	url: 'lms.lms.api.save_certificate_details',
-	makeParams(values) {
-		return {
-			member: props.event.member,
-			course: props.event.course,
-			batch_name: props.event.batch_name,
-			published: certificate.published,
-			issue_date: certificate.issue_date,
-			expiry_date: certificate.expiry_date,
-			template: certificate.template,
-			evaluator: props.event.evaluator,
-		}
-	},
-	auto: false,
-	onSuccess(data) {
-		certificate.name = data
-	},
-})
-
-const certificateDetails = createResource({
-	url: 'frappe.client.get',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Certificate',
-			filters: {
-				member: props.event.member,
-				course: props.event.course,
-			},
-		}
-	},
-	onSuccess(data) {
-		for (const key in data) {
-			if (key in certificate) certificate[key] = data[key]
-			certificate.name = data.name
-			showCertification.value = true
-		}
-	},
-	onError(err) {
-		certificate.template = defaultTemplate.data.value
-	},
-	auto: false,
-})
-
-const saveCertificate = () => {
-	certificateResource.submit(
-		{},
-		{
-			onSuccess: () => {
-				showToast(__('Success'), __('Certificate saved successfully'), 'check')
-			},
-		}
-	)
-}
-
-watch(show, () => {
-	if (show.value) {
-		evaluation.rating = 0
-		evaluation.status = 'Pending'
-		evaluation.summary = ''
-		evaluationDetails.reload()
-
-		certificate.published = true
-		certificate.issue_date = dayjs().format('YYYY-MM-DD')
-		certificate.expiry_date = null
-		certificate.template = null
-		certificate.name = null
-		certificateDetails.reload()
-	}
-})
-
-const openCertificate = (certificate) => {
-	window.open(
-		`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
-			certificate.name
-		}&format=${encodeURIComponent(certificate.template)}`
-	)
-}
-
-const statusOptions = computed(() => {
-	return [
-		{
-			value: 'Pending',
-			label: __('Pending'),
-		},
-		{
-			value: 'In Progress',
-			label: __('In Progress'),
-		},
-		{
-			value: 'Pass',
-			label: __('Pass'),
-		},
-		{
-			value: 'Fail',
-			label: __('Fail'),
-		},
-	]
-})
-
-const tabs = computed(() => {
-	const tabsArray = [
-		{
-			label: __('Evaluation'),
-			icon: ClipboardList,
-		},
-	]
-
-	if (showCertification.value) {
-		tabsArray.push({
-			label: __('Certification'),
-			icon: GraduationCap,
-		})
-	}
-
-	return tabsArray
-})
-</script>

frontend/src/components/Modals/ExplanationVideos.vue

@@ -1,34 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: '4xl',
-		}"
-	>
-		<template #body>
-			<div class="p-4">
-				<VideoBlock :file="file" />
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Dialog } from 'frappe-ui'
-import { computed } from 'vue'
-import VideoBlock from '@/components/VideoBlock.vue'
-
-const show = defineModel()
-
-const props = defineProps({
-	type: {
-		type: [String, null],
-		required: true,
-	},
-})
-
-const file = computed(() => {
-	if (props.type == 'youtube') return '/assets/lms/frontend/Youtube.mp4'
-	if (props.type == 'quiz') return '/assets/lms/frontend/Quiz.mp4'
-	if (props.type == 'upload') return '/assets/lms/frontend/Upload.mp4'
-})
-</script>

frontend/src/components/Modals/Question.vue

@@ -212,7 +212,7 @@ const questionCreation = createResource({
 })
 
 const submitQuestion = (close) => {
-	if (props.questionDetail?.question) updateQuestion(close)
+	if (questionData.data?.name) updateQuestion(close)
 	else addQuestion(close)
 }
 
@@ -239,7 +239,7 @@ const addQuestion = (close) => {
 					)
 				},
 				onError(err) {
-					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+					showToast(__('Error'), __(err.message?.[0] || err), 'x')
 				},
 			}
 		)
@@ -259,7 +259,7 @@ const addQuestionRow = (question, close) => {
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				showToast(__('Error'), __(err.message?.[0] || err), 'x')
 				close()
 			},
 		}
@@ -312,12 +312,13 @@ const updateQuestion = (close) => {
 							quiz.value.reload()
 							close()
 						},
+						onError(err) {
+							showToast(__('Error'), __(err.message?.[0] || err), 'x')
+							close()
+						},
 					}
 				)
 			},
-			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-			},
 		}
 	)
 }

frontend/src/components/Modals/Settings.vue

@@ -1,12 +1,12 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '4xl' }">
+	<Dialog v-model="show" :options="{ size: '3xl' }">
 		<template #body>
 			<div class="flex h-[calc(100vh_-_8rem)]">
 				<div class="flex w-52 shrink-0 flex-col bg-gray-50 p-2">
 					<h1 class="mb-3 px-2 pt-2 text-lg font-semibold">
 						{{ __('Settings') }}
 					</h1>
-					<div v-for="tab in tabs" :key="tab.label">
+					<div v-for="tab in tabs">
 						<div
 							v-if="!tab.hideLabel"
 							class="mb-2 mt-3 flex cursor-pointer gap-1.5 px-1 text-base font-medium text-gray-600 transition-all duration-300 ease-in-out"
@@ -17,7 +17,6 @@
 							<SidebarLink
 								v-for="item in tab.items"
 								:link="item"
-								:key="item.label"
 								class="w-full"
 								:class="
 									activeTab?.label == item.label
@@ -31,8 +30,7 @@
 				</div>
 				<div
 					v-if="activeTab && data.doc"
-					:key="activeTab.label"
-					class="flex flex-1 flex-col px-10 py-8"
+					class="flex flex-1 flex-col overflow-y-auto"
 				>
 					<Members
 						v-if="activeTab.label === 'Members'"
@@ -40,11 +38,6 @@
 						:description="activeTab.description"
 						v-model:show="show"
 					/>
-					<Categories
-						v-else-if="activeTab.label === 'Categories'"
-						:label="activeTab.label"
-						:description="activeTab.description"
-					/>
 					<SettingDetails
 						v-else
 						:fields="activeTab.fields"
@@ -60,16 +53,13 @@
 <script setup>
 import { Dialog, createDocumentResource } from 'frappe-ui'
 import { ref, computed, watch } from 'vue'
-import { useSettings } from '@/stores/settings'
 import SettingDetails from '../SettingDetails.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import Members from '@/components/Members.vue'
-import Categories from '@/components/Categories.vue'
 
 const show = defineModel()
 const doctype = ref('LMS Settings')
 const activeTab = ref(null)
-const settingsStore = useSettings()
 
 const data = createDocumentResource({
 	doctype: doctype.value,
@@ -79,8 +69,8 @@ const data = createDocumentResource({
 	auto: true,
 })
 
-const tabsStructure = computed(() => {
-	return [
+const tabs = computed(() => {
+	let _tabs = [
 		{
 			label: 'Settings',
 			hideLabel: true,
@@ -90,23 +80,6 @@ const tabsStructure = computed(() => {
 					description: 'Manage the members of your learning system',
 					icon: 'UserRoundPlus',
 				},
-			],
-		},
-		{
-			label: 'Settings',
-			hideLabel: true,
-			items: [
-				{
-					label: 'Categories',
-					description: 'Manage the members of your learning system',
-					icon: 'Network',
-				},
-			],
-		},
-		{
-			label: 'Settings',
-			hideLabel: true,
-			items: [
 				{
 					label: 'Payment Gateway',
 					icon: 'DollarSign',
@@ -152,13 +125,13 @@ const tabsStructure = computed(() => {
 			],
 		},
 		{
-			label: 'Customise',
-			hideLabel: false,
+			label: 'Settings',
+			hideLabel: true,
 			items: [
 				{
 					label: 'Sidebar',
 					icon: 'PanelLeftIcon',
-					description: 'Choose the items you want to show in the sidebar',
+					description: 'Customize the sidebar as per your needs',
 					fields: [
 						{
 							label: 'Courses',
@@ -195,6 +168,12 @@ const tabsStructure = computed(() => {
 						},
 					],
 				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
 				{
 					label: 'Email Templates',
 					icon: 'MailPlus',
@@ -220,19 +199,56 @@ const tabsStructure = computed(() => {
 						},
 					],
 				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
 				{
 					label: 'Signup',
 					icon: 'LogIn',
+					description:
+						'Customize the signup page to inform users about your terms and policies',
 					fields: [
 						{
-							label: 'Custom Content',
-							name: 'custom_signup_content',
-							type: 'Code',
-							mode: 'htmlmixed',
-							rows: 10,
+							label: 'Show terms of use on signup',
+							name: 'terms_of_use',
+							type: 'checkbox',
 						},
 						{
-							label: 'Ask user category',
+							label: 'Terms of Use Page',
+							name: 'terms_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							label: 'Show privacy policy on signup',
+							name: 'privacy_policy',
+							type: 'checkbox',
+						},
+						{
+							label: 'Privacy Policy Page',
+							name: 'privacy_policy_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							type: 'Column Break',
+						},
+						{
+							label: 'Show cookie policy on signup',
+							name: 'cookie_policy',
+							type: 'checkbox',
+						},
+						{
+							label: 'Cookie Policy Page',
+							name: 'cookie_policy_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							label: 'Ask user category during signup',
 							name: 'user_category',
 							type: 'checkbox',
 						},
@@ -241,28 +257,23 @@ const tabsStructure = computed(() => {
 			],
 		},
 	]
-})
 
-const tabs = computed(() => {
-	return tabsStructure.value.map((tab) => {
-		return {
-			...tab,
-			items: tab.items.filter((item) => {
-				return !item.condition || item.condition()
-			}),
-		}
+	return _tabs.map((tab) => {
+		tab.items = tab.items.filter((item) => {
+			if (item.condition) {
+				return item.condition()
+			}
+			return true
+		})
+		return tab
 	})
 })
 
-watch(show, async () => {
+watch(show, () => {
 	if (show.value) {
-		const currentTab = await tabs.value
-			.flatMap((tab) => tab.items)
-			.find((item) => item.label === settingsStore.activeTab)
-		activeTab.value = currentTab || tabs.value[0].items[0]
+		activeTab.value = tabs.value[0].items[0]
 	} else {
 		activeTab.value = null
-		settingsStore.isSettingsOpen = false
 	}
 })
 </script>

frontend/src/components/Modals/YouTubeExplanation.vue

@@ -0,0 +1,31 @@
+<template>
+	<Popover transition="default">
+		<template #target="{ isOpen, togglePopover }" class="flex w-full">
+			<slot v-bind="{ isOpen, togglePopover }"></slot>
+		</template>
+		<template #body>
+			<div
+				class="absolute left-0 mt-3 w-[35rem] max-w-lg -translate-x-1/2 transform rounded-lg bg-white px-4 sm:px-0 lg:max-w-3xl"
+			>
+				<div
+					class="overflow-hidden rounded-lg p-3 shadow-2xl ring-1 ring-black ring-opacity-5"
+				>
+					<video
+						controls
+						autoplay
+						muted
+						width="100%"
+						controlsList="nodownload"
+						oncontextmenu="return false;"
+						class="rounded-sm"
+					>
+						<source src="/Youtube.mov" type="video/mp4" />
+					</video>
+				</div>
+			</div>
+		</template>
+	</Popover>
+</template>
+<script setup>
+import { Popover } from 'frappe-ui'
+</script>

frontend/src/components/NoPermission.vue

@@ -24,7 +24,7 @@
 			<div>
 				{{ __('Please login to access this page.') }}
 			</div>
-			<Button @click="redirectToLogin()" class="mt-4">
+			<Button variant="solid" @click="redirectToLogin()" class="mt-2">
 				{{ __('Login') }}
 			</Button>
 		</div>

frontend/src/components/Quiz.vue

@@ -84,7 +84,7 @@
 						</div>
 					</div>
 					<div
-						class="text-gray-900 font-semibold mt-2 leading-5"
+						class="text-gray-900 font-semibold mt-2"
 						v-html="questionDetails.data.question"
 					></div>
 					<div v-if="questionDetails.data.type == 'Choices'" v-for="index in 4">

frontend/src/components/QuizPlugin.vue

@@ -1,58 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: 'xl',
-		}"
-	>
-		<template #body>
-			<div class="p-5 space-y-4">
-				<div class="text-lg font-semibold">
-					{{ __('Add a quiz to your lesson') }}
-				</div>
-				<div>
-					<Link
-						v-model="quiz"
-						doctype="LMS Quiz"
-						:label="__('Select a quiz')"
-						:onCreate="(value, close) => redirectToQuizForm()"
-					/>
-				</div>
-				<div class="flex justify-end space-x-2">
-					<Button variant="solid" @click="addQuiz()">
-						{{ __('Save') }}
-					</Button>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Dialog, Button } from 'frappe-ui'
-import { onMounted, ref, nextTick } from 'vue'
-import Link from '@/components/Controls/Link.vue'
-
-const show = ref(false)
-const quiz = ref(null)
-
-const props = defineProps({
-	onQuizAddition: {
-		type: Function,
-		required: true,
-	},
-})
-
-onMounted(async () => {
-	await nextTick()
-	show.value = true
-})
-
-const addQuiz = () => {
-	props.onQuizAddition(quiz.value)
-	show.value = false
-}
-
-const redirectToQuizForm = () => {
-	window.open('/lms/quizzes/new', '_blank')
-}
-</script>

frontend/src/components/SettingDetails.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col justify-between h-full">
+	<div class="flex flex-col justify-between h-full p-4">
 		<div>
 			<div class="font-semibold mb-1">
 				{{ __(label) }}
@@ -8,15 +8,9 @@
 				{{ __(description) }}
 			</div>
 		</div>
-		<div
-			class="my-5"
-			:class="{ 'flex justify-between w-full': columns.length > 1 }"
-		>
+		<div class="flex space-x-8 my-5">
 			<div v-for="(column, index) in columns" :key="index">
-				<div
-					class="flex flex-col space-y-5"
-					:class="columns.length > 1 ? 'w-72' : 'w-full'"
-				>
+				<div class="flex flex-col space-y-4 w-60">
 					<div v-for="field in column">
 						<Link
 							v-if="field.type == 'Link'"
@@ -24,25 +18,12 @@
 							:doctype="field.doctype"
 							:label="field.label"
 						/>
-
-						<Codemirror
-							v-else-if="field.type == 'Code'"
-							v-model:value="field.value"
-							:label="field.label"
-							:height="200"
-							:options="{
-								mode: field.mode,
-								theme: 'seti',
-							}"
-						/>
-
 						<FormControl
 							v-else
 							:key="field.name"
 							v-model="field.value"
 							:label="field.label"
 							:type="field.type"
-							:rows="field.rows"
 						/>
 					</div>
 				</div>
@@ -60,9 +41,6 @@
 import { FormControl, Button } from 'frappe-ui'
 import { computed } from 'vue'
 import Link from '@/components/Controls/Link.vue'
-import Codemirror from 'codemirror-editor-vue3'
-import 'codemirror/theme/seti.css'
-import 'codemirror/mode/htmlmixed/htmlmixed.js'
 
 const props = defineProps({
 	fields: {
@@ -116,13 +94,3 @@ const update = () => {
 	props.data.save.submit()
 }
 </script>
-<style>
-.CodeMirror pre.CodeMirror-line,
-.CodeMirror pre.CodeMirror-line-like {
-	font-family: revert;
-}
-
-.CodeMirror {
-	border-radius: 12px;
-}
-</style>

frontend/src/components/UploadPlugin.vue

@@ -1,53 +0,0 @@
-<template>
-	<FileUploader
-		:fileTypes="['image/*', 'video/*', 'audio/*', '.pdf']"
-		:validateFile="validateFile"
-		@success="(data) => addFile(data)"
-		ref="fileUploader"
-		class="hide"
-	/>
-</template>
-<script setup>
-import { FileUploader } from 'frappe-ui'
-import { onMounted, ref, nextTick } from 'vue'
-
-const fileUploader = ref(null)
-const emit = defineEmits(['fileUploaded'])
-
-const props = defineProps({
-	onFileUploaded: {
-		type: Function,
-		required: true,
-	},
-})
-
-onMounted(async () => {
-	await nextTick()
-	const fileInput = fileUploader.value.$el.querySelector('input[type="file"]')
-	if (fileInput) {
-		fileInput.click()
-	}
-})
-
-const addFile = (file) => {
-	props.onFileUploaded({
-		file_url: file.file_url,
-		file_type: file.file_type,
-	})
-}
-
-const validateFile = (file) => {
-	let extension = file.name.split('.').pop().toLowerCase()
-	if (!['jpg', 'jpeg', 'png', 'mp4', 'mov', 'mp3', 'pdf'].includes(extension)) {
-		return 'Only image and video files are allowed.'
-	}
-}
-
-const isVideo = (type) => {
-	return ['mov', 'mp4', 'avi', 'mkv', 'webm'].includes(type.toLowerCase())
-}
-
-const isAudio = (type) => {
-	return ['mp3', 'wav', 'ogg'].includes(type.toLowerCase())
-}
-</script>

frontend/src/components/UserDropdown.vue

@@ -67,20 +67,25 @@ import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { sessionStore } from '@/stores/session'
 import { Dropdown } from 'frappe-ui'
 import Apps from '@/components/Apps.vue'
-import { ChevronDown, LogIn, LogOut, User, Settings } from 'lucide-vue-next'
+import {
+	ChevronDown,
+	LogIn,
+	LogOut,
+	User,
+	ArrowRightLeft,
+	Settings,
+} from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { convertToTitleCase } from '../utils'
 import { usersStore } from '@/stores/user'
-import { useSettings } from '@/stores/settings'
-import { markRaw, watch, ref } from 'vue'
+import { ref, markRaw } from 'vue'
 import SettingsModal from '@/components/Modals/Settings.vue'
 
 const router = useRouter()
+const showSettingsModal = ref(false)
 const { logout, branding } = sessionStore()
 let { userResource } = usersStore()
-const settingsStore = useSettings()
 let { isLoggedIn } = sessionStore()
-const showSettingsModal = ref(false)
 
 const props = defineProps({
 	isCollapsed: {
@@ -89,13 +94,6 @@ const props = defineProps({
 	},
 })
 
-watch(
-	() => settingsStore.isSettingsOpen,
-	(value) => {
-		showSettingsModal.value = value
-	}
-)
-
 const userDropdownOptions = [
 	{
 		icon: User,
@@ -120,7 +118,7 @@ const userDropdownOptions = [
 		icon: Settings,
 		label: 'Settings',
 		onClick: () => {
-			settingsStore.isSettingsOpen = true
+			showSettingsModal.value = true
 		},
 		condition: () => {
 			return userResource.data?.is_moderator

frontend/src/components/VideoBlock.vue

@@ -4,7 +4,6 @@
 			@timeupdate="updateTime"
 			@ended="videoEnded"
 			class="rounded-lg border border-gray-100"
-			ref="videoRef"
 		>
 			<source :src="fileURL" :type="type" />
 		</video>
@@ -72,6 +71,7 @@ const props = defineProps({
 
 onMounted(() => {
 	setTimeout(() => {
+		videoRef.value = document.querySelector('video')
 		videoRef.value.onloadedmetadata = () => {
 			duration.value = videoRef.value.duration
 		}

frontend/src/pages/BatchForm.vue

@@ -13,9 +13,13 @@
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-10 mb-4 space-y-2">
+				<div class="grid grid-cols-2 gap-10 mb-4">
 					<div>
-						<FormControl v-model="batch.title" :label="__('Title')" />
+						<FormControl
+							v-model="batch.title"
+							:label="__('Title')"
+							class="mb-4"
+						/>
 					</div>
 					<div class="flex flex-col space-y-2">
 						<FormControl

frontend/src/pages/Batches.vue

@@ -8,12 +8,12 @@
 				:items="[{ label: __('Batches'), route: { name: 'Batches' } }]"
 			/>
 			<div class="flex space-x-2">
-				<div class="w-44">
+				<div class="w-40">
 					<Select
 						v-if="categories.data?.length"
 						v-model="currentCategory"
 						:options="categories.data"
-						:placeholder="__('Category')"
+						:placeholder="__('Filter')"
 					/>
 				</div>
 				<router-link

frontend/src/pages/CourseForm.vue

@@ -109,14 +109,6 @@
 								/>
 							</div>
 						</div>
-						<div class="w-1/2 mb-4">
-							<Link
-								doctype="LMS Category"
-								v-model="course.category"
-								:label="__('Category')"
-								:onCreate="(value, close) => openSettings(close)"
-							/>
-						</div>
 						<MultiSelect
 							v-model="instructors"
 							doctype="User"
@@ -229,20 +221,18 @@ import {
 	showToast,
 	getFileSize,
 	updateDocumentTitle,
-} from '@/utils'
+} from '../utils'
 import Link from '@/components/Controls/Link.vue'
 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'
 import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
 const newTag = ref('')
 const router = useRouter()
 const instructors = ref([])
-const settingsStore = useSettings()
 
 const props = defineProps({
 	courseName: {
@@ -430,7 +420,7 @@ const validateMandatoryFields = () => {
 		}
 	}
 	if (course.paid_course && (!course.course_price || !course.currency)) {
-		return __('Course price and currency are mandatory for paid courses')
+		return 'Course price and currency are mandatory for paid courses'
 	}
 }
 
@@ -446,7 +436,7 @@ watch(
 const validateFile = (file) => {
 	let extension = file.name.split('.').pop().toLowerCase()
 	if (!['jpg', 'jpeg', 'png', 'webp'].includes(extension)) {
-		return __('Only image file is allowed.')
+		return 'Only image file is allowed.'
 	}
 }
 
@@ -473,12 +463,6 @@ const removeImage = () => {
 	course.course_image = null
 }
 
-const openSettings = (close) => {
-	close()
-	settingsStore.activeTab = 'Categories'
-	settingsStore.isSettingsOpen = true
-}
-
 const check_permission = () => {
 	let user_is_instructor = false
 	if (user.data?.is_moderator) return

frontend/src/pages/Courses.vue

@@ -8,15 +8,6 @@
 				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
 			/>
 			<div class="flex space-x-2 justify-end">
-				<div class="w-44">
-					<FormControl
-						v-if="categories.data?.length"
-						type="select"
-						v-model="currentCategory"
-						:options="categories.data"
-						:placeholder="__('Category')"
-					/>
-				</div>
 				<div class="w-36">
 					<FormControl
 						type="text"
@@ -128,19 +119,11 @@ import {
 } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
 import { Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject, onMounted, watch } from 'vue'
+import { ref, computed, inject } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const searchQuery = ref('')
-const currentCategory = ref(null)
-
-onMounted(() => {
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('category')) {
-		currentCategory.value = queries.get('category')
-	}
-})
 
 const courses = createResource({
 	url: 'lms.lms.utils.get_courses',
@@ -185,57 +168,18 @@ const addToTabs = (label) => {
 }
 
 const getCourses = (type) => {
-	let courseList = courses.data[type]
 	if (searchQuery.value) {
 		let query = searchQuery.value.toLowerCase()
-		courseList = courseList.filter(
+		return courses.data[type].filter(
 			(course) =>
 				course.title.toLowerCase().includes(query) ||
 				course.short_introduction.toLowerCase().includes(query) ||
 				course.tags.filter((tag) => tag.toLowerCase().includes(query)).length
 		)
 	}
-	if (currentCategory.value && currentCategory.value != '') {
-		courseList = courseList.filter(
-			(course) => course.category == currentCategory.value
-		)
-	}
-	return courseList
+	return courses.data[type]
 }
 
-const categories = createResource({
-	url: 'lms.lms.api.get_categories',
-	makeParams() {
-		return {
-			doctype: 'LMS Course',
-			filters: {
-				published: 1,
-			},
-		}
-	},
-	cache: ['courseCategories'],
-	auto: true,
-	transform(data) {
-		data.unshift({
-			label: '',
-			value: null,
-		})
-	},
-})
-
-watch(
-	() => currentCategory.value,
-	() => {
-		let queries = new URLSearchParams(location.search)
-		if (currentCategory.value) {
-			queries.set('category', currentCategory.value)
-		} else {
-			queries.delete('category')
-		}
-		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
-	}
-)
-
 const pageMeta = computed(() => {
 	return {
 		title: 'Courses',

frontend/src/pages/Lesson.vue

@@ -120,7 +120,7 @@
 				</div>
 				<div
 					v-if="
-						JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 &&
+						lesson.data.instructor_content?.blocks?.length &&
 						allowInstructorContent()
 					"
 					class="bg-gray-100 p-3 rounded-md mt-6"
@@ -244,7 +244,7 @@ const lesson = createResource({
 	onSuccess(data) {
 		lessonProgress.value = data.membership?.progress
 		if (data.content) editor.value = renderEditor('editor', data.content)
-		if (JSON.parse(data.instructor_content)?.blocks?.length > 1)
+		if (data.instructor_content?.blocks?.length)
 			instructorEditor.value = renderEditor(
 				'instructor-content',
 				data.instructor_content
@@ -448,10 +448,6 @@ updateDocumentTitle(pageMeta)
 	max-width: unset;
 }
 
-.codex-editor__redactor {
-	padding-bottom: 0px !important;
-}
-
 .codeBoxHolder {
 	display: flex;
 	flex-direction: column;
@@ -541,13 +537,4 @@ updateDocumentTitle(pageMeta)
 	color: #383a42;
 	background-color: #fafafa;
 }
-
-.codeBoxTextArea {
-	line-height: 1.7;
-}
-
-iframe {
-	border-top: 3px solid theme('colors.gray.700');
-	border-bottom: 3px solid theme('colors.gray.700');
-}
 </style>

frontend/src/pages/LessonForm.vue

@@ -62,7 +62,7 @@
 			</div>
 			<div class="">
 				<div class="sticky top-0 p-5">
-					<LessonHelp />
+					<LessonPlugins :editor="editor" :notesEditor="instructorEditor" />
 				</div>
 			</div>
 		</div>
@@ -79,7 +79,7 @@ import {
 	onBeforeUnmount,
 } from 'vue'
 import EditorJS from '@editorjs/editorjs'
-import LessonHelp from '@/components/LessonHelp.vue'
+import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
 import { capture } from '@/telemetry'
@@ -117,7 +117,7 @@ onMounted(() => {
 const renderEditor = (holder) => {
 	return new EditorJS({
 		holder: holder,
-		tools: getEditorTools(true),
+		tools: getEditorTools(),
 		autofocus: true,
 	})
 }
@@ -143,9 +143,7 @@ const lessonDetails = createResource({
 			Object.keys(data.lesson).forEach((key) => {
 				lesson[key] = data.lesson[key]
 			})
-			lesson.include_in_preview = data?.lesson?.include_in_preview
-				? true
-				: false
+			lesson.include_in_preview = data.include_in_preview ? true : false
 			addLessonContent(data)
 			addInstructorNotes(data)
 			enableAutoSave()
@@ -182,7 +180,7 @@ const addInstructorNotes = (data) => {
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
 		saveLesson()
-	}, 10000)
+	}, 5000)
 }
 
 onBeforeUnmount(() => {
@@ -425,7 +423,7 @@ const breadcrumbs = computed(() => {
 		},
 		{
 			label: lessonDetails.data?.course_title,
-			route: { name: 'CourseForm', params: { courseName: props.courseName } },
+			route: { name: 'CourseDetail', params: { courseName: props.courseName } },
 		},
 	]
 
@@ -475,10 +473,6 @@ updateDocumentTitle(pageMeta)
 	max-width: none;
 }
 
-.codex-editor--narrow .ce-toolbar__actions {
-	right: 100%;
-}
-
 .ce-toolbar__content {
 	max-width: none;
 }
@@ -551,6 +545,10 @@ updateDocumentTitle(pageMeta)
 	cursor: pointer;
 }
 
+.codeBoxSelectItem:hover {
+	opacity: 0.7;
+}
+
 .codeBoxSelectedItem {
 	background-color: lightblue !important;
 }
@@ -568,17 +566,4 @@ updateDocumentTitle(pageMeta)
 	color: #383a42;
 	background-color: #fafafa;
 }
-
-.codeBoxTextArea {
-	line-height: 1.7;
-}
-
-.prose :where(pre):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
-	overflow-x: unset;
-}
-
-iframe {
-	border-top: 3px solid theme('colors.gray.700');
-	border-bottom: 3px solid theme('colors.gray.700');
-}
 </style>

frontend/src/pages/Profile.vue

@@ -146,7 +146,7 @@ const coverImage = createResource({
 
 const setActiveTab = () => {
 	let fragments = route.path.split('/')
-	let sections = ['certificates', 'roles', 'slots', 'schedule']
+	let sections = ['certificates', 'roles', 'evaluations']
 	sections.forEach((section) => {
 		if (fragments.includes(section)) {
 			activeTab.value = convertToTitleCase(section)
@@ -161,8 +161,7 @@ watchEffect(() => {
 			About: { name: 'ProfileAbout' },
 			Certificates: { name: 'ProfileCertificates' },
 			Roles: { name: 'ProfileRoles' },
-			Slots: { name: 'ProfileEvaluator' },
-			Schedule: { name: 'ProfileEvaluationSchedule' },
+			Evaluations: { name: 'ProfileEvaluator' },
 		}[activeTab.value]
 		router.push(route)
 	}
@@ -186,13 +185,8 @@ const isSessionUser = () => {
 const getTabButtons = () => {
 	let buttons = [{ label: 'About' }, { label: 'Certificates' }]
 	if ($user.data?.is_moderator) buttons.push({ label: 'Roles' })
-	if (
-		isSessionUser() &&
-		($user.data?.is_evaluator || $user.data?.is_moderator)
-	) {
-		buttons.push({ label: 'Slots' })
-		buttons.push({ label: 'Schedule' })
-	}
+	if (isSessionUser() && $user.data?.is_evaluator)
+		buttons.push({ label: 'Evaluations' })
 
 	return buttons
 }

frontend/src/pages/ProfileEvaluationSchedule.vue

@@ -1,102 +0,0 @@
-<template>
-	<div class="mt-7 mb-20">
-		<div class="flex h-screen flex-col overflow-hidden">
-			<Calendar
-				v-if="evaluations.data?.length"
-				:config="{
-					defaultMode: 'Month',
-					disableModes: ['Day', 'Week'],
-					redundantCellHeight: 100,
-					enableShortcuts: false,
-				}"
-				:events="evaluations.data"
-				@click="(event) => openEvent(event)"
-			>
-				<template #header="{ currentMonthYear, decrement, increment }">
-					<div class="mb-2 flex justify-between">
-						<span class="text-lg font-semibold">
-							{{ currentMonthYear }}
-						</span>
-						<div class="flex gap-x-1">
-							<Button
-								@click="decrement()"
-								variant="ghost"
-								class="h-4 w-4"
-								icon="chevron-left"
-							/>
-							<Button
-								@click="increment()"
-								variant="ghost"
-								class="h-4 w-4"
-								icon="chevron-right"
-							/>
-						</div>
-					</div>
-				</template>
-			</Calendar>
-		</div>
-	</div>
-	<Event v-model="showEvent" :event="currentEvent" />
-</template>
-<script setup>
-import { Calendar, createListResource, Button } from 'frappe-ui'
-import { inject, ref } from 'vue'
-import Event from '@/components/Modals/Event.vue'
-
-const user = inject('$user')
-const currentEvent = ref(null)
-const showEvent = ref(false)
-
-const props = defineProps({
-	profile: {
-		type: Object,
-		required: true,
-	},
-})
-
-const evaluations = createListResource({
-	doctype: 'LMS Certificate Request',
-	filters: {
-		evaluator: user.data?.name,
-	},
-	fields: [
-		'name',
-		'member_name',
-		'member',
-		'course',
-		'course_title',
-		'batch_name',
-		'batch_title',
-		'evaluator',
-		'evaluator_name',
-		'date',
-		'start_time',
-		'end_time',
-		'google_meet_link',
-	],
-	auto: true,
-	orderBy: 'creation desc',
-	limit: 100,
-	cache: ['schedule', user.data?.name],
-	transform(data) {
-		return data.map((d) => {
-			let mappedData = Object.assign({}, d)
-
-			mappedData.title = `${d.member_name}'s Evaluation`
-			mappedData.participant = d.member_name
-			mappedData.id = d.name
-			mappedData.venue = d.google_meet_link
-			mappedData.fromDate = `${d.date} ${d.start_time}`
-			mappedData.toDate = `${d.date} ${d.end_time}`
-			mappedData.color = 'green'
-
-			return mappedData
-		})
-	},
-})
-
-const openEvent = (event) => {
-	currentEvent.value = event.calendarEvent
-	showEvent.value = true
-}
-</script>

frontend/src/pages/QuizCreation.vue

@@ -22,7 +22,7 @@
 				"
 			/>
 			<div v-if="quizDetails.data?.name">
-				<div class="grid grid-cols-3 gap-5 mt-4 mb-8">
+				<div class="grid grid-cols-3 gap-5 mt-2 mb-8">
 					<FormControl
 						v-model="quiz.max_attempts"
 						:label="__('Maximun Attempts')"
@@ -125,7 +125,7 @@
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="deleteQuestions(selections, unselectAll)"
+										@click="deleteQuizzes(selections, unselectAll)"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -174,7 +174,7 @@ import {
 } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
 import Question from '@/components/Modals/Question.vue'
-import { showToast, updateDocumentTitle } from '@/utils'
+import { showToast } from '../utils'
 import { useRouter } from 'vue-router'
 
 const showQuestionModal = ref(false)
@@ -306,7 +306,7 @@ const createQuiz = () => {
 			onSuccess(data) {
 				showToast(__('Success'), __('Quiz created successfully'), 'check')
 				router.push({
-					name: 'QuizForm',
+					name: 'QuizCreation',
 					params: { quizID: data.name },
 				})
 			},
@@ -375,29 +375,24 @@ const openQuestionModal = (question = null) => {
 	showQuestionModal.value = true
 }
 
-const deleteQuestionResource = createResource({
-	url: 'lms.lms.api.delete_documents',
+const deleteQuiz = createResource({
+	url: 'frappe.client.delete',
 	makeParams(values) {
 		return {
 			doctype: 'LMS Quiz Question',
-			documents: values.questions,
+			name: values.quiz,
 		}
 	},
 })
 
-const deleteQuestions = (selections, unselectAll) => {
-	deleteQuestionResource.submit(
-		{
-			questions: Array.from(selections),
-		},
-		{
-			onSuccess() {
-				showToast(__('Success'), __('Questions deleted successfully'), 'check')
-				quizDetails.reload()
-				unselectAll()
-			},
-		}
-	)
+const deleteQuizzes = (selections, unselectAll) => {
+	selections.forEach(async (quiz) => {
+		deleteQuiz.submit({ quiz })
+	})
+	setTimeout(() => {
+		quizDetails.reload()
+		unselectAll()
+	}, 500)
 }
 
 const breadcrumbs = computed(() => {
@@ -415,18 +410,9 @@ const breadcrumbs = computed(() => {
 		})
 	} */
 	crumbs.push({
-		label: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
-		route: { name: 'QuizForm', params: { quizID: props.quizID } },
+		label: props.quizID == 'new' ? 'New Quiz' : quizDetails.data?.title,
+		route: { name: 'QuizCreation', params: { quizID: props.quizID } },
 	})
 	return crumbs
 })
-
-const pageMeta = computed(() => {
-	return {
-		title: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
-		description: __('Form to create and edit quizzes'),
-	}
-})
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/QuizSubmission.vue

@@ -1,48 +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="breadcrumbs" />
-	</header>
-	<div class="w-1/2 mx-auto py-10">
-		<Quiz :quizName="quizID" />
-	</div>
-</template>
-<script setup>
-import Quiz from '@/components/Quiz.vue'
-import { createResource, Breadcrumbs } from 'frappe-ui'
-import { computed, inject, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-
-const user = inject('$user')
-const router = useRouter()
-
-onMounted(() => {
-	if (!user.data) {
-		router.push({ name: 'Courses' })
-	}
-})
-
-const props = defineProps({
-	quizID: {
-		type: String,
-		required: true,
-	},
-})
-
-const title = createResource({
-	url: 'frappe.client.get_value',
-	params: {
-		doctype: 'LMS Quiz',
-		fieldname: 'title',
-		filters: {
-			name: props.quizID,
-		},
-	},
-	auto: true,
-})
-
-const breadcrumbs = computed(() => {
-	return [{ label: __('Quiz Submission') }, { label: title.data?.title }]
-})
-</script>

frontend/src/pages/Quizzes.vue

@@ -5,7 +5,7 @@
 		<Breadcrumbs :items="breadcrumbs" />
 		<router-link
 			:to="{
-				name: 'QuizForm',
+				name: 'QuizCreation',
 				params: {
 					quizID: 'new',
 				},
@@ -36,7 +36,7 @@
 				<router-link
 					v-for="row in quizzes.data"
 					:to="{
-						name: 'QuizForm',
+						name: 'QuizCreation',
 						params: {
 							quizID: row.name,
 						},
@@ -62,7 +62,6 @@ import {
 import { useRouter } from 'vue-router'
 import { computed, inject, onMounted } from 'vue'
 import { Plus } from 'lucide-vue-next'
-import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const router = useRouter()
@@ -124,13 +123,4 @@ const breadcrumbs = computed(() => {
 		},
 	]
 })
-
-const pageMeta = computed(() => {
-	return {
-		title: __('Quizzes'),
-		description: __('List of quizzes'),
-	}
-})
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/router.js

@@ -79,15 +79,9 @@ const routes = [
 			},
 			{
 				name: 'ProfileEvaluator',
-				path: 'slots',
+				path: 'evaluations',
 				component: () => import('@/pages/ProfileEvaluator.vue'),
 			},
-			{
-				name: 'ProfileEvaluationSchedule',
-				path: 'schedule',
-				component: () =>
-					import('@/pages/ProfileEvaluationSchedule.vue'),
-			},
 		],
 	},
 	{
@@ -154,14 +148,8 @@ const routes = [
 	},
 	{
 		path: '/quizzes/:quizID',
-		name: 'QuizForm',
-		component: () => import('@/pages/QuizForm.vue'),
-		props: true,
-	},
-	{
-		path: '/quiz/:quizID',
-		name: 'Quiz',
-		component: () => import('@/pages/QuizSubmission.vue'),
+		name: 'QuizCreation',
+		component: () => import('@/pages/QuizCreation.vue'),
 		props: true,
 	},
 ]

frontend/src/stores/settings.js

@@ -1,12 +0,0 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-export const useSettings = defineStore('settings', () => {
-	const isSettingsOpen = ref(false)
-	const activeTab = ref(null)
-
-	return {
-		isSettingsOpen,
-		activeTab,
-	}
-})

frontend/src/utils/code.ts

@@ -62,7 +62,7 @@ export class CodeBox {
 
 	static get toolbox() {
 		const app = createApp({
-			render: () => h(Code, { size: 18, strokeWidth: 1.5, color: 'black' }),
+			render: () => h(Code, { size: 24, strokeWidth: 2, color: 'black' }),
 		});
 
 		const div = document.createElement('div');

frontend/src/utils/customEmbed.js

@@ -0,0 +1,32 @@
+import Embed from '@editorjs/embed'
+import VideoBlock from '@/components/VideoBlock.vue'
+import { createApp } from 'vue'
+
+export class CustomEmbed extends Embed {
+	render() {
+		const container = super.render()
+		const { service, source, embed } = this.data
+
+		if (service === 'youtube' || service === 'vimeo') {
+			// Remove the iframe or existing embed content
+			container.innerHTML = ''
+
+			// Create a placeholder element for Vue component
+			const vueContainer = document.createElement('div')
+			vueContainer.setAttribute('data-service', service)
+			vueContainer.setAttribute('data-video-id', this.data.source)
+
+			// Append the Vue placeholder
+			container.appendChild(vueContainer)
+			console.log(source)
+			// Mount the Vue component (using a global Vue instance)
+			const app = createApp(VideoBlock, {
+				file: source,
+				type: 'video/youtube',
+			})
+			app.mount(vueContainer)
+		}
+
+		return container
+	}
+}

frontend/src/utils/index.js

@@ -149,9 +149,9 @@ export function getEditorTools() {
 			class: CodeBox,
 			config: {
 				themeURL:
-					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/atom-one-dark.min.css',
-				themeName: 'atom-one-dark',
-				useDefaultTheme: 'dark',
+					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/dracula.min.css', // Optional
+				themeName: 'atom-one-dark', // Optional
+				useDefaultTheme: 'dark', // Optional. This also determines the background color of the language select drop-down
 			},
 		},
 		list: {

frontend/src/utils/quiz.js

@@ -1,9 +1,7 @@
 import QuizBlock from '@/components/QuizBlock.vue'
-import QuizPlugin from '@/components/QuizPlugin.vue'
-import { createApp, h } from 'vue'
+import { createApp } from 'vue'
 import { usersStore } from '../stores/user'
 import translationPlugin from '../translation'
-import { CircleHelp } from 'lucide-vue-next'
 
 export class Quiz {
 	constructor({ data, api, readOnly }) {
@@ -11,31 +9,17 @@ export class Quiz {
 		this.readOnly = readOnly
 	}
 
-	static get toolbox() {
-		const app = createApp({
-			render: () =>
-				h(CircleHelp, { size: 18, strokeWidth: 1.5, color: 'black' }),
-		})
-
-		const div = document.createElement('div')
-		app.mount(div)
-
-		return {
-			title: __('Quiz'),
-			icon: div.innerHTML,
-		}
-	}
-
 	static get isReadOnlySupported() {
 		return true
 	}
 
 	render() {
 		this.wrapper = document.createElement('div')
-		if (Object.keys(this.data).length) {
-			this.renderQuiz(this.data.quiz)
-		} else {
-			this.renderQuizModal()
+		if (this.data) {
+			let renderedQuiz = this.renderQuiz(this.data.quiz)
+			if (!this.readOnly) {
+				this.wrapper.innerHTML = renderedQuiz
+			}
 		}
 		return this.wrapper
 	}
@@ -43,7 +27,7 @@ export class Quiz {
 	renderQuiz(quiz) {
 		if (this.readOnly) {
 			const app = createApp(QuizBlock, {
-				quiz: quiz,
+				quiz: quiz, // Pass quiz content as prop
 			})
 			app.use(translationPlugin)
 			const { userResource } = usersStore()
@@ -51,23 +35,11 @@ export class Quiz {
 			app.mount(this.wrapper)
 			return
 		}
-		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center mb-2'>
+		return `<div class='border rounded-md p-10 text-center mb-2'>
             <span class="font-medium">
                 Quiz: ${quiz}
             </span>
         </div>`
-		return
-	}
-
-	renderQuizModal() {
-		const app = createApp(QuizPlugin, {
-			onQuizAddition: (quiz) => {
-				this.data.quiz = quiz
-				this.renderQuiz(quiz)
-			},
-		})
-		app.use(translationPlugin)
-		app.mount(this.wrapper)
 	}
 
 	save(blockContent) {

frontend/src/utils/upload.js

@@ -1,9 +1,6 @@
 import AudioBlock from '@/components/AudioBlock.vue'
 import VideoBlock from '@/components/VideoBlock.vue'
-import UploadPlugin from '@/components/UploadPlugin.vue'
-import { h, createApp } from 'vue'
-import { Upload as UploadIcon } from 'lucide-vue-next'
-import translationPlugin from '../translation'
+import { createApp } from 'vue'
 
 export class Upload {
 	constructor({ data, api, readOnly }) {
@@ -11,38 +8,17 @@ export class Upload {
 		this.readOnly = readOnly
 	}
 
-	static get toolbox() {
-		const app = createApp({
-			render: () =>
-				h(UploadIcon, { size: 18, strokeWidth: 1.5, color: 'black' }),
-		})
-
-		const div = document.createElement('div')
-		app.mount(div)
-
-		return {
-			title: 'Upload',
-			icon: div.innerHTML,
-		}
-	}
-
 	static get isReadOnlySupported() {
 		return true
 	}
 
 	render() {
 		this.wrapper = document.createElement('div')
-
-		if (this.data && this.data.file_url) {
-			this.renderFile(this.data)
-		} else {
-			this.renderFileUploader()
-		}
-
+		this.renderUpload(this.data)
 		return this.wrapper
 	}
 
-	renderFile(file) {
+	renderUpload(file) {
 		if (this.isVideo(file.file_type)) {
 			const app = createApp(VideoBlock, {
 				file: file.file_url,
@@ -68,25 +44,6 @@ export class Upload {
 		}
 	}
 
-	renderFileUploader() {
-		const app = createApp(UploadPlugin, {
-			onFileUploaded: (file) => {
-				this.data.file_url = file.file_url
-				this.data.file_type = file.file_type
-				this.renderFile(file)
-			},
-		})
-		app.use(translationPlugin)
-		app.mount(this.wrapper)
-	}
-
-	validate(savedData) {
-		if (!savedData.file_url || !savedData.file_type) {
-			return false
-		}
-		return true
-	}
-
 	save(blockContent) {
 		return {
 			file_url: this.data.file_url,

lms/__init__.py

@@ -1 +1 @@
-__version__ = "2.6.0"
+__version__ = "2.3.0"

lms/fixtures/lms_category.json

@@ -1,51 +0,0 @@
-[
- {
-  "category": "Web Development",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-09-20 12:58:16.841571",
-  "name": "Web Development"
- },
- {
-  "category": "Business",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-09-20 12:58:32.304850",
-  "name": "Business"
- },
- {
-  "category": "Design",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-09-20 12:59:12.621022",
-  "name": "Design"
- },
- {
-  "category": "Personal Development",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-09-20 12:59:19.287404",
-  "name": "Personal Development"
- },
- {
-  "category": "Finance",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-09-20 12:58:28.579714",
-  "name": "Finance"
- },
- {
-  "category": "Frontend",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2024-05-08 14:05:16.979275",
-  "name": "Frontend"
- },
- {
-  "category": "Framework",
-  "docstatus": 0,
-  "doctype": "LMS Category",
-  "modified": "2023-06-15 18:01:41.598282",
-  "name": "Framework"
- }
-]

lms/hooks.py

@@ -115,7 +115,7 @@ scheduler_events = {
 	"daily": ["lms.job.doctype.job_opportunity.job_opportunity.update_job_openings"],
 }
 
-fixtures = ["Custom Field", "Function", "Industry", "LMS Category"]
+fixtures = ["Custom Field", "Function", "Industry"]
 
 # Testing
 # -------

lms/lms/api.py

@@ -7,7 +7,6 @@ from frappe import _
 from frappe.query_builder import DocType
 from frappe.query_builder.functions import Count
 from frappe.utils import time_diff, now_datetime, get_datetime
-from typing import Optional
 
 
 @frappe.whitelist()
@@ -581,7 +580,7 @@ def get_members(start=0, search=""):
 	members = frappe.get_all(
 		"User",
 		filters=filters,
-		fields=["name", "full_name", "user_image", "username", "last_active"],
+		fields=["name", "full_name", "user_image", "username"],
 		page_length=20,
 		start=start,
 	)
@@ -611,98 +610,3 @@ def check_app_permission():
 		return True
 
 	return False
-
-
-@frappe.whitelist()
-def save_evaluation_details(
-	member,
-	course,
-	batch_name,
-	evaluator,
-	date,
-	start_time,
-	end_time,
-	status,
-	rating,
-	summary,
-):
-	"""
-	Save evaluation details for a member against a course.
-	"""
-	evaluation = frappe.db.exists(
-		"LMS Certificate Evaluation", {"member": member, "course": course}
-	)
-
-	details = {
-		"date": date,
-		"start_time": start_time,
-		"end_time": end_time,
-		"status": status,
-		"rating": rating / 5,
-		"summary": summary,
-		"batch_name": batch_name,
-	}
-
-	if evaluation:
-		frappe.db.set_value("LMS Certificate Evaluation", evaluation, details)
-		return evaluation
-	else:
-		doc = frappe.new_doc("LMS Certificate Evaluation")
-		details.update(
-			{
-				"member": member,
-				"course": course,
-				"evaluator": evaluator,
-			}
-		)
-		doc.update(details)
-		doc.insert()
-		return doc.name
-
-
-@frappe.whitelist()
-def save_certificate_details(
-	member,
-	course,
-	batch_name,
-	evaluator,
-	issue_date,
-	expiry_date,
-	template,
-	published=True,
-):
-	"""
-	Save certificate details for a member against a course.
-	"""
-	certificate = frappe.db.exists("LMS Certificate", {"member": member, "course": course})
-
-	details = {
-		"published": published,
-		"issue_date": issue_date,
-		"expiry_date": expiry_date,
-		"template": template,
-		"batch_name": batch_name,
-	}
-
-	if certificate:
-		frappe.db.set_value("LMS Certificate", certificate, details)
-		return certificate
-	else:
-		doc = frappe.new_doc("LMS Certificate")
-		details.update(
-			{
-				"member": member,
-				"course": course,
-				"evaluator": evaluator,
-			}
-		)
-		doc.update(details)
-		doc.insert()
-		return doc.name
-
-
-@frappe.whitelist()
-def delete_documents(doctype, documents):
-	frappe.only_for("Moderator")
-	for doc in documents:
-		frappe.delete_doc(doctype, doc)

lms/lms/doctype/course_chapter/course_chapter.py

@@ -7,4 +7,5 @@ from frappe.utils.telemetry import capture
 
 
 class CourseChapter(Document):
-	pass
+	def after_insert(self):
+		capture("chapter_created", "lms")

lms/lms/doctype/course_lesson/course_lesson.py

@@ -24,6 +24,9 @@ class CourseLesson(Document):
 		for section in dynamic_documents:
 			self.update_lesson_name_in_document(section)
 
+	def after_insert(self):
+		capture("lesson_created", "lms")
+
 	def update_lesson_name_in_document(self, section):
 		doctype_map = {"Exercise": "LMS Exercise", "Quiz": "LMS Quiz"}
 		macros = find_macros(self.body)
@@ -113,8 +116,6 @@ def save_progress(lesson, course):
 	).save(ignore_permissions=True)
 
 	progress = get_course_progress(course)
-	capture_progress_for_analytics(progress, course)
-
 	# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necesary for badge to get assigned.
 	enrollment = frappe.get_doc("LMS Enrollment", membership)
 	enrollment.progress = progress
@@ -124,11 +125,6 @@ def save_progress(lesson, course):
 	return progress
 
 
-def capture_progress_for_analytics(progress, course):
-	if progress in [25, 50, 75, 100]:
-		capture("course_progress", "lms", {"course": course, "progress": progress})
-
-
 def get_quiz_progress(lesson):
 	lesson_details = frappe.db.get_value(
 		"Course Lesson", lesson, ["body", "content"], as_dict=1

lms/lms/doctype/lms_batch/lms_batch.py

@@ -8,7 +8,12 @@ import json
 from frappe import _
 from datetime import timedelta
 from frappe.model.document import Document
-from frappe.utils import cint, format_date, format_datetime, get_time, getdate, add_days
+from frappe.utils import (
+	cint,
+	format_date,
+	format_datetime,
+	get_time,
+)
 from lms.lms.utils import (
 	get_lessons,
 	get_lesson_index,
@@ -68,23 +73,21 @@ class LMSBatch(Document):
 					)
 				)
 
-	def validate_evaluation_end_date(self):
-		if self.evaluation_end_date and self.evaluation_end_date < self.end_date:
-			frappe.throw(_("Evaluation end date cannot be less than the batch end date."))
-
 	def send_confirmation_mail(self):
 		for student in self.students:
 			outgoing_email_account = frappe.get_cached_value(
 				"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 			)
-			if (
-				not student.confirmation_email_sent
-				and getdate(student.creation) >= add_days(getdate(), -2)
-				and (outgoing_email_account or frappe.conf.get("mail_login"))
+			if not student.confirmation_email_sent and (
+				outgoing_email_account or frappe.conf.get("mail_login")
 			):
 				self.send_mail(student)
 				student.confirmation_email_sent = 1
 
+	def validate_evaluation_end_date(self):
+		if self.evaluation_end_date and self.evaluation_end_date < self.end_date:
+			frappe.throw(_("Evaluation end date cannot be less than the batch end date."))
+
 	def send_mail(self, student):
 		subject = _("Enrollment Confirmation for the Next Training Batch")
 		template = "batch_confirmation"

lms/lms/doctype/lms_category/lms_category.json

@@ -15,13 +15,12 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Category",
-   "reqd": 1,
    "unique": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-23 19:33:49.593950",
+ "modified": "2023-06-15 15:14:11.341961",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Category",
@@ -56,6 +55,5 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "category",
- "track_changes": 1
+ "title_field": "category"
 }

lms/lms/doctype/lms_certificate/lms_certificate.json

@@ -15,10 +15,8 @@
   "template",
   "published",
   "section_break_scyf",
-  "evaluator",
-  "evaluator_name",
-  "column_break_slaw",
   "expiry_date",
+  "column_break_slaw",
   "batch_name"
  ],
  "fields": [
@@ -97,24 +95,11 @@
   {
    "fieldname": "column_break_slaw",
    "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "evaluator",
-   "fieldtype": "Link",
-   "label": "Evaluator",
-   "options": "User"
-  },
-  {
-   "fetch_from": "evaluator.full_name",
-   "fieldname": "evaluator_name",
-   "fieldtype": "Data",
-   "label": "Evaluator Name",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-11 11:37:20.419955",
+ "modified": "2024-07-16 15:29:19.708888",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate",

lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json

@@ -8,16 +8,12 @@
  "field_order": [
   "member",
   "member_name",
-  "column_break_ueht",
   "course",
-  "batch_name",
-  "section_break_zwfi",
-  "evaluator",
-  "evaluator_name",
   "column_break_5",
   "date",
   "start_time",
   "end_time",
+  "batch_name",
   "section_break_6",
   "rating",
   "status",
@@ -107,33 +103,11 @@
    "in_standard_filter": 1,
    "label": "Batch Name",
    "options": "LMS Batch"
-  },
-  {
-   "fieldname": "column_break_ueht",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_zwfi",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "evaluator",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Evaluator",
-   "options": "User"
-  },
-  {
-   "fetch_from": "evaluator.full_name",
-   "fieldname": "evaluator_name",
-   "fieldtype": "Data",
-   "label": "Evaluator Name",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-11 11:20:06.233491",
+ "modified": "2024-07-16 14:06:11.977666",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate Evaluation",

lms/lms/doctype/lms_certificate_request/lms_certificate_request.json

@@ -7,17 +7,11 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
-  "course_title",
+  "evaluator",
+  "batch_name",
   "column_break_4",
   "member",
   "member_name",
-  "section_break_ikne",
-  "evaluator",
-  "evaluator_name",
-  "column_break_sjco",
-  "batch_name",
-  "batch_title",
-  "timezone",
   "section_break_lifi",
   "date",
   "day",
@@ -39,6 +33,7 @@
   {
    "fieldname": "member",
    "fieldtype": "Link",
+   "in_standard_filter": 1,
    "label": "Member",
    "options": "User",
    "reqd": 1
@@ -46,9 +41,9 @@
   {
    "fieldname": "evaluator",
    "fieldtype": "Link",
-   "in_standard_filter": 1,
    "label": "Evaluator",
-   "options": "User"
+   "options": "User",
+   "read_only": 1
   },
   {
    "fieldname": "date",
@@ -108,47 +103,11 @@
    "in_standard_filter": 1,
    "label": "Batch",
    "options": "LMS Batch"
-  },
-  {
-   "fieldname": "section_break_ikne",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_sjco",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fetch_from": "course.title",
-   "fieldname": "course_title",
-   "fieldtype": "Data",
-   "label": "Course Title",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "evaluator.full_name",
-   "fieldname": "evaluator_name",
-   "fieldtype": "Data",
-   "label": "Evaluator Name",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "batch_name.timezone",
-   "fieldname": "timezone",
-   "fieldtype": "Data",
-   "label": "Timezone",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "batch_name.title",
-   "fieldname": "batch_title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Batch Title"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-11 11:19:44.669132",
+ "modified": "2024-04-16 11:01:28.336807",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate Request",

lms/lms/doctype/lms_certificate_request/lms_certificate_request.py

@@ -13,7 +13,6 @@ from frappe.utils import (
 	get_datetime,
 	nowtime,
 	get_time,
-	get_fullname,
 )
 from lms.lms.utils import get_evaluator
 import json
@@ -33,30 +32,25 @@ class LMSCertificateRequest(Document):
 	def set_evaluator(self):
 		if not self.evaluator:
 			self.evaluator = get_evaluator(self.course, self.batch_name)
-			self.evaluator_name = get_fullname(self.evaluator)
 
 	def validate_unavailability(self):
-		if self.evaluator:
-			unavailable = frappe.db.get_value(
-				"Course Evaluator",
-				self.evaluator,
-				["unavailable_from", "unavailable_to"],
-				as_dict=1,
-			)
-			if (
-				unavailable.unavailable_from
-				and unavailable.unavailable_to
-				and getdate(self.date) >= unavailable.unavailable_from
-				and getdate(self.date) <= unavailable.unavailable_to
-			):
-				frappe.throw(
-					_(
-						"The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
-					).format(
-						format_date(unavailable.unavailable_from, "medium"),
-						format_date(unavailable.unavailable_to, "medium"),
-					)
+		unavailable = frappe.db.get_value(
+			"Course Evaluator", self.evaluator, ["unavailable_from", "unavailable_to"], as_dict=1
+		)
+		if (
+			unavailable.unavailable_from
+			and unavailable.unavailable_to
+			and getdate(self.date) >= unavailable.unavailable_from
+			and getdate(self.date) <= unavailable.unavailable_to
+		):
+			frappe.throw(
+				_(
+					"The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
+				).format(
+					format_date(unavailable.unavailable_from, "medium"),
+					format_date(unavailable.unavailable_to, "medium"),
 				)
+			)
 
 	def validate_slot(self):
 		if frappe.db.exists(
@@ -126,12 +120,14 @@ class LMSCertificateRequest(Document):
 			template = "certificate_request_notification"
 
 			args = {
-				"course": self.course_title,
-				"timezone": self.timezone if self.batch_name else "",
+				"course": frappe.db.get_value("LMS Course", self.course, "title"),
+				"timezone": frappe.db.get_value("LMS Batch", self.batch_name, "timezone")
+				if self.batch_name
+				else "",
 				"date": format_date(self.date, "medium"),
 				"member_name": self.member_name,
 				"start_time": format_time(self.start_time, "short"),
-				"evaluator": self.evaluator_name,
+				"evaluator": frappe.db.get_value("User", self.evaluator, "full_name"),
 			}
 
 			frappe.sendmail(

lms/lms/doctype/lms_course/lms_course.json

@@ -16,12 +16,10 @@
  "field_order": [
   "title",
   "video_link",
+  "image",
   "column_break_3",
   "instructors",
   "tags",
-  "column_break_htgn",
-  "image",
-  "category",
   "status",
   "section_break_7",
   "published",
@@ -239,16 +237,6 @@
    "fieldname": "certification_tab",
    "fieldtype": "Tab Break",
    "label": "Certification"
-  },
-  {
-   "fieldname": "column_break_htgn",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "category",
-   "fieldtype": "Link",
-   "label": "Category",
-   "options": "LMS Category"
   }
  ],
  "is_published_field": "published",
@@ -275,7 +263,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2024-09-21 10:23:58.633912",
+ "modified": "2024-07-12 13:54:40.474097",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

lms/lms/doctype/lms_course/lms_course.py

@@ -48,6 +48,9 @@ class LMSCourse(Document):
 		if not self.upcoming and self.has_value_changed("upcoming"):
 			self.send_email_to_interested_users()
 
+	def after_insert(self):
+		capture("course_created", "lms")
+
 	def send_email_to_interested_users(self):
 		interested_users = frappe.get_all(
 			"LMS Course Interest", {"course": self.name}, ["name", "user"]

lms/lms/doctype/lms_settings/lms_settings.json

@@ -23,9 +23,15 @@
   "show_emails",
   "signup_settings_tab",
   "signup_settings_section",
-  "column_break_9",
-  "custom_signup_content",
+  "terms_of_use",
+  "terms_page",
   "user_category",
+  "column_break_9",
+  "privacy_policy",
+  "privacy_policy_page",
+  "column_break_12",
+  "cookie_policy",
+  "cookie_policy_page",
   "sidebar_tab",
   "items_in_sidebar_section",
   "courses",
@@ -86,14 +92,60 @@
    "fieldtype": "Column Break",
    "label": "Show Tab in Batch"
   },
+  {
+   "default": "0",
+   "fieldname": "terms_of_use",
+   "fieldtype": "Check",
+   "label": "Show Terms of Use on Signup"
+  },
+  {
+   "depends_on": "terms_of_use",
+   "fieldname": "terms_page",
+   "fieldtype": "Link",
+   "label": "Terms of Use Page",
+   "mandatory_depends_on": "terms_of_use",
+   "options": "Web Page"
+  },
   {
    "fieldname": "signup_settings_section",
    "fieldtype": "Section Break"
   },
+  {
+   "default": "0",
+   "fieldname": "privacy_policy",
+   "fieldtype": "Check",
+   "label": "Show Privacy Policy on Signup"
+  },
+  {
+   "depends_on": "privacy_policy",
+   "fieldname": "privacy_policy_page",
+   "fieldtype": "Link",
+   "label": "Privacy Policy Page",
+   "mandatory_depends_on": "privacy_policy",
+   "options": "Web Page"
+  },
+  {
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break"
+  },
   {
    "fieldname": "column_break_9",
    "fieldtype": "Column Break"
   },
+  {
+   "default": "0",
+   "fieldname": "cookie_policy",
+   "fieldtype": "Check",
+   "label": "Show Cookie Policy on Signup"
+  },
+  {
+   "depends_on": "cookie_policy",
+   "fieldname": "cookie_policy_page",
+   "fieldtype": "Link",
+   "label": "Cookie Policy Page",
+   "mandatory_depends_on": "cookie_policy",
+   "options": "Web Page"
+  },
   {
    "default": "0",
    "fieldname": "user_category",
@@ -326,17 +378,12 @@
    "fieldtype": "Table",
    "label": "Sidebar Items",
    "options": "LMS Sidebar Item"
-  },
-  {
-   "fieldname": "custom_signup_content",
-   "fieldtype": "HTML Editor",
-   "label": "Custom Signup Content"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-09-23 17:57:01.350020",
+ "modified": "2024-08-13 19:02:58.714080",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Settings",

lms/lms/notification/certificate_request_creation/certificate_request_creation.html

@@ -0,0 +1,9 @@
+{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
+{% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
+{% set timezone = timezone if timezone else '' %}
+{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}
+
+<p> {{ _("Hey {0}").format(doc.member_name) }} </p>
+<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
+<p> {{ _("Your evaluator is {0}").format(evaluator_name) }} </p>
+<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

lms/lms/notification/certificate_request_creation/certificate_request_creation.json

@@ -0,0 +1,34 @@
+{
+ "attach_print": 0,
+ "channel": "Email",
+ "creation": "2022-06-03 11:02:34.579145",
+ "days_in_advance": 0,
+ "docstatus": 0,
+ "doctype": "Notification",
+ "document_type": "LMS Certificate Request",
+ "enabled": 0,
+ "event": "New",
+ "idx": 0,
+ "is_standard": 1,
+ "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }} </p>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
+ "message_type": "HTML",
+ "modified": "2024-08-01 12:17:40.647724",
+ "modified_by": "jannat@frappe.io",
+ "module": "LMS",
+ "name": "Certificate Request Creation",
+ "owner": "Administrator",
+ "recipients": [
+  {
+   "receiver_by_document_field": "member"
+  },
+  {
+   "receiver_by_document_field": "evaluator"
+  },
+  {
+   "receiver_by_role": "Frappe School Admin"
+  }
+ ],
+ "send_system_notification": 0,
+ "send_to_all_assignees": 0,
+ "subject": "Your evaluation slot has been booked"
+}

lms/lms/notification/certificate_request_creation/certificate_request_creation.py

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

lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html

@@ -1,7 +1,8 @@
-<p> {{ _("Hey {0}").format(doc.member_name) }} </p>
-<br>
-<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), doc.timezone) }}</p>
-<br>
-<p> {{ _("{0} is your evaluator").format(doc.evaluator_name) }} </p>
-<br>
+{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
+{% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
+{% set timezone = timezone if timezone else '' %}
+{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}
+
+<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
+<p> {{ _("Your evaluator is {0}").format(evaluator_name) }}
 <p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

lms/lms/notification/certificate_request_reminder/certificate_request_reminder.json

@@ -11,10 +11,10 @@
  "event": "Days Before",
  "idx": 0,
  "is_standard": 1,
- "message": "<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<br>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), doc.timezone) }}</p>\n<br>\n<p> {{ _(\"{0} is your evaluator\").format(doc.evaluator_name) }} </p>\n<br>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
+ "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }}\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
  "message_type": "HTML",
- "modified": "2024-09-05 16:33:42.212842",
- "modified_by": "Administrator",
+ "modified": "2024-07-10 15:51:33.803704",
+ "modified_by": "sayali@erpnext.com",
  "module": "LMS",
  "name": "Certificate Request Reminder",
  "owner": "Administrator",

lms/lms/utils.py

@@ -722,6 +722,17 @@ def get_lesson_count(course):
 	return lesson_count
 
 
+def get_restriction_details():
+	user = frappe.db.get_value(
+		"User", frappe.session.user, ["profile_complete", "username"], as_dict=True
+	)
+	return {
+		"restrict": not user.profile_complete,
+		"username": user.username,
+		"prefix": frappe.get_hooks("profile_url_prefix")[0] or "/users/",
+	}
+
+
 def get_all_memberships(member):
 	return frappe.get_all(
 		"LMS Enrollment",
@@ -1209,7 +1220,6 @@ def get_course_details(course):
 			"featured",
 			"disable_self_learning",
 			"published_on",
-			"category",
 			"status",
 			"paid_course",
 			"course_price",

lms/locale/main.pot

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-09-20 16:04+0000\n"
-"PO-Revision-Date: 2024-09-20 16:04+0000\n"
+"POT-Creation-Date: 2024-08-30 16:04+0000\n"
+"PO-Revision-Date: 2024-08-30 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:66
+#: lms/doctype/lms_batch/lms_batch.py:71
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -378,16 +378,11 @@ msgstr ""
 msgid "Batch Student"
 msgstr ""
 
-#. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
-#: lms/doctype/lms_certificate_request/lms_certificate_request.json
-msgid "Batch Title"
-msgstr ""
-
 #: public/js/common_functions.js:427
 msgid "Batch Updated"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:37
+#: lms/doctype/lms_batch/lms_batch.py:42
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
@@ -398,7 +393,7 @@ msgstr ""
 #. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
 #: lms/doctype/lms_course/lms_course.json
-#: lms/doctype/lms_settings/lms_settings.json www/lms.py:60
+#: lms/doctype/lms_settings/lms_settings.json www/lms.py:61
 msgid "Batches"
 msgstr ""
 
@@ -911,7 +906,7 @@ msgstr ""
 msgid "Course Lesson"
 msgstr ""
 
-#: www/lms.py:27
+#: www/lms.py:28
 msgid "Course List"
 msgstr ""
 
@@ -941,18 +936,16 @@ msgstr ""
 
 #. Label of the title (Data) field in DocType 'Batch Course'
 #. Label of the course_title (Data) field in DocType 'LMS Certificate'
-#. Label of the course_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/doctype/batch_course/batch_course.json
 #: lms/doctype/lms_certificate/lms_certificate.json
-#: lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Course Title"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:324
+#: lms/doctype/lms_batch/lms_batch.py:327
 msgid "Course already added to the batch."
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:55
+#: lms/doctype/lms_batch/lms_batch.py:60
 msgid "Course {0} has already been added to this batch."
 msgstr ""
 
@@ -1248,7 +1241,7 @@ msgstr ""
 msgid "Enrolled successfully"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:89
+#: lms/doctype/lms_batch/lms_batch.py:92
 msgid "Enrollment Confirmation for the Next Training Batch"
 msgstr ""
 
@@ -1297,37 +1290,22 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:73
+#: lms/doctype/lms_batch/lms_batch.py:89
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
 #. Label of the evaluator (Link) field in DocType 'Batch Course'
 #. Label of the evaluator (Link) field in DocType 'Course Evaluator'
 #. Label of the evaluator (Link) field in DocType 'LMS Assignment Submission'
-#. Label of the evaluator (Link) field in DocType 'LMS Certificate'
-#. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #: lms/doctype/batch_course/batch_course.json
 #: lms/doctype/course_evaluator/course_evaluator.json
 #: lms/doctype/lms_assignment_submission/lms_assignment_submission.json
-#: lms/doctype/lms_certificate/lms_certificate.json
-#: lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: templates/upcoming_evals.html:33
 msgid "Evaluator"
 msgstr ""
 
-#. Label of the evaluator_name (Data) field in DocType 'LMS Certificate'
-#. Label of the evaluator_name (Data) field in DocType 'LMS Certificate
-#. Evaluation'
-#. Label of the evaluator_name (Data) field in DocType 'LMS Certificate
-#. Request'
-#: lms/doctype/lms_certificate/lms_certificate.json
-#: lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
-#: lms/doctype/lms_certificate_request/lms_certificate_request.json
-msgid "Evaluator Name"
-msgstr ""
-
 #. Name of a DocType
 #: lms/doctype/evaluator_schedule/evaluator_schedule.json
 msgid "Evaluator Schedule"
@@ -1570,7 +1548,7 @@ msgstr ""
 msgid "Here are a few courses we recommend for you to get started with {0}"
 msgstr ""
 
-#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
+#: lms/notification/certificate_request_creation/certificate_request_creation.html:6
 #: templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
 msgstr ""
@@ -1855,7 +1833,7 @@ msgstr ""
 msgid "Job Board Title"
 msgstr ""
 
-#: www/lms.py:108
+#: www/lms.py:109
 msgid "Job Openings"
 msgstr ""
 
@@ -2417,11 +2395,11 @@ msgstr ""
 msgid "Modified By"
 msgstr ""
 
-#: lms/api.py:190
+#: lms/api.py:189
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/api.py:186
+#: lms/api.py:185
 msgid "Module is incorrect."
 msgstr ""
 
@@ -2446,11 +2424,11 @@ msgstr ""
 msgid "New Assignment Submission"
 msgstr ""
 
-#: public/js/common_functions.js:255 www/lms.py:86
+#: public/js/common_functions.js:255 www/lms.py:87
 msgid "New Batch"
 msgstr ""
 
-#: www/lms.py:37
+#: www/lms.py:38
 msgid "New Course"
 msgstr ""
 
@@ -2788,7 +2766,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:235
+#: lms/doctype/lms_batch/lms_batch.py:238
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
@@ -2805,12 +2783,13 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/api.py:182
+#: lms/api.py:181
 msgid "Please login to continue with payment."
 msgstr ""
 
-#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:7
-#: templates/emails/certificate_request_notification.html:7
+#: lms/notification/certificate_request_creation/certificate_request_creation.html:9
+#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:8
+#: templates/emails/certificate_request_notification.html:4
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
@@ -3165,19 +3144,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:164
+#: lms/doctype/lms_batch/lms_batch.py:167
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:159
+#: lms/doctype/lms_batch/lms_batch.py:162
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:141
+#: lms/doctype/lms_batch/lms_batch.py:144
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:150
+#: lms/doctype/lms_batch/lms_batch.py:153
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -3468,7 +3447,7 @@ msgid "Startup Organization"
 msgstr ""
 
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
-#: lms/doctype/lms_settings/lms_settings.json www/lms.py:133
+#: lms/doctype/lms_settings/lms_settings.json www/lms.py:134
 msgid "Statistics"
 msgstr ""
 
@@ -3524,7 +3503,7 @@ msgstr ""
 msgid "Student Name"
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:44
+#: lms/doctype/lms_batch/lms_batch.py:49
 msgid "Student {0} has already been added to this batch."
 msgstr ""
 
@@ -3697,7 +3676,7 @@ msgstr ""
 msgid "The course {0} is now available on {1}."
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:53
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:47
 msgid "The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
 msgstr ""
 
@@ -3705,7 +3684,7 @@ msgstr ""
 msgid "The quiz has a time limit. For each question you will be given {0} seconds."
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:71
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:65
 msgid "The slot is already booked by another participant."
 msgstr ""
 
@@ -3713,7 +3692,7 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: lms/doctype/lms_batch/lms_batch.py:132
+#: lms/doctype/lms_batch/lms_batch.py:135
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -3791,10 +3770,8 @@ msgid "Timetable Template"
 msgstr ""
 
 #. Label of the timezone (Data) field in DocType 'LMS Batch'
-#. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: lms/doctype/lms_batch/lms_batch.json
-#: lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
@@ -4106,15 +4083,15 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:95
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:89
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/api.py:206
+#: lms/api.py:205
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/api.py:198
+#: lms/api.py:197
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -4139,11 +4116,11 @@ msgstr ""
 msgid "You can find their resume attached to this email."
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:115
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:109
 msgid "You cannot schedule evaluations after {0}."
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:104
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:98
 msgid "You cannot schedule evaluations for past slots."
 msgstr ""
 
@@ -4203,16 +4180,19 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
-#: templates/emails/certificate_request_notification.html:3
+#: lms/notification/certificate_request_creation/certificate_request_creation.html:7
+#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:6
+#: templates/emails/certificate_request_notification.html:2
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
 msgstr ""
 
-#: lms/doctype/lms_certificate_request/lms_certificate_request.py:125
+#: lms/doctype/lms_certificate_request/lms_certificate_request.py:119
 msgid "Your evaluation slot has been booked"
 msgstr ""
 
-#: templates/emails/certificate_request_notification.html:5
+#: lms/notification/certificate_request_creation/certificate_request_creation.html:8
+#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:7
+#: templates/emails/certificate_request_notification.html:3
 msgid "Your evaluator is {0}"
 msgstr ""
 
@@ -4293,10 +4273,6 @@ msgstr ""
 msgid "{0} is already certified for the course {1}"
 msgstr ""
 
-#: lms/notification/certificate_request_reminder/certificate_request_reminder.html:5
-msgid "{0} is your evaluator"
-msgstr ""
-
 #: lms/utils.py:689
 msgid "{0} mentioned you in a comment"
 msgstr ""

lms/patches.txt

@@ -89,5 +89,4 @@ lms.patches.v1_0.change_navbar_urls
 lms.patches.v1_0.set_published_on
 lms.patches.v2_0.fix_progress_percentage
 lms.patches.v2_0.add_discussion_topic_titles
-lms.patches.v2_0.sidebar_settings
-lms.patches.v2_0.delete_certificate_request_notification #18-09-2024
+lms.patches.v2_0.sidebar_settings

lms/patches/v2_0/delete_certificate_request_notification.py

@@ -1,11 +0,0 @@
-import frappe
-
-
-def execute():
-	delete_notification("Certificate Request Creation")
-	delete_notification("Certificate Request Reminder")
-
-
-def delete_notification(notification_name):
-	if frappe.db.exists("Notification", notification_name):
-		frappe.db.delete("Notification", notification_name)

lms/plugins.py

@@ -227,7 +227,8 @@ def assignment_renderer(detail):
 
 
 def show_custom_signup():
-	settings = frappe.get_single("LMS Settings")
-	if settings.custom_signup_content or settings.user_category:
+	if frappe.db.get_single_value(
+		"LMS Settings", "terms_of_use"
+	) or frappe.db.get_single_value("LMS Settings", "privacy_policy"):
 		return "lms/templates/signup-form.html"
 	return "frappe/templates/signup.html"

lms/public/css/style.css

@@ -2202,7 +2202,7 @@ select {
 .rows .grid-row .data-row,
 .rows .grid-row .grid-footer-toolbar,
 .grid-form-heading {
-	cursor: pointer;
+	cursor: none;
 }
 
 .schedule-header {

lms/templates/emails/certificate_request_notification.html

@@ -1,7 +1,4 @@
 <p> {{ _("Hey {0}").format(member_name) }} </p>
-<br>
-<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(course, date, start_time, timezone) }}</p>
-<br>
+<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, date, start_time, timezone) }}</p>
 <p> {{ _("Your evaluator is {0}").format(evaluator) }} </p>
-<br>
 <p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

lms/templates/signup-form.html

@@ -1,4 +1,3 @@
-{% set custom_signup_content = frappe.db.get_single_value("LMS Settings", "custom_signup_content") %}
 <form class="signup-form" role="form">
     <div class="page-card-body">
         <div class="form-group">
@@ -32,7 +31,6 @@
         </div>
         {% endif %}
 
-        {% if custom_signup_content %}
         <div class="form-group">
             <div class="checkbox">
                 <label>
@@ -41,12 +39,11 @@
                         data-fieldtype="Check" data-fieldname="terms" id="signup-terms" required>
                     </span>
                     <span class="label-area">
-                    {{ custom_signup_content }}
+                    {{ _("I have read and agree to your {0}").format(get_signup_optin_checks()) }}
                     </span>
                 </label>
             </div>
         </div>
-        {% endif %}
     </div>
     <div class="page-card-actions">
         <button class="btn btn-sm btn-primary btn-block btn-signup"

lms/www/lms.py

@@ -17,7 +17,8 @@ def get_context():
 	csrf_token = frappe.sessions.get_csrf_token()
 	frappe.db.commit()  # nosemgrep
 	context.csrf_token = csrf_token
-	capture("active_site", "lms")
+	if frappe.session.user != "Guest":
+		capture("active_site", "lms")
 	return context
 
 
@@ -148,9 +149,8 @@ def get_meta(app_path):
 			as_dict=True,
 		)
 
-		if user.bio:
-			soup = BeautifulSoup(user.bio, "html.parser")
-			user.bio = soup.get_text()
+		soup = BeautifulSoup(user.bio, "html.parser")
+		user.bio = soup.get_text()
 
 		return {
 			"title": user.full_name,