Browse Source

Bugfix/fix line chart labels (#491)

* Fix line chart labels

* Fix click event for drafts

* Update changelog
pull/492/head
Thomas Kaul 3 years ago
committed by GitHub
parent
commit
705441ecf8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      CHANGELOG.md
  2. 2
      apps/client/src/app/components/transactions-table/transactions-table.component.html
  3. 2
      apps/client/src/app/components/transactions-table/transactions-table.component.scss
  4. 12
      libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts

5
CHANGELOG.md

@ -16,6 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Upgraded `rxjs` from version `6.6.7` to `7.4.0` - Upgraded `rxjs` from version `6.6.7` to `7.4.0`
- Upgraded `storybook` from version `6.3.8` to `6.4.0-rc.3` - Upgraded `storybook` from version `6.3.8` to `6.4.0-rc.3`
### Fixed
- Fixed the broken line charts showing value labels if openend from the allocations page
- Fixed the click event for drafts in the transactions table
## 1.80.0 - 23.11.2021 ## 1.80.0 - 23.11.2021
### Added ### Added

2
apps/client/src/app/components/transactions-table/transactions-table.component.html

@ -254,10 +254,12 @@
*matRowDef="let row; columns: displayedColumns" *matRowDef="let row; columns: displayedColumns"
mat-row mat-row
(click)=" (click)="
!row.isDraft &&
onOpenPositionDialog({ onOpenPositionDialog({
symbol: row.symbol symbol: row.symbol
}) })
" "
[ngClass]="{ 'is-draft': row.isDraft }"
></tr> ></tr>
</table> </table>

2
apps/client/src/app/components/transactions-table/transactions-table.component.scss

@ -24,7 +24,9 @@
} }
.mat-row { .mat-row {
&:not(.is-draft) {
cursor: pointer; cursor: pointer;
}
.type-badge { .type-badge {
background-color: rgba(var(--palette-foreground-text), 0.05); background-color: rgba(var(--palette-foreground-text), 0.05);

12
libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts

@ -54,13 +54,7 @@ export class PortfolioProportionChartComponent
}; };
public constructor() { public constructor() {
Chart.register( Chart.register(ArcElement, DoughnutController, LinearScale, Tooltip);
ArcElement,
ChartDataLabels,
DoughnutController,
LinearScale,
Tooltip
);
} }
public ngAfterViewInit() { public ngAfterViewInit() {
@ -76,7 +70,6 @@ export class PortfolioProportionChartComponent
} }
public ngOnDestroy() { public ngOnDestroy() {
Chart.unregister(ChartDataLabels);
this.chart?.destroy(); this.chart?.destroy();
} }
@ -254,7 +247,7 @@ export class PortfolioProportionChartComponent
} else { } else {
this.chart = new Chart(this.chartCanvas.nativeElement, { this.chart = new Chart(this.chartCanvas.nativeElement, {
data, data,
options: { options: <unknown>{
cutout: '70%', cutout: '70%',
layout: { layout: {
padding: this.showLabels === true ? 100 : 0 padding: this.showLabels === true ? 100 : 0
@ -316,6 +309,7 @@ export class PortfolioProportionChartComponent
} }
} }
}, },
plugins: [ChartDataLabels],
type: 'doughnut' type: 'doughnut'
}); });
} }

Loading…
Cancel
Save