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

layout update, import file design

parent 3837ab2c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 119 additions and 97 deletions
Core/Core/ClientApp/src/app/home/components/account-properties/change-password/change-password.component.html
+ 1
− 1
View file @ 95bb3e57
<h1 mat-dialog-title>Změnit heslo</h1>
<h2 mat-dialog-title>Změnit heslo</h2>
 
<form [formGroup]="InsertForm" (submit)="onChangeClick($event)">
<div mat-dialog-content>
......
Core/Core/ClientApp/src/app/home/components/account-properties/delete-user/delete-user.component.html
+ 1
− 1
View file @ 95bb3e57
<h1 mat-dialog-title>Smazat účet</h1>
<h2 mat-dialog-title>Smazat účet</h2>
 
<form [formGroup]="InsertForm" (submit)="onChangeClick($event)">
<div mat-dialog-content>
......
Core/Core/ClientApp/src/app/home/components/import/import.component.css
+ 10
− 1
View file @ 95bb3e57

form {
background-color: white;
padding: 2em 0 2em 0;
margin-bottom: 1em;
}
.fileName {
word-wrap: break-word;
overflow-wrap: break-word;
}
Core/Core/ClientApp/src/app/home/components/import/import.component.html
+ 19
− 17
View file @ 95bb3e57
<div>
 
<form method="post" enctype="multipart/form-data" asp-controller="FileUpload" asp-action="Index">
<div class="form-group">
<div class="col-md-10">
<p>Nahrát historii:</p>
<input
type="file"
id="file"
(change)="handleFileInput($event.target.files)"
multiple />
</div>
</div>
<div class="form-group">
<div class="col-md-10">
<input type="submit" value="Odeslat" (click)="uploadFileToActivity()"/>
<form method="post" enctype="multipart/form-data" asp-controller="FileUpload" asp-action="Index">
<div class="container-fluid">
<div class="row justify-content-center"><div class="col text-center"><h3>Nahrát historii</h3></div></div>
<div class="row">&nbsp;</div>
<div class="row">
<div class="col">
<button mat-raised-button (click)="openInput()">Vybrat soubor</button>
<input id="fileInput" hidden type="file" (change)="handleFileInput($event.target.files)" name="file" accept=".csv">
</div>
</div>
</form>
</div>
<div class="row" *ngIf="fileToUpload!=null && fileToUpload.name">&nbsp;</div>
<div class="row fileName" *ngIf="fileToUpload!=null && fileToUpload.name"><div class="col">{{fileToUpload.name}}</div></div>
<div class="row">&nbsp;</div>
<div class="row"><div class="col"><button mat-raised-button color="basic" (click)="uploadFileToActivity()" [disabled]="fileToUpload==null || !fileToUpload.name">Odeslat</button></div></div>
</div>
</form>
Core/Core/ClientApp/src/app/home/components/import/import.component.ts
+ 4
− 2
View file @ 95bb3e57
......@@ -15,16 +15,18 @@ export class ImportComponent {
constructor(private ImportService: ImportService, private DatachangeService: DatachangeService) { }
 
handleFileInput(files: FileList) {
console.log('hanfleFileInput');
this.fileToUpload = files.item(0);
}
 
uploadFileToActivity() {
console.log('uploadFileToActivity');
this.ImportService.postFile(this.fileToUpload).subscribe(data => {
this.DatachangeService.OnDataChange();
}, error => {
console.log(error);
});
}
openInput() {
document.getElementById("fileInput").click();
}
}
Core/Core/ClientApp/src/app/home/home.component.css
+ 0
− 4
View file @ 95bb3e57
......@@ -11,10 +11,6 @@
background-color: #f5f5f5;
}
 
.chart{
max-width: 20em;
}
table {
width: 100%;
}
......
Core/Core/ClientApp/src/app/home/home.component.html
+ 84
− 71
View file @ 95bb3e57
......@@ -5,88 +5,101 @@
</div>
</div>
<div class='container-fluid wrapper content'>
<div class="row">
<div class="col input__header"><app-import></app-import></div>
</div>
<div class="row">
<div id="Entries" class="col-md-auto"><app-file-history></app-file-history></div>
<div class="row">&nbsp;</div>
<div class="row justify-content-center"><h2>Historie</h2></div>
<div class="row">&nbsp;</div>
 
<div id="main" class="col">
<div class="row">
<div class="col-lg-5">
<div class="container-fluid">
<div class="row"><div class="col"><app-import></app-import></div></div>
<div class="row"><div class="col"><app-file-history></app-file-history></div></div>
</div>
</div>
<div class="col-lg-7">
<div class="container-fluid">
<div class="row justify-content-center"><h2>Historie</h2></div>
<div class="row justify-content-center">
<div id="History_WeeksBar" class="col-md-auto, chart"><div [chart]="HistoryWeeksBarChart"></div></div>
<div id="History_PerSizePie" class="col-md-auto, chart"><div [chart]="GetHistoryPerSizePie"></div></div>
<div id="History_WeeksBar" class="col-md-6"><div [chart]="HistoryWeeksBarChart"></div></div>
<div id="History_PerSizePie" class="col-md-6"><div [chart]="GetHistoryPerSizePie"></div></div>
</div>
<div class="row justify-content-center"><div class="col-md-auto">&nbsp;</div></div>
<div class="row justify-content-center">&nbsp;</div>
<div class="row justify-content-center">
<div id="History_SymbolCategoryChart" class="col-md-auto, chart"><div [chart]="HistorySymbolCategoryPieChart"></div></div>
<div id="History_SymbolTypeChart" class="col-md-auto, chart"><div [chart]="HistorySymbolTypePieChart"></div></div>
<div id="History_SymbolCategoryChart" class="col-md-6"><div [chart]="HistorySymbolCategoryPieChart"></div></div>
<div id="History_SymbolTypeChart" class="col-md-6"><div [chart]="HistorySymbolTypePieChart"></div></div>
</div>
<div class="row justify-content-center"><div class="col-md-auto">&nbsp;</div></div>
 
<div class="row justify-content-center"><h2>Předpovědi</h2></div>
<div class="row justify-content-center"><h3>1) Odhad neuronovou sítí</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Table" class="col-md-auto, chart">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef> No. </th>
<td mat-cell *matCellDef="let element"> {{element.position}} </td>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> Typ </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>
<!-- Amount Column -->
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> Částka </th>
<td mat-cell *matCellDef="let element"> {{element.amount}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
</div>
<div id="Forecast_Pie" class="col-md-auto, chart"><div [chart]="ForecastPieChart"></div></div>
</div>
</div>
</div>
</div>
 
<div class="row justify-content-center"><h3>2) Odhad průměrem</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Average_Line" class="col-md-auto, chart"><div [chart]="ForecastAverageLineChart"></div></div>
<div id="Forecast_Average_Pie" class="col-md-auto, chart"><div [chart]="ForecastAveragePieChart"></div></div>
<div class="row justify-content-center">&nbsp;</div>
<div class="row justify-content-center">
<div class="container-fluid">
<div class="row justify-content-center"><h2>Předpověď transakcí</h2></div>
<div class="row justify-content-center"><h3>1) Odhad neuronovou sítí</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Table" class="col-lg-5">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef> No. </th>
<td mat-cell *matCellDef="let element"> {{element.position}} </td>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> Typ </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>
<!-- Amount Column -->
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> Částka </th>
<td mat-cell *matCellDef="let element"> {{element.amount}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
</div>
<div id="Forecast_Pie" class="col-lg-5"><div [chart]="ForecastPieChart"></div></div>
</div>
 
<div class="row justify-content-center"><h3>3) Odhad částkou</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Table" class="col-md-auto, chart">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef> No. </th>
<td mat-cell *matCellDef="let element"> {{element.position}} </td>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> Typ </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>
<!-- Amount Column -->
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> Částka </th>
<td mat-cell *matCellDef="let element"> {{element.amount}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
</div>
<div class="row justify-content-center">&nbsp;</div>
<div class="row justify-content-center"><h3>2) Odhad průměrem</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Average_Line" class="col-md-8"><div [chart]="ForecastAverageLineChart"></div></div>
<div id="Forecast_Average_Pie" class="col-lg-4"><div [chart]="ForecastAveragePieChart"></div></div>
</div>
 
<div id="Forecast_AmountComparsion_Kind_Pie" class="col-md-auto, chart"><div [chart]="ForecastAmountComparsionKindPieChart"></div></div>
<div id="Forecast_AmountComparsion_Size_Pie" class="col-md-auto, chart"><div [chart]="ForecastAmountComparsionSizePieChart"></div></div>
</div>
<div class="row justify-content-center">&nbsp;</div>
<div class="row justify-content-center"><h3>3) Odhad částkou</h3></div>
<div class="row justify-content-center">
<div id="Forecast_Table" class="col-lg-4">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef> No. </th>
<td mat-cell *matCellDef="let element"> {{element.position}} </td>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> Typ </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>
<!-- Amount Column -->
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> Částka </th>
<td mat-cell *matCellDef="let element"> {{element.amount}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
</div>
<div id="Forecast_AmountComparsion_Kind_Pie" class="col-md-4"><div [chart]="ForecastAmountComparsionKindPieChart"></div></div>
<div id="Forecast_AmountComparsion_Size_Pie" class="col-md-4"><div [chart]="ForecastAmountComparsionSizePieChart"></div></div>
</div>
</div>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment