fix: user changes

This commit is contained in:
sajjadtalkhabi
2026-05-28 13:34:30 +03:30
parent cb86920015
commit 7ed6ec9ae1
46 changed files with 328 additions and 1114 deletions
@@ -1,305 +0,0 @@
<template>
<BasicModal
title="افزودن دانشجو"
title-en="Add Student"
width="95%"
max-width="42rem"
min-width="auto"
:show-close-button="true"
>
<template #default="{ close }">
<div class="add-course-student">
<div class="add-course-student__search">
<SvgIcon name="user" :size="18" color="var(--color-thd-gray)" />
<input
v-model="searchInput"
type="text"
class="add-course-student__search-input"
placeholder="اسم دانشجو را وارد نمایید"
@input="onSearchInput"
/>
</div>
<SkeletonLoaderBlock v-if="isLoading" :rows="4" :cols-per-row="1" />
<div v-else-if="users.length > 0" class="add-course-student__list">
<div v-for="user in users" :key="user.id" class="add-course-student__row">
<div class="add-course-student__main">
<div v-if="user.avatarUrl" class="add-course-student__avatar">
<img :src="user.avatarUrl" :alt="user?.name" />
</div>
<div
v-else
class="add-course-student__avatar add-course-student__avatar--placeholder"
>
<SvgIcon name="user" :size="20" color="#bcbcbc" />
</div>
<div class="add-course-student__text">
<p class="add-course-student__name">{{ user?.name }}</p>
<p class="add-course-student__meta">
<span>{{ user.address?.province?.name || '—' }}</span>
<span class="add-course-student__sep">،</span>
<span>{{ user.address?.city?.name || '—' }}</span>
</p>
</div>
</div>
<CircleButton
v-if="isAttached(user.id)"
tooltip="حذف از دوره"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
type="button"
:loading="pendingId === user.id"
@click="onDetach(user)"
>
<template #icon>
<SvgIcon name="trash" :size="16" color="var(--color-error)" />
</template>
</CircleButton>
<CircleButton
v-else
tooltip="افزودن به دوره"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
type="button"
:loading="pendingId === user.id"
@click="onAttach(user)"
>
<template #icon>
<SvgIcon name="plus" :size="16" color="var(--color-sec-gray)" />
</template>
</CircleButton>
</div>
</div>
<NoItems v-else title="بدون نتیجه" desc="دانشجویی یافت نشد." />
<div class="add-course-student__divider" />
<div class="add-course-student__footer">
<BaseButton text="تایید" custom-class="add-course-student__close-btn" @click="close">
<template #appendIcon>
<SvgIcon name="arrow-left" :size="18" color="#fff" />
</template>
</BaseButton>
</div>
</div>
</template>
</BasicModal>
</template>
<script setup>
import { computed, ref, watch } from 'vue'
import useModal from '@/composables/useModal'
import useDebounce from '@/composables/useDebounce'
import { useQueryClient } from '@tanstack/vue-query'
import BasicModal from '@/components/BasicModal.vue'
import BaseButton from '@/components/BaseButton.vue'
import SvgIcon from '@/components/icons/SvgIcon.vue'
import NoItems from '@/components/blocks/NoItems.vue'
import CircleButton from '@/components/CircleButton.vue'
import LineTitleBlock from '@/components/LineTitleBlock.vue'
import { useAdminUsersListQuery } from '@/services/query/admin-users'
import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import {
adminCoursesKeys,
useAddAdminCourseStudentMutation,
useAdminCourseStudentsQuery,
useRemoveAdminCourseStudentMutation,
} from '@/services/query/admin-courses'
defineOptions({ name: 'AddCourseStudentModal' })
const queryClient = useQueryClient()
const { getModal } = useModal()
const modalData = computed(() => getModal('AddCourseStudentModal')?.data ?? {})
const courseId = computed(() => modalData.value.courseId ?? null)
const searchInput = ref('')
const searchQuery = ref('')
const userFilters = computed(() => ({ name: searchQuery.value }))
const userPagination = ref({ page: 1, perPage: 20 })
const { data: usersResponse, isLoading } = useAdminUsersListQuery(userFilters, userPagination)
const users = computed(() => usersResponse.value?.data ?? [])
const attachedFilters = computed(() => ({}))
const attachedPagination = ref({ page: 1, perPage: 200 })
const { data: attachedResponse } = useAdminCourseStudentsQuery(
courseId,
attachedFilters,
attachedPagination,
{ enabled: () => !!courseId.value }
)
const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((u) => u.id)))
const isAttached = (id) => attachedIds.value.has(id)
const onSearchInput = useDebounce(() => {
searchQuery.value = searchInput.value || ''
userPagination.value = { ...userPagination.value, page: 1 }
}, 400)
const pendingId = ref(null)
const addMutation = useAddAdminCourseStudentMutation()
const removeMutation = useRemoveAdminCourseStudentMutation()
const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
const onAttach = async (user) => {
if (!courseId.value) return
pendingId.value = user.id
try {
await addMutation.mutateAsync({
courseId: courseId.value,
payload: { userIds: [user.id] },
})
invalidate()
} finally {
pendingId.value = null
}
}
const onDetach = async (user) => {
if (!courseId.value) return
pendingId.value = user.id
try {
await removeMutation.mutateAsync({ courseId: courseId.value, userId: user.id })
invalidate()
} finally {
pendingId.value = null
}
}
watch(courseId, () => {
searchInput.value = ''
searchQuery.value = ''
pendingId.value = null
})
</script>
<style lang="scss" scoped>
.add-course-student {
width: 100%;
text-align: start;
padding: 0.5rem 0.25rem;
&__search {
display: flex;
align-items: center;
gap: 0.5rem;
margin-block: 1rem;
padding: 0 1rem;
height: 2.75rem;
border: 1px solid var(--color-thd-gray);
border-radius: 9999px;
background: #fff;
}
&__search-input {
flex: 1;
border: none;
outline: none;
background: transparent;
font-family: var(--font-family-fa);
font-size: 0.875rem;
color: #4b4b4b;
text-align: start;
&::placeholder {
color: var(--color-prim-gray);
}
}
&__list {
display: flex;
flex-direction: column;
gap: 0.5rem;
max-height: 22rem;
overflow-y: auto;
padding-inline-end: 0.25rem;
}
&__row {
display: flex;
align-items: center;
gap: 0.625rem;
padding: 0.625rem 0.875rem;
background: rgba(255, 255, 255, 85%);
border-radius: 0.875rem;
box-shadow: 0 4px 10px -6px rgba(241, 241, 241, 70%);
}
&__main {
flex: 1;
display: flex;
align-items: center;
gap: 0.625rem;
min-width: 0;
}
&__avatar {
width: 2.5rem;
height: 2.5rem;
border-radius: 9999px;
overflow: hidden;
border: 1px solid #eee;
flex-shrink: 0;
img {
width: 100%;
height: 100%;
object-fit: cover;
}
&--placeholder {
background: #f5f5f5;
display: flex;
align-items: center;
justify-content: center;
border: none;
}
}
&__text {
min-width: 0;
}
&__name {
font-family: var(--font-family-fa);
font-size: 0.95rem;
color: #4b4b4b;
margin: 0 0 0.25rem;
}
&__meta {
font-family: var(--font-family-fa);
font-size: 0.75rem;
font-weight: 300;
color: #848484;
margin: 0;
}
&__sep {
color: #c4c4c4;
margin-inline: 0.25rem;
}
&__divider {
border-block-end: 1px solid var(--color-thd-gray);
margin-block: 1rem;
}
&__footer {
display: flex;
justify-content: flex-start;
}
&__close-btn {
min-width: 12rem;
}
}
</style>
@@ -1,9 +1,14 @@
<template>
<BasicModal width="95%" max-width="42rem" min-width="auto" :show-close-button="true">
<BasicModal
title="افزودن جلسه"
title-en="Add"
width="95%"
max-width="42rem"
min-width="auto"
:show-close-button="true"
>
<template #default="{ close }">
<div class="add-session">
<LineTitleBlock title="افزودن جلسه" title-en="Add" />
<div class="add-session__search">
<SvgIcon name="book" :size="18" color="var(--color-thd-gray)" />
<input
@@ -37,20 +42,6 @@
</div>
<CircleButton
v-if="isAttached(session.id)"
tooltip="حذف از دوره"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
type="button"
:loading="pendingId === session.id"
@click="onDetach(session)"
>
<template #icon>
<SvgIcon name="trash" :size="16" color="var(--color-error)" />
</template>
</CircleButton>
<CircleButton
v-else
tooltip="افزودن به دوره"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
@@ -92,14 +83,13 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
import NoItems from '@/components/blocks/NoItems.vue'
import CircleButton from '@/components/CircleButton.vue'
import LineTitleBlock from '@/components/LineTitleBlock.vue'
import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
import { adminCoursesKeys } from '@/services/query/admin-courses'
import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import {
adminCoursesKeys,
useAdminCourseSessionsQuery,
useAttachAdminCourseSessionMutation,
useDetachAdminCourseSessionMutation,
} from '@/services/query/admin-courses'
adminSessionsKeys,
useAdminSessionsListQuery,
useUpdateAdminSessionMutation,
} from '@/services/query/admin-sessions'
defineOptions({ name: 'AddSessionToCourseModal' })
@@ -111,8 +101,8 @@ const courseId = computed(() => modalData.value.courseId ?? null)
const searchInput = ref('')
const searchQuery = ref('')
const sessionFilters = computed(() => ({ title: searchQuery.value }))
const sessionPagination = ref({ page: 1, perPage: 20 })
const sessionFilters = computed(() => ({ search: searchQuery.value }))
const sessionPagination = ref({ page: 1, perPage: 10 })
const { data: sessionsResponse, isLoading } = useAdminSessionsListQuery(
sessionFilters,
@@ -120,18 +110,6 @@ const { data: sessionsResponse, isLoading } = useAdminSessionsListQuery(
)
const sessions = computed(() => sessionsResponse.value?.data ?? [])
const attachedFilters = computed(() => ({}))
const attachedPagination = ref({ page: 1, perPage: 200 })
const { data: attachedResponse } = useAdminCourseSessionsQuery(
courseId,
attachedFilters,
attachedPagination,
{ enabled: () => !!courseId.value }
)
const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((s) => s.id)))
const isAttached = (id) => attachedIds.value.has(id)
const teacherName = (session) => {
const t = session.teacher
if (!t) return '—'
@@ -145,18 +123,20 @@ const onSearchInput = useDebounce(() => {
const pendingId = ref(null)
const attachMutation = useAttachAdminCourseSessionMutation()
const detachMutation = useDetachAdminCourseSessionMutation()
const updateSessionMutation = useUpdateAdminSessionMutation()
const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
const invalidate = () => {
queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
queryClient.invalidateQueries({ queryKey: adminSessionsKeys.all })
}
const onAttach = async (session) => {
if (!courseId.value) return
pendingId.value = session.id
try {
await attachMutation.mutateAsync({
courseId: courseId.value,
payload: { sessionIds: [session.id] },
await updateSessionMutation.mutateAsync({
id: session.id,
payload: { courseId: courseId.value },
})
invalidate()
} finally {
@@ -164,17 +144,6 @@ const onAttach = async (session) => {
}
}
const onDetach = async (session) => {
if (!courseId.value) return
pendingId.value = session.id
try {
await detachMutation.mutateAsync({ courseId: courseId.value, sessionId: session.id })
invalidate()
} finally {
pendingId.value = null
}
}
watch(courseId, () => {
searchInput.value = ''
searchQuery.value = ''
@@ -1,9 +1,14 @@
<template>
<BasicModal width="95%" max-width="80rem" min-width="auto" :show-close-button="true">
<BasicModal
title="جزئیات دوره"
title-en="details"
width="95%"
max-width="80rem"
min-width="auto"
:show-close-button="true"
>
<template #default="{ close }">
<div class="course-details">
<LineTitleBlock title="جزئیات دوره" title-en="details" />
<SkeletonLoaderBlock v-if="isLoading" :rows="3" :cols-per-row="1" />
<template v-else-if="course">
@@ -14,14 +19,6 @@
</div>
<div class="course-details__grid">
<LineInfoBlock title="عنوان دوره" :desc="course.title || '—'" />
<LineInfoBlock
title="تاریخ شروع"
:numeric-desc="course.faStartDate || formatJalaaliDate(course.startDate) || '—'"
/>
<LineInfoBlock
title="تاریخ پایان"
:numeric-desc="course.faEndDate || formatJalaaliDate(course.endDate) || '—'"
/>
<LineInfoBlock title="تعداد جلسات" :numeric-desc="course.sessionsCount ?? 0" />
<LineInfoBlock title="پیش‌نیاز دوره" :desc="teacherName" />
</div>
@@ -30,12 +27,8 @@
<div v-if="course.description" class="course-details__description">
<LineInfoBlock title="توضیحات دوره" :desc="course.description" />
</div>
</template>
<NoItems v-else title="یافت نشد" desc="اطلاعات این دوره در دسترس نیست." />
<TabsBlock v-if="course" :tabs="tabs" v-model="activeTab">
<template #sessions>
<section class="course-details__sessions">
<div class="course-details__panel-header">
<LineTitleBlock title="لیست جلسات" title-en="Sessions" />
<BaseButton
@@ -60,70 +53,10 @@
:pagination="sessionsPaginationMeta"
@update:page="setSessionsPage"
/>
</template>
</section>
</template>
<template #students>
<div class="course-details__panel-header">
<LineTitleBlock title="دانشجویان" title-en="Students" />
<BaseButton
text="افزودن دانشجو به این دوره"
custom-class="course-details__panel-btn"
@click="onOpenAddStudent"
>
<template #appendIcon>
<SvgIcon name="arrow-left" :size="16" color="#fff" />
</template>
</BaseButton>
</div>
<SkeletonLoaderBlock v-if="studentsPending" :rows="4" :cols-per-row="1" />
<div v-else-if="students.length > 0">
<div
v-for="student in students"
:key="student.id"
class="course-details__student-row"
>
<div class="course-details__student-main">
<div v-if="studentAvatar(student)" class="course-details__avatar">
<img :src="studentAvatar(student)" :alt="student.name" />
</div>
<div v-else class="course-details__avatar course-details__avatar--placeholder">
<SvgIcon name="user" :size="20" color="#bcbcbc" />
</div>
<div>
<p class="course-details__student-name">{{ student.name || '—' }}</p>
<p class="course-details__student-meta">
<span dir="ltr">{{ student.phone || '—' }}</span>
<template v-if="student.email">
<span class="course-details__sep">،</span>
<span dir="ltr">{{ student.email }}</span>
</template>
</p>
</div>
</div>
<div v-if="student.phone" class="course-details__student-actions">
<CircleButton
tooltip="ارسال پیام"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
@click="onMessageStudent(student)"
>
<template #icon>
<SvgIcon name="chat" :size="16" color="var(--color-sec-gray)" />
</template>
</CircleButton>
</div>
</div>
</div>
<NoItems v-else title="بدون دانشجو" desc="دانشجویی به این دوره اضافه نشده است." />
<PaginationBlock
v-if="studentsPaginationMeta.lastPage > 1"
:pagination="studentsPaginationMeta"
@update:page="setStudentsPage"
/>
</template>
</TabsBlock>
<NoItems v-else title="یافت نشد" desc="اطلاعات این دوره در دسترس نیست." />
<div class="course-details__divider" />
@@ -140,26 +73,20 @@
</template>
<script setup>
import { computed, ref } from 'vue'
import { computed } from 'vue'
import useModal from '@/composables/useModal'
import BasicModal from '@/components/BasicModal.vue'
import BaseButton from '@/components/BaseButton.vue'
import SvgIcon from '@/components/icons/SvgIcon.vue'
import NoItems from '@/components/blocks/NoItems.vue'
import { formatJalaaliDate } from '@/utils/date-utils'
import CircleButton from '@/components/CircleButton.vue'
import TabsBlock from '@/components/blocks/TabsBlock.vue'
import { usePagination } from '@/composables/usePagination'
import LineTitleBlock from '@/components/LineTitleBlock.vue'
import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
import { useAdminCourseQuery } from '@/services/query/admin-courses'
import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import CourseSessionItem from '@/features/admin/courses/components/CourseSessionItem.vue'
import {
useAdminCourseQuery,
useAdminCourseSessionsQuery,
useCourseAttendeesQuery,
} from '@/services/query/admin-courses'
defineOptions({ name: 'CourseDetailsModal' })
@@ -178,24 +105,17 @@ const teacherName = computed(() => {
return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
})
const tabs = [
{ name: 'sessions', label: 'لیست جلسات', icon: 'list-bullets' },
{ name: 'students', label: 'دانشجویان', icon: 'users' },
]
const activeTab = ref('sessions')
const sessionsFilters = ref({})
const sessionsFilters = computed(() => ({ courseId: courseId.value }))
const { pagination: sessionsPagination, setPage: setSessionsPage } = usePagination({
page: 1,
perPage: 10,
})
const { data: sessionsData, isLoading: sessionsPending } = useAdminCourseSessionsQuery(
courseId,
const { data: sessionsData, isLoading: sessionsPending } = useAdminSessionsListQuery(
sessionsFilters,
sessionsPagination,
{
enabled: () => !!courseId.value && activeTab.value === 'sessions',
enabled: () => !!courseId.value,
keepPreviousData: true,
}
)
@@ -207,43 +127,9 @@ const sessionsPaginationMeta = computed(() => ({
...sessionsData.value?.meta,
}))
const studentsFilters = ref({})
const { pagination: studentsPagination, setPage: setStudentsPage } = usePagination({
page: 1,
perPage: 10,
})
const { data: studentsData, isLoading: studentsPending } = useCourseAttendeesQuery(
courseId,
studentsFilters,
studentsPagination,
{
enabled: () => !!courseId.value && activeTab.value === 'students',
keepPreviousData: true,
}
)
const students = computed(() => studentsData.value?.data ?? [])
const studentsPaginationMeta = computed(() => ({
page: studentsPagination.value.page,
perPage: studentsPagination.value.perPage,
...studentsData.value?.meta,
}))
const studentAvatar = (student) => student.avatarUrl || student.avatarDownloadUrl || ''
const onOpenAddSession = () => {
openModal('AddSessionToCourseModal', { courseId: courseId.value })
}
const onOpenAddStudent = () => {
openModal('AddCourseStudentModal', { courseId: courseId.value })
}
const onMessageStudent = (student) => {
if (!student?.phone) return
window.location.href = `sms:${student.phone}`
}
</script>
<style lang="scss" scoped>
@@ -299,6 +185,10 @@ const onMessageStudent = (student) => {
margin-block: 0.5rem 1rem;
}
&__sessions {
margin-top: 0.5rem;
}
&__panel-header {
display: flex;
align-items: center;
@@ -312,74 +202,6 @@ const onMessageStudent = (student) => {
margin-inline-start: auto;
}
&__student-row {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.625rem 0.875rem;
background: rgba(255, 255, 255, 85%);
border-radius: 0.875rem;
box-shadow: 0 4px 10px -6px rgba(241, 241, 241, 70%);
margin-bottom: 0.5rem;
}
&__student-main {
display: flex;
align-items: center;
gap: 0.625rem;
flex: 1;
min-width: 0;
}
&__avatar {
width: 2.5rem;
height: 2.5rem;
border-radius: 9999px;
overflow: hidden;
border: 1px solid #eee;
flex-shrink: 0;
img {
width: 100%;
height: 100%;
object-fit: cover;
}
&--placeholder {
background: #f5f5f5;
display: flex;
align-items: center;
justify-content: center;
border: none;
}
}
&__student-name {
font-family: var(--font-family-fa);
font-size: 0.95rem;
color: #4b4b4b;
margin: 0 0 0.25rem;
}
&__student-meta {
font-family: var(--font-family-fa);
font-size: 0.75rem;
font-weight: 300;
color: #848484;
margin: 0;
}
&__sep {
color: #c4c4c4;
margin-inline: 0.25rem;
}
&__student-actions {
display: flex;
align-items: center;
gap: 0.375rem;
}
&__divider {
border-block-end: 1px solid var(--color-thd-gray);
margin-block: 1.5rem;
@@ -25,7 +25,6 @@
</div>
<div class="course-form__main-col">
<LineTitleBlock title="اطلاعات دوره" title-en="Course Details" />
<div class="course-form__row">
<div class="course-form__cell course-form__cell--third">
<TextField
@@ -64,17 +63,6 @@
@blur="validateAt('capacity', form.capacity)"
/>
</div>
<div class="course-form__cell course-form__cell--third">
<TextField
v-model="form.sessionsCount"
name="sessionsCount"
label="تعداد جلسه"
inputmode="numeric"
:convert-digits="true"
:error="errors.sessionsCount"
@blur="validateAt('sessionsCount', form.sessionsCount)"
/>
</div>
<div class="course-form__cell course-form__cell--third">
<SelectField
v-model="form.prerequisites"
@@ -152,7 +140,6 @@ import BaseButton from '@/components/BaseButton.vue'
import SvgIcon from '@/components/icons/SvgIcon.vue'
import TextField from '@/components/form/TextField.vue'
import SelectField from '@/components/form/SelectField.vue'
import LineTitleBlock from '@/components/LineTitleBlock.vue'
import ImageCropper from '@/components/form/ImageCropper.vue'
import { objectToFormData } from '@/utils/object-to-formdata'
import { useUploadMediaMutation } from '@/services/query/auth'
@@ -180,7 +167,6 @@ const form = ref({
title: '',
teacherId: '',
capacity: '',
sessionsCount: '',
prerequisites: [],
contentType: '',
description: '',
@@ -198,7 +184,10 @@ const contentTypeOptions = Object.entries(COURSE_CONTENT_TYPE).map(([value, labe
const { validate, validateAt, errors } = useYup(courseSchema)
const teacherSearch = ref('')
const teacherFilters = computed(() => ({ name: teacherSearch.value }))
const teacherFilters = computed(() => ({
search: teacherSearch.value,
roles: 'teacher',
}))
const teacherPagination = ref({ page: 1, perPage: 10 })
const { data: teachersResponse } = useAdminUsersListQuery(teacherFilters, teacherPagination)
const selectedTeacher = ref(null)
@@ -247,7 +236,6 @@ watch(existingCourse, (course) => {
title: course.title || '',
teacherId: teacher?.id || course.teacherId || '',
capacity: course.capacity ?? '',
sessionsCount: course.sessionsCount ?? '',
prerequisites: prereqs.map((p) => p.courseId ?? p.id).filter(Boolean),
contentType: course.contentType || '',
description: course.description || '',
@@ -62,7 +62,6 @@
<AddOfferedCourseModal v-if="isModal('AddOfferedCourseModal')" />
<CourseDetailsModal v-if="isModal('CourseDetailsModal')" />
<AddCourseStudentModal v-if="isModal('AddCourseStudentModal')" />
<AddSessionToCourseModal v-if="isModal('AddSessionToCourseModal')" />
</div>
</template>
@@ -83,7 +82,6 @@ import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import CoursesFilters from '@/features/admin/courses/components/CoursesFilters.vue'
import CourseDetailsModal from '@/features/admin/courses/components/modals/CourseDetailsModal.vue'
import AddOfferedCourseModal from '@/features/admin/courses/components/modals/AddOfferedCourseModal.vue'
import AddCourseStudentModal from '@/features/admin/courses/components/modals/AddCourseStudentModal.vue'
import AddSessionToCourseModal from '@/features/admin/courses/components/modals/AddSessionToCourseModal.vue'
import {
adminCoursesKeys,
@@ -4,7 +4,6 @@ export const courseSchema = object().shape({
title: string().required().min(3).max(255),
teacherId: mixed().required(),
capacity: number().required().min(1),
sessionsCount: number().required().min(1),
prerequisites: array().nullable().default([]),
contentType: string().oneOf(['video', 'voice', 'text']).required(),
contentMediaId: number().nullable().notRequired(),
@@ -17,15 +17,11 @@
title="تاریخ شروع"
:numeric-desc="formatJalaaliDate(session.startsAt) || '—'"
/>
<LineInfoBlock
title="تاریخ پایان"
:numeric-desc="formatJalaaliDate(session.endsAt) || '—'"
/>
<LineInfoBlock title="مدت زمان جلسه" :numeric-desc="durationLabel" />
<LineInfoBlock title="نوع جلسه" :desc="sessionTypeLabel" />
<LineInfoBlock title="دوره مرتبط" :desc="courseTitle" />
<LineInfoBlock title="متعلق به" :desc="termTitle" />
<LineInfoBlock title="محتوای جلسه" :desc="contentTypeLabel" />
</div>
@@ -37,14 +33,14 @@
<LineInfoBlock title="لینک جلسه" :desc="session.link" />
</div>
<div v-if="mediaUrl || session.contentType" class="session-details__media">
<div v-if="mediaUrl || contentType" class="session-details__media">
<VideoPlayerBlock
v-if="session.contentType === 'video'"
v-if="contentType === 'video'"
:src="mediaUrl"
:video-id="session.id"
/>
<VoiceRecorder
v-else-if="session.contentType === 'voice'"
v-else-if="contentType === 'voice'"
:model-value="mediaUrl"
:disabled="true"
/>
@@ -112,21 +108,28 @@ const durationLabel = computed(() =>
const courseTitle = computed(() => session.value?.course?.title || '—')
const termTitle = computed(
() => session.value?.course?.term?.title || session.value?.term?.title || '—'
)
const contentTypeLabel = computed(() => COURSE_CONTENT_TYPE[session.value?.contentType] || '—')
const isOnline = computed(() => session.value?.type === 'online')
const collectionToContentType = (collectionName) => {
if (collectionName === 'videos') return 'video'
if (collectionName === 'voices') return 'voice'
if (collectionName === 'pdfs') return 'text'
return ''
}
const media = computed(() => (Array.isArray(session.value?.media) ? session.value.media : []))
const contentMedia = computed(() => media.value.find((m) => m.collectionName !== 'cover'))
const contentType = computed(() => collectionToContentType(contentMedia.value?.collectionName))
const contentTypeLabel = computed(() => COURSE_CONTENT_TYPE[contentType.value] || '—')
const mediaUrl = computed(
() => session.value?.contentMedia?.url || session.value?.contentMedia?.downloadUrl || ''
() => contentMedia.value?.url || contentMedia.value?.downloadUrl || ''
)
const mediaFileName = computed(
() => session.value?.contentMedia?.fileName || session.value?.contentMedia?.name || 'فایل پیوست'
)
const mediaFileName = computed(() => contentMedia.value?.fileName || 'فایل پیوست')
</script>
<style lang="scss" scoped>
@@ -67,7 +67,7 @@ const emit = defineEmits(['delete'])
const teacherName = computed(() => {
const t = props.course.teacher
if (!t) return '—'
return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
return t.name
})
const isActive = computed(() => props.course.isActive ?? false)
@@ -1,9 +1,14 @@
<template>
<BasicModal width="95%" max-width="42rem" min-width="auto" :show-close-button="true">
<BasicModal
title="افزودن دانشجو"
title-en="Add Student"
width="95%"
max-width="42rem"
min-width="auto"
:show-close-button="true"
>
<template #default="{ close }">
<div class="add-term-student">
<LineTitleBlock title="افزودن دانشجو" title-en="Add Student" />
<div class="add-term-student__search">
<SvgIcon name="user" :size="18" color="var(--color-thd-gray)" />
<input
@@ -37,20 +42,6 @@
</div>
<CircleButton
v-if="isAttached(user.id)"
tooltip="حذف از ترم"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
type="button"
:loading="pendingId === user.id"
@click="onDetach(user)"
>
<template #icon>
<SvgIcon name="trash" :size="16" color="var(--color-error)" />
</template>
</CircleButton>
<CircleButton
v-else
tooltip="افزودن به ترم"
bg-color="rgba(104, 104, 104, 0.05)"
size="2.25rem"
@@ -91,15 +82,9 @@ import BaseButton from '@/components/BaseButton.vue'
import SvgIcon from '@/components/icons/SvgIcon.vue'
import NoItems from '@/components/blocks/NoItems.vue'
import CircleButton from '@/components/CircleButton.vue'
import LineTitleBlock from '@/components/LineTitleBlock.vue'
import { useAdminUsersListQuery } from '@/services/query/admin-users'
import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import {
adminTermsKeys,
useAddAdminTermStudentsMutation,
useAdminTermStudentsQuery,
useRemoveAdminTermStudentMutation,
} from '@/services/query/admin-terms'
import { adminTermsKeys, useAddAdminTermStudentsMutation } from '@/services/query/admin-terms'
defineOptions({ name: 'AddTermStudentModal' })
@@ -111,29 +96,13 @@ const termId = computed(() => modalData.value.termId ?? null)
const searchInput = ref('')
const searchQuery = ref('')
const userFilters = computed(() => ({ name: searchQuery.value }))
const userPagination = ref({ page: 1, perPage: 20 })
const userFilters = computed(() => ({ search: searchQuery.value }))
const userPagination = ref({ page: 1, perPage: 10 })
const { data: usersResponse, isLoading } = useAdminUsersListQuery(userFilters, userPagination)
const users = computed(() => usersResponse.value?.data ?? [])
const attachedFilters = computed(() => ({}))
const attachedPagination = ref({ page: 1, perPage: 200 })
const { data: attachedResponse } = useAdminTermStudentsQuery(
termId,
attachedFilters,
attachedPagination,
{ enabled: () => !!termId.value }
)
const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((u) => u.id)))
const isAttached = (id) => attachedIds.value.has(id)
const userLabel = (user) =>
`${user.firstName || ''} ${user.lastName || ''}`.trim() ||
user.fullName ||
user.phoneNumber ||
'—'
const userLabel = (user) => user.name.trim() || '—'
const onSearchInput = useDebounce(() => {
searchQuery.value = searchInput.value || ''
@@ -143,7 +112,6 @@ const onSearchInput = useDebounce(() => {
const pendingId = ref(null)
const addMutation = useAddAdminTermStudentsMutation()
const removeMutation = useRemoveAdminTermStudentMutation()
const invalidate = () => queryClient.invalidateQueries({ queryKey: adminTermsKeys.all })
@@ -153,7 +121,7 @@ const onAttach = async (user) => {
try {
await addMutation.mutateAsync({
termId: termId.value,
payload: { userIds: [user.id] },
payload: { userId: user.id },
})
invalidate()
} finally {
@@ -161,17 +129,6 @@ const onAttach = async (user) => {
}
}
const onDetach = async (user) => {
if (!termId.value) return
pendingId.value = user.id
try {
await removeMutation.mutateAsync({ termId: termId.value, userId: user.id })
invalidate()
} finally {
pendingId.value = null
}
}
watch(termId, () => {
searchInput.value = ''
searchQuery.value = ''
@@ -293,7 +250,7 @@ watch(termId, () => {
&__footer {
display: flex;
justify-content: flex-start;
justify-content: flex-end;
}
&__close-btn {
@@ -1,15 +1,21 @@
<template>
<BasicModal width="95%" max-width="80rem" min-width="auto" :show-close-button="true">
<template #default="{ data, close }">
<BasicModal
title="جزئیات ترم"
title-en="Term Details"
width="95%"
max-width="80rem"
min-width="auto"
:show-close-button="true"
>
<template #default="{ close }">
<div v-if="!term" class="term-details">
<p class="term-details__loading">در حال بارگذاری…</p>
</div>
<div v-else class="term-details">
<section class="term-details__section">
<LineTitleBlock title="جزئیات ترم" title-en="Term Details" />
<div class="term-details__overview">
<div class="term-details__image">
<img v-if="term.image" :src="term.image" :alt="term.title" />
<img v-if="term.coverUrl" :src="term.coverUrl" :alt="term.title" />
<SvgIcon v-else name="book" :size="32" color="#bcbcbc" />
</div>
<div class="term-details__overview-grid">
@@ -51,19 +57,19 @@
<div v-else-if="students.length > 0">
<div v-for="student in students" :key="student.id" class="term-details__student-row">
<div class="term-details__student-main">
<div v-if="studentAvatar(student)" class="term-details__avatar">
<img :src="studentAvatar(student)" :alt="student.name" />
<div v-if="studentAvatar(student?.user)" class="term-details__avatar">
<img :src="studentAvatar(student?.user)" :alt="student.name" />
</div>
<div v-else class="term-details__avatar term-details__avatar--placeholder">
<SvgIcon name="user" :size="20" color="#bcbcbc" />
</div>
<div>
<p class="term-details__student-name">{{ student.name || '—' }}</p>
<p class="term-details__student-name">{{ student?.user?.name || '—' }}</p>
<p class="term-details__student-meta">
<span dir="ltr">{{ student.phone || '—' }}</span>
<template v-if="student.email">
<span dir="ltr">{{ student?.user.phone || '—' }}</span>
<template v-if="student?.user.email">
<span class="term-details__sep">،</span>
<span dir="ltr">{{ student.email }}</span>
<span dir="ltr">{{ student?.user.email }}</span>
</template>
</p>
</div>
@@ -114,7 +120,6 @@
</BaseButton>
</div>
</div>
<span class="term-details__data-tap" v-if="false">{{ data }}</span>
</template>
</BasicModal>
</template>
@@ -135,12 +140,12 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
import { useAdminTermEnrolleesQuery, useAdminTermQuery } from '@/services/query/admin-terms'
import {
adminCoursesKeys,
useAdminCoursesListQuery,
useUpdateAdminCourseMutation,
} from '@/services/query/admin-courses'
import { useAdminTermQuery, useTermAttendeesQuery } from '@/services/query/admin-terms'
defineOptions({ name: 'TermDetailsModal' })
@@ -167,7 +172,7 @@ const {
reset: resetStudentPagination,
} = usePagination({ page: 1, perPage: 10 })
const { data: studentsData, isLoading: studentsPending } = useTermAttendeesQuery(
const { data: studentsData, isLoading: studentsPending } = useAdminTermEnrolleesQuery(
termId,
studentFilters,
studentPagination,