chore: merge 'develop' into 'main'

.gitignore

@@ -13,4 +13,5 @@ package-lock.json
 lms/public/frontend
 lms/www/lms.html
 lms/www/_lms.html
-frappe-ui
+frappe-ui
+frappe-semgrep-rules

codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "**/test_helper.py"

frontend/src/components/Assessments.vue

@@ -208,20 +208,20 @@ const canAddAssessments = () => {
 const getAssessmentColumns = () => {
 	let columns = [
 		{
-			label: 'Assessment',
+			label: __('Assessment'),
 			key: 'title',
 			width: '25rem',
 		},
 		{
-			label: 'Type',
+			label: __('Type'),
 			key: 'assessment_type',
 			width: '15rem',
 		},
 	]
 
 	if (!user.data?.is_moderator) {
 		columns.push({
-			label: 'Status/Percentage',
+			label: __('Status/Percentage'),
 			key: 'status',
 			align: 'left',
 			width: '10rem',

frontend/src/components/Controls/Autocomplete.vue

@@ -99,18 +99,17 @@
 												name="item-label"
 												v-bind="{ active, selected, option }"
 											>
-												<div class="flex flex-col space-y-1 text-ink-gray-8">
-													<div>
-														{{ option.label }}
+												<div class="flex flex-col gap-1 p-1">
+													<div class="text-base font-medium text-ink-gray-8">
+														{{
+															option.value == option.label
+																? option.description
+																: option.label
+														}}
+													</div>
+													<div class="text-sm text-ink-gray-5">
+														{{ option.value }}
 													</div>
-													<div
-														v-if="
-															option.description &&
-															option.description != option.label
-														"
-														class="text-xs text-ink-gray-7"
-														v-html="option.description"
-													></div>
 												</div>
 											</slot>
 										</li>

frontend/src/components/CourseOutline.vue

@@ -112,6 +112,14 @@
 														v-else-if="lesson.icon === 'icon-quiz'"
 														class="h-4 w-4 stroke-1 mr-2"
 													/>
+													<NotebookPen
+														v-else-if="lesson.icon === 'icon-assignment'"
+														class="h-4 w-4 stroke-1 mr-2"
+													/>
+													<SquareCode
+														v-else-if="lesson.icon === 'icon-code'"
+														class="h-4 w-4 stroke-1 mr-2"
+													/>
 													<FileText
 														v-else-if="lesson.icon === 'icon-list'"
 														class="h-4 w-4 text-ink-gray-9 stroke-1 mr-2"
@@ -177,8 +185,11 @@ import {
 	FilePenLine,
 	HelpCircle,
 	MonitorPlay,
+	NotebookPen,
 	Plus,
+	SquareCode,
 	Trash2,
+	Notebook,
 } from 'lucide-vue-next'
 import { useRoute, useRouter } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'

frontend/src/components/Modals/BatchCourseModal.vue

@@ -2,7 +2,7 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			title: __('Add a course'),
+			title: __('Add Course'),
 			size: 'sm',
 			actions: [
 				{
@@ -19,6 +19,7 @@
 				v-model="course"
 				:label="__('Course')"
 				:required="true"
+				:filters="{ published: 1 }"
 				:onCreate="
 					(value, close) => {
 						close()

frontend/src/components/Modals/StudentModal.vue

@@ -2,7 +2,7 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			title: __('Add a Student'),
+			title: __('Enroll a Student'),
 			size: 'sm',
 			actions: [
 				{
@@ -19,9 +19,24 @@
 					doctype="User"
 					v-model="student"
 					:filters="{ ignore_user_type: 1 }"
+					placeholder=" "
+					:label="__('Student')"
 					:onCreate="
-						(value, close) => {
-							openSettings('Members', close)
+						() => {
+							openSettings('Members')
+							show = false
+						}
+					"
+					:required="true"
+				/>
+				<Link
+					doctype="LMS Payment"
+					v-model="payment"
+					placeholder=" "
+					:label="__('Payment')"
+					:onCreate="
+						() => {
+							openSettings('Transactions')
 							show = false
 						}
 					"
@@ -31,15 +46,16 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource, toast } from 'frappe-ui'
+import { call, Dialog, toast } from 'frappe-ui'
 import { ref, inject } from 'vue'
-import Link from '@/components/Controls/Link.vue'
 import { useOnboarding } from 'frappe-ui/frappe'
 import { openSettings } from '@/utils'
+import Link from '@/components/Controls/Link.vue'
 
 const students = defineModel('reloadStudents')
 const batchModal = defineModel('batchModal')
-const student = ref()
+const student = ref(null)
+const payment = ref(null)
 const user = inject('$user')
 const { updateOnboardingStep } = useOnboarding('learning')
 const show = defineModel()
@@ -51,36 +67,28 @@ const props = defineProps({
 	},
 })
 
-const studentResource = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Batch Enrollment',
-				batch: props.batch,
-				member: student.value,
-			},
-		}
-	},
-})
-
 const addStudent = (close) => {
-	studentResource.submit(
-		{},
-		{
-			onSuccess() {
-				if (user.data?.is_system_manager)
-					updateOnboardingStep('add_batch_student')
+	call('frappe.client.insert', {
+		doc: {
+			doctype: 'LMS Batch Enrollment',
+			batch: props.batch,
+			member: student.value,
+			payment: payment.value,
+		},
+	})
+		.then(() => {
+			if (user.data?.is_system_manager)
+				updateOnboardingStep('add_batch_student')
 
-				students.value.reload()
-				batchModal.value.reload()
-				student.value = null
-				close()
-			},
-			onError(err) {
-				toast.error(err.messages?.[0] || err)
-			},
-		}
-	)
+			students.value.reload()
+			batchModal.value.reload()
+			student.value = null
+			payment.value = null
+			close()
+		})
+		.catch((err) => {
+			toast.error(err.messages?.[0] || err)
+			console.error(err)
+		})
 }
 </script>

frontend/src/components/NumberChartGraph.vue

@@ -5,7 +5,7 @@
 		</div>
 		<div class="flex items-center space-x-2">
 			<slot name="prefix" />
-			<div class="font-semibold text-2xl">
+			<div class="font-semibold text-ink-gray-9 text-2xl">
 				{{ value }}
 			</div>
 			<slot name="suffix" />

frontend/src/components/Settings/SettingFields.vue

@@ -65,7 +65,7 @@
 							<div v-else>
 								<div class="flex items-center text-sm space-x-2">
 									<div
-										class="flex items-center justify-center rounded border border-outline-gray-1 bg-surface-gray-2"
+										class="flex items-center justify-center rounded border border-outline-gray-modals bg-surface-gray-2"
 										:class="field.size == 'lg' ? 'px-5 py-5' : 'px-20 py-8'"
 									>
 										<img
@@ -90,7 +90,7 @@
 									</div>
 									<X
 										@click="data[field.name] = null"
-										class="border text-ink-gray-7 border-outline-gray-3 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+										class="border text-ink-gray-7 border-outline-gray-modals rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
 									/>
 								</div>
 							</div>

frontend/src/pages/AssignmentSubmission.vue

@@ -59,7 +59,7 @@ onMounted(() => {
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
-			label: 'Submissions',
+			label: __('Submissions'),
 			route: { name: 'AssignmentSubmissionList' },
 		},
 		{

frontend/src/pages/Assignments.vue

@@ -200,7 +200,7 @@ const assignmentTypes = computed(() => {
 
 const breadcrumbs = computed(() => [
 	{
-		label: 'Assignments',
+		label: __('Assignments'),
 		route: { name: 'Assignments' },
 	},
 ])

frontend/src/pages/Badge.vue

@@ -59,7 +59,7 @@ const badge = createResource({
 const breadcrumbs = computed(() => {
 	return [
 		{
-			label: 'Badges',
+			label: __('Badges'),
 		},
 		{
 			label: badge.data.badge,

frontend/src/pages/Batch.vue

@@ -330,10 +330,10 @@ const batch = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let crumbs = [{ label: 'Batches', route: { name: 'Batches' } }]
+	let crumbs = [{ label: __('Batches'), route: { name: 'Batches' } }]
 	if (!isStudent.value) {
 		crumbs.push({
-			label: 'Details',
+			label: __('Details'),
 			route: {
 				name: 'BatchDetail',
 				params: {

frontend/src/pages/BatchDetail.vue

@@ -120,12 +120,12 @@ const courses = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let items = [{ label: 'Batches', route: { name: 'Batches' } }]
-	items.push({
+	let crumbs = [{ label: __('Batches'), route: { name: 'Batches' } }]
+	crumbs.push({
 		label: batch?.data?.title,
 		route: { name: 'BatchDetail', params: { batchName: batch?.data?.name } },
 	})
-	return items
+	return crumbs
 })
 
 usePageMeta(() => {

frontend/src/pages/BatchForm.vue

@@ -559,7 +559,7 @@ const trashBatch = (close) => {
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
-			label: 'Batches',
+			label: __('Batches'),
 			route: {
 				name: 'Batches',
 			},
@@ -577,7 +577,7 @@ const breadcrumbs = computed(() => {
 		})
 	}
 	crumbs.push({
-		label: props.batchName == 'new' ? 'New Batch' : 'Edit Batch',
+		label: props.batchName == 'new' ? __('New Batch') : __('Edit Batch'),
 		route: { name: 'BatchForm', params: { batchName: props.batchName } },
 	})
 	return crumbs