Skip to content

Adjustments #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Adjustments #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93836fd
Adjustments
maximgorbatyuk Jan 31, 2025
1a8f795
Adjustments
maximgorbatyuk Jan 31, 2025
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
34 changes: 5 additions & 29 deletions ...ules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,14 @@
<div class="h5 mb-3">{{ title }}</div>

<div class="row">
<div class="col-md-3">
<div
class="text-muted mb-1 d-flex justify-content-between align-items-center"
>
<span>Кликабельно <i class="bi bi-caret-down-fill"></i></span>
<span>Кол-во анкет</span>
</div>

<ul *ngIf="salaries" class="list-group list-group-flush">
<button
*ngFor="let item of salaries"
(click)="toggleBarDatasetByProfession(item)"
type="button"
class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
>
<span class="{{ item.turnedOn ? 'fw-bolder' : '' }}">
{{ item.professionName }}
</span>
<span
class="badge bg-{{
item.turnedOn ? 'primary' : 'secondary'
}} rounded-pill"
>{{ item.items.length }}</span
>
</button>
</ul>
</div>

<div class="col-md-9" *ngIf="canvasId">
<div class="" *ngIf="canvasId">
<div id="canvas-container">
<canvas [attr.id]="canvasId">{{ chartDataLocal }}</canvas>
</div>
</div>
<div class="small text-muted fst-italic">
Для графика использованы 90% анкет. Первые 5% и последние 5% не
учитываются.
</div>
</div>
</div>
21 changes: 2 additions & 19 deletions ...odules/salaries/components/salaries-by-grades-chart/salaries-by-grades-chart.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ export class SalariesByGradesChartComponent implements OnInit, OnDestroy {
@Input()
title: string | null = null;

@Input()
salaries: Array<SalariesPerProfession> | null = null;

@Input()
professions: Array<LabelEntityDto> = [];

chartDataLocal: SalariesChartJsObject | null = null;

readonly canvasId = "canvas_" + Math.random().toString(36);
Expand All @@ -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) {
Expand Down
32 changes: 1 addition & 31 deletions src/app/modules/salaries/components/salaries-by-grades-chart/salaries-chart-js-object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,10 @@ interface ChartDatasetType {
export class SalariesChartJsObject extends Chart {
private readonly datasets: Array<ChartDatasetType> = [];

constructor(
canvasId: string,
chartData: SalariesByMoneyBarChart,
professions: Array<LabelEntityDto>
) {
constructor(canvasId: string, chartData: SalariesByMoneyBarChart) {
const randomColor = new RandomRgbColor();
const datasets: Array<ChartDatasetType> = [];

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,
Expand Down Expand Up @@ -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) {
Expand Down
69 changes: 24 additions & 45 deletions src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,25 +301,39 @@
</div>

<div class="mt-5 mb-5">
<div class="h4">Зарплаты по грейдам в таблицах</div>
<div class="row mt-3">
<div class="col-md-6 mb-3">
<div class="h5 mb-2">Казахстан</div>
<div class="h4">Зарплаты в Казахстанских компаниях</div>

<div class="mt-3">
<div>
<app-salaries-by-grade-block
[chart]="salariesChart"
[showLocal]="true"
></app-salaries-by-grade-block>
</div>
<div class="col-md-6 mb-3">
<div class="h5 mb-2">Удаленка</div>
<app-salaries-by-grade-block
[chart]="salariesChart"
[showLocal]="false"
></app-salaries-by-grade-block>

<div class="mt-3">
<app-salaries-by-grades-chart
[chart]="salariesChart.salariesByMoneyBarChart"
/>
</div>
</div>
</div>

<div class="mt-5 mb-5" *ngIf="salariesChart.hasRemoteSalaries">
<div class="h4">Зарплаты валютных удаленщиков</div>
<div class="mt-3">
<app-salaries-by-grade-block
[chart]="salariesChart"
[showLocal]="false"
></app-salaries-by-grade-block>
</div>
<div class="mt-3">
<app-salaries-by-grades-chart
[chart]="salariesChart.salariesByMoneyBarChartForRemote"
/>
</div>
</div>

<div class="mt-5 mb-5">
<app-grades-min-max-chart [source]="salariesChart">
</app-grades-min-max-chart>
Expand Down Expand Up @@ -401,41 +415,6 @@
</div>
</div>

<div
class="card mt-5"
*ngIf="!showDataStub && salariesChart.salariesByMoneyBarChart"
>
<div class="card-body py-5 px-5">
<div class="mb-5 display-4">
<span>Сравнение зарплат и специализаций</span>
</div>

<div class="mt-5 mb-5">
<app-salaries-by-grades-chart
[chart]="salariesChart.salariesByMoneyBarChart"
[salaries]="salariesChart.salariesPerProfessionForLocal"
[professions]="professions"
>
</app-salaries-by-grades-chart>
</div>

<div class="mt-5 mb-5" *ngIf="salariesChart.hasRemoteSalaries">
<app-salaries-by-grades-chart
[chart]="salariesChart.salariesByMoneyBarChartForRemote"
[salaries]="salariesChart.salariesPerProfessionForRemote"
[professions]="professions"
>
</app-salaries-by-grades-chart>
</div>

<div *ngIf="shouldShowSurveyBlock" class="mt-3 mb-5">
<app-salaries-survey-block
(closeButtonClick)="closeSurveyBlock()"
></app-salaries-survey-block>
</div>
</div>
</div>

<div
class="card mt-5"
*ngIf="!showDataStub && salariesChart.salariesByMoneyBarChart"
Expand Down
1 change: 0 additions & 1 deletion src/app/modules/salaries/components/salaries-chart/stub-salaries-chart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export class StubSalariesChart extends SalariesChart {
items: StubSalariesChart.salaryLabels.map((x) =>
StubSalariesChart.getRandomNumber(100, 25)
),
itemsByProfession: [],
labels: StubSalariesChart.salaryLabels,
},
salariesByMoneyBarChartForRemote: null,
Expand Down
6 changes: 0 additions & 6 deletions src/app/services/user-salaries.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,9 @@ export interface PeopleByGradesChartData {
}>;
}

export interface SalariesByProfessionMoneyBarChartItem {
profession: number;
items: Array<number>;
}

export interface SalariesByMoneyBarChart {
labels: string[];
items: Array<number>;
itemsByProfession: Array<SalariesByProfessionMoneyBarChartItem>;
}

export interface CreateSalaryRecordResponse {
Expand Down
Loading