Merged PR 675: File Propertyの「priority」をHighかNormalで表示する
## 概要 [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) ## 動作確認状況 - ローカルで確認
This commit is contained in:
parent
87ede1ad3b
commit
cbf7622909
@ -1,7 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import styles from "styles/app.module.scss";
|
import styles from "styles/app.module.scss";
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import logo from "../../assets/images/OMS_logo_black.svg";
|
import logo from "../../assets/images/OMS_logo_black.svg";
|
||||||
import { HEADER_NAME } from "./constants";
|
import { HEADER_NAME } from "./constants";
|
||||||
|
|
||||||
@ -13,7 +11,6 @@ const NotLoginHeader: React.FC<NotLoginHeaderProps> = (
|
|||||||
props: NotLoginHeaderProps
|
props: NotLoginHeaderProps
|
||||||
) => {
|
) => {
|
||||||
const { isMobile } = props;
|
const { isMobile } = props;
|
||||||
const { t } = useTranslation();
|
|
||||||
return (
|
return (
|
||||||
<header className={`${styles.header} ${isMobile && styles.home}`}>
|
<header className={`${styles.header} ${isMobile && styles.home}`}>
|
||||||
<div className={`${styles.headerLogo}`}>
|
<div className={`${styles.headerLogo}`}>
|
||||||
|
|||||||
@ -99,3 +99,8 @@ export const INIT_DISPLAY_INFO: DisplayInfoType = {
|
|||||||
export const BACKUP_POPUP_LIST_SIZE = 10;
|
export const BACKUP_POPUP_LIST_SIZE = 10;
|
||||||
|
|
||||||
export const BACKUP_POPUP_LIST_STATUS = [STATUS.FINISHED, STATUS.BACKUP];
|
export const BACKUP_POPUP_LIST_STATUS = [STATUS.FINISHED, STATUS.BACKUP];
|
||||||
|
|
||||||
|
export const PRIORITY = {
|
||||||
|
NORMAL: "Normal",
|
||||||
|
HIGH: "High",
|
||||||
|
} as const;
|
||||||
|
|||||||
@ -5,5 +5,6 @@
|
|||||||
export const TERMS_DOCUMENT_TYPE = {
|
export const TERMS_DOCUMENT_TYPE = {
|
||||||
DPA: "DPA",
|
DPA: "DPA",
|
||||||
EULA: "EULA",
|
EULA: "EULA",
|
||||||
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||||
PRIVACY_NOTICE: "PrivacyNotice",
|
PRIVACY_NOTICE: "PrivacyNotice",
|
||||||
} as const;
|
} as const;
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
import React, { useCallback } from "react";
|
import React, { useCallback } from "react";
|
||||||
import styles from "styles/app.module.scss";
|
import styles from "styles/app.module.scss";
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
import { selectSelectedFileTask, selectIsLoading } from "features/dictation";
|
import {
|
||||||
|
selectSelectedFileTask,
|
||||||
|
selectIsLoading,
|
||||||
|
PRIORITY,
|
||||||
|
} from "features/dictation";
|
||||||
import { getTranslationID } from "translation";
|
import { getTranslationID } from "translation";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import close from "../../assets/images/close.svg";
|
import close from "../../assets/images/close.svg";
|
||||||
@ -51,7 +55,11 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
|
|||||||
<dt>{t(getTranslationID("dictationPage.label.workType"))}</dt>
|
<dt>{t(getTranslationID("dictationPage.label.workType"))}</dt>
|
||||||
<dd>{selectedFileTask?.workType ?? ""}</dd>
|
<dd>{selectedFileTask?.workType ?? ""}</dd>
|
||||||
<dt>{t(getTranslationID("dictationPage.label.priority"))}</dt>
|
<dt>{t(getTranslationID("dictationPage.label.priority"))}</dt>
|
||||||
<dd>{selectedFileTask?.priority ?? ""}</dd>
|
<dd>
|
||||||
|
{selectedFileTask?.priority === "01"
|
||||||
|
? PRIORITY.HIGH
|
||||||
|
: PRIORITY.NORMAL}
|
||||||
|
</dd>
|
||||||
<dt>
|
<dt>
|
||||||
{t(getTranslationID("dictationPage.label.recordingStartedDate"))}
|
{t(getTranslationID("dictationPage.label.recordingStartedDate"))}
|
||||||
</dt>
|
</dt>
|
||||||
@ -114,6 +122,7 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
|
|||||||
<dt>{t(getTranslationID("dictationPage.label.transcriptionist"))}</dt>
|
<dt>{t(getTranslationID("dictationPage.label.transcriptionist"))}</dt>
|
||||||
<dd>{selectedFileTask?.typist?.name ?? ""}</dd>
|
<dd>{selectedFileTask?.typist?.name ?? ""}</dd>
|
||||||
<dd className={`${styles.full} ${styles.alignRight}`}>
|
<dd className={`${styles.full} ${styles.alignRight}`}>
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
|
||||||
<a onClick={closePopup} className={`${styles.buttonText}`}>
|
<a onClick={closePopup} className={`${styles.buttonText}`}>
|
||||||
<img src={close} className={styles.modalTitleIcon} alt="close" />
|
<img src={close} className={styles.modalTitleIcon} alt="close" />
|
||||||
{t(getTranslationID("filePropertyPopup.label.close"))}
|
{t(getTranslationID("filePropertyPopup.label.close"))}
|
||||||
|
|||||||
@ -32,6 +32,7 @@ import {
|
|||||||
selectIsLoading,
|
selectIsLoading,
|
||||||
playbackAsync,
|
playbackAsync,
|
||||||
cancelAsync,
|
cancelAsync,
|
||||||
|
PRIORITY,
|
||||||
} from "features/dictation";
|
} from "features/dictation";
|
||||||
import { getTranslationID } from "translation";
|
import { getTranslationID } from "translation";
|
||||||
import { Task } from "api/api";
|
import { Task } from "api/api";
|
||||||
@ -1189,7 +1190,9 @@ const DictationPage: React.FC = (): JSX.Element => {
|
|||||||
)}
|
)}
|
||||||
{displayColumn.Priority && (
|
{displayColumn.Priority && (
|
||||||
<td className={styles.clm3}>
|
<td className={styles.clm3}>
|
||||||
{x.priority === "01" ? "High" : "Normal"}
|
{x.priority === "01"
|
||||||
|
? PRIORITY.HIGH
|
||||||
|
: PRIORITY.NORMAL}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
{displayColumn.Encryption && (
|
{displayColumn.Encryption && (
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user