fix

src/features/admin/terms/components/modals/AttachCourseToTermModal.vue

@@ -96,14 +96,16 @@ import NoItems from '@/components/blocks/NoItems.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import { adminTermsKeys } from '@/services/query/admin-terms'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
 import {
   adminCoursesKeys,
-  useAddAdminCourseMutation,
   useAdminCoursesListQuery,
-  useDeleteAdminCourseMutation,
+  useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
 
+// TODO: repurpose this modal as "copy course from another term" — the original
+// flow (link a stand-alone template to a term) no longer matches the unified
+// course model. Until then, this stays a stand-alone-course → new-offered-course copy.
+
 defineOptions({ name: 'AttachCourseToTermModal' })
 
 const queryClient = useQueryClient()
@@ -116,7 +118,7 @@ const searchQuery = ref('')
 const templateFilters = computed(() => ({ title: searchQuery.value }))
 const templatePagination = ref({ page: 1, perPage: 20 })
 
-const { data: templatesResponse, isLoading } = useAdminCourseTemplatesListQuery(
+const { data: templatesResponse, isLoading } = useAdminCoursesListQuery(
   templateFilters,
   templatePagination
 )
@@ -124,18 +126,24 @@ const { data: templatesResponse, isLoading } = useAdminCourseTemplatesListQuery(
 const templates = computed(() => templatesResponse.value?.data ?? [])
 
 const courseFilters = computed(() => ({ termId: termId.value }))
-const coursePagination = ref({ page: 1, perPage: 100 })
+const coursePagination = ref({ page: 1, perPage: 10 })
 const { data: coursesResponse } = useAdminCoursesListQuery(courseFilters, coursePagination, {
   enabled: () => !!termId.value,
 })
 
 const attachedCourses = computed(() => coursesResponse.value?.data ?? [])
 
-const attachedCourseByTemplate = (templateId) =>
-  attachedCourses.value.find((c) => c.template?.id === templateId || c.templateId === templateId)
+// Tracks which stand-alone course (termId=null) has already been copied
+// into this term. We match by title since the unified model no longer
+// keeps a back-reference to the source course.
+const attachedCourseByTemplate = (sourceId) => {
+  const source = templates.value.find((t) => t.id === sourceId)
+  if (!source) return null
+  return attachedCourses.value.find((c) => c.title === source.title)
+}
 
-const teacherName = (template) => {
-  const t = template.defaultTeacher || template.teacher
+const teacherName = (course) => {
+  const t = course.teacher
   if (!t) return '—'
   return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
 }
@@ -147,8 +155,7 @@ const onSearch = useDebounce((event) => {
 
 const pendingId = ref(null)
 
-const addMutation = useAddAdminCourseMutation()
-const deleteMutation = useDeleteAdminCourseMutation()
+const updateMutation = useUpdateAdminCourseMutation()
 
 const invalidate = () => {
   queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
@@ -156,16 +163,12 @@ const invalidate = () => {
 }
 
 const onAttach = async (template) => {
+  console.log(template)
+
   if (!termId.value) return
   pendingId.value = template.id
   try {
-    await addMutation.mutateAsync({
-      termId: termId.value,
-      templateId: template.id,
-      title: template.title,
-      capacity: template.defaultCapacity ?? null,
-      isActive: template.isActiveByDefault ?? true,
-    })
+    await updateMutation.mutateAsync({ id: template.id, payload: { termId: termId.value } })
     invalidate()
   } finally {
     pendingId.value = null
@@ -177,7 +180,7 @@ const onDetach = async (template) => {
   if (!offered) return
   pendingId.value = template.id
   try {
-    await deleteMutation.mutateAsync(offered.id)
+    await updateMutation.mutateAsync({ id: template.id, payload: { termId: null } })
     invalidate()
   } finally {
     pendingId.value = null
@@ -303,7 +306,7 @@ watch(termId, () => {
 
   &__footer {
     display: flex;
-    justify-content: flex-start;
+    justify-content: flex-end;
   }
 
   &__close-btn {

src/features/admin/terms/components/modals/TermDetailsModal.vue

@@ -16,11 +16,11 @@
               <LineInfoBlock title="عنوان ترم" :desc="term.title || '-'" />
               <LineInfoBlock
                 title="تاریخ شروع"
-                :numeric-desc="term.faStartDate || formatJalaaliDate(term.startDate) || '-'"
+                :numeric-desc="formatJalaaliDate(term.startsAt) || '-'"
               />
               <LineInfoBlock
                 title="تاریخ پایان"
-                :numeric-desc="term.faEndDate || formatJalaaliDate(term.endDate) || '-'"
+                :numeric-desc="formatJalaaliDate(term.endsAt) || '-'"
               />
               <LineInfoBlock title="تعداد دانشجویان" :numeric-desc="term.studentsCount ?? 0" />
               <LineInfoBlock title="تعداد دوره‌ها" :numeric-desc="term.coursesCount ?? 0" />
@@ -109,10 +109,7 @@
                 v-for="course in termCourses"
                 :key="course.id"
                 :course="course"
-                @edit="onEditCourse"
-                @delete="onAskDeleteCourse"
-                @change-status="onChangeCourseStatus"
-                @show-details="onShowCourseDetails"
+                @delete="(course) => onAskDeleteCourse(course)"
               />
             </div>
             <NoItems v-else title="متاسفیم" desc="دوره‌ای برای نمایش وجود ندارد." />
@@ -138,6 +135,7 @@
 
 <script setup>
 import { computed, ref } from 'vue'
+import CourseItem from '../CourseItem.vue'
 import useModal from '@/composables/useModal'
 import { useQueryClient } from '@tanstack/vue-query'
 import BasicModal from '@/components/BasicModal.vue'
@@ -152,13 +150,11 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import ToggleSwitch from '@/components/form/ToggleSwitch.vue'
 import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
 import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
-import CourseItem from '@/features/admin/courses/components/CourseItem.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
   adminCoursesKeys,
   useAdminCoursesListQuery,
-  useChangeAdminCourseStatusMutation,
-  useDeleteAdminCourseMutation,
+  useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
 import {
   adminTermsKeys,
@@ -181,10 +177,10 @@ const { data: term } = useAdminTermQuery(termId, {
 })
 
 const tabs = [
-  { name: 'students', label: 'دانشجویان', icon: 'users' },
   { name: 'courses', label: 'دوره‌ها', icon: 'list-bullets' },
+  { name: 'students', label: 'دانشجویان', icon: 'users' },
 ]
-const activeTab = ref('students')
+const activeTab = ref('courses')
 
 const studentFilters = ref({})
 const {
@@ -230,15 +226,10 @@ const onToggleLeave = (student, isOnLeave) => {
 }
 
 const onAskRemoveStudent = (student) => {
-  openModal('ConfirmModal', {
-    title: `حذف ${studentName(student)}`,
-    message: `آیا از حذف <strong>${studentName(student)}</strong> از این ترم اطمینان دارید؟`,
-    onConfirm: () =>
-      removeStudentMutation.mutate(
-        { termId: termId.value, userId: student.id },
-        { onSuccess: invalidate }
-      ),
-  })
+  removeStudentMutation.mutate(
+    { termId: termId.value, userId: student.id },
+    { onSuccess: invalidate }
+  )
 }
 
 const courseFilters = computed(() => ({ termId: termId.value }))
@@ -265,31 +256,18 @@ const coursePaginationMeta = computed(() => ({
 
 const invalidateCourses = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
-const deleteCourseMutation = useDeleteAdminCourseMutation()
-const changeCourseStatusMutation = useChangeAdminCourseStatusMutation()
+// Backend has no dedicated status endpoint — PATCH /courses/:id with { isActive }.
+const updateCourseMutation = useUpdateAdminCourseMutation()
 
 const onOpenAddCourse = () => {
   openModal('AttachCourseToTermModal', { termId: termId.value })
 }
 
-const onEditCourse = (course) => {
-  openModal('AddOfferedCourseModal', { mode: 'edit', courseId: course.id })
-}
-
-const onShowCourseDetails = (course) => {
-  openModal('CourseDetailsModal', { id: course.id })
-}
-
 const onAskDeleteCourse = (course) => {
-  openModal('ConfirmModal', {
-    title: `حذف ${course.title}`,
-    message: `بعد از حذف امکان بازگشت وجود ندارد، آیا از حذف <strong>${course.title}</strong> اطمینان دارید؟`,
-    onConfirm: () => deleteCourseMutation.mutate(course.id, { onSuccess: invalidateCourses }),
-  })
-}
-
-const onChangeCourseStatus = ({ id, isActive }) => {
-  changeCourseStatusMutation.mutate({ id, payload: { isActive } }, { onSuccess: invalidateCourses })
+  updateCourseMutation.mutate(
+    { id: course.id, payload: { termId: null } },
+    { onSuccess: invalidateCourses }
+  )
 }
 
 const onOpenAddStudent = () => {
@@ -352,7 +330,7 @@ const onOpenAddStudent = () => {
     }
 
     @media (min-width: 1280px) {
-      grid-template-columns: repeat(5, 1fr);
+      grid-template-columns: repeat(6, 1fr);
     }
   }