Merge branch 'feature/exam-attempt-domain' of github.com:Tria-plc/emaui into feature/exam-attempt-domain

2026-08-26 19:12:50 +00:00 · 2026-08-18 10:16:30 +03:00
parent 74eee3ad48 f0443b84b1
commit 2b653ac13b
6 changed files with 118 additions and 5 deletions
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage/actions.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage/actions.tsx
@@ -1,9 +1,18 @@
-import { ActionIcon, Group } from "@mantine/core";
-import { IconEdit, IconTrash, IconDetails } from "@tabler/icons-react";
+import { ActionIcon, Group, Menu } from "@mantine/core";
+import { IconEdit, IconTrash, IconDetails, IconToggleRight } from "@tabler/icons-react";
 import type { TFunction } from "i18next";
 import type { AdvancedColumn } from "@ema-platform/ui";
 import { LICENSE_PERMISSIONS, RequirePermission } from "@ema-platform/auth";
-import type { Exam } from "../../types/exam";
+import type { Exam, ExamStatus } from "../../types/exam";
+
+const STATUSES: ExamStatus[] = [
+  "PENDING",
+  "ACTIVE",
+  "COMPLETED",
+  "CANCELLED",
+  "POSTPONED",
+  "PUBLISHED",
+];

 export function examActionsColumn(
  t: TFunction,
@@ -11,6 +20,8 @@ export function examActionsColumn(
    onEdit: (exam: Exam) => void;
    onDelete: (exam: Exam) => void;
    onDetails: (exam: Exam) => void;
+    onChangeStatus: (exam: Exam, status: ExamStatus) => void;
+    changingStatusId?: string | null;
  },
 ): AdvancedColumn<Exam> {
  return {
@@ -19,6 +30,30 @@ export function examActionsColumn(
    cell: ({ row }) => (
      <Group gap="xs">
        <RequirePermission anyOf={[LICENSE_PERMISSIONS.MANAGE_EXAMS]} hideOnly>
+          <Menu shadow="md" width={160} position="bottom-end">
+            <Menu.Target>
+              <ActionIcon
+                variant="subtle"
+                color="teal"
+                size="sm"
+                loading={handlers.changingStatusId === row.original.id}
+              >
+                <IconToggleRight size={14} />
+              </ActionIcon>
+            </Menu.Target>
+            <Menu.Dropdown>
+              <Menu.Label>{t("exam.form.status")}</Menu.Label>
+              {STATUSES.map((status) => (
+                <Menu.Item
+                  key={status}
+                  disabled={status === row.original.status}
+                  onClick={() => handlers.onChangeStatus(row.original, status)}
+                >
+                  {t(`exam.form.${status.toLowerCase()}`)}
+                </Menu.Item>
+              ))}
+            </Menu.Dropdown>
+          </Menu>
          <ActionIcon
            variant="subtle"
            color="blue"
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
@@ -254,6 +254,12 @@ function ExamForm({
                  onChange={setForm}
                  size="sm"
                  required
+                  disabled={adminMethod === "ONLINE"}
+                  description={
+                    adminMethod === "ONLINE"
+                      ? t("exam.form.onlineChoiceOnlyHint")
+                      : undefined
+                  }
                />
                <Select
                  label={t("exam.detail.administration")}
@@ -263,7 +269,14 @@ function ExamForm({
                    { value: "ONLINE", label: t("exam.form.online") },
                  ]}
                  value={adminMethod}
-                  onChange={setAdminMethod}
+                  onChange={(value) => {
+                    setAdminMethod(value);
+                    // Online exams are graded automatically, and that only
+                    // has an answer model for CHOICE — matches the backend
+                    // rule (online_exam_requires_choice_form), not just a
+                    // UI nicety.
+                    if (value === "ONLINE") setForm("CHOICE");
+                  }}
                  size="sm"
                  required
                />
@@ -355,6 +368,7 @@ export function ExamPage() {
  const [deleteTarget, setDeleteTarget] = useState<Exam | null>(null);
  const [deleteOpened, { open: openDelete, close: closeDelete }] =
    useDisclosure(false);
+  const [changingStatusId, setChangingStatusId] = useState<string | null>(null);

  const certOptions = certifications
    .filter((c) => c.isActive)
@@ -405,6 +419,18 @@ export function ExamPage() {
    }
  };

+  const handleChangeStatus = async (exam: Exam, status: Exam["status"]) => {
+    setChangingStatusId(exam.id);
+    try {
+      await updateExam({ id: exam.id, status }).unwrap();
+      notify.success(t("exam.updated"));
+    } catch (e) {
+      handleError(e);
+    } finally {
+      setChangingStatusId(null);
+    }
+  };
+
  const handleDelete = async () => {
    if (!deleteTarget) return;
    try {
@@ -438,6 +464,8 @@ export function ExamPage() {
        openDelete();
      },
      onDetails: (exam) => navigate(`/exams/${exam.id}`),
+      onChangeStatus: handleChangeStatus,
+      changingStatusId,
    }),
  ];

--- a/apps/backoffice/src/app/features/result/pages/ResultPage/actions.tsx
+++ b/apps/backoffice/src/app/features/result/pages/ResultPage/actions.tsx
@@ -1,5 +1,5 @@
 import { Button, Group } from '@mantine/core';
-import { IconEye, IconTrash } from '@tabler/icons-react';
+import { IconEye, IconSend, IconTrash } from '@tabler/icons-react';
 import type { TFunction } from 'i18next';
 import type { AdvancedColumn } from '@ema-platform/ui';
 import { LICENSE_PERMISSIONS, RequirePermission } from '@ema-platform/auth';
@@ -13,6 +13,7 @@ export function resultActionsColumn(
    onQc: (result: Result, action: QcAction) => void;
    onViewDetail: (result: Result) => void;
    onDelete: (result: Result) => void;
+    onPublish: (result: Result) => void;
  },
 ): AdvancedColumn<Result> {
  return {
@@ -49,6 +50,19 @@ export function resultActionsColumn(
              </Button>
            </RequirePermission>
          )}
+          {r.reviewStatus === 'APPROVED' && (
+            <RequirePermission anyOf={[LICENSE_PERMISSIONS.PUBLISH_EXAM_RESULT]} hideOnly>
+              <Button
+                size="compact-xs"
+                variant="light"
+                color="teal"
+                leftSection={<IconSend size={13} />}
+                onClick={() => handlers.onPublish(r)}
+              >
+                {t('result.review.publish')}
+              </Button>
+            </RequirePermission>
+          )}
          <Button size="xs" variant="subtle" leftSection={<IconEye size={13} />} onClick={() => handlers.onViewDetail(r)}>
            {t('result.action.viewEdit')}
          </Button>
--- a/apps/backoffice/src/app/features/result/pages/ResultPage/index.tsx
+++ b/apps/backoffice/src/app/features/result/pages/ResultPage/index.tsx
@@ -126,6 +126,8 @@ export function ResultPage() {
  const [detailOpened, { open: openDetail, close: closeDetail }] = useDisclosure(false);
  const [deleteTarget, setDeleteTarget] = useState<Result | null>(null);
  const [deleteOpened, { open: openDelete, close: closeDelete }] = useDisclosure(false);
+  const [publishTarget, setPublishTarget] = useState<Result | null>(null);
+  const [publishOpened, { open: openPublish, close: closePublish }] = useDisclosure(false);
  const [detailRemark, setDetailRemark] = useState<BilingualValue>({ en: '', am: '' });
  const [detailBreakdowns, setDetailBreakdowns] = useState<ResultBreakdown[]>([]);
  const [detailSaving, setDetailSaving] = useState(false);
@@ -262,6 +264,19 @@ export function ResultPage() {
    }
  };

+  /** Same publish call as handlePublish, but scoped to one row's exam — no page filter needed. */
+  const handleConfirmPublish = async () => {
+    if (!publishTarget) return;
+    try {
+      const outcome = await publishResults(publishTarget.examId).unwrap();
+      notify.success(t('result.review.publishedCount', outcome));
+      closePublish();
+      setPublishTarget(null);
+    } catch (error) {
+      notify.error(extractErrorMessage(error, t('result.review.error')));
+    }
+  };
+
  const handleDetailClose = () => {
    closeDetail();
    setDetailBreakdowns([]);
@@ -288,6 +303,7 @@ export function ResultPage() {
      onQc: openQc,
      onViewDetail: viewDetail,
      onDelete: (r) => { setDeleteTarget(r); openDelete(); },
+      onPublish: (r) => { setPublishTarget(r); openPublish(); },
    }),
  ];

@@ -584,6 +600,20 @@ export function ResultPage() {
        </ModalFooter>
      </Modal>

+      <Modal opened={publishOpened} onClose={closePublish} title={t('result.review.publish')} size="sm">
+        <Text mb="md">
+          {t('result.review.publishConfirmText', {
+            exam: publishTarget ? getExamTitle(publishTarget.examId) : '',
+          })}
+        </Text>
+        <ModalFooter>
+          <Button variant="default" onClick={closePublish} size="sm">{t('result.cancel')}</Button>
+          <Button color="teal" loading={isPublishing} onClick={handleConfirmPublish} size="sm">
+            {t('result.review.publish')}
+          </Button>
+        </ModalFooter>
+      </Modal>
+
      {/* Choose exam, then record */}
      <Modal opened={pickerOpened} onClose={closePicker} title={t('result.record')} size="md" radius="lg">
        <Stack gap="md">
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -251,6 +251,7 @@ export const am: Translations = {
      choice: "ምርጫ",
      offline: "ከመስመር ውጪ",
      online: "በመስመር",
+      onlineChoiceOnlyHint: "የመስመር ላይ ፈተናዎች በራስ-ሰር ይመዘገባሉ፣ ይህም ለምርጫ ጥያቄዎች ብቻ ይሰራል።",
      sum: "ድምር",
      average: "አማካይ",
      percentage: "መቶኛ",
@@ -660,6 +661,8 @@ export const am: Translations = {
      returned: "ውጤት ወደ ፈታኙ ተመልሷል",
      publishedCount: "{{published}} ውጤቶች ወጥተዋል፤ {{skipped}} ተዘለዋል።",
      publishNeedsExam: "ውጤቶችን ለማውጣት መጀመሪያ በፈተና ያጣሩ።",
+      publishConfirmText:
+        "ይህ ለ{{exam}} የጸደቁትን ሁሉንም ውጤቶች ያወጣል — ይህን ብቻ አይደለም — እና እያንዳንዱን ተፈታኝ ያሳውቃል። ይቀጥል?",
      lockedAfterApproval: "ይህ ውጤት ጸድቋል፤ ማስተካከል አይቻልም። መጀመሪያ ወደ ፈታኙ ይመልሱት።",
      originalScore: "የፈታኙ ጠቅላላ",
      derivedStatus: "ውጤት (ከማለፊያ ነጥብ የተገኘ)",
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -249,6 +249,7 @@ export const en = {
      choice: 'Choice',
      offline: 'Offline',
      online: 'Online',
+      onlineChoiceOnlyHint: 'Online exams are graded automatically, which only works for multiple choice.',
      sum: 'Sum',
      average: 'Average',
      percentage: 'Percentage',
@@ -660,6 +661,8 @@ export const en = {
      returned: 'Result returned to the examiner',
      publishedCount: 'Published {{published}} result(s); {{skipped}} skipped.',
      publishNeedsExam: 'Filter by an exam first to publish its results.',
+      publishConfirmText:
+        'This publishes every approved result for {{exam}} — not just this one — and notifies each candidate. Continue?',
      lockedAfterApproval:
        'This result is approved and can no longer be edited. Return it to the examiner first.',
      originalScore: 'Examiner total',