diff --git a/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts b/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts index 44df06f..1bc2800 100644 --- a/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts +++ b/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts @@ -1,18 +1,18 @@ -import { HttpErrorResponse } from "@angular/common/http"; -import { Component } from "@angular/core"; -import { MatDialog } from "@angular/material/dialog"; -import { LoaderService } from "src/app/components/loader/loader.service"; -import { MeterData } from "src/app/dataModels/Meterdata"; -import { UsageType } from "src/app/dataModels/UsageType"; -import { MeterDataAddDialogComponent } from "src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component"; -import { DatabaseService } from "src/app/services/database.service"; -import { ErrorService } from "src/app/services/error.service"; -import { GlobalService } from "src/app/services/global.service"; +import { HttpErrorResponse } from '@angular/common/http'; +import { Component } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { LoaderService } from 'src/app/components/loader/loader.service'; +import { MeterData } from 'src/app/dataModels/Meterdata'; +import { UsageType } from 'src/app/dataModels/UsageType'; +import { MeterDataAddDialogComponent } from 'src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component'; +import { DatabaseService } from 'src/app/services/database.service'; +import { ErrorService } from 'src/app/services/error.service'; +import { GlobalService } from 'src/app/services/global.service'; @Component({ - selector: "app-dashboard", - templateUrl: "./dashboard.component.html", - styleUrls: ["./dashboard.component.scss"], + selector: 'app-dashboard', + templateUrl: './dashboard.component.html', + styleUrls: ['./dashboard.component.scss'], }) export class DashboardComponent { usageTypes = UsageType; @@ -27,7 +27,7 @@ export class DashboardComponent { energyAverageAmountLastYear1Hem: number = 0; waterAverageAmountLastYear: number = 0; - displayedColumns: string[] = ["date", "amount", "meter"]; + displayedColumns: string[] = ['date', 'amount', 'meter']; constructor( private dataService: DatabaseService, @@ -45,7 +45,7 @@ export class DashboardComponent { next: (data) => { this.splitMeterData(data); this.loaderService.hide(); - console.log("Meter data:", data); + console.log('Meter data:', data); }, error: (error: HttpErrorResponse) => { this.errorService.handleError(error); @@ -82,7 +82,11 @@ export class DashboardComponent { } addMeterData(): void { - const dialogRef = this.dialog.open(MeterDataAddDialogComponent); + const dialogRef = this.dialog.open(MeterDataAddDialogComponent, { + width: '400px', + data: {}, + restoreFocus: false, + }); dialogRef.afterClosed().subscribe((newMeterData: MeterData) => { console.log({ newMeterData }); diff --git a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.html b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.html index 5d579f3..41b8101 100644 --- a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.html +++ b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.html @@ -1,20 +1,23 @@

Neuer Eintrag - Typ: {{usageType}}

- + + + Datum - - Meter + + Zähler {{el.name}} - + + Zählerstand
diff --git a/rossa-tech-cli/src/styles.scss b/rossa-tech-cli/src/styles.scss index 19c9fd2..c70bbba 100644 --- a/rossa-tech-cli/src/styles.scss +++ b/rossa-tech-cli/src/styles.scss @@ -55,3 +55,18 @@ div.mat-grid-tile-content { button { border-radius: 0; } + +// mat-dialog +.mat-mdc-dialog-container { + .mat-mdc-dialog-title { + border-bottom: #a6a6a6 1px solid; + } + .mat-mdc-dialog-content { + } + .mat-mdc-dialog-actions { + border-top: #a6a6a6 1px solid; + display: flex; + flex-direction: row; + justify-content: end; + } +}