From cbf7622909fefbc118556c746cee7190042197ad Mon Sep 17 00:00:00 2001 From: "makabe.t" Date: Wed, 10 Jan 2024 06:12:15 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20675:=20File=20Property=E3=81=AE?= =?UTF-8?q?=E3=80=8Cpriority=E3=80=8D=E3=82=92High=E3=81=8BNormal=E3=81=A7?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task3433: File Propertyの「priority」をHighかNormalで表示する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3433) - FilePropertyポップアップのpriorityの項目の表示を数字からHigh/Normalとなるように修正しました。 ## レビューポイント - 表示内容は認識通りでしょうか？ ## UIの変更 - [Task3433](https://ndstokyo.sharepoint.com/:f:/r/sites/Piranha/Shared%20Documents/General/OMDS/%E3%82%B9%E3%82%AF%E3%83%AA%E3%83%BC%E3%83%B3%E3%82%B7%E3%83%A7%E3%83%83%E3%83%88/Task3433?csf=1&web=1&e=5iWTtn) ## 動作確認状況 - ローカルで確認 --- .../src/components/header/notLoginHeader.tsx | 3 --- .../src/features/dictation/constants.ts | 5 +++++ dictation_client/src/features/terms/constants.ts | 1 + .../src/pages/DictationPage/filePropertyPopup.tsx | 13 +++++++++++-- dictation_client/src/pages/DictationPage/index.tsx | 5 ++++- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dictation_client/src/components/header/notLoginHeader.tsx b/dictation_client/src/components/header/notLoginHeader.tsx index 09cdcd6..67c71cc 100644 --- a/dictation_client/src/components/header/notLoginHeader.tsx +++ b/dictation_client/src/components/header/notLoginHeader.tsx @@ -1,7 +1,5 @@ import React from "react"; import styles from "styles/app.module.scss"; - -import { useTranslation } from "react-i18next"; import logo from "../../assets/images/OMS_logo_black.svg"; import { HEADER_NAME } from "./constants"; @@ -13,7 +11,6 @@ const NotLoginHeader: React.FC = ( props: NotLoginHeaderProps ) => { const { isMobile } = props; - const { t } = useTranslation(); return (
diff --git a/dictation_client/src/features/dictation/constants.ts b/dictation_client/src/features/dictation/constants.ts index d699a54..de262e0 100644 --- a/dictation_client/src/features/dictation/constants.ts +++ b/dictation_client/src/features/dictation/constants.ts @@ -99,3 +99,8 @@ export const INIT_DISPLAY_INFO: DisplayInfoType = { export const BACKUP_POPUP_LIST_SIZE = 10; export const BACKUP_POPUP_LIST_STATUS = [STATUS.FINISHED, STATUS.BACKUP]; + +export const PRIORITY = { + NORMAL: "Normal", + HIGH: "High", +} as const; diff --git a/dictation_client/src/features/terms/constants.ts b/dictation_client/src/features/terms/constants.ts index e9cbd2f..d06ba4f 100644 --- a/dictation_client/src/features/terms/constants.ts +++ b/dictation_client/src/features/terms/constants.ts @@ -5,5 +5,6 @@ export const TERMS_DOCUMENT_TYPE = { DPA: "DPA", EULA: "EULA", + // eslint-disable-next-line @typescript-eslint/naming-convention PRIVACY_NOTICE: "PrivacyNotice", } as const; diff --git a/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx b/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx index c0e362d..0bcd5ba 100644 --- a/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx +++ b/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx @@ -1,7 +1,11 @@ import React, { useCallback } from "react"; import styles from "styles/app.module.scss"; import { useSelector } from "react-redux"; -import { selectSelectedFileTask, selectIsLoading } from "features/dictation"; +import { + selectSelectedFileTask, + selectIsLoading, + PRIORITY, +} from "features/dictation"; import { getTranslationID } from "translation"; import { useTranslation } from "react-i18next"; import close from "../../assets/images/close.svg"; @@ -51,7 +55,11 @@ export const FilePropertyPopup: React.FC = (props) => {
{t(getTranslationID("dictationPage.label.workType"))}
{selectedFileTask?.workType ?? ""}
{t(getTranslationID("dictationPage.label.priority"))}
-
{selectedFileTask?.priority ?? ""}
+
+ {selectedFileTask?.priority === "01" + ? PRIORITY.HIGH + : PRIORITY.NORMAL} +
{t(getTranslationID("dictationPage.label.recordingStartedDate"))}
@@ -114,6 +122,7 @@ export const FilePropertyPopup: React.FC = (props) => {
{t(getTranslationID("dictationPage.label.transcriptionist"))}
{selectedFileTask?.typist?.name ?? ""}
+ {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} close {t(getTranslationID("filePropertyPopup.label.close"))} diff --git a/dictation_client/src/pages/DictationPage/index.tsx b/dictation_client/src/pages/DictationPage/index.tsx index 8cfe9b0..b2591d3 100644 --- a/dictation_client/src/pages/DictationPage/index.tsx +++ b/dictation_client/src/pages/DictationPage/index.tsx @@ -32,6 +32,7 @@ import { selectIsLoading, playbackAsync, cancelAsync, + PRIORITY, } from "features/dictation"; import { getTranslationID } from "translation"; import { Task } from "api/api"; @@ -1189,7 +1190,9 @@ const DictationPage: React.FC = (): JSX.Element => { )} {displayColumn.Priority && ( - {x.priority === "01" ? "High" : "Normal"} + {x.priority === "01" + ? PRIORITY.HIGH + : PRIORITY.NORMAL} )} {displayColumn.Encryption && (