loaded chart with forecast api data, and line chart with real data

Core/Core/ClientApp/src/app/home/home-chart-definitions.service.ts

@@ -8,13 +8,19 @@ export class HomeChartDefinitionsService {
     this.MakeCharts();
   }
+  //history
+  public Expenses: number[]; //weekBarChart
   public TrasactionPerSizeTypes: Array<{ name: string, y: number }>;
   public TrasactionPerSymbolCategory: Array<{ name: string, y: number }>;
   public TrasactionPerSymbolType: Array<{ name: string, y: number }>;
-  public Expenses: number[];
+  
+  //forecast
   public ForecastTypes: number[];
-
+  public ForecastAverageLineData: Array<{ name: string, y: number }>;
+  public ForecastAveragePieData: Array<{ name: string, y: number }>;
+  public ForecastAmountComparsionKindPieData: Array<{ name: string, y: number }>;
+  public ForecastAmountComparsionSizePieData: Array<{ name: string, y: number }>;
   public HistoryWeeksBarChart: Chart;
   public HistoryPerSizePieChart: Chart;
@@ -57,10 +63,10 @@ export class HomeChartDefinitionsService {
     this.ForecastAmountComparsionSizePieChart.removeSeries(0);
     this.ForecastPieChart.addSeries({ name: 'Výdaje', data: this.ForecastTypes } as Highcharts.SeriesColumnOptions, true, false);
-    this.ForecastAverageLineChart.addSeries({ name: 'Výdaje', data: this.ForecastTypes } as Highcharts.SeriesColumnOptions, true, false);
-    this.ForecastAveragePieChart.addSeries({ name: 'Výdaje', data: this.ForecastTypes } as Highcharts.SeriesColumnOptions, true, false);
-    this.ForecastAmountComparsionKindPieChart.addSeries({ name: 'Výdaje', data: this.ForecastTypes } as Highcharts.SeriesColumnOptions, true, false);
-    this.ForecastAmountComparsionSizePieChart.addSeries({ name: 'Výdaje', data: this.ForecastTypes } as Highcharts.SeriesColumnOptions, true, false);
+    this.ForecastAverageLineChart.addSeries({ name: 'Výdaje', data: this.ForecastAverageLineData } as Highcharts.SeriesColumnOptions, true, false);
+    this.ForecastAveragePieChart.addSeries({ name: 'Výdaje', data: this.ForecastAveragePieData } as Highcharts.SeriesColumnOptions, true, false);
+    this.ForecastAmountComparsionKindPieChart.addSeries({ name: 'Výdaje', data: this.ForecastAmountComparsionKindPieData } as Highcharts.SeriesColumnOptions, true, false);
+    this.ForecastAmountComparsionSizePieChart.addSeries({ name: 'Výdaje', data: this.ForecastAmountComparsionSizePieData } as Highcharts.SeriesColumnOptions, true, false);
     this.ForecastPieChart.ref.reflow();
     this.ForecastAverageLineChart.ref.reflow();
@@ -204,7 +210,7 @@ export class HomeChartDefinitionsService {
       series: [
         {
           name: 'Line 1',
-          data: this.ForecastTypes
+          data: this.ForecastAverageLineData
         } as Highcharts.SeriesColumnOptions
       ]
     });
@@ -226,7 +232,7 @@ export class HomeChartDefinitionsService {
       series: [
         {
           name: 'Line 1',
-          data: this.ForecastTypes
+          data: this.ForecastAveragePieData
         } as Highcharts.SeriesColumnOptions
       ]
     });
@@ -248,7 +254,7 @@ export class HomeChartDefinitionsService {
       series: [
         {
           name: 'Line 1',
-          data: this.ForecastTypes
+          data: this.ForecastAmountComparsionKindPieData
         } as Highcharts.SeriesColumnOptions
       ]
     });
@@ -270,7 +276,7 @@ export class HomeChartDefinitionsService {
       series: [
         {
           name: 'Line 1',
-          data: this.ForecastTypes
+          data: this.ForecastAmountComparsionSizePieData
         } as Highcharts.SeriesColumnOptions
       ]
     });

Core/Core/ClientApp/src/app/home/home.component.ts

@@ -24,10 +24,10 @@ export class HomeComponent implements OnInit {
   public GetHistoryPerSizePie: Chart;
   public HistoryWeeksBarChart: Chart;
-  public ForecastPieChart: Chart;
   public HistorySymbolCategoryPieChart: Chart;
   public HistorySymbolTypePieChart: Chart;
+  public ForecastPieChart: Chart;
   public ForecastAverageLineChart: Chart;
   public ForecastAveragePieChart: Chart;
   public ForecastAmountComparsionKindPieChart: Chart;
@@ -54,7 +54,6 @@ export class HomeComponent implements OnInit {
     this.HistorySymbolTypePieChart = this.HomeService.GetHistorySymbolTypePieChart();
     this.ForecastPieChart = this.HomeService.GetForecastPie();
-
     this.ForecastAverageLineChart = this.HomeService.GetForecastAverageLine();
     this.ForecastAveragePieChart = this.HomeService.GetForecastAveragePie();
     this.ForecastAmountComparsionKindPieChart = this.HomeService.GetForecastAmountComparsionKindPie();

Core/Core/ClientApp/src/app/home/home.service.ts

@@ -42,8 +42,6 @@ export class HomeService {
       if (res === null)
         return;
-
-
       this.HomeChartDefinitionsService.ForecastTypes = new Array(1, 2, 3);
       let fileArray = new Array<IFutureTransaction>();
       for (let i: number = 0; i < res.neuralPrediction.length; i++) {
@@ -51,6 +49,17 @@ export class HomeService {
         fileArray.push({ position: i + 1, name: transaction.name, amount: Math.abs(transaction.amount).toString() + ' Kč' });
       }
       this.dataSource.data = fileArray;
+
+      //make 1D array for line chart (4x Mon - Sun)
+      let continuousData: ITransaction[] = new Array();
+      for (let i: number = 0; i < res.averagePrediction.length; i++)
+        continuousData = continuousData.concat(res.averagePrediction[i]);
+
+      this.HomeChartDefinitionsService.ForecastAverageLineData = this.MakePieChartData(continuousData);
+      this.HomeChartDefinitionsService.ForecastAveragePieData = this.MakePieChartData(res.amountPrediction);
+      this.HomeChartDefinitionsService.ForecastAmountComparsionKindPieData = this.MakePieChartData(res.amountPrediction);
+      this.HomeChartDefinitionsService.ForecastAmountComparsionSizePieData = this.MakePieChartData(res.amountPrediction);
+
       this.HomeChartDefinitionsService.ReloadForecastChartSeries();
     }, error => {
       console.error("Get Forecast error:", error);