diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.css b/Front/skydivelogs-app/src/app/summary/summary.component.css index 0f8381a..05bb70b 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.css +++ b/Front/skydivelogs-app/src/app/summary/summary.component.css @@ -39,4 +39,11 @@ } .contentFlex { flex: 45%; -} \ No newline at end of file +} + +.chart-container { + position: relative; + margin: auto; + height: 80vh; + width: 80vw; +} diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html index 98ad3c3..4fc6ceb 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.html +++ b/Front/skydivelogs-app/src/app/summary/summary.component.html @@ -165,31 +165,17 @@ - - - - - - - - - - - - - - -
{{ element.label }}{{ element.label2 }}{{ element.nb }}
+
+ + +
diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts index 04a13f2..3323bc8 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.ts +++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts @@ -26,7 +26,6 @@ export class SummaryComponent implements OnInit { public dsNbJumpByGear: MatTableDataSource; public dsNbJumpByType: MatTableDataSource; public dsNbJumpByYear: MatTableDataSource; - public dsNbJumpByYearByJumpType: MatTableDataSource; public dsJumpForLastYearByDz: MatTableDataSource; public dsJumpForLastYearByJumpType: MatTableDataSource; public dsJumpForLastMonthByDz: MatTableDataSource; @@ -148,7 +147,6 @@ export class SummaryComponent implements OnInit { case 7: this.serviceApi.getStatsByYearByJumpType().subscribe((data) => { data.sort((a, b) => a.label.localeCompare(b.label)); - this.dsNbJumpByYearByJumpType = new MatTableDataSource(data); let firstYear: number = Number(data[0].label); const now = new Date(); @@ -186,27 +184,12 @@ export class SummaryComponent implements OnInit { backgroundColor: color, borderColor: color, pointBackgroundColor: color, - // pointBorderColor: "#fb0000ff", fill: false, pointRadius: 6, }; results.push(tmp); }); - // const results = Array.from(tmpResults, function (item) { - // //const color = this.jumpTypeToColor.get(item[0]); - // return { - // label: item[0], - // data: item[1], - // backgroundColor: color, - // borderColor: color, - // pointBackgroundColor: color, - // pointBorderColor: "#fb0000ff", - // fill: false, - // pointRadius: 6, - // }; - // }); - this.barChartData = { labels: listOfYears, datasets: results, @@ -226,7 +209,7 @@ export class SummaryComponent implements OnInit { this.barChartType = "line"; this.barChartOptions = { responsive: true, - maintainAspectRatio: true, + maintainAspectRatio: false, plugins: { legend: { display: true, @@ -246,6 +229,7 @@ export class SummaryComponent implements OnInit { }, y: { stacked: false, + beginAtZero: true, }, }, };