fix: test

2026-05-28 15:40:22 +03:30
parent fc0aa2586e
commit 3f3c66a02d
25 changed files with 406 additions and 104 deletions
@@ -5,12 +5,12 @@
      <div class="assignment-item__sub">
        <span class="assignment-item__sub-label">دوره:</span>
        <span class="assignment-item__sub-value">
-          {{ assignment.course?.title || assignment.courseTitle || '—' }}
+          {{ assignment.session?.course?.title || '—' }}
        </span>
        <span class="assignment-item__dot">|</span>
        <span class="assignment-item__sub-label">جلسه:</span>
        <span class="assignment-item__sub-value">
-          {{ assignment.session?.title || assignment.sessionTitle || '—' }}
+          {{ assignment.session?.title || '—' }}
        </span>
      </div>
    </div>
@@ -92,12 +92,10 @@ const duration = computed(() =>
 )

 const submissions = computed(() =>
-  props.assignment.submissionsCount == null ? '—' : `${props.assignment.submissionsCount} نفر`
+  props.assignment.submittersCount == null ? '—' : `${props.assignment.submittersCount} نفر`
 )

-const createdAt = computed(
-  () => props.assignment.faCreatedAt || formatJalaaliDate(props.assignment.createdAt) || '—'
-)
+const createdAt = computed(() => formatJalaaliDate(props.assignment.createdAt) || '—')
 </script>

 <style lang="scss" scoped>
@@ -7,6 +7,18 @@
        </template>
      </TextField>
      <SelectField
+        v-model="form.termId"
+        name="termId"
+        label="ترم"
+        :options="termOptions"
+        option-label="title"
+        option-value="id"
+        :searchable="true"
+        :on-search="searchTerms"
+        @update:modelValue="onTermChange"
+      />
+      <SelectField
+        v-if="form.termId"
        v-model="form.courseId"
        name="courseId"
        label="دوره"
@@ -15,8 +27,10 @@
        option-value="id"
        :searchable="true"
        :on-search="searchTemplates"
+        @update:modelValue="onCourseChange"
      />
      <SelectField
+        v-if="form.courseId"
        v-model="form.sessionId"
        name="sessionId"
        label="جلسه"
@@ -65,6 +79,7 @@ import TextField from '@/components/form/TextField.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import SelectField from '@/components/form/SelectField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
+import { useAdminTermsListQuery } from '@/services/query/admin-terms'
 import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'

@@ -73,6 +88,7 @@ const props = defineProps({
    type: Object,
    default: () => ({
      title: '',
+      termId: '',
      courseId: '',
      sessionId: '',
      fromDate: '',
@@ -85,6 +101,7 @@ const emit = defineEmits(['update:modelValue', 'apply', 'reset'])

 const emptyForm = () => ({
  title: '',
+  termId: '',
  courseId: '',
  sessionId: '',
  fromDate: '',
@@ -102,10 +119,21 @@ watch(

 const todayIso = new Date().toISOString()

+const termSearch = ref('')
+const termFilters = computed(() => ({ title: termSearch.value }))
+const termPagination = ref({ page: 1, perPage: 100 })
+const { data: termsResponse } = useAdminTermsListQuery(termFilters, termPagination)
+const termOptions = computed(() => termsResponse.value?.data ?? [])
+
 const templateSearch = ref('')
-const templateFilters = computed(() => ({ title: templateSearch.value }))
+const templateFilters = computed(() => ({
+  title: templateSearch.value,
+  termId: form.value.termId || undefined,
+}))
 const templatePagination = ref({ page: 1, perPage: 10 })
-const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination, {
+  enabled: () => !!form.value.termId,
+})
 const templateOptions = computed(() => templatesResponse.value?.data ?? [])

 const sessionSearch = ref('')
@@ -114,9 +142,14 @@ const sessionListFilters = computed(() => ({
  courseId: form.value.courseId || undefined,
 }))
 const sessionPagination = ref({ page: 1, perPage: 10 })
-const { data: sessionsResponse } = useAdminSessionsListQuery(sessionListFilters, sessionPagination)
+const { data: sessionsResponse } = useAdminSessionsListQuery(sessionListFilters, sessionPagination, {
+  enabled: () => !!form.value.courseId,
+})
 const sessionOptions = computed(() => sessionsResponse.value?.data ?? [])

+const searchTerms = useDebounce((q) => {
+  termSearch.value = q || ''
+}, 400)
 const searchTemplates = useDebounce((q) => {
  templateSearch.value = q || ''
 }, 400)
@@ -124,6 +157,15 @@ const searchSessions = useDebounce((q) => {
  sessionSearch.value = q || ''
 }, 400)

+const onTermChange = () => {
+  form.value.courseId = ''
+  form.value.sessionId = ''
+}
+
+const onCourseChange = () => {
+  form.value.sessionId = ''
+}
+
 const hasFilters = computed(() =>
  Object.values(form.value).some((v) => v !== '' && v !== null && v !== undefined)
 )
@@ -157,7 +199,7 @@ const onReset = () => {
    }

    @media (min-width: 1280px) {
-      grid-template-columns: repeat(5, 1fr);
+      grid-template-columns: repeat(6, 1fr);
    }
  }

@@ -21,6 +21,18 @@
              <SvgIcon name="book" :size="20" color="var(--color-thd-gray)" />
            </template>
          </TextField>
+          <SelectField
+            v-model="form.termId"
+            name="termId"
+            label="ترم مرتبط"
+            :options="termOptions"
+            option-label="title"
+            option-value="id"
+            :searchable="true"
+            :on-search="searchTerms"
+            :error="errors.termId"
+            @update:model-value="onTermChange"
+          />
          <SelectField
            v-model="form.courseId"
            name="courseId"
@@ -30,6 +42,7 @@
            option-value="id"
            :searchable="true"
            :on-search="searchTemplates"
+            :disabled="!form.termId"
            :error="errors.courseId"
            @update:model-value="onCourseChange"
          />
@@ -77,13 +90,13 @@
        </div>

        <div class="add-assignment__files">
-          <LineTitleBlock title="فایل‌های تکلیف" title-en="Assignment Files" />
          <FileUploader
            v-model="attachments"
            accept=".mp4,.mov,.avi,.mp3,.wav,.jpg,.jpeg,.png,.pdf,.txt,.doc,.docx"
            :multiple="true"
            :max-files="10"
-            context="assignment"
+            @select="onAttachmentsSelect"
+            @error="onAttachmentsError"
          />
        </div>

@@ -117,6 +130,7 @@
 </template>

 <script setup>
+import { toast } from 'vue3-toastify'
 import useYup from '@/composables/useYup'
 import { computed, ref, watch } from 'vue'
 import useModal from '@/composables/useModal'
@@ -130,9 +144,12 @@ import TextField from '@/components/form/TextField.vue'
 import SelectField from '@/components/form/SelectField.vue'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import FileUploader from '@/components/form/FileUploader.vue'
+import { objectToFormData } from '@/utils/object-to-formdata'
+import { useUploadMediaMutation } from '@/services/query/auth'
 import TextareaField from '@/components/form/TextareaField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
 import { assignmentSchema } from '@/features/admin/assignments/schema'
+import { useAdminTermsListQuery } from '@/services/query/admin-terms'
 import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
 import {
@@ -158,6 +175,7 @@ const priorityOptions = Object.entries(ASSIGNMENT_PRIORITY).map(([value, label])

 const form = ref({
  title: '',
+  termId: '',
  courseId: '',
  sessionId: '',
  startDate: '',
@@ -172,10 +190,28 @@ const schema = assignmentSchema

 const { validate, validateAt, errors, resetErrors } = useYup(schema)

+const termSearch = ref('')
+const termFilters = computed(() => ({ title: termSearch.value }))
+const termPagination = ref({ page: 1, perPage: 100 })
+const { data: termsResponse } = useAdminTermsListQuery(termFilters, termPagination)
+const selectedTerm = ref(null)
+const termOptions = computed(() => {
+  const base = termsResponse.value?.data ?? []
+  if (selectedTerm.value && !base.some((t) => t.id === selectedTerm.value.id)) {
+    return [...base, selectedTerm.value]
+  }
+  return base
+})
+
 const templateSearch = ref('')
-const templateFilters = computed(() => ({ title: templateSearch.value }))
+const templateFilters = computed(() => ({
+  title: templateSearch.value,
+  termId: form.value.termId || undefined,
+}))
 const templatePagination = ref({ page: 1, perPage: 10 })
-const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination, {
+  enabled: () => !!form.value.termId,
+})
 const selectedTemplate = ref(null)
 const templateOptions = computed(() => {
  const base = templatesResponse.value?.data ?? []
@@ -203,6 +239,9 @@ const sessionOptions = computed(() => {
  return base
 })

+const searchTerms = useDebounce((q) => {
+  termSearch.value = q || ''
+}, 400)
 const searchTemplates = useDebounce((q) => {
  templateSearch.value = q || ''
 }, 400)
@@ -210,37 +249,78 @@ const searchSessions = useDebounce((q) => {
  sessionSearch.value = q || ''
 }, 400)

+const onTermChange = (value) => {
+  form.value.termId = value
+  form.value.courseId = ''
+  form.value.sessionId = ''
+  selectedTemplate.value = null
+  selectedSession.value = null
+}
+
 const onCourseChange = (value) => {
  form.value.courseId = value
  form.value.sessionId = ''
  selectedSession.value = null
 }

+const uploadMediaMutation = useUploadMediaMutation()
+
+const onAttachmentsSelect = async (files) => {
+  for (const file of files) {
+    try {
+      const fd = objectToFormData({ file, purpose: 'homework_file', context: 'homework' })
+      const response = await uploadMediaMutation.mutateAsync(fd)
+      const payload = response?.data ?? response
+      const id = payload?.id ?? payload?.uploadId
+      if (id == null) continue
+      attachments.value = [
+        ...attachments.value,
+        { id, name: file.name, size: file.size, url: payload?.url ?? '' },
+      ]
+    } catch {
+      toast.error(`بارگذاری فایل "${file.name}" با خطا مواجه شد.`)
+    }
+  }
+}
+
+const onAttachmentsError = (msg) => toast.error(msg)
+
 const { data: existingAssignment } = useAdminAssignmentQuery(assignmentId, {
  enabled: () => !!assignmentId.value,
 })

 watch(existingAssignment, (assignment) => {
  if (!assignment) return
-  const tpl = assignment.course
  const sessionEntity = assignment.session
+  const tpl = sessionEntity?.course || assignment.course
+  const termEntity = tpl?.term || assignment.term
+  const termId = termEntity?.id || tpl?.termId || assignment.termId || ''
+  const priorityValue =
+    assignment.priority ||
+    (typeof assignment.isPriority === 'boolean'
+      ? assignment.isPriority
+        ? 'mandatory'
+        : 'optional'
+      : 'mandatory')
+  if (termEntity) selectedTerm.value = termEntity
  if (tpl) selectedTemplate.value = tpl
  if (sessionEntity) selectedSession.value = sessionEntity
  form.value = {
    title: assignment.title || '',
-    courseId: tpl?.id || assignment.courseId || '',
+    termId,
+    courseId: tpl?.id || sessionEntity?.courseId || assignment.courseId || '',
    sessionId: sessionEntity?.id || assignment.sessionId || '',
    startDate: assignment.startDate || '',
-    endDate: assignment.endDate || '',
-    priority: assignment.priority || 'mandatory',
+    endDate: assignment.endDate || assignment.deadline || '',
+    priority: priorityValue,
    description: assignment.description || '',
  }
-  attachments.value = Array.isArray(assignment.attachments)
-    ? assignment.attachments.map((file) => ({
-        id: file.id,
-        name: file.title || `فایل ${file.id}`,
-        url: file.fileUrl || '',
-        type: file.type || 'other',
+  attachments.value = Array.isArray(assignment.media)
+    ? assignment.media.map((m) => ({
+        id: m.id,
+        name: m.fileName || `فایل ${m.id}`,
+        size: m.fileSize ?? 0,
+        url: m.url || m.downloadUrl || '',
      }))
    : []
 })
@@ -254,13 +334,13 @@ const onSubmit = async (close) => {
  const { isValid, payload } = await validate(form.value)
  if (!isValid) return
  const finalPayload = {
-    ...payload,
-    attachments: attachments.value.map((file, index) => ({
-      fileId: file.id,
-      type: file.type || 'other',
-      title: file.name,
-      order: index + 1,
-    })),
+    sessionId: payload.sessionId,
+    title: payload.title,
+    description: payload.description ?? '',
+    deadline: payload.endDate || null,
+    isActive: true,
+    isPriority: payload.priority === 'mandatory',
+    mediaIds: attachments.value.map((file) => file.id).filter((id) => id != null),
  }
  if (isEditMode.value) {
    await updateMutation.mutateAsync({ id: assignmentId.value, payload: finalPayload })
@@ -14,12 +14,9 @@
          <div class="assignment-details__head">
            <p class="assignment-details__title">{{ assignment.title || '—' }}</p>
            <p class="assignment-details__sub">
-              <span>
-                دوره:
-                {{ assignment.course?.title || assignment.courseTitle || '—' }}
-              </span>
+              <span>دوره: {{ courseTitle }}</span>
              <span class="assignment-details__sep">|</span>
-              <span>جلسه: {{ assignment.session?.title || assignment.sessionTitle || '—' }}</span>
+              <span>جلسه: {{ sessionTitle }}</span>
            </p>
          </div>

@@ -28,21 +25,10 @@
              title="تاریخ شروع"
              :numeric-desc="formatJalaaliDate(assignment.startDate) || '—'"
            />
-            <LineInfoBlock
-              title="تاریخ پایان"
-              :numeric-desc="formatJalaaliDate(assignment.endDate) || '—'"
-            />
-            <LineInfoBlock
-              title="مدت زمان"
-              :numeric-desc="
-                assignment.durationDays != null ? `${assignment.durationDays} روز` : '—'
-              "
-            />
-            <LineInfoBlock title="اولویت" :desc="ASSIGNMENT_PRIORITY[assignment.priority] || '—'" />
-            <LineInfoBlock
-              title="تعداد فرستندگان"
-              :numeric-desc="assignment.submissionsCount ?? 0"
-            />
+            <LineInfoBlock title="تاریخ پایان" :numeric-desc="deadlineLabel" />
+            <LineInfoBlock title="مدت زمان" :numeric-desc="durationLabel" />
+            <LineInfoBlock title="اولویت" :desc="priorityLabel" />
+            <LineInfoBlock title="تعداد فرستندگان" :numeric-desc="submittersLabel" />
            <LineInfoBlock
              title="تاریخ ثبت"
              :numeric-desc="
@@ -55,18 +41,18 @@
            <LineInfoBlock title="توضیحات" :desc="assignment.description" />
          </div>

-          <div v-if="assignment.attachments?.length" class="assignment-details__attachments">
+          <div v-if="attachmentItems.length" class="assignment-details__attachments">
            <LineTitleBlock title="فایل‌های تکلیف" title-en="Attachments" />
            <ul class="assignment-details__attachments-list">
-              <li v-for="file in assignment.attachments" :key="file.id">
+              <li v-for="file in attachmentItems" :key="file.id">
                <a
-                  :href="file.fileUrl || '#'"
+                  :href="file.url || '#'"
                  target="_blank"
                  rel="noopener noreferrer"
                  class="assignment-details__file"
                >
                  <SvgIcon name="file" :size="16" color="var(--color-prim-gray)" />
-                  <span>{{ file.title || `فایل ${file.id}` }}</span>
+                  <span>{{ file.title }}</span>
                </a>
              </li>
            </ul>
@@ -112,6 +98,65 @@ const assignmentId = computed(() => modalData.value.id ?? null)
 const { data: assignment, isLoading } = useAdminAssignmentQuery(assignmentId, {
  enabled: () => !!assignmentId.value,
 })
+
+const courseTitle = computed(
+  () =>
+    assignment.value?.session?.course?.title ||
+    assignment.value?.course?.title ||
+    assignment.value?.courseTitle ||
+    '—'
+)
+
+const sessionTitle = computed(
+  () => assignment.value?.session?.title || assignment.value?.sessionTitle || '—'
+)
+
+const deadlineRaw = computed(() => assignment.value?.endDate || assignment.value?.deadline || '')
+const deadlineLabel = computed(() => formatJalaaliDate(deadlineRaw.value) || '—')
+
+const durationLabel = computed(() => {
+  if (assignment.value?.durationDays != null) return `${assignment.value.durationDays} روز`
+  const start = assignment.value?.startDate || assignment.value?.createdAt
+  const end = deadlineRaw.value
+  if (!start || !end) return '—'
+  const diff = Math.ceil((new Date(end).getTime() - new Date(start).getTime()) / 86_400_000)
+  return diff >= 0 ? `${diff} روز` : '—'
+})
+
+const priorityLabel = computed(() => {
+  const priority =
+    assignment.value?.priority ||
+    (typeof assignment.value?.isPriority === 'boolean'
+      ? assignment.value.isPriority
+        ? 'mandatory'
+        : 'optional'
+      : null)
+  return ASSIGNMENT_PRIORITY[priority] || '—'
+})
+
+const submittersLabel = computed(
+  () => assignment.value?.submittersCount ?? assignment.value?.submissionsCount ?? 0
+)
+
+const attachmentItems = computed(() => {
+  const media = assignment.value?.media
+  if (Array.isArray(media) && media.length > 0) {
+    return media.map((m) => ({
+      id: m.id,
+      title: m.fileName || `فایل ${m.id}`,
+      url: m.url || m.downloadUrl || '',
+    }))
+  }
+  const legacy = assignment.value?.attachments
+  if (Array.isArray(legacy)) {
+    return legacy.map((a) => ({
+      id: a.id,
+      title: a.title || `فایل ${a.id}`,
+      url: a.fileUrl || '',
+    }))
+  }
+  return []
+})
 </script>

 <style lang="scss" scoped>
@@ -1,10 +1,14 @@
 <template>
-  <BasicModal width="95%" max-width="60rem" min-width="auto" :show-close-button="true">
-    <template #default="{ data, close }">
+  <BasicModal
+    title="تکالیف فرستادگان"
+    title-en="Delegates’ Submissions"
+    width="95%"
+    max-width="60rem"
+    min-width="auto"
+    :show-close-button="true"
+  >
+    <template #default="{ close }">
      <div class="assignment-submissions">
-        <LineTitleBlock title="تکالیف فرستادگان" title-en="Delegates’ Submissions" />
-        <p v-if="data?.title" class="assignment-submissions__assignment">{{ data.title }}</p>
-
        <SkeletonLoaderBlock v-if="isLoading" :rows="4" :cols-per-row="1" />
        <div v-else-if="submissions.length > 0" class="assignment-submissions__list">
          <div
@@ -101,15 +105,16 @@ const paginationMeta = computed(() => ({
 }))

 const userName = (user) =>
-  `${user?.firstName || ''} ${user?.lastName || ''}`.trim() || user?.fullName || '—'
+  user?.name || `${user?.firstName || ''} ${user?.lastName || ''}`.trim() || user?.fullName || '—'

 const locationFromAddress = (user) => {
-  const province = user?.address?.province?.name || ''
-  const city = user?.address?.city?.name || ''
+  const province = user?.province?.name || user?.address?.province?.name || ''
+  const city = user?.city?.name || user?.address?.city?.name || ''
  return [province, city].filter(Boolean).join('، ')
 }

-const submittedAt = (sub) => sub.faSubmittedAt || formatJalaaliDate(sub.submittedAt) || '—'
+const submittedAt = (sub) =>
+  sub.faSubmittedAt || formatJalaaliDate(sub.submittedAt || sub.createdAt || sub.reviewedAt) || '—'

 const onShowDetails = (submission) => {
  openModal('AssignmentSubmissionDetailsModal', {