Merged PR 618: 画面修正（第５のライセンス一覧の項目順を変更）
## 概要 [Task3271: 画面修正（第５のライセンス一覧の項目順を変更）](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3271) - 何をどう変更したか、追加したライブラリなど - 項目の配置を変更 - License Inventory→Number of unused licenses→Number of licenses available for reuse→Number of licenses allocatedの順で修正 - Total number of licenses on orderをlicense情報の一番下に配置 - 不要な項目を削除 - Total number of orderを削除 - レイアウトを最新のものに適用 - このPull Requestでの対象/対象外 項目名の変更は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/Task3271?csf=1&web=1&e=ac0SrH ## 動作確認状況 - ローカルで確認
This commit is contained in:
水本 祐希
parent
375e8e87a8
commit
8fe649cb7f
@ -121,9 +121,9 @@ export const LicenseSummary: React.FC<LicenseSummaryProps> = (
|
||||
</h1>
|
||||
</div>
|
||||
<section className={styles.license}>
|
||||
<div>
|
||||
<div className={styles.boxFlex}>
|
||||
<h2 className="">{companyName}</h2>
|
||||
<ul className={styles.menuAction}>
|
||||
<ul className={`${styles.menuAction} ${styles.box100}`}>
|
||||
<li>
|
||||
{/* 他アカウントのライセンス情報を見ている場合は、前画面に戻る用のreturnボタンを表示 */}
|
||||
{selectedRow && (
|
||||
@ -194,99 +194,133 @@ export const LicenseSummary: React.FC<LicenseSummaryProps> = (
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<dl className={`${styles.listVertical} ${styles.marginBtm5}`}>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.totalLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.totalLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.allocatedLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.allocatedLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.reusableLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.reusableLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID("LicenseSummaryPage.label.freeLicense")
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.freeLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.expiringWithin14daysLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.expiringWithin14daysLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.issueRequesting"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.issueRequesting}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.numberOfRequesting"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.numberOfRequesting}</dd>
|
||||
<dt>
|
||||
{t(getTranslationID("LicenseSummaryPage.label.shortage"))}
|
||||
</dt>
|
||||
<dd>
|
||||
<span
|
||||
className={
|
||||
licenseSummaryInfo.shortage > 0 ? styles.isAlert : ""
|
||||
}
|
||||
>
|
||||
{licenseSummaryInfo.shortage}
|
||||
</span>
|
||||
</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID("LicenseSummaryPage.label.storageSize")
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.storageSize}GB</dd>
|
||||
<dt>
|
||||
{t(getTranslationID("LicenseSummaryPage.label.usedSize"))}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.usedSize}GB</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.storageAvailable"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>
|
||||
{licenseSummaryInfo.isStorageAvailable && (
|
||||
<img src={block} alt="" className={styles.icInTable} />
|
||||
)}
|
||||
{!licenseSummaryInfo.isStorageAvailable && (
|
||||
<img src={circle} alt="" className={styles.icInTable} />
|
||||
)}
|
||||
</dd>
|
||||
</dl>
|
||||
<div className={styles.marginRgt3}>
|
||||
<dl
|
||||
className={`${styles.listVertical} ${styles.marginBtm3}`}
|
||||
>
|
||||
<h4 className={styles.listHeader}>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.licenseLabel"
|
||||
)
|
||||
)}
|
||||
</h4>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.totalLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.totalLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.freeLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.freeLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.reusableLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.reusableLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.allocatedLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.allocatedLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.expiringWithin14daysLicense"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.expiringWithin14daysLicense}</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID("LicenseSummaryPage.label.shortage")
|
||||
)}
|
||||
</dt>
|
||||
<dd>
|
||||
<span
|
||||
className={
|
||||
licenseSummaryInfo.shortage > 0
|
||||
? styles.isAlert
|
||||
: ""
|
||||
}
|
||||
>
|
||||
{licenseSummaryInfo.shortage}
|
||||
</span>
|
||||
</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.issueRequesting"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.issueRequesting}</dd>
|
||||
</dl>
|
||||
</div>
|
||||
<div>
|
||||
<dl
|
||||
className={`${styles.listVertical} ${styles.marginBtm3}`}
|
||||
>
|
||||
<h4 className={styles.listHeader}>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.storageLabel"
|
||||
)
|
||||
)}
|
||||
</h4>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.storageSize"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.storageSize}GB</dd>
|
||||
<dt>
|
||||
{t(
|
||||
getTranslationID("LicenseSummaryPage.label.usedSize")
|
||||
)}
|
||||
</dt>
|
||||
<dd>{licenseSummaryInfo.usedSize}GB</dd>
|
||||
<dt className={styles.overLine}>
|
||||
{t(
|
||||
getTranslationID(
|
||||
"LicenseSummaryPage.label.storageAvailable"
|
||||
)
|
||||
)}
|
||||
</dt>
|
||||
<dd>
|
||||
{licenseSummaryInfo.isStorageAvailable && (
|
||||
<img
|
||||
src={block}
|
||||
alt=""
|
||||
className={styles.icInTable}
|
||||
/>
|
||||
)}
|
||||
{!licenseSummaryInfo.isStorageAvailable && (
|
||||
<img
|
||||
src={circle}
|
||||
alt=""
|
||||
className={styles.icInTable}
|
||||
/>
|
||||
)}
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -180,7 +180,9 @@
|
||||
"shortage": "Mangel",
|
||||
"storageSize": "Lagerung verfügbar",
|
||||
"usedSize": "Gebrauchter Lagerung",
|
||||
"storageAvailable": "Speicher nicht verfügbar (Menge überschritten)"
|
||||
"storageAvailable": "Speicher nicht verfügbar (Menge überschritten)",
|
||||
"licenseLabel": "(de)License",
|
||||
"storageLabel": "(de)Storage"
|
||||
}
|
||||
},
|
||||
"licenseOrderPage": {
|
||||
@ -532,10 +534,10 @@
|
||||
"title": "(de)Terms of Use has updated. Please confirm again.",
|
||||
"linkOfEula": "(de)Click here to read the terms of use.",
|
||||
"linkOfDpa": "(de)Click here to read the terms of use.",
|
||||
"linkOfPrivacyNotice": "(de)Click here to read the terms of use.",
|
||||
"checkBoxForConsent": "(de)Yes, I agree to the terms of use.",
|
||||
"forOdds": "(de)for ODDS.",
|
||||
"button": "(de)Continue"
|
||||
"button": "(de)Continue",
|
||||
"linkOfPrivacyNotice": "(de)Click here to read the terms of use."
|
||||
}
|
||||
},
|
||||
"supportPage": {
|
||||
|
||||
@ -180,7 +180,9 @@
|
||||
"shortage": "Shortage",
|
||||
"storageSize": "Storage Available",
|
||||
"usedSize": "Storage Used",
|
||||
"storageAvailable": "Storage Unavailable (Exceeded Amount)"
|
||||
"storageAvailable": "Storage Unavailable (Exceeded Amount)",
|
||||
"licenseLabel": "License",
|
||||
"storageLabel": "Storage"
|
||||
}
|
||||
},
|
||||
"licenseOrderPage": {
|
||||
@ -532,10 +534,10 @@
|
||||
"title": "Terms of Use has updated. Please confirm again.",
|
||||
"linkOfEula": "Click here to read the terms of use.",
|
||||
"linkOfDpa": "Click here to read the terms of use.",
|
||||
"linkOfPrivacyNotice": "Click here to read the terms of use.",
|
||||
"checkBoxForConsent": "Yes, I agree to the terms of use.",
|
||||
"forOdds": "for ODDS.",
|
||||
"button": "Continue"
|
||||
"button": "Continue",
|
||||
"linkOfPrivacyNotice": "Click here to read the terms of use."
|
||||
}
|
||||
},
|
||||
"supportPage": {
|
||||
|
||||
@ -180,7 +180,9 @@
|
||||
"shortage": "Escasez",
|
||||
"storageSize": "Almacenamiento disponible",
|
||||
"usedSize": "Almacenamiento utilizado",
|
||||
"storageAvailable": "Almacenamiento no disponible (cantidad excedida)"
|
||||
"storageAvailable": "Almacenamiento no disponible (cantidad excedida)",
|
||||
"licenseLabel": "(es)License",
|
||||
"storageLabel": "(es)Storage"
|
||||
}
|
||||
},
|
||||
"licenseOrderPage": {
|
||||
@ -532,10 +534,10 @@
|
||||
"title": "(es)Terms of Use has updated. Please confirm again.",
|
||||
"linkOfEula": "(es)Click here to read the terms of use.",
|
||||
"linkOfDpa": "(es)Click here to read the terms of use.",
|
||||
"linkOfPrivacyNotice": "(es)Click here to read the terms of use.",
|
||||
"checkBoxForConsent": "(es)Yes, I agree to the terms of use.",
|
||||
"forOdds": "(es)for ODDS.",
|
||||
"button": "(es)Continue"
|
||||
"button": "(es)Continue",
|
||||
"linkOfPrivacyNotice": "(es)Click here to read the terms of use."
|
||||
}
|
||||
},
|
||||
"supportPage": {
|
||||
|
||||
@ -180,7 +180,9 @@
|
||||
"shortage": "Pénurie",
|
||||
"storageSize": "Stockage disponible",
|
||||
"usedSize": "Stockage utilisé",
|
||||
"storageAvailable": "Stockage indisponible (montant dépassée)"
|
||||
"storageAvailable": "Stockage indisponible (montant dépassée)",
|
||||
"licenseLabel": "(fr)License",
|
||||
"storageLabel": "(fr)Storage"
|
||||
}
|
||||
},
|
||||
"licenseOrderPage": {
|
||||
@ -532,10 +534,10 @@
|
||||
"title": "(fr)Terms of Use has updated. Please confirm again.",
|
||||
"linkOfEula": "(fr)Click here to read the terms of use.",
|
||||
"linkOfDpa": "(fr)Click here to read the terms of use.",
|
||||
"linkOfPrivacyNotice": "(fr)Click here to read the terms of use.",
|
||||
"checkBoxForConsent": "(fr)Yes, I agree to the terms of use.",
|
||||
"forOdds": "(fr)for ODDS.",
|
||||
"button": "(fr)Continue"
|
||||
"button": "(fr)Continue",
|
||||
"linkOfPrivacyNotice": "(fr)Click here to read the terms of use."
|
||||
}
|
||||
},
|
||||
"supportPage": {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user