diff --git a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.html b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.html index bbd77511..4dece9d6 100644 --- a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.html +++ b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.html @@ -2,38 +2,14 @@
{{ title }}
-
-
- Кликабельно - Кол-во анкет -
- - -
- -
+
{{ chartDataLocal }}
+
+ Для графика использованы 90% анкет. Первые 5% и последние 5% не + учитываются. +
diff --git a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.ts b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.ts index f2f45b09..8fdea0f3 100644 --- a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.ts +++ b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.ts @@ -16,12 +16,6 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { @Input() title: string | null = null; - @Input() - salaries: Array | null = null; - - @Input() - professions: Array = []; - chartDataLocal: SalariesChartJsObject | null = null; readonly canvasId = "canvas_" + Math.random().toString(36); @@ -40,23 +34,12 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { // ignored } - toggleBarDatasetByProfession(item: SalariesPerProfession): void { - item.toggle(); - this.chartDataLocal?.toggleDatasetByProfession(item.profession); - } - private initChart(): void { - if (this.chart == null || this.salaries == null) { + if (this.chart == null) { return; } - this.chartDataLocal = new SalariesChartJsObject( - this.canvasId, - this.chart, - this.professions - ); - - this.chartDataLocal.hideProfessionDatasets(); + this.chartDataLocal = new SalariesChartJsObject(this.canvasId, this.chart); var chartEl = document.getElementById(this.canvasId); if (chartEl != null && chartEl.parentElement != null) { diff --git a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-chart-js-object.ts b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-chart-js-object.ts index 59b58c34..4ff00bdc 100644 --- a/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-chart-js-object.ts +++ b/src/app/modules/salaries/components/salaries-by-grades-chart/salaries-chart-js-object.ts @@ -17,29 +17,10 @@ interface ChartDatasetType { export class SalariesChartJsObject extends Chart { private readonly datasets: Array = []; - constructor( - canvasId: string, - chartData: SalariesByMoneyBarChart, - professions: Array - ) { + constructor(canvasId: string, chartData: SalariesByMoneyBarChart) { const randomColor = new RandomRgbColor(); const datasets: Array = []; - chartData.itemsByProfession.forEach((x, i) => { - const color = new RandomRgbColor(); - datasets.push({ - profession: x.profession, - label: - professions.find((p) => p.id == x.profession)?.title ?? "Unknown", - data: x.items, - borderWidth: 2, - borderColor: color.toString(1), - backgroundColor: color.toString(0.7), - type: "line" as ChartType, - pointStyle: false as PointStyle, - }); - }); - datasets.push({ profession: null, type: "bar" as ChartType, @@ -93,17 +74,6 @@ export class SalariesChartJsObject extends Chart { this.datasets = datasets; } - hideProfessionDatasets(): void { - for (let index = 0; index < this.datasets.length; index++) { - const dataset = this.datasets[index]; - if (dataset.profession != null) { - this.setDatasetVisibility(index, false); - } - } - - this.update(); - } - toggleDatasetByProfession(professionId: number | null): void { const index = this.datasets.findIndex((x) => x.profession == professionId); if (index == -1) { diff --git a/src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html b/src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html index 6c703fb0..6e7b7e4c 100644 --- a/src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html +++ b/src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html @@ -301,25 +301,39 @@
-
Зарплаты по грейдам в таблицах
-
-
-
Казахстан
+
Зарплаты в Казахстанских компаниях
+ +
+
-
-
Удаленка
- + +
+
+
+
Зарплаты валютных удаленщиков
+
+ +
+
+ +
+
+
@@ -401,41 +415,6 @@
-
-
-
- Сравнение зарплат и специализаций -
- -
- - -
- -
- - -
- -
- -
-
-
-
StubSalariesChart.getRandomNumber(100, 25) ), - itemsByProfession: [], labels: StubSalariesChart.salaryLabels, }, salariesByMoneyBarChartForRemote: null, diff --git a/src/app/services/user-salaries.service.ts b/src/app/services/user-salaries.service.ts index c1419f74..7fd88390 100644 --- a/src/app/services/user-salaries.service.ts +++ b/src/app/services/user-salaries.service.ts @@ -87,15 +87,9 @@ export interface PeopleByGradesChartData { }>; } -export interface SalariesByProfessionMoneyBarChartItem { - profession: number; - items: Array; -} - export interface SalariesByMoneyBarChart { labels: string[]; items: Array; - itemsByProfession: Array; } export interface CreateSalaryRecordResponse {