diff --git a/Core/.vs/Core/v15/.suo b/Core/.vs/Core/v15/.suo index 7e5a03109e99c6a451c29bad617bd26703328240..b0d78f91c0415bc1d0d430c00839eb7b7192dcdd 100644 Binary files a/Core/.vs/Core/v15/.suo and b/Core/.vs/Core/v15/.suo differ diff --git a/Core/.vs/Core/v15/Server/sqlite3/storage.ide b/Core/.vs/Core/v15/Server/sqlite3/storage.ide index 56758a88b356f5fc284d2b23256cb2a77affde45..7b2ef00128c2df7c7414a76e8264888456408a00 100644 Binary files a/Core/.vs/Core/v15/Server/sqlite3/storage.ide and b/Core/.vs/Core/v15/Server/sqlite3/storage.ide differ diff --git a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm index 6c61276be3f79a886a3701a11f73af34fe4e312b..8f006dd34e238925f71076a03e95557ec85747ff 100644 Binary files a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm and b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm differ diff --git a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal index 8bbac321ffb8d86a9dc3ae2dd3a5c867137102f0..d109ac74a0856a345274362ffc93b950e4d6bf04 100644 Binary files a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal and b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Core/Core/ClientApp/src/app/expenses/expenses.component.ts b/Core/Core/ClientApp/src/app/expenses/expenses.component.ts index bff584853dfff2a1c1d76e7092decc80cf2d2426..6baef35a8f42023a25e3e5b1ad831ac129896c5c 100644 --- a/Core/Core/ClientApp/src/app/expenses/expenses.component.ts +++ b/Core/Core/ClientApp/src/app/expenses/expenses.component.ts @@ -1,6 +1,7 @@ import { Component, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Chart } from 'angular-highcharts'; +import { forEach } from '@angular/router/src/utils/collection'; @Component({ selector: 'app-expenses', @@ -11,23 +12,26 @@ import { Chart } from 'angular-highcharts'; export class ExpensesComponent { chart: Chart; - public ExpensesData: Array<number>; + public expenses: Array<Expenses>; + public ExpensesData: number[]; /** expenses ctor */ constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { + http.get<Array<Expenses>>(baseUrl + 'api/Expenses/getExpenses').subscribe(result => { + this.expenses = result; + this.ExpensesData = []; + this.expenses.forEach(expense => { this.ExpensesData.push(expense.amount); }); + this.createGraph(); + console.log("this.load: ", this.ExpensesData); - var res = []; - http.get<Array<number>>(baseUrl + 'api/Expenses/GetArray').subscribe(data => res.push(data)); - - console.log(res); - this.ExpensesData = res; - console.log(this.ExpensesData); + }, error => console.error(error)); } ngOnInit() { - //this.ExpensesData=[9,7,8] + } + createGraph(): void { this.chart = new Chart({ chart: { type: 'pie' @@ -42,14 +46,14 @@ export class ExpensesComponent { { name: 'Line 1', data: this.ExpensesData - //data: [1, 2, 3] } as Highcharts.SeriesColumnOptions ] }); + } +} - - - - } +interface Expenses { + description: string; + amount: number; } diff --git a/Core/Core/ClientApp/src/app/expenses/expenses.service.ts b/Core/Core/ClientApp/src/app/expenses/expenses.service.ts new file mode 100644 index 0000000000000000000000000000000000000000..42e79d0450c21e19a256ee0d947d9406688d08b6 --- /dev/null +++ b/Core/Core/ClientApp/src/app/expenses/expenses.service.ts @@ -0,0 +1,8 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class ExpensesService { + constructor() { + + } +} \ No newline at end of file diff --git a/Core/Core/Controllers/ExpensesController.cs b/Core/Core/Controllers/ExpensesController.cs index dc0d7aafbbc3b50af108c59f3c700c8e18cceae9..50187ce2888c233b724416d6bc1be58920ef0dd2 100644 --- a/Core/Core/Controllers/ExpensesController.cs +++ b/Core/Core/Controllers/ExpensesController.cs @@ -15,36 +15,20 @@ namespace Core.Controllers }; [HttpGet("[action]")] - public Array GetArray() - { - return new int[] { 3, 5, 6 }; - } - - /*[HttpGet("[action]")] - public IEnumerable<WeatherForecast> WeatherForecasts() + public IEnumerable<Expense> getExpenses() { var rng = new Random(); - return Enumerable.Range(1, 5).Select(index => new WeatherForecast + return Enumerable.Range(1, 5).Select(index => new Expense { - DateFormatted = DateTime.Now.AddDays(index).ToString("d"), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] + description = "example", + amount = 5 }); - }*/ + } - /*public class WeatherForecast + public class Expense { - public string DateFormatted { get; set; } - public int TemperatureC { get; set; } - public string Summary { get; set; } - - public int TemperatureF - { - get - { - return 32 + (int)(TemperatureC / 0.5556); - } - } - }*/ + public string description; + public int amount; + } } }