From 2c1678d331fb49efd7198d92a34980cf660d395d Mon Sep 17 00:00:00 2001 From: Peter Rossa Date: Tue, 23 May 2023 19:43:12 +0200 Subject: [PATCH] Move some files and adjust imports --- rossa-tech-cli/src/app/auth/login.service.ts | 2 +- .../dashboard/dashboard.component.ts | 10 +++---- .../components/loginPage/login.component.ts | 2 +- .../consumption-last-year.component.ts | 28 +++++++++---------- .../meter-data-list.component.ts | 16 +++++------ .../meter-data-wrapper.component.ts | 14 +++++----- .../src/app/{ => core}/dataModels/Meter.ts | 0 .../app/{ => core}/dataModels/Meterdata.ts | 0 .../app/{ => core}/dataModels/UsageType.ts | 0 .../{ => core}/dataModels/gameTitle.type.ts | 0 .../src/app/{ => core}/dataModels/info.md | 0 .../{ => core}/dataModels/loginUser.type.ts | 0 .../{ => core}/dataModels/userRole.type.ts | 0 .../services/database.service.spec.ts | 0 .../{ => core}/services/database.service.ts | 0 .../app/{ => core}/services/error.service.ts | 0 .../app/{ => core}/services/forms.service.ts | 0 .../services/global.service.spec.ts | 0 .../app/{ => core}/services/global.service.ts | 0 .../services/notification.service.ts | 0 .../{ => core}/services/user.service.spec.ts | 0 .../app/{ => core}/services/user.service.ts | 0 .../meter-data-add-dialog.component.ts | 28 +++++++++---------- rossa-tech-cli/src/app/models/Meter.ts | 16 ----------- rossa-tech-cli/src/app/models/Meterdata.ts | 22 --------------- rossa-tech-cli/src/app/models/UsageType.ts | 4 --- rossa-tech-cli/src/app/models/info.md | 15 ---------- 27 files changed, 50 insertions(+), 107 deletions(-) rename rossa-tech-cli/src/app/{ => core}/dataModels/Meter.ts (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/Meterdata.ts (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/UsageType.ts (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/gameTitle.type.ts (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/info.md (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/loginUser.type.ts (100%) rename rossa-tech-cli/src/app/{ => core}/dataModels/userRole.type.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/database.service.spec.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/database.service.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/error.service.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/forms.service.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/global.service.spec.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/global.service.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/notification.service.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/user.service.spec.ts (100%) rename rossa-tech-cli/src/app/{ => core}/services/user.service.ts (100%) delete mode 100644 rossa-tech-cli/src/app/models/Meter.ts delete mode 100644 rossa-tech-cli/src/app/models/Meterdata.ts delete mode 100644 rossa-tech-cli/src/app/models/UsageType.ts delete mode 100644 rossa-tech-cli/src/app/models/info.md diff --git a/rossa-tech-cli/src/app/auth/login.service.ts b/rossa-tech-cli/src/app/auth/login.service.ts index 51ed66b..9874858 100644 --- a/rossa-tech-cli/src/app/auth/login.service.ts +++ b/rossa-tech-cli/src/app/auth/login.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { LoginUser } from '../dataModels/loginUser.type'; +import { LoginUser } from '../core/dataModels/loginUser.type'; import { environment } from '../../environments/environment'; @Injectable({ 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 1bc2800..ff6b3b4 100644 --- a/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts +++ b/rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts @@ -2,12 +2,12 @@ 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 { MeterData } from 'src/app/core/dataModels/Meterdata'; +import { UsageType } from 'src/app/core/dataModels/UsageType'; +import { DatabaseService } from 'src/app/core/services/database.service'; +import { ErrorService } from 'src/app/core/services/error.service'; +import { GlobalService } from 'src/app/core/services/global.service'; 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', diff --git a/rossa-tech-cli/src/app/components/loginPage/login.component.ts b/rossa-tech-cli/src/app/components/loginPage/login.component.ts index adba442..15171e0 100644 --- a/rossa-tech-cli/src/app/components/loginPage/login.component.ts +++ b/rossa-tech-cli/src/app/components/loginPage/login.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { Router } from '@angular/router'; -import { LoginUser } from '../../dataModels/loginUser.type'; +import { LoginUser } from '../../core/dataModels/loginUser.type'; import { LoginService } from '../../auth/login.service'; import { FormsService } from '../../services/forms.service'; import { AuthService } from 'src/app/auth/auth.service'; diff --git a/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts b/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts index 97b1805..28e447e 100644 --- a/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts +++ b/rossa-tech-cli/src/app/components/subcomponents/consumption-last-year/consumption-last-year.component.ts @@ -1,13 +1,13 @@ -import { Component, Input, OnChanges } from "@angular/core"; -import { Meters } from "src/app/dataModels/Meter"; -import { MeterData } from "src/app/dataModels/Meterdata"; -import { UsageType } from "src/app/dataModels/UsageType"; -import { GlobalService } from "src/app/services/global.service"; +import { Component, Input, OnChanges } from '@angular/core'; +import { Meters } from 'src/app/core/dataModels/Meter'; +import { MeterData } from 'src/app/core/dataModels/Meterdata'; +import { UsageType } from 'src/app/core/dataModels/UsageType'; +import { GlobalService } from 'src/app/core/services/global.service'; @Component({ - selector: "app-consumption-last-year", - templateUrl: "./consumption-last-year.component.html", - styleUrls: ["./consumption-last-year.component.scss"], + selector: 'app-consumption-last-year', + templateUrl: './consumption-last-year.component.html', + styleUrls: ['./consumption-last-year.component.scss'], }) export class ConsumptionLastYearComponent implements OnChanges { @Input() @@ -34,13 +34,13 @@ export class ConsumptionLastYearComponent implements OnChanges { ngOnChanges(): void { if (this.type && this.type === this.usageTypes.ENERGY) { - console.log("count energy"); + console.log('count energy'); if (this.meterData) { this.meterData.forEach((data) => { - if (data.meter.name === this.meters["1LOG"]) { + if (data.meter.name === this.meters['1LOG']) { this.meterDataEnergy1Log.push(data); - } else if (data.meter.name === this.meters["1HEM"]) { + } else if (data.meter.name === this.meters['1HEM']) { this.meterDataEnergy1Hem.push(data); } }); @@ -63,13 +63,13 @@ export class ConsumptionLastYearComponent implements OnChanges { ); } } else if (this.type && this.type === this.usageTypes.WATER) { - console.log("count water"); + console.log('count water'); if (this.meterData) { this.meterData.forEach((data) => { - if (data.meter.name === this.meters["WASSER"]) { + if (data.meter.name === this.meters['WASSER']) { this.meterDataWasser.push(data); - } else if (data.meter.name === this.meters["ABWASSER"]) { + } else if (data.meter.name === this.meters['ABWASSER']) { this.meterDataAbwasser.push(data); } }); diff --git a/rossa-tech-cli/src/app/components/subcomponents/meter-data-list/meter-data-list.component.ts b/rossa-tech-cli/src/app/components/subcomponents/meter-data-list/meter-data-list.component.ts index ae6f263..ab7a6cb 100644 --- a/rossa-tech-cli/src/app/components/subcomponents/meter-data-list/meter-data-list.component.ts +++ b/rossa-tech-cli/src/app/components/subcomponents/meter-data-list/meter-data-list.component.ts @@ -1,12 +1,12 @@ -import { Component, Input, OnChanges, OnInit } from "@angular/core"; -import { MatTableDataSource } from "@angular/material/table"; -import { UsageType } from "src/app/dataModels/UsageType"; -import { MeterData } from "src/app/dataModels/Meterdata"; +import { Component, Input, OnChanges, OnInit } from '@angular/core'; +import { MatTableDataSource } from '@angular/material/table'; +import { UsageType } from 'src/app/core/dataModels/UsageType'; +import { MeterData } from 'src/app/core/dataModels/Meterdata'; @Component({ - selector: "app-meter-data-list", - templateUrl: "./meter-data-list.component.html", - styleUrls: ["./meter-data-list.component.scss"], + selector: 'app-meter-data-list', + templateUrl: './meter-data-list.component.html', + styleUrls: ['./meter-data-list.component.scss'], }) export class MeterDataListComponent implements OnInit, OnChanges { @Input() @@ -14,7 +14,7 @@ export class MeterDataListComponent implements OnInit, OnChanges { @Input() type: UsageType = UsageType.ENERGY; - displayedColumns: string[] = ["id", "date", "amount", "meter"]; + displayedColumns: string[] = ['id', 'date', 'amount', 'meter']; dataSource = new MatTableDataSource(); // dataSource = [ diff --git a/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts b/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts index d74bf51..232a763 100644 --- a/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts +++ b/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts @@ -1,12 +1,12 @@ -import { Component, Input, OnChanges } from "@angular/core"; -import { MeterData } from "src/app/dataModels/Meterdata"; -import { UsageType } from "src/app/dataModels/UsageType"; -import { GlobalService } from "src/app/services/global.service"; +import { Component, Input, OnChanges } from '@angular/core'; +import { MeterData } from 'src/app/core/dataModels/Meterdata'; +import { UsageType } from 'src/app/core/dataModels/UsageType'; +import { GlobalService } from 'src/app/services/global.service'; @Component({ - selector: "app-meter-data-wrapper", - templateUrl: "./meter-data-wrapper.component.html", - styleUrls: ["./meter-data-wrapper.component.scss"], + selector: 'app-meter-data-wrapper', + templateUrl: './meter-data-wrapper.component.html', + styleUrls: ['./meter-data-wrapper.component.scss'], }) export class MeterDataWrapperComponent /* implements OnChanges */ { @Input() diff --git a/rossa-tech-cli/src/app/dataModels/Meter.ts b/rossa-tech-cli/src/app/core/dataModels/Meter.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/Meter.ts rename to rossa-tech-cli/src/app/core/dataModels/Meter.ts diff --git a/rossa-tech-cli/src/app/dataModels/Meterdata.ts b/rossa-tech-cli/src/app/core/dataModels/Meterdata.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/Meterdata.ts rename to rossa-tech-cli/src/app/core/dataModels/Meterdata.ts diff --git a/rossa-tech-cli/src/app/dataModels/UsageType.ts b/rossa-tech-cli/src/app/core/dataModels/UsageType.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/UsageType.ts rename to rossa-tech-cli/src/app/core/dataModels/UsageType.ts diff --git a/rossa-tech-cli/src/app/dataModels/gameTitle.type.ts b/rossa-tech-cli/src/app/core/dataModels/gameTitle.type.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/gameTitle.type.ts rename to rossa-tech-cli/src/app/core/dataModels/gameTitle.type.ts diff --git a/rossa-tech-cli/src/app/dataModels/info.md b/rossa-tech-cli/src/app/core/dataModels/info.md similarity index 100% rename from rossa-tech-cli/src/app/dataModels/info.md rename to rossa-tech-cli/src/app/core/dataModels/info.md diff --git a/rossa-tech-cli/src/app/dataModels/loginUser.type.ts b/rossa-tech-cli/src/app/core/dataModels/loginUser.type.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/loginUser.type.ts rename to rossa-tech-cli/src/app/core/dataModels/loginUser.type.ts diff --git a/rossa-tech-cli/src/app/dataModels/userRole.type.ts b/rossa-tech-cli/src/app/core/dataModels/userRole.type.ts similarity index 100% rename from rossa-tech-cli/src/app/dataModels/userRole.type.ts rename to rossa-tech-cli/src/app/core/dataModels/userRole.type.ts diff --git a/rossa-tech-cli/src/app/services/database.service.spec.ts b/rossa-tech-cli/src/app/core/services/database.service.spec.ts similarity index 100% rename from rossa-tech-cli/src/app/services/database.service.spec.ts rename to rossa-tech-cli/src/app/core/services/database.service.spec.ts diff --git a/rossa-tech-cli/src/app/services/database.service.ts b/rossa-tech-cli/src/app/core/services/database.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/database.service.ts rename to rossa-tech-cli/src/app/core/services/database.service.ts diff --git a/rossa-tech-cli/src/app/services/error.service.ts b/rossa-tech-cli/src/app/core/services/error.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/error.service.ts rename to rossa-tech-cli/src/app/core/services/error.service.ts diff --git a/rossa-tech-cli/src/app/services/forms.service.ts b/rossa-tech-cli/src/app/core/services/forms.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/forms.service.ts rename to rossa-tech-cli/src/app/core/services/forms.service.ts diff --git a/rossa-tech-cli/src/app/services/global.service.spec.ts b/rossa-tech-cli/src/app/core/services/global.service.spec.ts similarity index 100% rename from rossa-tech-cli/src/app/services/global.service.spec.ts rename to rossa-tech-cli/src/app/core/services/global.service.spec.ts diff --git a/rossa-tech-cli/src/app/services/global.service.ts b/rossa-tech-cli/src/app/core/services/global.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/global.service.ts rename to rossa-tech-cli/src/app/core/services/global.service.ts diff --git a/rossa-tech-cli/src/app/services/notification.service.ts b/rossa-tech-cli/src/app/core/services/notification.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/notification.service.ts rename to rossa-tech-cli/src/app/core/services/notification.service.ts diff --git a/rossa-tech-cli/src/app/services/user.service.spec.ts b/rossa-tech-cli/src/app/core/services/user.service.spec.ts similarity index 100% rename from rossa-tech-cli/src/app/services/user.service.spec.ts rename to rossa-tech-cli/src/app/core/services/user.service.spec.ts diff --git a/rossa-tech-cli/src/app/services/user.service.ts b/rossa-tech-cli/src/app/core/services/user.service.ts similarity index 100% rename from rossa-tech-cli/src/app/services/user.service.ts rename to rossa-tech-cli/src/app/core/services/user.service.ts diff --git a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts index 3d048db..32fda5f 100644 --- a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts +++ b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit } from "@angular/core"; -import { FormBuilder, FormGroup, Validators } from "@angular/forms"; -import { MatDialogRef } from "@angular/material/dialog"; -import { Meter, Meters } from "src/app/dataModels/Meter"; -import { MeterData } from "src/app/dataModels/Meterdata"; -import { UsageType } from "src/app/dataModels/UsageType"; -import { DatabaseService } from "src/app/services/database.service"; +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MatDialogRef } from '@angular/material/dialog'; +import { Meter, Meters } from 'src/app/core/dataModels/Meter'; +import { MeterData } from 'src/app/core/dataModels/Meterdata'; +import { UsageType } from 'src/app/core/dataModels/UsageType'; +import { DatabaseService } from 'src/app/services/database.service'; @Component({ - selector: "app-meter-data-add-dialog", - templateUrl: "./meter-data-add-dialog.component.html", - styleUrls: ["./meter-data-add-dialog.component.scss"], + selector: 'app-meter-data-add-dialog', + templateUrl: './meter-data-add-dialog.component.html', + styleUrls: ['./meter-data-add-dialog.component.scss'], }) export class MeterDataAddDialogComponent implements OnInit { meters: Meter[] = []; @@ -18,8 +18,8 @@ export class MeterDataAddDialogComponent implements OnInit { form: FormGroup = this.fb.group({ date: [new Date(), Validators.required], - meter: ["", Validators.required], - amount: ["", Validators.required], + meter: ['', Validators.required], + amount: ['', Validators.required], }); constructor( @@ -35,7 +35,7 @@ export class MeterDataAddDialogComponent implements OnInit { this.meters = meters; }, error: (err) => { - console.log("get meters error", { err }); + console.log('get meters error', { err }); }, }); } @@ -55,7 +55,7 @@ export class MeterDataAddDialogComponent implements OnInit { } setUsageType(meterName: string): void { - if (meterName === Meters["1HEM"] || meterName === Meters["1LOG"]) { + if (meterName === Meters['1HEM'] || meterName === Meters['1LOG']) { this.usageType = this.usageTypes.ENERGY; } else if (meterName === Meters.ABWASSER || meterName === Meters.WASSER) { this.usageType = this.usageTypes.WATER; diff --git a/rossa-tech-cli/src/app/models/Meter.ts b/rossa-tech-cli/src/app/models/Meter.ts deleted file mode 100644 index 161a3a9..0000000 --- a/rossa-tech-cli/src/app/models/Meter.ts +++ /dev/null @@ -1,16 +0,0 @@ -export class Meter { - id: number; - name: '1LOG' | '1HEM' | 'WASSER' | 'ABWASSER'; - - constructor(id: number, name: '1LOG' | '1HEM' | 'WASSER' | 'ABWASSER') { - this.id = id; - this.name = name; - } -} - -export enum Meters { - '1LOG' = '1LOG', - '1HEM' = '1HEM', - 'WASSER' = 'WASSER', - 'ABWASSER' = 'ABWASSER', -} diff --git a/rossa-tech-cli/src/app/models/Meterdata.ts b/rossa-tech-cli/src/app/models/Meterdata.ts deleted file mode 100644 index ae742d2..0000000 --- a/rossa-tech-cli/src/app/models/Meterdata.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Meter } from './Meter'; -export class MeterData { - id?: number; - type: 'ENERGY' | 'WATER'; - date: Date; - amount: number; - meter: Meter; - - constructor( - type: 'ENERGY' | 'WATER', - date: Date, - amount: number, - meter: Meter, - id?: number - ) { - this.id = id; - this.type = type; - this.date = date; - this.amount = amount; - this.meter = meter; - } -} diff --git a/rossa-tech-cli/src/app/models/UsageType.ts b/rossa-tech-cli/src/app/models/UsageType.ts deleted file mode 100644 index 7344aba..0000000 --- a/rossa-tech-cli/src/app/models/UsageType.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum UsageType { - ENERGY = 'ENERGY', - WATER = 'WATER' -} diff --git a/rossa-tech-cli/src/app/models/info.md b/rossa-tech-cli/src/app/models/info.md deleted file mode 100644 index e17c3eb..0000000 --- a/rossa-tech-cli/src/app/models/info.md +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE meter ( - id INT NOT NULL AUTO_INCREMENT, - name VARCHAR(255) NOT NULL, - PRIMARY KEY (id) -); - -CREATE TABLE meterdata ( - id INT NOT NULL AUTO_INCREMENT, - type ENUM('energy', 'water') NOT NULL, - date DATETIME NOT NULL, - amount FLOAT NOT NULL, - meter_id INT NOT NULL, - PRIMARY KEY (id), - FOREIGN KEY (meter_id) REFERENCES meter(id) -);