Skip to content
Snippets Groups Projects
Commit e40b0ad4 authored by Radek Puš's avatar Radek Puš
Browse files

separated other intrfaces

parent 4c8f46e9
No related branches found
No related tags found
No related merge requests found
Showing
with 66 additions and 43 deletions
......@@ -2,6 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { FormControl, FormBuilder, Validators, FormGroup } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { IDialogData } from '../../../../interfaces/IDialogData';
 
@Component({
selector: 'app-change-password',
......@@ -20,7 +21,7 @@ export class ChangePasswordComponent implements OnInit {
/** ChangePassword ctor */
constructor(
public dialogRef: MatDialogRef<ChangePasswordComponent>,
@Inject(MAT_DIALOG_DATA) public data: DialogData,
@Inject(MAT_DIALOG_DATA) public data: IDialogData,
private FormBuilder: FormBuilder,
private HttpClient: HttpClient
) { }
......@@ -66,8 +67,3 @@ export class ChangePasswordComponent implements OnInit {
});
}
}
export interface DialogData {
animal: string;
name: string;
}
......@@ -2,6 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { FormControl, FormBuilder, Validators, FormGroup } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { IDialogData } from '../../../../interfaces/IDialogData';
 
@Component({
selector: 'app-delete-user',
......@@ -18,7 +19,7 @@ export class DeleteUserComponent implements OnInit {
/** ChangePassword ctor */
constructor(
public dialogRef: MatDialogRef<DeleteUserComponent>,
@Inject(MAT_DIALOG_DATA) public data: DialogData,
@Inject(MAT_DIALOG_DATA) public data: IDialogData,
private FormBuilder: FormBuilder,
private HttpClient: HttpClient
) { }
......@@ -56,8 +57,3 @@ export class DeleteUserComponent implements OnInit {
});
}
}
export interface DialogData {
animal: string;
name: string;
}
......@@ -2,8 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Observable } from 'rxjs';
import { LoginService } from '../login/login.service';
import { Chart } from 'angular-highcharts';
import { HomeService, FutureTransaction } from './home.service';
import { HomeService } from './home.service';
import { MatPaginator, MatTableDataSource } from '@angular/material';
import { IFutureTransaction } from '../interfaces/IFutureTransaction';
 
@Component({
selector: 'app-home',
......@@ -14,7 +15,7 @@ import { MatPaginator, MatTableDataSource } from '@angular/material';
export class HomeComponent implements OnInit {
@ViewChild(MatPaginator, { static: true })
paginator: MatPaginator;
dataSource: MatTableDataSource<FutureTransaction>;
dataSource: MatTableDataSource<IFutureTransaction>;
displayedColumns: string[] = ['position', 'name', 'amount'];
 
 
......
import { Injectable, OnInit } from '@angular/core';
import { Injectable } from '@angular/core';
import { Chart } from 'angular-highcharts';
import { HttpClient } from '@angular/common/http';
import { MatTableDataSource } from '@angular/material';
import { HomeChartDefinitionsService } from './home-chart-definitions.service';
import { IFutureTransaction } from '../interfaces/IFutureTransaction';
import { ITransactionSumsContainer } from '../interfaces/ITransactionSumsContainer';
import { ITransaction } from '../interfaces/ITransaction';
 
@Injectable()
export class HomeService {
dataSource: MatTableDataSource<FutureTransaction>;
dataSource: MatTableDataSource<IFutureTransaction>;
 
constructor(private HttpClient: HttpClient, private HomeChartDefinitionsService: HomeChartDefinitionsService) {
this.dataSource = new MatTableDataSource<FutureTransaction>([]);
this.dataSource = new MatTableDataSource<IFutureTransaction>([]);
this.ReloadData();
}
 
......@@ -19,7 +22,7 @@ export class HomeService {
}
 
private LoadHistoryData(): void {
this.HttpClient.get<TransactionSumsContainer>('api/History').subscribe(res => {
this.HttpClient.get<ITransactionSumsContainer>('api/History').subscribe(res => {
if (res === null)
return;
 
......@@ -34,12 +37,12 @@ export class HomeService {
}
 
private LoadForecastData(): void {
this.HttpClient.get<TransactionSumsContainer>('api/Forecast').subscribe(res => {
this.HttpClient.get<ITransactionSumsContainer>('api/Forecast').subscribe(res => {
if (res === null)
return;
 
this.HomeChartDefinitionsService.ForecastTypes = new Array(res.smallCount, res.mediumCount, res.hugeCount);
let fileArray = new Array<FutureTransaction>();
let fileArray = new Array<IFutureTransaction>();
for (let i: number = 0; i < res.expenses.length; i++) {
fileArray.push({ position: i + 1, name: 'default', amount: res.expenses[i] });
}
......@@ -50,7 +53,7 @@ export class HomeService {
});
}
 
private MakePieChartData(input: Transaction[]): Array<{ name: string, y: number }> {
private MakePieChartData(input: ITransaction[]): Array<{ name: string, y: number }> {
let pieData = new Array<{ name: string, y: number }>();
 
for (let i: number = 0; i < input.length; i++) {
......@@ -67,25 +70,3 @@ export class HomeService {
public GetHistorySymbolTypePieChart(): Chart { return this.HomeChartDefinitionsService.HistorySymbolTypePieChart; }
public GetForecastPie(): Chart { return this.HomeChartDefinitionsService.ForecastPieChart; }
}
export interface Transaction {
amount: number;
count: number;
name: string;
}
interface TransactionSumsContainer {
expenses: number[];
smallCount: number;
mediumCount: number;
hugeCount: number;
expensesPerSymbolCategory: Transaction[];
expensesPerSymbolType: Transaction[];
expensesPerSize: Transaction[];
}
export interface FutureTransaction {
position: number;
name: string;
amount: number;
}
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//# sourceMappingURL=IDialogData.js.map
\ No newline at end of file
{"version":3,"file":"IDialogData.js","sourceRoot":"","sources":["IDialogData.ts"],"names":[],"mappings":""}
\ No newline at end of file
export interface IDialogData {
animal: string;
name: string;
}
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//# sourceMappingURL=IFutureTransaction.js.map
\ No newline at end of file
{"version":3,"file":"IFutureTransaction.js","sourceRoot":"","sources":["IFutureTransaction.ts"],"names":[],"mappings":""}
\ No newline at end of file
export interface IFutureTransaction {
position: number;
name: string;
amount: number;
}
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//# sourceMappingURL=ITransaction.js.map
\ No newline at end of file
{"version":3,"file":"ITransaction.js","sourceRoot":"","sources":["ITransaction.ts"],"names":[],"mappings":""}
\ No newline at end of file
export interface ITransaction {
amount: number;
count: number;
name: string;
}
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
//# sourceMappingURL=ITransactionSumsContainer.js.map
\ No newline at end of file
{"version":3,"file":"ITransactionSumsContainer.js","sourceRoot":"","sources":["ITransactionSumsContainer.ts"],"names":[],"mappings":""}
\ No newline at end of file
import { ITransaction } from "./ITransaction";
export interface ITransactionSumsContainer {
expenses: number[];
smallCount: number;
mediumCount: number;
hugeCount: number;
expensesPerSymbolCategory: ITransaction[];
expensesPerSymbolType: ITransaction[];
expensesPerSize: ITransaction[];
}
......@@ -42,8 +42,12 @@
<None Remove="ClientApp\src\app\home\components\czech-paginator-intl.ts" />
<None Remove="ClientApp\src\app\home\home.module.ts" />
<None Remove="ClientApp\src\app\home\components\import\import.service.ts" />
<None Remove="ClientApp\src\app\interfaces\IDialogData.ts" />
<None Remove="ClientApp\src\app\interfaces\IFile.ts" />
<None Remove="ClientApp\src\app\interfaces\IFutureTransaction.ts" />
<None Remove="ClientApp\src\app\interfaces\IRequestFiles.ts" />
<None Remove="ClientApp\src\app\interfaces\ITransaction.ts" />
<None Remove="ClientApp\src\app\interfaces\ITransactionSumsContainer.ts" />
<None Remove="ClientApp\src\app\login\login.service.ts" />
<None Remove="ClientApp\src\app\registration\registration.service.ts" />
</ItemGroup>
......@@ -61,8 +65,12 @@
<TypeScriptCompile Include="ClientApp\src\app\helpers\czech-paginator-intl.ts" />
<TypeScriptCompile Include="ClientApp\src\app\home\home.module.ts" />
<TypeScriptCompile Include="ClientApp\src\app\home\components\import\import.service.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\IDialogData.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\IFile.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\IFutureTransaction.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\IRequestFiles.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\ITransaction.ts" />
<TypeScriptCompile Include="ClientApp\src\app\interfaces\ITransactionSumsContainer.ts" />
<TypeScriptCompile Include="ClientApp\src\app\login\login.service.ts">
<SubType>Code</SubType>
</TypeScriptCompile>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment