moved the grid columns around

pull/3539/head
Jamie Rees 5 years ago
parent 7a9d22e43c
commit 4cd4a1ef50

@ -31,15 +31,16 @@
<table mat-table [dataSource]="dataSource" class="table" matSort [matSortActive]="defaultSort" matSortDisableClear [matSortDirection]="defaultOrder"> <table mat-table [dataSource]="dataSource" class="table" matSort [matSortActive]="defaultSort" matSortDisableClear [matSortDirection]="defaultOrder">
<ng-container matColumnDef="title">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestsTitle' | translate}} </th>
<td mat-cell *matCellDef="let element"> {{element.title}} ({{element.releaseDate | amLocal | amDateFormat: 'YYYY'}}) </td>
</ng-container>
<ng-container matColumnDef="requestedUser.requestedBy"> <ng-container matColumnDef="requestedUser.requestedBy">
<th mat-header-cell *matHeaderCellDef> {{'Requests.RequestedBy' | translate}} </th> <th mat-header-cell *matHeaderCellDef> {{'Requests.RequestedBy' | translate}} </th>
<td mat-cell *matCellDef="let element"> {{element.requestedUser?.userAlias}} </td> <td mat-cell *matCellDef="let element"> {{element.requestedUser?.userAlias}} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="title">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestsTitle' | translate}} </th>
<td mat-cell *matCellDef="let element"> {{element.title}} ({{element.releaseDate | amLocal | amDateFormat: 'YYYY'}}) </td>
</ng-container>
<ng-container matColumnDef="requestedDate"> <ng-container matColumnDef="requestedDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestDate' | translate}} </th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestDate' | translate}} </th>

@ -32,7 +32,7 @@
<ng-container matColumnDef="series"> <ng-container matColumnDef="series">
<th mat-header-cell *matHeaderCellDef> {{'Requests.Series' | translate}} </th> <th mat-header-cell *matHeaderCellDef> {{'Requests.RequestsTitle' | translate}} </th>
<td mat-cell *matCellDef="let element"> {{element.parentRequest.title}} </td> <td mat-cell *matCellDef="let element"> {{element.parentRequest.title}} </td>
</ng-container> </ng-container>
@ -41,15 +41,6 @@
<td mat-cell *matCellDef="let element"> {{element.requestedUser.userAlias}} </td> <td mat-cell *matCellDef="let element"> {{element.requestedUser.userAlias}} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef> {{'Requests.Status' | translate}} </th>
<td mat-cell *matCellDef="let element">
{{element.parentRequest.status}}
</td>
</ng-container>
<ng-container matColumnDef="requestedDate"> <ng-container matColumnDef="requestedDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{'Requests.RequestDate' | translate}} </th> <th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{'Requests.RequestDate' | translate}} </th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
@ -67,6 +58,13 @@
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef> {{'Requests.Status' | translate}} </th>
<td mat-cell *matCellDef="let element">
{{element.parentRequest.status}}
</td>
</ng-container>
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef> </th> <th mat-header-cell *matHeaderCellDef> </th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">

@ -162,8 +162,7 @@
"RequestsToDisplay": "Requests to display", "RequestsToDisplay": "Requests to display",
"RequestsTitle": "Title", "RequestsTitle": "Title",
"Details": "Details", "Details": "Details",
"Options": "Options", "Options": "Options"
"Series": "Series"
}, },
"Issues": { "Issues": {
"Title": "Issues", "Title": "Issues",

Loading…
Cancel
Save