chore: resolved conflicts

This commit is contained in:
Jannat Patel
2025-02-10 16:48:02 +05:30
24 changed files with 2221 additions and 636 deletions

View File

@@ -291,7 +291,7 @@ const deleteStudents = createResource({
url: 'lms.lms.api.delete_documents',
makeParams(values) {
return {
doctype: 'Batch Student',
doctype: 'LMS Batch Enrollment',
documents: values.students,
}
},

View File

@@ -46,11 +46,9 @@ const studentResource = createResource({
makeParams(values) {
return {
doc: {
doctype: 'Batch Student',
parent: props.batch,
parenttype: 'LMS Batch',
parentfield: 'students',
student: student.value,
doctype: 'LMS Batch Enrollment',
batch: props.batch,
member: student.value,
},
}
},

View File

@@ -25,6 +25,7 @@
<div class="border-r">
<Tabs
v-model="tabIndex"
as="div"
:tabs="tabs"
tablistClass="overflow-y-hidden bg-surface-white"
>
@@ -54,7 +55,7 @@
</button>
</div>
</template>
<template #default="{ tab }">
<template #tab-panel="{ tab }">
<div class="pt-5 px-5 pb-10">
<div v-if="tab.label == 'Courses'">
<BatchCourses :batch="batch.data.name" />

View File

@@ -53,6 +53,7 @@
<div class="">
<Tabs
v-if="hasCourses"
as="div"
v-model="tabIndex"
tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
:tabs="makeTabs"
@@ -71,7 +72,7 @@
</button>
</div>
</template>
<template #default="{ tab }">
<template #tab-panel="{ tab }">
<div
v-if="tab.courses && tab.courses.value.length"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-7 my-5 mx-5"