diff --git a/src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.html b/src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.html index ffeaafdec9ab5fe17021e55f2fb99e953b5ba22f..3b7814871f7e24c014aec2fc108c44af6750541f 100644 --- a/src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.html +++ b/src/app/features/deposit/components/dialogs/deposit-file-detail/deposit-file-detail.dialog.html @@ -91,7 +91,7 @@ <mat-list-item> <div class="item-content"> <span class="key">{{'deposit.file.detail.data.fileSize' | translate}}</span> - <span class="value">{{data.fileSize}}</span> + <span class="value">{{data.fileSize | filesize}}</span> </div> </mat-list-item> <mat-divider></mat-divider> diff --git a/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.html b/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.html index 642a2685c07dd6d142737341d9be51c65d7c093d..4179b790389992478ae5fb7f2e8698e866af82a7 100644 --- a/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.html +++ b/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.html @@ -60,6 +60,7 @@ </a> </div> <div class="right-part"> + <span>{{depositDataFile.fileSize | filesize}}</span> <div class="flex-space-guard"> <button *ngIf="isInError()" mat-icon-button diff --git a/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.scss b/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.scss index 697ea16fc4c2f66836b90bf9f8cd5220bdaeb3e5..633da847a54e99c6093d945681b298258c0b38fc 100644 --- a/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.scss +++ b/src/app/features/deposit/components/presentationals/deposit-file/deposit-file.presentational.scss @@ -100,7 +100,7 @@ $progress-bar-height: 20px; &.is-uploaded { .right-part { - width: 135px; + width: 150px; display: flex; justify-content: space-between; align-items: center; diff --git a/src/app/shared/pipes/file-size.pipe.ts b/src/app/shared/pipes/file-size.pipe.ts index 1f91b1ef7549feadb1e3f6755272e81f58d6975c..3fa9bd0959a3c5e036728d59ab619eb36d4787b2 100644 --- a/src/app/shared/pipes/file-size.pipe.ts +++ b/src/app/shared/pipes/file-size.pipe.ts @@ -8,7 +8,25 @@ import {SharedAbstractPipe} from "@app/shared/pipes/shared-abstract/shared-abstr name: "filesize", }) export class FileSizePipe extends SharedAbstractPipe implements PipeTransform { - transform(size: number, extension: string = "MB"): string { - return (size / (1024 * 1024)).toFixed(2) + extension; + transform(size: number): string { + let extension: string; + let newSize: number; + if (size < 1024) { + newSize = size; + extension = "B"; + } else if (size < 1048576) { + newSize = size / 1024; + extension = "KB"; + } else if (size < 1073741824) { + newSize = size / 1048576; + extension = "MB"; + } else if (size < 1099511627776) { + newSize = size / 1.073741824; + extension = "GB"; + } else { + newSize = size / 1.099511627776; + extension = "TB"; + } + return newSize.toFixed(2) + extension; } }