fix

2026-06-05 14:41:38 +03:30
parent d42b7aaa7b
commit 1c665830b0
27 changed files with 565 additions and 617 deletions
@@ -10,24 +10,12 @@
    </div>

    <div class="student-session-item__badges">
-      <span
-        v-if="session.isSeen"
-        class="student-session-item__badge student-session-item__badge--seen"
-      >
-        دیده شده
-      </span>
-      <span v-if="session.needsAssignment" class="student-session-item__badge">
-        <SvgIcon name="paper-plane" :size="11" color="#5d5d5d" />
-        ارسال تکلیف
-      </span>
-      <span v-if="session.hasQuiz" class="student-session-item__badge">
-        <SvgIcon name="file" :size="11" color="#5d5d5d" />
-        دارای آزمون
-      </span>
-      <span v-if="session.isOnline" class="student-session-item__badge">
-        <SvgIcon name="users-three" :size="11" color="#5d5d5d" />
-        جلسه آنلاین
-      </span>
+      <Badge v-if="isComplete" variant="success">تکمیل شده</Badge>
+      <Badge v-if="session.isSeen" variant="success">دیده شده</Badge>
+      <Badge v-if="session.grade != null" variant="primary" label="نمره" :value="session.grade" />
+      <Badge v-if="session.needsAssignment" icon="paper-plane">دارای تکلیف</Badge>
+      <Badge v-if="session.hasQuiz" icon="file">دارای آزمون</Badge>
+      <Badge v-if="isOnline" icon="users-three">جلسه آنلاین</Badge>
    </div>

    <div class="student-session-item__actions">
@@ -46,6 +34,7 @@

 <script setup>
 import { computed } from 'vue'
+import Badge from '@/components/Badge.vue'
 import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'

@@ -58,6 +47,9 @@ const emit = defineEmits(['start'])
 const durationText = computed(() =>
  props.session.durationHours == null ? '—' : `${props.session.durationHours} ساعت`
 )
+
+const isOnline = computed(() => props.session.type === 'online')
+const isComplete = computed(() => props.session.isComplete === true)
 </script>

 <style lang="scss" scoped>
@@ -84,7 +76,7 @@ const durationText = computed(() =>
    font-size: 0.95rem;
    color: #4b4b4b;
    margin: 0;
-    text-align: end;
+    text-align: start;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
@@ -104,25 +96,6 @@ const durationText = computed(() =>
    gap: 0.5rem;
  }

-  &__badge {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.375rem;
-    padding: 0.375rem 0.875rem;
-    border-radius: 0.75rem;
-    background: rgba(107, 107, 107, 4%);
-    font-family: var(--font-family-fa);
-    font-weight: 400;
-    font-size: 0.7rem;
-    color: #5d5d5d;
-    white-space: nowrap;
-
-    &--seen {
-      background: rgba(0, 255, 68, 4%);
-      color: #009a12;
-    }
-  }
-
  &__hours {
    display: inline-flex;
    align-items: center;
@@ -10,103 +10,92 @@
      </template>
    </BoxedIconTitleBlock>

-    <TabsBlock :tabs="tabs" v-model="activeTab" @change-tab="onTabChange">
-      <template #homework>
-        <SkeletonLoaderBlock v-if="isLoading && !session" :rows="3" :cols-per-row="1" />
-        <div v-else class="ssd__panel">
-          <div class="ssd__prompt">
-            <SvgIcon name="warning" :size="22" color="#b8b8b8" class="ssd__prompt-icon" />
-            <p class="ssd__prompt-text">
-              {{ session?.homeworkPrompt || 'متنی برای این جلسه ثبت نشده است.' }}
-            </p>
-          </div>
+    <SkeletonLoaderBlock v-if="isLoading && !session" :rows="3" :cols-per-row="1" />
+    <div v-else class="ssd__panel">
+      <div class="ssd__prompt">
+        <SvgIcon name="warning" :size="22" color="#b8b8b8" class="ssd__prompt-icon" />
+        <p class="ssd__prompt-text">
+          {{ session?.homeworkPrompt || 'متنی برای این جلسه ثبت نشده است.' }}
+        </p>
+      </div>

-          <div class="ssd__media">
-            <div class="ssd__content">
-              <div v-if="contentKind === 'video'" class="ssd__video">
-                <VideoPlayerBlock
-                  :src="session?.videoUrl || ''"
-                  :poster="session?.poster || ''"
-                  :video-id="sessionId"
-                />
-              </div>
-              <div v-else-if="contentKind === 'audio'" class="ssd__audio">
-                <SvgIcon name="paper-plane-right" :size="40" color="rgba(0, 112, 116, 0.31)" />
-                <audio :src="session.audioUrl" controls class="ssd__audio-player" />
-              </div>
-              <div v-else-if="contentKind === 'text'" class="ssd__text">
-                <SvgIcon name="warning" :size="22" color="#b8b8b8" class="ssd__text-icon" />
-                <p class="ssd__text-body">{{ session.text }}</p>
-              </div>
-              <div v-else-if="contentKind === 'link'" class="ssd__link">
-                <div class="ssd__link__box">
-                  <span>https://link</span>
-                  <SvgIcon name="link" :size="22" class="ssd__link-icon" />
-                </div>
-                <BaseButton text="ورود به جلسه " custom-class="ssd__link-btn">
-                  <template #appendIcon>
-                    <SvgIcon name="arrow-left" :size="18" color="#fff" />
-                  </template>
-                </BaseButton>
-              </div>
-              <div v-else class="ssd__empty">
-                <SvgIcon name="warning" :size="32" color="#bcbcbc" />
-                <p>محتوایی برای این جلسه ثبت نشده است.</p>
-              </div>
+      <div class="ssd__media">
+        <div class="ssd__content">
+          <div v-if="contentKind === 'video'" class="ssd__video">
+            <VideoPlayerBlock
+              :src="session?.videoUrl || ''"
+              :poster="session?.poster || ''"
+              :video-id="sessionId"
+            />
+          </div>
+          <div v-else-if="contentKind === 'audio'" class="ssd__audio">
+            <VoiceRecorder :model-value="session.audioUrl" disabled />
+          </div>
+          <div v-else-if="contentKind === 'text'" class="ssd__text">
+            <SvgIcon name="warning" :size="22" color="#b8b8b8" class="ssd__text-icon" />
+            <p class="ssd__text-body">{{ session.text }}</p>
+          </div>
+          <div v-else-if="contentKind === 'link'" class="ssd__link">
+            <div class="ssd__link__box">
+              <span>https://link</span>
+              <SvgIcon name="link" :size="22" class="ssd__link-icon" />
            </div>
-
-            <div class="ssd__uploads" v-if="contentKind !== 'link'">
-              <VoiceRecorder
-                class="ssd__uploads-recorder"
-                v-model="homeworkAudio"
-                :error="errors.audio"
-              />
-              <ImageUploader
-                class="ssd__uploads-uploader"
-                v-model="homeworkImage"
-                :error="errors.image"
-              />
-            </div>
-          </div>
-
-          <div class="ssd__hint">
-            <SvgIcon name="warning" :size="22" color="#b8b8b8" />
-            <p class="ssd__hint-text">
-              {{ session?.homeworkHint || '' }}
-            </p>
-          </div>
-
-          <div class="ssd__footer">
-            <BaseButton
-              text="ارسال تکلیف"
-              :loading="submitMutation.isPending.value"
-              :disabled="!canSubmit"
-              custom-class="ssd__submit-btn"
-              @click="onSubmit"
-            >
+            <BaseButton text="ورود به جلسه " custom-class="ssd__link-btn">
              <template #appendIcon>
                <SvgIcon name="arrow-left" :size="18" color="#fff" />
              </template>
            </BaseButton>
          </div>
+          <div v-else class="ssd__empty">
+            <SvgIcon name="warning" :size="32" color="#bcbcbc" />
+            <p>محتوایی برای این جلسه ثبت نشده است.</p>
+          </div>
        </div>
-      </template>

-      <template #exam>
-        <NoItems title="در حال انتقال" desc="در حال انتقال به صفحه آزمون..." />
-      </template>
-    </TabsBlock>
+        <div class="ssd__uploads" v-if="contentKind !== 'link'">
+          <VoiceRecorder
+            class="ssd__uploads-recorder"
+            v-model="homeworkAudio"
+            :error="errors.audio"
+          />
+          <ImageUploader
+            class="ssd__uploads-uploader"
+            v-model="homeworkImage"
+            :error="errors.image"
+          />
+        </div>
+      </div>
+
+      <div class="ssd__hint">
+        <SvgIcon name="warning" :size="22" color="#b8b8b8" />
+        <p class="ssd__hint-text">
+          {{ session?.homeworkHint || '' }}
+        </p>
+      </div>
+
+      <div class="ssd__footer">
+        <BaseButton
+          text="ارسال تکلیف"
+          :loading="submitMutation.isPending.value"
+          :disabled="!canSubmit"
+          custom-class="ssd__submit-btn"
+          @click="onSubmit"
+        >
+          <template #appendIcon>
+            <SvgIcon name="arrow-left" :size="18" color="#fff" />
+          </template>
+        </BaseButton>
+      </div>
+    </div>
  </div>
 </template>

 <script setup>
 import { toast } from 'vue3-toastify'
+import { useRoute } from 'vue-router'
 import { computed, reactive, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import BaseButton from '@/components/BaseButton.vue'
-import NoItems from '@/components/blocks/NoItems.vue'
-import TabsBlock from '@/components/blocks/TabsBlock.vue'
 import { objectToFormData } from '@/utils/object-to-formdata'
 import { useUploadMediaMutation } from '@/services/query/auth'
 import VoiceRecorder from '@/components/form/VoiceRecorder.vue'
@@ -120,7 +109,6 @@ import {
 } from '@/services/query/student-sessions'

 const route = useRoute()
-const router = useRouter()

 const sessionId = computed(() => route.params.id)

@@ -131,19 +119,13 @@ const { data: session, isLoading } = useStudentSessionQuery(sessionId, {
 const contentKind = computed(() => {
  const s = session.value
  if (!s) return ''
+  if (s.type === 'online') return 'link'
  if (s.videoUrl) return 'link'
  if (s.audioUrl) return 'audio'
  if (s.text) return 'text'
-  if (s.link) return 'link'
  return ''
 })

-const tabs = [
-  { name: 'homework', label: 'ارسال تکلیف', icon: 'list-bullets' },
-  { name: 'exam', label: 'آزمـــــون', icon: 'file' },
-]
-const activeTab = ref('homework')
-
 const homeworkAudio = ref(null)
 const homeworkImage = ref(null)
 const errors = reactive({ audio: '', image: '' })
@@ -190,17 +172,6 @@ const onSubmit = async () => {
    toast.error('ارسال تکلیف با خطا مواجه شد.')
  }
 }
-
-const onTabChange = (name) => {
-  if (name !== 'exam') return
-  const examId = session.value?.examId
-  if (examId) {
-    router.push({ name: 'student-exam', params: { id: examId } }).catch(() => {})
-  } else {
-    toast.info('آزمونی برای این جلسه ثبت نشده است.')
-    activeTab.value = 'homework'
-  }
-}
 </script>

 <style lang="scss" scoped>
@@ -313,7 +284,7 @@ const onTabChange = (name) => {

  &__footer {
    display: flex;
-    justify-content: center;
+    justify-content: flex-end;
    margin-top: 0.5rem;
  }