From d6db89bc2c52f6c7f43130cae36d9af5cd6b8a6d Mon Sep 17 00:00:00 2001 From: "makabe.t" Date: Tue, 4 Jul 2023 02:32:00 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20191:=20=E3=82=BF=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E4=B8=80=E8=A6=A7=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=82=B6=E3=82=A4=E3=83=B3=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99?= =?UTF-8?q?=E3=82=8B=EF=BC=88=E3=82=BD=E3=83=BC=E3=83=88=E3=81=AE=E2=96=BD?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=A8=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E3=82=AB=E3=83=BC?= =?UTF-8?q?=E3=82=BD=E3=83=AB=E3=81=AA=E3=81=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2045: [Sp12-1着手]タスク一覧画面のデザインを修正する（ソートの▽表示とチェックボックスのカーソルなど）](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2045) - aタグを使ったリンク・ボタン等でカーソルが指差しアイコンになるよう修正 - ソートの▽が選択とソート順によって変わるように修正 - チェックボックスのカーソルが常に指差しアイコンになる - `.eslintignore`の修正がdevelopから漏れていたので反映 ## レビューポイント - 各修正内容は適切か - ほかに必要なデザイン修正はないか - `.eslintignore`は岩田の以下の修正内容がdevelopで上書きされてしまっていたので反映しています。 - https://dev.azure.com/ODMSCloud/ODMS%20Cloud/_git/ODMS%20Cloud/pullrequest/192 ## UIの変更 - [Task2045](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/Task2045?csf=1&web=1&e=KoDGxK) ## 動作確認状況 - ローカルで確認 --- dictation_client/.eslintignore | 2 + .../src/pages/DictationPage/index.tsx | 93 ++++++++++++++++--- dictation_client/src/styles/app.module.scss | 4 + .../src/styles/app.module.scss.d.ts | 2 +- 4 files changed, 87 insertions(+), 14 deletions(-) diff --git a/dictation_client/.eslintignore b/dictation_client/.eslintignore index 1fbf4c4..5b42489 100644 --- a/dictation_client/.eslintignore +++ b/dictation_client/.eslintignore @@ -5,3 +5,5 @@ jest.config.js vite.config.ts .env.local +# デザイナのcssから生成するため除外 +src/styles/app.module.scss.d.ts \ No newline at end of file diff --git a/dictation_client/src/pages/DictationPage/index.tsx b/dictation_client/src/pages/DictationPage/index.tsx index cb449b2..da6e520 100644 --- a/dictation_client/src/pages/DictationPage/index.tsx +++ b/dictation_client/src/pages/DictationPage/index.tsx @@ -28,6 +28,7 @@ import { changeAssignee, listTypistsAsync, listTypistGroupsAsync, + DirectionType, selectIsLoading, } from "features/dictation"; import { getTranslationID } from "translation"; @@ -358,6 +359,20 @@ const DictationPage: React.FC = (): JSX.Element => { ] ); + const sortIconClass = ( + currentParam: SortableColumnType, + currentDirection: DirectionType, + column: SortableColumnType + ) => { + if (currentParam !== column) { + return ""; + } + if (currentDirection === DIRECTION.DESC) { + return styles.isActiveZa; + } + return styles.isActiveAz; + }; + // 初回読み込み処理 useEffect(() => { (async () => { @@ -542,7 +557,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.JobNumber) } @@ -560,7 +579,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.Status) } @@ -579,7 +602,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.Encryption) } @@ -597,7 +624,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.AuthorId) } @@ -615,7 +646,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.WorkType) } @@ -633,7 +668,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.FileName) } @@ -651,7 +690,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.FileLength) } @@ -669,7 +712,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.FileSize) } @@ -687,7 +734,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn( SORTABLE_COLUMN.RecordingStartedDate @@ -709,7 +760,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn( SORTABLE_COLUMN.RecordingFinishedDate @@ -731,7 +786,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn(SORTABLE_COLUMN.UploadDate) } @@ -749,7 +808,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn( SORTABLE_COLUMN.TranscriptionStartedDate @@ -771,7 +834,11 @@ const DictationPage: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} updateSortColumn( SORTABLE_COLUMN.TranscriptionFinishedDate diff --git a/dictation_client/src/styles/app.module.scss b/dictation_client/src/styles/app.module.scss index a604774..6545500 100644 --- a/dictation_client/src/styles/app.module.scss +++ b/dictation_client/src/styles/app.module.scss @@ -113,6 +113,10 @@ body { line-height: 1; } +a { + cursor: pointer; +} + ol, ul { list-style: none; diff --git a/dictation_client/src/styles/app.module.scss.d.ts b/dictation_client/src/styles/app.module.scss.d.ts index a2e3b07..3d79c3e 100644 --- a/dictation_client/src/styles/app.module.scss.d.ts +++ b/dictation_client/src/styles/app.module.scss.d.ts @@ -87,7 +87,7 @@ declare const classNames: { readonly isDisable: "isDisable"; readonly icCheckCircle: "icCheckCircle"; readonly icInTable: "icInTable"; - readonly svg: "svg"; + readonly 'svg"': 'svg"'; readonly history: "history"; readonly cardHistory: "cardHistory"; readonly partner: "partner";