diff --git a/apps/backoffice/src/app/features/result/pages/ResultPage.tsx b/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
index 8cd31eafb..e735081d7 100644
--- a/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
+++ b/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
@@ -334,6 +334,14 @@ export function ResultPage() {
),
},
+ {
+ header: t('result.review.column'),
+ cell: ({ row }) => (
+
+ {t(`result.review.${row.original.reviewStatus}`)}
+
+ ),
+ },
{
header: t('result.columns.date'),
cell: ({ row }) => {new Date(row.original.createdAt).toLocaleDateString()},
@@ -341,22 +349,40 @@ export function ResultPage() {
{
header: '',
label: t('result.columns.actions', 'Actions'),
- cell: ({ row }) => (
-
- } onClick={() => viewDetail(row.original)}>
- {t('result.action.viewEdit')}
-
- }
- onClick={() => { setDeleteTarget(row.original); openDelete(); }}
- >
- {t('result.action.delete')}
-
-
- ),
+ cell: ({ row }) => {
+ const r = row.original;
+ return (
+
+ {(r.reviewStatus === 'MARKED' || r.reviewStatus === 'MODERATED') && (
+ <>
+
+
+ >
+ )}
+ {(r.reviewStatus === 'APPROVED' || r.reviewStatus === 'MODERATED') && (
+
+ )}
+ } onClick={() => viewDetail(r)}>
+ {t('result.action.viewEdit')}
+
+ }
+ onClick={() => { setDeleteTarget(r); openDelete(); }}
+ >
+ {t('result.action.delete')}
+
+
+ );
+ },
},
];
@@ -418,113 +444,19 @@ export function ResultPage() {
-
-
-
- {t('result.columns.seafarer')}
- {t('result.columns.exam')}
- {t('result.columns.totalScore')}
- {t('result.columns.status')}
- {t('result.review.column')}
- {t('result.columns.date')}
-
-
-
-
- {filtered.map((r) => (
-
-
-
- {r.seafarer ? `${r.seafarer.firstName} ${r.seafarer.lastName}` : r.seafarerId.slice(0, 8)}
-
-
- {r.exam ? r.exam.title[locale] : getExamTitle(r.examId)}
- {r.totalScore}
-
-
- }
- >
- {t(`result.status.${r.status}`)}
-
-
-
-
- {t(`result.review.${r.reviewStatus}`)}
-
-
- {new Date(r.createdAt).toLocaleDateString()}
-
-
- {(r.reviewStatus === 'MARKED' || r.reviewStatus === 'MODERATED') && (
- <>
-
-
- >
- )}
- {(r.reviewStatus === 'APPROVED' || r.reviewStatus === 'MODERATED') && (
-
- )}
- }
- onClick={() => viewDetail(r)}
- >
- {t('result.action.viewEdit')}
-
- }
- onClick={() => { setDeleteTarget(r); openDelete(); }}
- >
- {t('result.action.delete')}
-
-
-
-
- ))}
- {filtered.length === 0 && (
-
-
- {t('result.noItems')}
-
-
- )}
-
-
-
+
+