Price |
@@ -137,8 +131,8 @@
- ISIN |
- {{ element.isin }} |
+ Symbol |
+ {{ element.symbol }} |
diff --git a/frontend/src/app/Views/dashboard/dashboard.component.ts b/frontend/src/app/Views/dashboard/dashboard.component.ts
index de4cf55..f3e012b 100644
--- a/frontend/src/app/Views/dashboard/dashboard.component.ts
+++ b/frontend/src/app/Views/dashboard/dashboard.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { DataService } from 'src/app/Services/data.service';
import { MatDialog } from '@angular/material/dialog';
import { UserDialogComponent } from './user-dialog/user-dialog.component';
+import { C } from '@angular/cdk/keycodes';
import { HelperService } from 'src/app/Helpers/helper.service';
export interface PeriodicElement {
@@ -30,8 +31,7 @@ var TRANSACTION_DATA: TransactionData[] = [];
var STOCK_DATA: Stock[] = [];
export interface TransactionData {
- comment: string;
- isin: string;
+ symbol: string;
time: string;
count: number;
price: number;
@@ -44,8 +44,8 @@ export interface TransactionData {
})
export class DashboardComponent implements OnInit {
constructor(
- private dataService: DataService,
private helper: HelperService,
+ private dataService: DataService,
public dialog: MatDialog
) {}
@@ -55,34 +55,11 @@ export class DashboardComponent implements OnInit {
depotCost: number = 0;
profit: number = 0;
- getTransactions() {
- var TRANSACTION_DATA: TransactionData[] = [];
- this.dataService.getTransactionData().subscribe((response: any) => {
- var data = JSON.parse(response);
- this.depotCost = 0;
- for (let i = 0; i < data.data.length; i++) {
- this.depotCost += data.data[i].price;
- TRANSACTION_DATA.push({
- comment: data.data[i].comment,
- isin: data.data[i].isin,
- time: data.data[i].time,
- count: data.data[i].count,
- price: data.data[i].price,
- });
- }
- this.dataSourceTransactions = TRANSACTION_DATA;
- //TODO move to helper service
-
- this.profit = this.depotCurrentValue - this.depotCost;
- });
- }
-
ngOnInit() {
this.dataService.getStockData().subscribe((response: any) => {
var data = JSON.parse(response);
- this.depotCurrentValue = 0;
for (let i = 0; i < data.data.length; i++) {
- this.depotCurrentValue = data.data[i].current_price;
+ this.depotCurrentValue += data.data[i].current_price;
STOCK_DATA.push({
count: data.data[i].count,
currentPrice: data.data[i].current_price,
@@ -98,12 +75,10 @@ export class DashboardComponent implements OnInit {
this.dataService.getTransactionData().subscribe((response: any) => {
var data = JSON.parse(response);
- this.depotCost = 0;
for (let i = 0; i < data.data.length; i++) {
this.depotCost += data.data[i].price;
TRANSACTION_DATA.push({
- comment: data.data[i].comment,
- isin: data.data[i].isin,
+ symbol: data.data[i].symbol,
time: data.data[i].time,
count: data.data[i].count,
price: data.data[i].price,
@@ -116,8 +91,7 @@ export class DashboardComponent implements OnInit {
});
}
- comment: string = '';
- isin: string = '';
+ symbol: string = '';
time: Date = new Date();
count: number = 0.0;
price: number = 0.0;
@@ -126,8 +100,7 @@ export class DashboardComponent implements OnInit {
const dialogRef = this.dialog.open(UserDialogComponent, {
width: '50vw',
data: {
- comment: this.comment,
- isin: this.isin,
+ symbol: this.symbol,
time: this.time,
count: this.count,
price: this.price,
@@ -135,18 +108,11 @@ export class DashboardComponent implements OnInit {
});
dialogRef.afterClosed().subscribe((result) => {
- this.helper.delay(1000);
- this.getTransactions();
+ console.log('The dialog was closed');
});
}
- displayedColumns: string[] = [
- 'comment',
- 'weight',
- 'position',
- 'name',
- 'symbol',
- ];
+ displayedColumns: string[] = ['weight', 'position', 'name', 'symbol'];
displayedColumnsStocks: string[] = [
'position',
'name',
diff --git a/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html b/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html
index 0808e12..21b87cf 100644
--- a/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html
+++ b/frontend/src/app/Views/dashboard/user-dialog/user-dialog.component.html
@@ -7,27 +7,15 @@
class="backgorund"
>
-
+
-
-
-
-