From 169c0bbc581452fb3ba728a6253f68917e824df4 Mon Sep 17 00:00:00 2001
From: Max Ehrlicher-Schmidt <maxes2000@t-online.de>
Date: Tue, 1 Dec 2020 23:58:36 +0100
Subject: [PATCH] Add icons to pages and tables

---
 src/app/app.component.ts                      |  4 +--
 .../data-page/data-page.component.html        |  3 ++-
 .../data-page/data-page.component.scss        |  8 ++++++
 .../data-page/data-page.component.ts          |  3 +++
 src/app/components/table/table.component.html |  1 +
 src/app/components/table/table.component.scss |  6 +++++
 src/app/components/table/table.component.ts   |  4 +++
 .../pages/dataPages/bike/bike.component.html  |  1 +
 .../pages/dataPages/bike/bike.component.ts    |  1 +
 .../lending-station.component.html            |  1 +
 .../lending-station.component.ts              |  7 +++---
 .../pages/tables/bikes/bikes.component.html   |  1 +
 src/app/pages/tables/bikes/bikes.component.ts |  9 ++++++-
 .../engagement-types.component.spec.ts        | 25 -------------------
 .../equipment-types.component.html            |  1 +
 .../equipment-types.component.ts              |  1 +
 .../tables/equipment/equipment.component.html |  1 +
 .../tables/equipment/equipment.component.ts   |  1 +
 .../lending-stations.component.html           |  1 +
 .../lending-stations.component.ts             |  1 +
 .../time-frames/time-frames.component.html    |  1 +
 .../time-frames/time-frames.component.ts      |  1 +
 22 files changed, 50 insertions(+), 32 deletions(-)
 delete mode 100644 src/app/pages/tables/engagement-types/engagement-types.component.spec.ts

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 40ddd87..18cb82e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -29,7 +29,7 @@ export class AppComponent {
       children: [
         {
           displayName: 'Lastenräder',
-          iconName: 'group',
+          iconName: 'directions_bike',
           route: 'table/bikes'
         },
         {
@@ -39,7 +39,7 @@ export class AppComponent {
         },
         {
           displayName: 'Standorte',
-          iconName: 'group',
+          iconName: 'place',
           route: 'table/lendingStations'
         }]
       }];
diff --git a/src/app/components/data-page/data-page.component.html b/src/app/components/data-page/data-page.component.html
index 867f760..e2ff041 100644
--- a/src/app/components/data-page/data-page.component.html
+++ b/src/app/components/data-page/data-page.component.html
@@ -8,8 +8,9 @@
 </div>
 
 <div class="data-page-wrapper" *ngIf="data">
-  <h1>
+  <h1 class="headline">
     {{ data[headlineDataPath] }}
+    <mat-icon>{{headlineIconName}}</mat-icon>
   </h1>
   <ng-container *ngFor="let object of propertiesInfo">
     <mat-card class="inline-card" *ngIf="object.type === 'Group'">
diff --git a/src/app/components/data-page/data-page.component.scss b/src/app/components/data-page/data-page.component.scss
index a4e4b8a..c3961fe 100644
--- a/src/app/components/data-page/data-page.component.scss
+++ b/src/app/components/data-page/data-page.component.scss
@@ -29,3 +29,11 @@
   top: 2em;
   right: 2em;
 }
+
+.headline {
+  display: flex;
+  align-items: center;
+  .mat-icon {
+    margin-left: 8px;
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/data-page/data-page.component.ts b/src/app/components/data-page/data-page.component.ts
index f0c8af6..160decb 100644
--- a/src/app/components/data-page/data-page.component.ts
+++ b/src/app/components/data-page/data-page.component.ts
@@ -47,9 +47,12 @@ export class DataPageComponent implements OnInit, OnDestroy {
   @Input()
   dataService: any;
 
+  /** specifies which property should be shown in the headline */
   @Input()
   headlineDataPath: string;
   @Input()
+  headlineIconName: string = "help_outline";
+  @Input()
   pageDataGQLType: string;
   @Input()
   pageDataGQLUpdateInputType: string;
diff --git a/src/app/components/table/table.component.html b/src/app/components/table/table.component.html
index cf3b86c..d151df6 100644
--- a/src/app/components/table/table.component.html
+++ b/src/app/components/table/table.component.html
@@ -1,6 +1,7 @@
 <div class="table-page-wrapper">
   <h1 class="headline" *ngIf="headline">
     {{ headline }}
+    <mat-icon>{{headlineIconName}}</mat-icon>
   </h1>
   <div class="table-control">
     <!--<button
diff --git a/src/app/components/table/table.component.scss b/src/app/components/table/table.component.scss
index 7a6475d..5c2fa34 100644
--- a/src/app/components/table/table.component.scss
+++ b/src/app/components/table/table.component.scss
@@ -3,7 +3,13 @@
   flex-direction: column;
   height: 100%;
   .headline {
+    display: flex;
+    align-items: center;
     margin: 0 0.5em;
+    margin-top: 0.25em;
+    .mat-icon {
+      margin-left: 8px;
+    }
   }
   .table-control {
     margin: 0.5em;
diff --git a/src/app/components/table/table.component.ts b/src/app/components/table/table.component.ts
index 33549a3..f86d4e1 100644
--- a/src/app/components/table/table.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -29,8 +29,12 @@ import { SelectObjectDialogComponent } from '../tableComponents/select-object-di
   styleUrls: ['./table.component.scss'],
 })
 export class TableComponent implements AfterViewInit {
+  /** specifies the headline */
   @Input()
   headline: string = null;
+  @Input()
+  headlineIconName: string = "help_outline";
+  
   /** this array defines the columns and translations of the table and the order they are displayed  */
   @Input()
   columnInfo: {
diff --git a/src/app/pages/dataPages/bike/bike.component.html b/src/app/pages/dataPages/bike/bike.component.html
index f84bcad..00b0f80 100644
--- a/src/app/pages/dataPages/bike/bike.component.html
+++ b/src/app/pages/dataPages/bike/bike.component.html
@@ -2,6 +2,7 @@
   [dataService]="dataService"
   [propertiesInfo]="propertiesInfo"
   [headlineDataPath]="headlineDataPath"
+  [headlineIconName]="headlineIconName"
   [pageDataGQLType]="pageDataGQLType"
   [pageDataGQLUpdateInputType]="pageDataGQLUpdateInputType"
   (lockEvent)="lock($event)"
diff --git a/src/app/pages/dataPages/bike/bike.component.ts b/src/app/pages/dataPages/bike/bike.component.ts
index ca5e223..1dec98b 100644
--- a/src/app/pages/dataPages/bike/bike.component.ts
+++ b/src/app/pages/dataPages/bike/bike.component.ts
@@ -236,6 +236,7 @@ export class BikeComponent implements OnInit {
   ];
 
   headlineDataPath = 'name';
+  headlineIconName = 'directions_bike'
   pageDataGQLType: string = 'CargoBike';
   pageDataGQLUpdateInputType: string = 'CargoBikeUpdateInput';
 
diff --git a/src/app/pages/dataPages/lending-station/lending-station.component.html b/src/app/pages/dataPages/lending-station/lending-station.component.html
index f84bcad..00b0f80 100644
--- a/src/app/pages/dataPages/lending-station/lending-station.component.html
+++ b/src/app/pages/dataPages/lending-station/lending-station.component.html
@@ -2,6 +2,7 @@
   [dataService]="dataService"
   [propertiesInfo]="propertiesInfo"
   [headlineDataPath]="headlineDataPath"
+  [headlineIconName]="headlineIconName"
   [pageDataGQLType]="pageDataGQLType"
   [pageDataGQLUpdateInputType]="pageDataGQLUpdateInputType"
   (lockEvent)="lock($event)"
diff --git a/src/app/pages/dataPages/lending-station/lending-station.component.ts b/src/app/pages/dataPages/lending-station/lending-station.component.ts
index 497ad95..b6f1b30 100644
--- a/src/app/pages/dataPages/lending-station/lending-station.component.ts
+++ b/src/app/pages/dataPages/lending-station/lending-station.component.ts
@@ -28,9 +28,7 @@ export class LendingStationComponent implements OnInit {
     {
       type: 'Group',
       title: 'Öffnungszeiten',
-      properties: [
-        
-      ],
+      properties: [],
     },
     {
       type: 'Group',
@@ -54,6 +52,7 @@ export class LendingStationComponent implements OnInit {
         },
         { dataPath: 'contactInformationIntern.email', translation: 'Email' },
         { dataPath: 'contactInformationIntern.email2', translation: 'Email 2' },
+        { dataPath: 'contactInformationIntern.note', translation: 'Anmerkung' },
       ],
     },
     {
@@ -78,6 +77,7 @@ export class LendingStationComponent implements OnInit {
         },
         { dataPath: 'contactInformationExtern.email', translation: 'Email' },
         { dataPath: 'contactInformationExtern.email2', translation: 'Email 2' },
+        { dataPath: 'contactInformationExtern.note', translation: 'Anmerkung' },
       ],
     },
     /*
@@ -118,6 +118,7 @@ export class LendingStationComponent implements OnInit {
   ];
 
   headlineDataPath = 'name';
+  headlineIconName = 'location_on';
   pageDataGQLType: string = 'LendingStation';
   pageDataGQLUpdateInputType: string = 'LendingStationUpdateInput';
 
diff --git a/src/app/pages/tables/bikes/bikes.component.html b/src/app/pages/tables/bikes/bikes.component.html
index ecca39d..8c18b6a 100644
--- a/src/app/pages/tables/bikes/bikes.component.html
+++ b/src/app/pages/tables/bikes/bikes.component.html
@@ -1,5 +1,6 @@
 <app-table
   [headline]="headline"
+  [headlineIconName]="headlineIconName"
   [columnInfo]="columnInfo"
   [dataService]="dataService"
   [tableDataGQLType]="tableDataGQLType"
diff --git a/src/app/pages/tables/bikes/bikes.component.ts b/src/app/pages/tables/bikes/bikes.component.ts
index 9338cb2..c3fce20 100644
--- a/src/app/pages/tables/bikes/bikes.component.ts
+++ b/src/app/pages/tables/bikes/bikes.component.ts
@@ -111,7 +111,13 @@ export class BikesComponent implements OnInit {
       translation: '',
     },
     { dataPath: 'lendingStation.id', translation: '' },
-    { dataPath: 'lendingStation.name', translation: '' },
+    {
+      dataPath: 'lendingStation.name',
+      translation: '',
+      link: (row: any) => {
+        return '/lendingStation/' + row['lendingStation.id'];
+      },
+    },
     { dataPath: 'lendingStation.address.number', translation: '' },
     { dataPath: 'lendingStation.address.street', translation: '' },
     { dataPath: 'lendingStation.address.zip', translation: '' },
@@ -124,6 +130,7 @@ export class BikesComponent implements OnInit {
   tableDataGQLUpdateInputType: string = 'CargoBikeUpdateInput';
 
   headline = 'Lastenräder';
+  headlineIconName = 'directions_bike';
 
   loadingRowIds: string[] = [];
   constructor(private bikesService: BikesService) {}
diff --git a/src/app/pages/tables/engagement-types/engagement-types.component.spec.ts b/src/app/pages/tables/engagement-types/engagement-types.component.spec.ts
deleted file mode 100644
index 27ddbdd..0000000
--- a/src/app/pages/tables/engagement-types/engagement-types.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EngagementTypesComponent } from './engagement-types.component';
-
-describe('EngagementTypesComponent', () => {
-  let component: EngagementTypesComponent;
-  let fixture: ComponentFixture<EngagementTypesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ EngagementTypesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EngagementTypesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/tables/equipment-types/equipment-types.component.html b/src/app/pages/tables/equipment-types/equipment-types.component.html
index fb3a5aa..a85f5f6 100644
--- a/src/app/pages/tables/equipment-types/equipment-types.component.html
+++ b/src/app/pages/tables/equipment-types/equipment-types.component.html
@@ -1,5 +1,6 @@
 <app-table
   [headline]="headline"
+  [headlineIconName]="headlineIconName"
   [columnInfo]="columnInfo"
   [dataService]="dataService"
   [tableDataGQLType]="tableDataGQLType"
diff --git a/src/app/pages/tables/equipment-types/equipment-types.component.ts b/src/app/pages/tables/equipment-types/equipment-types.component.ts
index 72bfa16..d6b0b08 100644
--- a/src/app/pages/tables/equipment-types/equipment-types.component.ts
+++ b/src/app/pages/tables/equipment-types/equipment-types.component.ts
@@ -8,6 +8,7 @@ import {EquipmentTypeService} from 'src/app/services/equipmentType.service'
 })
 export class EquipmentTypesComponent implements OnInit {
   headline = 'Equipmenttypen';
+  headlineIconName = 'toys';
 
   columnInfo = [
     { dataPath: 'id', translation: 'ID', readonly: true },
diff --git a/src/app/pages/tables/equipment/equipment.component.html b/src/app/pages/tables/equipment/equipment.component.html
index fb3a5aa..a85f5f6 100644
--- a/src/app/pages/tables/equipment/equipment.component.html
+++ b/src/app/pages/tables/equipment/equipment.component.html
@@ -1,5 +1,6 @@
 <app-table
   [headline]="headline"
+  [headlineIconName]="headlineIconName"
   [columnInfo]="columnInfo"
   [dataService]="dataService"
   [tableDataGQLType]="tableDataGQLType"
diff --git a/src/app/pages/tables/equipment/equipment.component.ts b/src/app/pages/tables/equipment/equipment.component.ts
index 14fb55a..fb202e6 100644
--- a/src/app/pages/tables/equipment/equipment.component.ts
+++ b/src/app/pages/tables/equipment/equipment.component.ts
@@ -8,6 +8,7 @@ import { EquipmentService } from 'src/app/services/equipment.service';
 })
 export class EquipmentComponent implements OnInit {
   headline = 'Equipment';
+  headlineIconName = 'battery_full';
 
   columnInfo = [
     { dataPath: 'id', translation: 'ID', readonly: true },
diff --git a/src/app/pages/tables/lending-stations/lending-stations.component.html b/src/app/pages/tables/lending-stations/lending-stations.component.html
index ecca39d..8c18b6a 100644
--- a/src/app/pages/tables/lending-stations/lending-stations.component.html
+++ b/src/app/pages/tables/lending-stations/lending-stations.component.html
@@ -1,5 +1,6 @@
 <app-table
   [headline]="headline"
+  [headlineIconName]="headlineIconName"
   [columnInfo]="columnInfo"
   [dataService]="dataService"
   [tableDataGQLType]="tableDataGQLType"
diff --git a/src/app/pages/tables/lending-stations/lending-stations.component.ts b/src/app/pages/tables/lending-stations/lending-stations.component.ts
index 5fd6a7f..237a39b 100644
--- a/src/app/pages/tables/lending-stations/lending-stations.component.ts
+++ b/src/app/pages/tables/lending-stations/lending-stations.component.ts
@@ -68,6 +68,7 @@ export class LendingStationsComponent implements OnInit {
   tableDataGQLUpdateInputType: string = 'LendingStationUpdateInput';
 
   headline = 'Standorte';
+  headlineIconName = 'location_on';
 
   loadingRowIds: string[] = [];
   constructor(private lendingStationsService: LendingStationsService) {}
diff --git a/src/app/pages/tables/time-frames/time-frames.component.html b/src/app/pages/tables/time-frames/time-frames.component.html
index fb3a5aa..a85f5f6 100644
--- a/src/app/pages/tables/time-frames/time-frames.component.html
+++ b/src/app/pages/tables/time-frames/time-frames.component.html
@@ -1,5 +1,6 @@
 <app-table
   [headline]="headline"
+  [headlineIconName]="headlineIconName"
   [columnInfo]="columnInfo"
   [dataService]="dataService"
   [tableDataGQLType]="tableDataGQLType"
diff --git a/src/app/pages/tables/time-frames/time-frames.component.ts b/src/app/pages/tables/time-frames/time-frames.component.ts
index 9dcffdd..d8c22f6 100644
--- a/src/app/pages/tables/time-frames/time-frames.component.ts
+++ b/src/app/pages/tables/time-frames/time-frames.component.ts
@@ -9,6 +9,7 @@ import { TimeFrameService } from 'src/app/services/timeFrame.service';
 })
 export class TimeFramesComponent implements OnInit {
   headline = 'Zeitscheiben';
+  headlineIconName = 'access_time';
 
   columnInfo = [
     {