Move some files and adjust imports

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({

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 { MeterData } from 'src/app/core/dataModels/Meterdata';
-import { UsageType } from 'src/app/dataModels/UsageType';
+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',

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';

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 { Component, Input, OnChanges } from '@angular/core';
-import { Meters } from "src/app/dataModels/Meter";
+import { Meters } from 'src/app/core/dataModels/Meter';
-import { MeterData } from "src/app/dataModels/Meterdata";
+import { MeterData } from 'src/app/core/dataModels/Meterdata';
-import { UsageType } from "src/app/dataModels/UsageType";
+import { UsageType } from 'src/app/core/dataModels/UsageType';
-import { GlobalService } from "src/app/services/global.service";
+import { GlobalService } from 'src/app/core/services/global.service';
 
 @Component({
-  selector: "app-consumption-last-year",
+  selector: 'app-consumption-last-year',
-  templateUrl: "./consumption-last-year.component.html",
+  templateUrl: './consumption-last-year.component.html',
-  styleUrls: ["./consumption-last-year.component.scss"],
+  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);
           }
         });

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 { Component, Input, OnChanges, OnInit } from '@angular/core';
-import { MatTableDataSource } from "@angular/material/table";
+import { MatTableDataSource } from '@angular/material/table';
-import { UsageType } from "src/app/dataModels/UsageType";
+import { UsageType } from 'src/app/core/dataModels/UsageType';
-import { MeterData } from "src/app/dataModels/Meterdata";
+import { MeterData } from 'src/app/core/dataModels/Meterdata';
 
 @Component({
-  selector: "app-meter-data-list",
+  selector: 'app-meter-data-list',
-  templateUrl: "./meter-data-list.component.html",
+  templateUrl: './meter-data-list.component.html',
-  styleUrls: ["./meter-data-list.component.scss"],
+  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<MeterData>();
   // dataSource = [

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 { Component, Input, OnChanges } from '@angular/core';
-import { MeterData } from "src/app/dataModels/Meterdata";
+import { MeterData } from 'src/app/core/dataModels/Meterdata';
-import { UsageType } from "src/app/dataModels/UsageType";
+import { UsageType } from 'src/app/core/dataModels/UsageType';
-import { GlobalService } from "src/app/services/global.service";
+import { GlobalService } from 'src/app/services/global.service';
 
 @Component({
-  selector: "app-meter-data-wrapper",
+  selector: 'app-meter-data-wrapper',
-  templateUrl: "./meter-data-wrapper.component.html",
+  templateUrl: './meter-data-wrapper.component.html',
-  styleUrls: ["./meter-data-wrapper.component.scss"],
+  styleUrls: ['./meter-data-wrapper.component.scss'],
 })
 export class MeterDataWrapperComponent /* implements OnChanges */ {
   @Input()

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 { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialogRef } from "@angular/material/dialog";
+import { MatDialogRef } from '@angular/material/dialog';
-import { Meter, Meters } from "src/app/dataModels/Meter";
+import { Meter, Meters } from 'src/app/core/dataModels/Meter';
-import { MeterData } from "src/app/dataModels/Meterdata";
+import { MeterData } from 'src/app/core/dataModels/Meterdata';
-import { UsageType } from "src/app/dataModels/UsageType";
+import { UsageType } from 'src/app/core/dataModels/UsageType';
-import { DatabaseService } from "src/app/services/database.service";
+import { DatabaseService } from 'src/app/services/database.service';
 
 @Component({
-  selector: "app-meter-data-add-dialog",
+  selector: 'app-meter-data-add-dialog',
-  templateUrl: "./meter-data-add-dialog.component.html",
+  templateUrl: './meter-data-add-dialog.component.html',
-  styleUrls: ["./meter-data-add-dialog.component.scss"],
+  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],
+    meter: ['', Validators.required],
-    amount: ["", 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;

rossa-tech-cli/src/app/models/Meter.ts

@@ -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',
-}

rossa-tech-cli/src/app/models/Meterdata.ts

@@ -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;
-  }
-}

rossa-tech-cli/src/app/models/UsageType.ts

@@ -1,4 +0,0 @@
-export enum UsageType {
-  ENERGY = 'ENERGY',
-  WATER = 'WATER'
-}

rossa-tech-cli/src/app/models/info.md

@@ -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)
-);