From 4caa23ba3c950474f981b33e249cc39447533305 Mon Sep 17 00:00:00 2001
From: "saito.k" <saito.k@nds-tyo.co.jp>
Date: Mon, 19 Feb 2024 02:17:37 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20755:=20[FB=E5=AF=BE=E5=BF=9C]File?=
 =?UTF-8?q?=20Property=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=A4=E3=81=84?=
 =?UTF-8?q?=E3=81=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[Task3735: 対応](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3735)

- FilePropertyの表示順を変更する
  - カテゴリ（General、Job）はそのままで、OMDS様の希望する並び順にする

## レビューポイント
- 並び順の変更にミスはないか

## UIの変更
- 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/Task3735?csf=1&web=1&e=r3IhXL

## 動作確認状況
- ローカルで確認

## 補足
- 相談、参考資料などがあれば
---
 .../pages/DictationPage/filePropertyPopup.tsx | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx b/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx
index 1a4104c..979bbf1 100644
--- a/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx
+++ b/dictation_client/src/pages/DictationPage/filePropertyPopup.tsx
@@ -50,16 +50,6 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
           <dd>{selectedFileTask?.fileSize ?? ""}</dd>
           <dt>{t(getTranslationID("dictationPage.label.fileLength"))}</dt>
           <dd>{selectedFileTask?.audioDuration ?? ""}</dd>
-          <dt>{t(getTranslationID("dictationPage.label.authorId"))}</dt>
-          <dd>{selectedFileTask?.authorId ?? ""}</dd>
-          <dt>{t(getTranslationID("dictationPage.label.workType"))}</dt>
-          <dd>{selectedFileTask?.workType ?? ""}</dd>
-          <dt>{t(getTranslationID("dictationPage.label.priority"))}</dt>
-          <dd>
-            {selectedFileTask?.priority === "01"
-              ? PRIORITY.HIGH
-              : PRIORITY.NORMAL}
-          </dd>
           <dt>
             {t(getTranslationID("dictationPage.label.recordingStartedDate"))}
           </dt>
@@ -68,8 +58,6 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
             {t(getTranslationID("dictationPage.label.recordingFinishedDate"))}
           </dt>
           <dd>{selectedFileTask?.audioFinishedDate ?? ""}</dd>
-          <dt>{t(getTranslationID("dictationPage.label.uploadDate"))}</dt>
-          <dd>{selectedFileTask?.audioUploadedDate ?? ""}</dd>
           <dt>{t(getTranslationID("dictationPage.label.encryption"))}</dt>
           <dd>
             {selectedFileTask?.isEncrypted ? (
@@ -78,6 +66,16 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
               ""
             )}
           </dd>
+          <dt>{t(getTranslationID("dictationPage.label.priority"))}</dt>
+          <dd>
+            {selectedFileTask?.priority === "01"
+              ? PRIORITY.HIGH
+              : PRIORITY.NORMAL}
+          </dd>
+          <dt>{t(getTranslationID("dictationPage.label.authorId"))}</dt>
+          <dd>{selectedFileTask?.authorId ?? ""}</dd>
+          <dt>{t(getTranslationID("dictationPage.label.workType"))}</dt>
+          <dd>{selectedFileTask?.workType ?? ""}</dd>
           <dt>{t(getTranslationID("dictationPage.label.optionItem1"))}</dt>
           <dd>{selectedFileTask?.optionItemList[0].optionItemValue}</dd>
           <dt>{t(getTranslationID("dictationPage.label.optionItem2"))}</dt>
@@ -107,6 +105,10 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
           <dd>{selectedFileTask?.jobNumber ?? ""}</dd>
           <dt>{t(getTranslationID("dictationPage.label.status"))}</dt>
           <dd>{selectedFileTask?.status ?? ""}</dd>
+          <dt>{t(getTranslationID("dictationPage.label.uploadDate"))}</dt>
+          <dd>{selectedFileTask?.audioUploadedDate ?? ""}</dd>
+          <dt>{t(getTranslationID("dictationPage.label.transcriptionist"))}</dt>
+          <dd>{selectedFileTask?.typist?.name ?? ""}</dd>
           <dt>
             {t(
               getTranslationID("dictationPage.label.transcriptionStartedDate")
@@ -119,8 +121,6 @@ export const FilePropertyPopup: React.FC<FilePropertyPopupProps> = (props) => {
             )}
           </dt>
           <dd>{selectedFileTask?.transcriptionFinishedDate ?? ""}</dd>
-          <dt>{t(getTranslationID("dictationPage.label.transcriptionist"))}</dt>
-          <dd>{selectedFileTask?.typist?.name ?? ""}</dd>
           <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}`}>