Skip to content
This repository was archived by the owner on Jul 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions src/app/dashboard/charts/linechart/linechart.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {Component, Input, OnChanges, OnInit} from '@angular/core';
import {DatePipe} from "@angular/common";
import {DatePipe} from '@angular/common';

@Component({
selector: 'app-linechart',
templateUrl: './linechart.component.html',
styleUrls: ['./linechart.component.css']
})
export class LinechartComponent implements OnInit, OnChanges{
export class LinechartComponent implements OnInit, OnChanges {

@Input() labels: string[];
@Input() statistics: any;
Expand All @@ -18,7 +18,7 @@ export class LinechartComponent implements OnInit, OnChanges{
private lineChartLabels = [];
private lineChartData: Array<any>;

constructor(private datePipe: DatePipe){
constructor(private datePipe: DatePipe) {

}

Expand Down Expand Up @@ -46,8 +46,6 @@ export class LinechartComponent implements OnInit, OnChanges{
this.lineChartData = [];
this.lineChartLabels.length = 0;

let dataHelperArray = [];
let dateHelperArray = [];
let dataArray = [];
let dates = [];
dataArray = this.statistics.map(record => {
Expand All @@ -57,32 +55,21 @@ export class LinechartComponent implements OnInit, OnChanges{
return this.datePipe.transform(record.timeStamp, 'short');
});

// TODO remove once backend is fixed
let size = dataArray.length
for(let j = 1; j <= 50; j++){
let index = (Math.floor(size/50)) * j;
dataHelperArray[j-1]=dataArray[index];
dateHelperArray[j-1]=dates[index];
}

for (let i = 0; i < dateHelperArray.length; i++) {
this.lineChartLabels.push(dateHelperArray[i]);
for (let i = 0; i < dates.length; i++) {
this.lineChartLabels.push(dates[i]);
}
this.lineChartData = [
{data: dataHelperArray, label: this.labels[0], borderWidth: [1]},
{data: dataArray, label: this.labels[0], borderWidth: [1]},
];



}


// events
public chartClicked(e:any):void {
public chartClicked(e: any): void {
console.log(e);
}

public chartHovered(e:any):void {
public chartHovered(e: any): void {
console.log(e);
}
}
8 changes: 4 additions & 4 deletions src/app/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
}

loadTimeBasedPublicData(start: Date, end: Date) {
const query = 'startTime=' + start.toISOString() + '&endTime=' + end.toISOString();
this.publicStatisticsService.query(query)
const query = 'startTime=' + start.toISOString() + '&endTime=' + end.toISOString() + '&numberOfItems=100';
this.publicStatisticsService.query(query)
.subscribe(
response => {
this.timeBasedPublicStatistics = response;
Expand All @@ -90,11 +90,11 @@ export class DashboardComponent implements OnInit, OnDestroy {
}

loadTimeBasedPrivateData(start: Date, end: Date) {
const query = 'startTime=' + start.toISOString() + '&endTime=' + end.toISOString();
console.log(start.toISOString());
const query = 'startTime=' + start.toISOString() + '&endTime=' + end.toISOString() + '&numberOfItems=100';
this.privateStatisticsService.query(query)
.subscribe(
response => {
console.log(response);
this.timeBasedPrivateStatistics = response;
}
);
Expand Down