From 93836fd50b4c335c025c5eeaa2c2a87c6775de9b Mon Sep 17 00:00:00 2001 From: "maxim.gorbatyuk" Date: Fri, 31 Jan 2025 20:31:20 +0500 Subject: [PATCH 1/2] Adjustments --- .../salaries-by-grades-chart.component.html | 30 +------------------ .../salaries-by-grades-chart.component.ts | 13 +------- .../salaries-chart-js-object.ts | 29 +----------------- .../salaries-chart.component.html | 10 ++----- .../salaries-chart/stub-salaries-chart.ts | 1 - src/app/services/user-salaries.service.ts | 6 ---- 6 files changed, 5 insertions(+), 84 deletions(-) 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..70f5a12a 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,35 +2,7 @@
{{ title }}
-
-
- Кликабельно - Кол-во анкет -
- -
    - -
-
- -
+
{{ chartDataLocal }}
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..c49269f5 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 @@ -19,9 +19,6 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { @Input() salaries: Array | null = null; - @Input() - professions: Array = []; - chartDataLocal: SalariesChartJsObject | null = null; readonly canvasId = "canvas_" + Math.random().toString(36); @@ -40,11 +37,6 @@ 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) { return; @@ -52,12 +44,9 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { this.chartDataLocal = new SalariesChartJsObject( this.canvasId, - this.chart, - this.professions + this.chart ); - this.chartDataLocal.hideProfessionDatasets(); - var chartEl = document.getElementById(this.canvasId); if (chartEl != null && chartEl.parentElement != null) { chartEl.style.height = chartEl?.parentElement.style.height ?? "100%"; 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..93cf74af 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 @@ -19,27 +19,11 @@ export class SalariesChartJsObject extends Chart { constructor( canvasId: string, - chartData: SalariesByMoneyBarChart, - professions: Array + 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 +77,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..b07cd503 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 @@ -413,19 +413,13 @@
- + [salaries]="salariesChart.salariesPerProfessionForLocal" />
- + [salaries]="salariesChart.salariesPerProfessionForRemote" />
diff --git a/src/app/modules/salaries/components/salaries-chart/stub-salaries-chart.ts b/src/app/modules/salaries/components/salaries-chart/stub-salaries-chart.ts index 36ae2651..d8f61b8b 100644 --- a/src/app/modules/salaries/components/salaries-chart/stub-salaries-chart.ts +++ b/src/app/modules/salaries/components/salaries-chart/stub-salaries-chart.ts @@ -38,7 +38,6 @@ export class StubSalariesChart extends SalariesChart { items: StubSalariesChart.salaryLabels.map((x) => 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 { From 1a8f7959430fc111855b008b13b3458afd27fbee Mon Sep 17 00:00:00 2001 From: "maxim.gorbatyuk" Date: Fri, 31 Jan 2025 20:55:19 +0500 Subject: [PATCH 2/2] Adjustments --- .../salaries-by-grades-chart.component.html | 4 ++ .../salaries-by-grades-chart.component.ts | 10 +-- .../salaries-chart-js-object.ts | 5 +- .../salaries-chart.component.html | 63 +++++++------------ 4 files changed, 31 insertions(+), 51 deletions(-) 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 70f5a12a..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 @@ -7,5 +7,9 @@ {{ 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 c49269f5..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,9 +16,6 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { @Input() title: string | null = null; - @Input() - salaries: Array | null = null; - chartDataLocal: SalariesChartJsObject | null = null; readonly canvasId = "canvas_" + Math.random().toString(36); @@ -38,14 +35,11 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy { } private initChart(): void { - if (this.chart == null || this.salaries == null) { + if (this.chart == null) { return; } - this.chartDataLocal = new SalariesChartJsObject( - this.canvasId, - this.chart - ); + 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 93cf74af..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,10 +17,7 @@ interface ChartDatasetType { export class SalariesChartJsObject extends Chart { private readonly datasets: Array = []; - constructor( - canvasId: string, - chartData: SalariesByMoneyBarChart - ) { + constructor(canvasId: string, chartData: SalariesByMoneyBarChart) { const randomColor = new RandomRgbColor(); const datasets: Array = []; 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 b07cd503..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,35 +415,6 @@
-
-
-
- Сравнение зарплат и специализаций -
- -
- -
- -
- -
- -
- -
-
-
-