Init webapp

rossa-tech-cli/src/app/components/dashboard/dashboard.component.ts

@@ -1,27 +1,25 @@
-import { Component } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { LoaderService } from 'src/app/components/loader/loader.service';
-import { MeterDataAddDialogComponent } from 'src/app/components/dialogs/meter-data-add-dialog/meter-data-add-dialog.component';
-import { DatabaseService } from 'src/app/services/database.service';
-import { GlobalService } from 'src/app/services/global.service';
-import { UsageType } from 'src/app/models/UsageType';
-import { MeterData } from 'src/app/models/Meterdata';
+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;
 
-  // meterDataEnergy1Hem: MeterData[] = [];
-  // meterDataEnergy1Log: MeterData[] = [];
   meterDataEnergy: MeterData[] = [];
   meterDataWater: MeterData[] = [];
 
-  // meterDataEnergyDTO1Log: MeterData[] = [];
-  // meterDataEnergyDTO1Hem: MeterData[] = [];
   meterDataEnergyDTO: MeterData[] = [];
   meterDataWaterDTO: MeterData[] = [];
 
@@ -29,12 +27,13 @@ export class DashboardComponent {
   energyAverageAmountLastYear1Hem: number = 0;
   waterAverageAmountLastYear: number = 0;
 
-  displayedColumns: string[] = ['date', 'amount', 'meter'];
+  displayedColumns: string[] = ["date", "amount", "meter"];
 
   constructor(
     private dataService: DatabaseService,
     private loaderService: LoaderService,
     private globalService: GlobalService,
+    private errorService: ErrorService,
     private dialog: MatDialog
   ) {
     this.loadMeterData();
@@ -46,11 +45,11 @@ export class DashboardComponent {
       next: (data) => {
         this.splitMeterData(data);
         this.loaderService.hide();
-        console.log('Meter data:', data);
+        console.log("Meter data:", data);
       },
-      error: (err) => {
+      error: (error: HttpErrorResponse) => {
+        this.errorService.handleError(error);
         this.loaderService.hide();
-        console.error(err);
       },
     });
   }
@@ -70,16 +69,6 @@ export class DashboardComponent {
   }
 
   initEnergyMeterData(): void {
-    // this.meterDataEnergy1Log = this.globalService.sortMeterData(
-    //   this.meterDataEnergy1Log
-    // );
-    // this.meterDataEnergy1Hem = this.globalService.sortMeterData(
-    //   this.meterDataEnergy1Hem
-    // );
-
-    // this.meterDataEnergyDTO1Log = this.meterDataEnergy1Log;
-    // this.meterDataEnergyDTO1Hem = this.meterDataEnergy1Hem;
-
     this.meterDataEnergy = this.globalService.sortMeterData(
       this.meterDataEnergy
     );
@@ -103,8 +92,9 @@ export class DashboardComponent {
           next: (meterData: MeterData) => {
             console.log({ meterData });
           },
-          error: (err) => {
-            console.log('add meterData error', { err });
+          error: (error: HttpErrorResponse) => {
+            this.errorService.handleError(error);
+            this.loaderService.hide();
           },
         });
       }