diff --git a/src/app/workspace-admin/files/files.component.html b/src/app/workspace-admin/files/files.component.html index d376b64f8852f70ac9769a395a98c871a9dfdc0b..e1bfe20af0304cc69e12a5574bedd6594368d54e 100644 --- a/src/app/workspace-admin/files/files.component.html +++ b/src/app/workspace-admin/files/files.component.html @@ -13,7 +13,7 @@ <ng-container matColumnDef="typelabel"> <mat-header-cell *matHeaderCellDef mat-sort-header> Typ </mat-header-cell> - <mat-cell *matCellDef="let element">{{element.typelabel}}</mat-cell> + <mat-cell *matCellDef="let element">{{typeLabels[element.type]}}</mat-cell> </ng-container> <ng-container matColumnDef="filename"> @@ -49,16 +49,16 @@ <ng-container matColumnDef="filedatetime"> <mat-header-cell *matHeaderCellDef mat-sort-header class="datecell"> Datum </mat-header-cell> - <mat-cell *matCellDef="let element" class="datecell"> {{element.filedatetimestr}} </mat-cell> + <mat-cell *matCellDef="let element" class="datecell"> + {{(element.filedatetime * 1000) | date: 'd.M.yy hh:mm'}} + </mat-cell> </ng-container> <ng-container matColumnDef="filesize"> <mat-header-cell *matHeaderCellDef mat-sort-header> Größe </mat-header-cell> <mat-cell *matCellDef="let element"> - {{element.filesizestr}} - <span *ngIf="element.info.totalSize"> - / {{element.info.totalSize | bytes }} - </span> + {{element.filesize | bytes}} + <span *ngIf="element.info.totalSize"> (Komplett: {{element.info.totalSize | bytes }})</span> </mat-cell> </ng-container> diff --git a/src/app/workspace-admin/files/files.component.ts b/src/app/workspace-admin/files/files.component.ts index 8bfd5e1768feb41ee93d246fa7a164aba2a5db39..b1c9c6869cb7943c16f301ccf6186ad90f18a31d 100644 --- a/src/app/workspace-admin/files/files.component.ts +++ b/src/app/workspace-admin/files/files.component.ts @@ -45,6 +45,14 @@ export class FilesComponent implements OnInit { public checkWarnings = []; public checkInfos = []; + public typeLabels = { + 'Testtakers': 'Teilnehmerliste', + 'Booklet': 'Testheft', + 'SysCheck': 'Systemcheck', + 'Resource': 'Resource', + 'Unit': 'Unit' + } + @ViewChild(MatSort, { static: true }) sort: MatSort; public fileStats: FileStats = { types: {}, diff --git a/src/app/workspace-admin/workspace.interfaces.ts b/src/app/workspace-admin/workspace.interfaces.ts index aeb16634a0cac9dfefc75a4ee5c388ef382df792..a5c747ec132fb2eac2eab5cb31b1fa43492d5bbf 100644 --- a/src/app/workspace-admin/workspace.interfaces.ts +++ b/src/app/workspace-admin/workspace.interfaces.ts @@ -7,11 +7,8 @@ export interface WorkspaceData { export interface GetFileResponseData { filename: string; filesize: number; - filesizestr: string; filedatetime: string; - filedatetimestr: string; type: string; - typelabel: string; isChecked: boolean; report: { error: string[];