Skip to content
This repository was archived by the owner on Dec 6, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/widgets/civil/CivilListTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { CivilListType } from '@/entities/civil/type';
import Link from 'next/link';
import Select from '@/shared/Select';
import { statusOptions } from './CivilListFilter';
import { formatDateToKST } from '@/shared/lib/formatDateToKST';

type Props = {
data: CivilListType[];
Expand Down Expand Up @@ -105,7 +106,7 @@ export default function CivilListTable({
</td>
<td className={tdClass}>
<div className='line-clamp-1' title={item.createdAt}>
{item.createdAt}
{formatDateToKST(item.createdAt)}
</div>
</td>
<td className={tdClass}>
Expand Down
20 changes: 11 additions & 9 deletions frontend/src/widgets/voting/VotingTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useRouter } from 'next/router';
import { getBuildingPermission } from '@/shared/lib/getBuildingPermission';
import { deleteVoting } from '@/entities/voting/api/voting.api';
import { useAuthStore } from '@/shared/store/auth.store';
import { formatDateToKST } from '@/shared/lib/formatDateToKST';

type Props = {
data: VotingList[];
Expand All @@ -22,15 +23,16 @@ export default function VotingTable({ data, currentPage, itemsPerPage, totalCoun
const tdClass = 'p-3 text-center text-gray-500';
const thClass = 'p-3 font-medium';

const formatISODateToDisplay = (isoString: string) => {
// 기본 제공된 코드이나 사용되지 않기에 주석 처리함
/* const formatISODateToDisplay = (isoString: string) => {
const date = new Date(isoString);
const y = date.getFullYear();
const m = String(date.getMonth() + 1).padStart(2, '0');
const d = String(date.getDate()).padStart(2, '0');
const hh = String(date.getHours()).padStart(2, '0');
const mm = String(date.getMinutes()).padStart(2, '0');
return `${y}-${m}-${d} ${hh}:${mm}`;
};
}; */

const isVotingInProgress = (start: string, end: string) => {
const startDate = new Date(start);
Expand Down Expand Up @@ -99,10 +101,10 @@ export default function VotingTable({ data, currentPage, itemsPerPage, totalCoun
<th className={thClass}>제목</th>
<th className={thClass}>작성자</th>
<th className={thClass}>투표권자</th>
<th className={thClass}>작성일시</th>
<th className={thClass}>투표시작</th>
<th className={thClass}>투표종료</th>
<th className={thClass}>투표상태</th>
<th className={thClass}>작성 일시</th>
<th className={thClass}>투표 시작</th>
<th className={thClass}>투표 종료</th>
<th className={thClass}>투표 상태</th>
{isAdminPage && <th className={thClass}>비고</th>}
</tr>
</thead>
Expand Down Expand Up @@ -134,9 +136,9 @@ export default function VotingTable({ data, currentPage, itemsPerPage, totalCoun
</td>
<td className={tdClass}>{item.writerName}</td>
<td className={tdClass}>{getBuildingPermission(item.buildingPermission)}</td>
<td className={tdClass}>{formatISODateToDisplay(item.createdAt)}</td>
<td className={tdClass}>{formatISODateToDisplay(item.startDate)}</td>
<td className={tdClass}>{formatISODateToDisplay(item.endDate)}</td>
<td className={tdClass}>{formatDateToKST(item.createdAt)}</td>
<td className={tdClass}>{formatDateToKST(item.startDate)}</td>
<td className={tdClass}>{formatDateToKST(item.endDate)}</td>
<td className={tdClass}>
<VotingStatusChip type='process' status={item.status} />
</td>
Expand Down