fix: show only past-due sessions needing attendance on attendance page

Use attendanceScope filtering, correct pending status for held sessions, and return to the attendance hub after saving.
This commit is contained in:
2026-08-16 08:22:18 +03:30
parent 2aa99119e2
commit e977ccd356
2 changed files with 46 additions and 38 deletions
@@ -5,7 +5,7 @@
:title="$t('attendances.title')"
:subtitle="`دوره: ${session.course?.title || '-'} | کلاس: ${session.class?.name || '-'} | تاریخ: ${formatJalali(session.day)} (${session.startTime || ''} تا ${session.endTime || ''})`"
>
<Button label="بازگشت" icon="pi pi-arrow-left" text severity="secondary" @click="$router.push('/sessions')" />
<Button label="بازگشت" icon="pi pi-arrow-left" text severity="secondary" @click="$router.push('/attendances')" />
</PageHeader>
<div class="surface-card p-4 sm:p-5 border-round border-1 border-color shadow-sm mb-3" v-if="session.note">
@@ -56,7 +56,7 @@
</DataTable>
<div class="flex justify-content-end gap-2 mt-4 pt-3 border-top-1 border-color">
<Button label="انصراف" text severity="secondary" @click="$router.push('/sessions')" />
<Button label="انصراف" text severity="secondary" @click="$router.push('/attendances')" />
<Button
:label="$t('attendances.submitAttendance')"
icon="pi pi-save"
@@ -147,7 +147,7 @@ const handleSubmit = async () => {
}));
await attendanceApi.recordSessionAttendance(sessionId, payloadList);
showSuccess('حضور و غیاب جلسه با موفقیت ثبت شد');
router.push('/sessions');
router.push('/attendances');
} catch (err) {
showError(err);
} finally {
+43 -35
View File
@@ -3,7 +3,7 @@
<div class="attendance-list-view">
<PageHeader
title="حضور و غیاب"
subtitle="ثبت و پیگیری حضور و غیاب جلسات آموزشی"
subtitle="جلسات سررسید گذشته که ثبت حضور دانشجویان آن‌ها ناقص است"
>
<Button
label="مشاهده جلسات"
@@ -16,27 +16,27 @@
<div class="grid mb-4">
<div class="col-12 sm:col-4">
<div class="surface-card p-4 border-round-xl border-1 border-color shadow-sm">
<span class="text-muted text-xs block mb-1">جلسات بدون ثبت حضور</span>
<span class="text-muted text-xs block mb-1">در انتظار ثبت حضور</span>
<span class="text-3xl font-bold text-orange-500">{{ toPersianDigits(summary.pending) }}</span>
</div>
</div>
<div class="col-12 sm:col-4">
<div class="surface-card p-4 border-round-xl border-1 border-color shadow-sm">
<span class="text-muted text-xs block mb-1">جلسات ثبتشده</span>
<span class="text-muted text-xs block mb-1">ثبت کامل شده</span>
<span class="text-3xl font-bold text-green-500">{{ toPersianDigits(summary.recorded) }}</span>
</div>
</div>
<div class="col-12 sm:col-4">
<div class="surface-card p-4 border-round-xl border-1 border-color shadow-sm">
<span class="text-muted text-xs block mb-1">کل جلسات</span>
<span class="text-muted text-xs block mb-1">جلسات سررسید گذشته</span>
<span class="text-3xl font-bold text-color">{{ toPersianDigits(summary.total) }}</span>
</div>
</div>
</div>
<DataTableWrapper
:items="displayItems"
:totalCount="displayTotal"
:items="items"
:totalCount="totalCount"
:page="queryParams.page"
:limit="queryParams.limit"
:sortBy="queryParams.sortBy"
@@ -53,6 +53,7 @@
optionLabel="label"
optionValue="value"
class="text-sm"
@change="onAttendanceFilterChange"
/>
</template>
@@ -89,8 +90,8 @@
<Column field="attendanceStatus" header="وضعیت حضور">
<template #body="{ data }">
<Tag
:value="hasAttendance(data) ? 'ثبت شده' : 'در انتظار ثبت'"
:severity="hasAttendance(data) ? 'success' : 'warn'"
:value="getAttendanceStatus(data).label"
:severity="getAttendanceStatus(data).severity"
/>
</template>
</Column>
@@ -105,9 +106,9 @@
<template #body="{ data }">
<Button
icon="pi pi-check-square"
:label="hasAttendance(data) ? 'ویرایش' : 'ثبت'"
:label="data.attendanceComplete ? 'ویرایش' : 'ثبت'"
size="small"
:severity="hasAttendance(data) ? 'secondary' : 'success'"
:severity="data.attendanceComplete ? 'secondary' : 'success'"
@click="$router.push(`/sessions/attendance/${data._id || data.id}`)"
/>
</template>
@@ -117,7 +118,7 @@
</template>
<script setup>
import { ref, computed, onMounted } from 'vue';
import { ref, onMounted } from 'vue';
import { useDataTable } from '@/composables/useDataTable';
import { usePersianDate } from '@/composables/usePersianDate';
import { sessionApi } from '@/api/sessionApi';
@@ -131,15 +132,20 @@ import SelectButton from 'primevue/selectbutton';
const { formatJalali, toPersianDigits } = usePersianDate();
const attendanceFilter = ref('all');
const attendanceFilter = ref('pending');
const filterOptions = [
{ label: 'همه', value: 'all' },
{ label: 'در انتظار ثبت', value: 'pending' },
{ label: 'ثبت شده', value: 'recorded' }
];
const summary = ref({ pending: 0, recorded: 0, total: 0 });
const fetchAttendanceSessions = (params) =>
sessionApi.getAll({
...params,
attendanceScope: params.attendanceScope || attendanceFilter.value
});
const {
items,
totalCount,
@@ -149,38 +155,40 @@ const {
onPageChange,
onSort,
onSearch
} = useDataTable(sessionApi.getAll, {
} = useDataTable(fetchAttendanceSessions, {
sortBy: 'day',
sortOrder: 'desc'
sortOrder: 'desc',
attendanceScope: 'pending'
});
const hasAttendance = (session) => Array.isArray(session.attendanceList) && session.attendanceList.length > 0;
const displayItems = computed(() => {
if (attendanceFilter.value === 'pending') {
return items.value.filter((s) => !hasAttendance(s));
const getAttendanceStatus = (session) => {
if (session.attendanceComplete) {
return { label: 'ثبت شده', severity: 'success' };
}
if (attendanceFilter.value === 'recorded') {
return items.value.filter((s) => hasAttendance(s));
if (session.attendancePending) {
return { label: 'در انتظار ثبت', severity: 'warn' };
}
return items.value;
});
return { label: 'برگزار نشده', severity: 'secondary' };
};
const displayTotal = computed(() => {
if (attendanceFilter.value === 'all') return totalCount.value;
return displayItems.value.length;
});
const onAttendanceFilterChange = () => {
queryParams.attendanceScope = attendanceFilter.value;
queryParams.page = 1;
loadData();
};
const loadSummary = async () => {
try {
const res = await sessionApi.getAll({ page: 1, limit: 500, sortBy: 'day', sortOrder: 'desc' });
const data = res.data || res;
const sessions = Array.isArray(data) ? data : (data.data || []);
const total = res.meta?.totalCount ?? sessions.length;
const [pendingRes, recordedRes] = await Promise.all([
sessionApi.getAll({ page: 1, limit: 1, attendanceScope: 'pending', sortBy: 'day', sortOrder: 'desc' }),
sessionApi.getAll({ page: 1, limit: 1, attendanceScope: 'recorded', sortBy: 'day', sortOrder: 'desc' })
]);
const pending = pendingRes.meta?.totalCount ?? 0;
const recorded = recordedRes.meta?.totalCount ?? 0;
summary.value = {
total,
recorded: sessions.filter((s) => hasAttendance(s)).length,
pending: sessions.filter((s) => !hasAttendance(s)).length
pending,
recorded,
total: pending + recorded
};
} catch {
summary.value = { pending: 0, recorded: 0, total: 0 };