From 65761b500f54b232a2d415ac67533233468d5733 Mon Sep 17 00:00:00 2001 From: Max Ehrlicher-Schmidt Date: Sun, 29 Nov 2020 23:55:37 +0100 Subject: [PATCH] Add NumRanges --- src/app/app.module.ts | 4 + .../data-page/data-page.component.html | 56 +++++--- .../data-page/data-page.component.ts | 37 +++++- src/app/components/table/table.component.html | 104 ++++++++++----- src/app/components/table/table.component.ts | 23 +++- .../tableComponents/cell/cell.component.html | 25 ---- .../tableComponents/cell/cell.component.scss | 8 -- .../tableComponents/cell/cell.component.ts | 52 +++++++- .../date-range-cell.component.html | 1 + .../date-range-cell.component.scss | 0 .../date-range-cell.component.ts | 15 +++ .../number-range-cell.component.html | 28 ++++ .../number-range-cell.component.scss | 8 ++ .../number-range-cell.component.ts | 123 ++++++++++++++++++ .../pages/dataPages/bike/bike.component.ts | 2 +- src/environments/environment.ts | 4 +- 16 files changed, 390 insertions(+), 100 deletions(-) create mode 100644 src/app/components/tableComponents/date-range-cell/date-range-cell.component.html create mode 100644 src/app/components/tableComponents/date-range-cell/date-range-cell.component.scss create mode 100644 src/app/components/tableComponents/date-range-cell/date-range-cell.component.ts create mode 100644 src/app/components/tableComponents/number-range-cell/number-range-cell.component.html create mode 100644 src/app/components/tableComponents/number-range-cell/number-range-cell.component.scss create mode 100644 src/app/components/tableComponents/number-range-cell/number-range-cell.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d51f858..b68abea 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -60,6 +60,8 @@ import { ReferenceTableComponent } from './components/reference-table/reference- import { MatSnackBarModule } from '@angular/material/snack-bar'; import { EquipmentComponent } from './pages/tables/equipment/equipment.component'; import { TimeFramesComponent } from './pages/tables/time-frames/time-frames.component'; +import { NumberRangeCellComponent } from './components/tableComponents/number-range-cell/number-range-cell.component'; +import { DateRangeCellComponent } from './components/tableComponents/date-range-cell/date-range-cell.component'; @@ -84,6 +86,8 @@ import { TimeFramesComponent } from './pages/tables/time-frames/time-frames.comp ReferenceTableComponent, EquipmentComponent, TimeFramesComponent, + NumberRangeCellComponent, + DateRangeCellComponent, ], imports: [ BrowserModule, diff --git a/src/app/components/data-page/data-page.component.html b/src/app/components/data-page/data-page.component.html index 39b5fb5..1dbbd37 100644 --- a/src/app/components/data-page/data-page.component.html +++ b/src/app/components/data-page/data-page.component.html @@ -14,14 +14,25 @@ {{ object.title }} - - + + + @@ -32,7 +43,9 @@ *ngIf="object.linkToTable" color="primary" [routerLink]="object.linkToTable(data)" - [queryParams]="object.linkToTableParams ? object.linkToTableParams(data) : {}" + [queryParams]=" + object.linkToTableParams ? object.linkToTableParams(data) : {} + " matTooltip="Zur Tabelle" > subdirectory_arrow_right @@ -83,15 +96,26 @@ > cancel - + + + +