philorg/gisaf-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix authorization in many places (use async)

Browse source 
Admin basket: Fix display
This commit is contained in:
phil 2024-03-26 12:06:22 +05:30
parent 339d8f2210
commit 909e250fe9
26 changed files with 121 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/admin/admin-basket/basket.component.html
View file

@ -59,7 +59,7 @@
<ng-container matColumnDef="time">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Import time</th>
<td mat-cell *matCellDef="let item">{{ isDate(item.time) ? (item.time | date:'dd/MM/yyyy, HH:mm:ss') : 'never' }}</td>
<td mat-cell *matCellDef="let item">{{ item.time | date:'dd/MM/yyyy, HH:mm:ss' }}</td>
</ng-container>
<ng-container matColumnDef="url">
@ -74,17 +74,17 @@
<ng-container matColumnDef="project">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Project</th>
<td mat-cell *matCellDef="let item">{{ item.project }}</td>
<td mat-cell *matCellDef="let item">{{ adminDataService.projectMap.get(item.project_id).name }}</td>
</ng-container>
<ng-container matColumnDef="surveyor">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Surveyor</th>
<td mat-cell *matCellDef="let item">{{ item.surveyor }}</td>
<td mat-cell *matCellDef="let item">{{ adminDataService.surveyorMap.get(item.surveyor_id).name }}</td>
</ng-container>
<ng-container matColumnDef="equipment">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Equipment</th>
<td mat-cell *matCellDef="let item">{{ item.equipment }}</td>
<td mat-cell *matCellDef="let item">{{ adminDataService.equipmentMap.get(item.equipment_id).name }}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="getColumns();sticky:true"></tr>

3
src/app/admin/admin-basket/data.service.ts
View file

@ -5,8 +5,7 @@ import { map } from 'rxjs/operators'
// import { Apollo, gql } from 'apollo-angular'
import { Project } from '../admin-data.service'
import { AdminService, AdminBasket, BasketNameOnly } from '../../openapi'
import { AdminService, AdminBasket, BasketNameOnly, Project } from '../../openapi'
export class AdminBasketFile {
constructor(