Skip to content

Implemented application table column selection #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 5, 2023
Merged

Implemented application table column selection #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8da6fca
Fixed routing of gateway list + fixed memory leak by unsubscribing pr…
fcv-iteratorIt Oct 5, 2023
0cc25c9
Fixed routing errors in gateway list
fcv-iteratorIt Nov 9, 2023
618d6d3
Changed mqtt datatarget topic placeholder + added tooltip
fcv-iteratorIt Nov 10, 2023
d152bee
Added additional text changes from Product Owner
fcv-iteratorIt Nov 15, 2023
2eba477
Removed maxLenght from device AND gateway EUI, now removes non-hex di…
fcv-iteratorIt Nov 15, 2023
4b7510e
Added sticky to name column on gateway status table
fcv-iteratorIt Nov 17, 2023
8aa035c
Implemented application table column selection
fcv-iteratorIt Nov 22, 2023
1ec5bf4
Removed unused controller name from select
fcv-iteratorIt Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/applications/application.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { ApplicationStatus } from './enums/status.enum';
import { IotDevice } from './iot-devices/iot-device.model';
import { ApplicationDeviceType } from './models/application-device-type.model';
import { PermissionResponse } from '@app/admin/permission/permission.model';
import { Datatarget } from '@applications/datatarget/datatarget.model';

export class Application {
public id: number;
Expand Down Expand Up @@ -33,6 +34,7 @@ export class Application {
public deviceTypes?: ApplicationDeviceType[];
public permissions: PermissionResponse[];
public permissionIds: number[];
public dataTargets: Datatarget[];
}

export class ApplicationRequest {
Expand Down
148 changes: 139 additions & 9 deletions src/app/applications/applications-list/applications-table/applications-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
<div class="select-container">
<mat-select
class="form-control table-select"
multiple="true"
[(value)]="optionalColumnsSelected"
(selectionChange)="handleColumnSelection($event)"
panelClass="tall"
>
<mat-option disabled>
<button
mat-raised-button
class="mat-primary fill text-sm"
(click)="selectAll()">
{{'QUESTION.DATATARGET.SELECTALLDEVICES' | translate}}
</button>
<button
mat-raised-button
class="mat-primary fill text-sm"
(click)="deSelectAll()">
{{'QUESTION.DATATARGET.DESELECTALLDEVICES' | translate}}
</button>
</mat-option>
<mat-option *ngFor="let option of optionalColumnOptions" [value]="option.id">
{{option.display | translate}}
</mat-option>
</mat-select>
</div>

<div class="mat-elevation-z8">
<div class="loading-shade" *ngIf="isLoadingResults">
<mat-spinner *ngIf="isLoadingResults"></mat-spinner>
Expand All @@ -8,16 +36,34 @@
</div>

<table mat-table [dataSource]="data" class="example-table" matSort matSortActive="name" matSortDisableClear
matSortDirection="asc">
matSortDirection="asc">

<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-6">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-2">
{{ 'APPLICATION-TABLE.NAME' | translate }}
</th>
<td mat-cell *matCellDef="let element">
<a [routerLink]="['/applications', element.id]" routerLinkActive="active"
class="application-link">{{element.name}}</a>
class="application-link">{{element.name}}</a>
</td>
</ng-container>

<ng-container matColumnDef="owner">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.OWNER' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{application.owner ?? '-'}}
</td>
</ng-container>

<ng-container matColumnDef="contactPerson">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.CONTACT-PERSON' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{application.contactPerson ?? '-'}}
</td>
</ng-container>

Expand All @@ -26,7 +72,89 @@
<th mat-header-cell *matHeaderCellDef class="col-2">
{{ 'APPLICATION-TABLE.IOT-DEVICES' | translate }}</th>
<td mat-cell *matCellDef="let element">
{{element ?.iotDevices?.length ? element?.iotDevices?.length : 0}}
{{element?.iotDevices?.length ?? 0}}
</td>
</ng-container>

<ng-container matColumnDef="dataTargets">
<th mat-header-cell *matHeaderCellDef class="col-1">
{{ 'APPLICATION-TABLE.DATA-TARGETS' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{application?.dataTargets?.length ?? 0}}
</td>
</ng-container>

<ng-container matColumnDef="openDataDkEnabled">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{ 'APPLICATION-TABLE.OPEN-DATA-DK' | translate }}
</th>
<td mat-cell *matCellDef="let application">
{{isOpenDataDK(application.dataTargets) | yesNo}}
</td>
</ng-container>

<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.STATUS' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{'APPLICATION.STATUS.' + application.status | translate}}
</td>
</ng-container>

<ng-container matColumnDef="personalData">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.PERSONAL-DATA' | translate}}
</th>
<td mat-cell *matCellDef="let application">
<fa-icon *ngIf="application.personalData" [icon]="faFlagIcon" class="flag-icon"></fa-icon>
{{!application.personalData ? '-' : ''}}
</td>
</ng-container>

<ng-container matColumnDef="startDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.START-DATE' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{(application.startDate | dateOnly) ?? '-'}}
</td>
</ng-container>

<ng-container matColumnDef="endDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header class="col-1">
{{'APPLICATION-TABLE.END-DATE' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{(application.endDate | dateOnly) ?? '-'}}
</td>
</ng-container>

<ng-container matColumnDef="category">
<th mat-header-cell *matHeaderCellDef class="col-1">
{{'APPLICATION-TABLE.CATEGORY' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{application.category ?? '-'}}
</td>
</ng-container>

<ng-container matColumnDef="controlledProperties">
<th mat-header-cell *matHeaderCellDef class="col-1">
{{'APPLICATION-TABLE.CONTROLLED-PROPERTIES' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{mapControlledProperties(application.controlledProperties) ?? '-'}}
</td>
</ng-container>

<ng-container matColumnDef="deviceTypes">
<th mat-header-cell *matHeaderCellDef class="col-1">
{{'APPLICATION-TABLE.DEVICE-TYPES' | translate}}
</th>
<td mat-cell *matCellDef="let application">
{{mapDeviceTypes(application.deviceTypes) ?? '-'}}
</td>
</ng-container>

Expand All @@ -36,26 +164,28 @@
<td mat-cell *matCellDef="let element">
<div class="dropdown" *ngIf="element?.id | canEditApplication">
<a href="#" role="button" id="tableRowDropdown-{{element.id}}" class="applicationRow__edit dropdown-toggle"
data-toggle="dropdown" aria-expanded="false"
[attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
data-toggle="dropdown" aria-expanded="false"
[attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
<ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
<li class="dropdown-item">
<a (click)="navigateToEditPage(element.id)"
routerLinkActive="active">{{ 'APPLICATION-TABLE-ROW.EDIT' | translate }}</a>
routerLinkActive="active">{{ 'APPLICATION-TABLE-ROW.EDIT' | translate }}</a>
</li>
<li class="dropdown-item">
<a (click)="deleteApplication(element.id)"
[routerLink]="[]">{{ 'APPLICATION-TABLE-ROW.DELETE' | translate }}</a>
[routerLink]="[]">{{ 'APPLICATION-TABLE-ROW.DELETE' | translate }}</a>
</li>
</ul>
</div>
</td>
</ng-container>

<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
</div>

<mat-paginator [length]="resultsLength" [pageSizeOptions]="pageSizeOptions" [pageSize]="pageSize" showFirstLastButtons>
<mat-paginator [length]="resultsLength" [pageSizeOptions]="pageSizeOptions" [pageSize]="pageSize"
showFirstLastButtons>
</mat-paginator>
</div>
27 changes: 15 additions & 12 deletions src/app/applications/applications-list/applications-table/applications-table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// .example-loading-shade {
// position: absolute;
// top: 0;
// left: 0;
// bottom: 0;
// right: 0;
// background: rgba(0, 0, 0, 0.15);
// z-index: 1;
// display: flex;
// align-items: center;
// justify-content: center;
// }
.table-select {
width: 180px;
margin: 5px;

}

.select-container {
display: flex;
flex-direction: row;
justify-content: flex-end;
}

.flag-icon {
color: red;
}
Loading