Compare commits

...

2 Commits

9 changed files with 10 additions and 7 deletions

View File

@@ -59,7 +59,7 @@ export default function AdminSettingsPage() {
{ id: "target", header: "팝업 대상", size: 120, cell: ({ row }) => <CenterTargetCell centerCds={row.original.centerCds} centers={centersQuery.data ?? []} /> }, { id: "target", header: "팝업 대상", size: 120, cell: ({ row }) => <CenterTargetCell centerCds={row.original.centerCds} centers={centersQuery.data ?? []} /> },
{ accessorKey: "startDt", header: "팝업 시작", size: 110, cell: ({ row }) => row.original.startDt?.slice(0, 10) }, { accessorKey: "startDt", header: "팝업 시작", size: 110, cell: ({ row }) => row.original.startDt?.slice(0, 10) },
{ accessorKey: "endDt", header: "팝업 종료", size: 110, cell: ({ row }) => row.original.endDt?.slice(0, 10) }, { accessorKey: "endDt", header: "팝업 종료", size: 110, cell: ({ row }) => row.original.endDt?.slice(0, 10) },
{ accessorKey: "regUser", header: "게시자", size: 100 }, { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUserName ?? row.original.regUser },
{ accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) },
], [totalElements, pagination.pageIndex, pagination.pageSize, centersQuery.data]); ], [totalElements, pagination.pageIndex, pagination.pageSize, centersQuery.data]);

View File

@@ -65,7 +65,7 @@ export function NoticeViewDialog({ noticeId, onEdit, onDeleted }: NoticeViewDial
) : ( ) : (
<div className="space-y-4"> <div className="space-y-4">
<div className="flex flex-wrap items-center gap-1 text-sm text-muted-foreground"> <div className="flex flex-wrap items-center gap-1 text-sm text-muted-foreground">
<span>{notice.regUser} · {notice.regDt?.slice(0, 10)}</span> <span>{notice.regUserName ?? notice.regUser} · {notice.regDt?.slice(0, 10)}</span>
{admin ? ( {admin ? (
<> <>
<span>· 공지 대상:</span> <span>· 공지 대상:</span>

View File

@@ -78,7 +78,7 @@ export default function NoticesPage() {
} }
base.push( base.push(
{ accessorKey: "regUser", header: "게시자", size: 100 }, { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUserName ?? row.original.regUser },
{ accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) },
); );

View File

@@ -98,7 +98,7 @@ export function QnaAnswerSection({ questionId, answer, admin, onChanged }: QnaAn
return ( return (
<div className="space-y-3 rounded-md border p-3"> <div className="space-y-3 rounded-md border p-3">
<div className="text-sm text-muted-foreground"> <div className="text-sm text-muted-foreground">
답변자: {answer?.regUser} · {answer?.regDt?.slice(0, 10)} 답변자: {answer?.regUserName ?? answer?.regUser} · {answer?.regDt?.slice(0, 10)}
</div> </div>
<div dangerouslySetInnerHTML={{ __html: answer?.contentHtml ?? "" }} /> <div dangerouslySetInnerHTML={{ __html: answer?.contentHtml ?? "" }} />
<FileAttachmentField <FileAttachmentField

View File

@@ -66,8 +66,7 @@ export function QnaViewDialog({ questionId, onEdit, onChanged }: QnaViewDialogPr
) : ( ) : (
<div className="space-y-4"> <div className="space-y-4">
<div className="text-sm text-muted-foreground"> <div className="text-sm text-muted-foreground">
{question.regUser} · {question.regDt?.slice(0, 10)} {question.regUser} · {question.regDt?.slice(0, 10)} · {question.centerName}
{admin ? ` · ${question.centerName}` : ""}
</div> </div>
<div className="rounded-md border p-3" dangerouslySetInnerHTML={{ __html: question.contentHtml }} /> <div className="rounded-md border p-3" dangerouslySetInnerHTML={{ __html: question.contentHtml }} />
<FileAttachmentField <FileAttachmentField

View File

@@ -56,7 +56,7 @@ export default function QnaPage() {
cell: ({ row }) => totalElements - pagination.pageIndex * pagination.pageSize - row.index, cell: ({ row }) => totalElements - pagination.pageIndex * pagination.pageSize - row.index,
}, },
{ accessorKey: "title", header: "문의 제목" }, { accessorKey: "title", header: "문의 제목" },
{ accessorKey: "regUser", header: "게시자", size: 100 }, { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUser },
{ accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) },
]; ];

View File

@@ -15,6 +15,7 @@ export interface Notice {
files: FileItem[]; files: FileItem[];
viewed: boolean; viewed: boolean;
regUser: string; regUser: string;
regUserName?: string | null;
regDt: string; regDt: string;
modUser: string; modUser: string;
modDt: string; modDt: string;

View File

@@ -15,6 +15,7 @@ export interface Popup {
endDt: string; endDt: string;
viewed: boolean; viewed: boolean;
regUser: string; regUser: string;
regUserName?: string | null;
regDt: string; regDt: string;
modUser: string; modUser: string;
modDt: string; modDt: string;

View File

@@ -13,6 +13,7 @@ export interface QnaAnswer {
viewUser?: string | null; viewUser?: string | null;
viewDt?: string | null; viewDt?: string | null;
regUser: string; regUser: string;
regUserName?: string | null;
regDt: string; regDt: string;
modUser: string; modUser: string;
modDt: string; modDt: string;
@@ -33,6 +34,7 @@ export interface QnaQuestion {
files: FileItem[]; files: FileItem[];
answer: QnaAnswer | null; answer: QnaAnswer | null;
regUser: string; regUser: string;
regUserName?: string | null;
regDt: string; regDt: string;
modUser: string; modUser: string;
modDt: string; modDt: string;