From c3750e3c1c2d26dd782bf86c5f82d2d5af282a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E6=9C=AC=20=E7=A5=90=E5=B8=8C?= Date: Tue, 28 Nov 2023 06:35:56 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20591:=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task3158: 修正対応](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3158) - 何をどう変更したか、追加したライブラリなど shotageの値が1以上の場合、赤文字になる ## UIの変更 - Before/Afterのスクショなど - スクショ置き場 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/Task3158?csf=1&web=1&e=3qaLfD ## 動作確認状況 - ローカルで確認 --- .../src/pages/LicensePage/licenseSummary.tsx | 10 +++++++++- .../src/pages/LicensePage/partnerLicense.tsx | 14 +++++++++++--- dictation_client/src/styles/app.module.scss | 3 +++ dictation_client/src/styles/app.module.scss.d.ts | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dictation_client/src/pages/LicensePage/licenseSummary.tsx b/dictation_client/src/pages/LicensePage/licenseSummary.tsx index ff299b9..44bb696 100644 --- a/dictation_client/src/pages/LicensePage/licenseSummary.tsx +++ b/dictation_client/src/pages/LicensePage/licenseSummary.tsx @@ -248,7 +248,15 @@ export const LicenseSummary: React.FC = (
{t(getTranslationID("LicenseSummaryPage.label.shortage"))}
-
{licenseSummaryInfo.shortage}
+
+ 0 ? styles.isAlert : "" + } + > + {licenseSummaryInfo.shortage} + +
{t( getTranslationID("LicenseSummaryPage.label.storageSize") diff --git a/dictation_client/src/pages/LicensePage/partnerLicense.tsx b/dictation_client/src/pages/LicensePage/partnerLicense.tsx index f136481..51e6115 100644 --- a/dictation_client/src/pages/LicensePage/partnerLicense.tsx +++ b/dictation_client/src/pages/LicensePage/partnerLicense.tsx @@ -385,9 +385,17 @@ const PartnerLicense: React.FC = (): JSX.Element => { {ownPartnerLicenseInfo.issuedRequested} - {ownPartnerLicenseInfo.tier !== 1 - ? ownPartnerLicenseInfo.shortage - : "-"} + 0 + ? styles.isAlert + : "" + } + > + {ownPartnerLicenseInfo.tier !== 1 + ? ownPartnerLicenseInfo.shortage + : "-"} + {ownPartnerLicenseInfo.tier !== 1 diff --git a/dictation_client/src/styles/app.module.scss b/dictation_client/src/styles/app.module.scss index 8d64ef1..a1ff500 100644 --- a/dictation_client/src/styles/app.module.scss +++ b/dictation_client/src/styles/app.module.scss @@ -901,6 +901,9 @@ h3 + .brCrumb .tlIcon { text-align: right; word-break: break-all; } +.listVertical dd .isAlert { + color: #ff5a33; +} .listDocument { margin-bottom: 3rem; } diff --git a/dictation_client/src/styles/app.module.scss.d.ts b/dictation_client/src/styles/app.module.scss.d.ts index a9c42a8..c4b1492 100644 --- a/dictation_client/src/styles/app.module.scss.d.ts +++ b/dictation_client/src/styles/app.module.scss.d.ts @@ -49,6 +49,7 @@ declare const classNames: { readonly formTrash: "formTrash"; readonly listVertical: "listVertical"; readonly listHeader: "listHeader"; + readonly isAlert: "isAlert"; readonly listDocument: "listDocument"; readonly boxFlex: "boxFlex"; readonly aru: "aru"; @@ -84,7 +85,6 @@ declare const classNames: { readonly widthSml: "widthSml"; readonly widthMin: "widthMin"; readonly snackbar: "snackbar"; - readonly isAlert: "isAlert"; readonly snackbarMessage: "snackbarMessage"; readonly snackbarIcon: "snackbarIcon"; readonly snackbarIconClose: "snackbarIconClose";