Customers have the right to request the restriction of certain uses and disclosures of personally
- identifiable information as follows. You can contact us in order to (1) update or correct your personally
+ identifiable information as follows. You can contact us in order to (1) update or correct your personally
identifiable information, (2) change your preferences with respect to communications and other information
you receive from us, or (3) delete the personally identifiable information maintained about you on our
- systems (subject to the following paragraph), by cancelling your account. Such updates, corrections, changes
+ systems (subject to the following paragraph), by cancelling your account. Such updates, corrections, changes
and deletions will have no effect on other information that we maintain, or information that we have
provided to third parties in accordance with this Privacy Policy prior to such update, correction, change or
deletion. To protect your privacy and security, we may take reasonable steps (such as requesting a unique
@@ -340,7 +340,7 @@
Your Consent
- We've updated our Privacy Policy to provide you with complete transparency into what is being set when you
+ We've updated our Privacy Policy to provide you with complete transparency into what is being set when you
visit our site and how it's being used. By using our website, registering an account, or making a purchase,
you hereby consent to our Privacy Policy and agree to its terms.
@@ -454,7 +454,7 @@
What is GDPR?
GDPR is an EU-wide privacy and data protection law that regulates how EU residents' data is protected by
- companies and enhances the control the EU residents have, over their personal data.
+ companies and enhances the control the EU residents have, over their personal data.
The GDPR is relevant to any globally operating company and not just the EU-based businesses and EU
@@ -504,7 +504,7 @@
Individual Data Subject's Rights - Data Access, Portability and Deletion
- We are committed to helping our customers meet the data subject rights requirements of GDPR. Tech.Interview
+ We are committed to helping our customers meet the data subject rights requirements of GDPR. Tech.Interview
processes or stores all personal data in fully vetted, DPA compliant vendors. We do store all conversation
and personal data for up to 6 years unless your account is deleted. In which case, we dispose of all data in
accordance with our Terms of Service and Privacy Policy, but we will not hold it longer than 60 days.
@@ -512,7 +512,7 @@
We are aware that if you are working with EU customers, you need to be able to provide them with the ability
to access, update, retrieve and remove personal data. We got you! We've been set up as self service from the
- start and have always given you access to your data and your customers data. Our customer support team is
+ start and have always given you access to your data and your customers data. Our customer support team is
here for you to answer any questions you might have about working with the API.
diff --git a/src/app/modules/salaries/components/add-salary/add-salary-form.ts b/src/app/modules/salaries/components/add-salary/add-salary-form.ts
new file mode 100644
index 00000000..e1e02571
--- /dev/null
+++ b/src/app/modules/salaries/components/add-salary/add-salary-form.ts
@@ -0,0 +1,67 @@
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { DeveloperGrade } from "@models/enums";
+import { CompanyType } from "@models/salaries/company-type";
+import { Currency } from "@models/salaries/currency";
+import { UserProfession } from "@models/salaries/user-profession";
+import { CreateUserSalaryRequest } from "@services/user-salaries.service";
+
+export class AddSalaryForm extends FormGroup {
+
+static readonly digitsPattern = '^[0-9]*$';
+
+ constructor() {
+ const now = new Date(Date.now());
+ const currentQuarter = Math.floor((now.getMonth() + 3) / 3);
+
+ super({
+ value: new FormControl(
+ null,
+ [
+ Validators.pattern(AddSalaryForm.digitsPattern),
+ Validators.required
+ ]),
+ quarter: new FormControl(
+ currentQuarter,
+ [
+ Validators.pattern(AddSalaryForm.digitsPattern),
+ Validators.min(1),
+ Validators.max(4),
+ Validators.required
+ ]),
+ year: new FormControl(
+ now.getFullYear(),
+ [
+ Validators.pattern(AddSalaryForm.digitsPattern),
+ Validators.min(2000),
+ Validators.max(2100),
+ Validators.required
+ ]),
+ currency: new FormControl(Currency.KZT, [Validators.required]),
+ company: new FormControl(null, [Validators.required]),
+ grade: new FormControl(null, []),
+ profession: new FormControl(null, [Validators.required]),
+ });
+ }
+
+ createRequestOrNull(): CreateUserSalaryRequest | null {
+ if (this.valid) {
+ const profession = Number(this.value.profession) as UserProfession;
+ const grade = this.value.grade != null
+ ? Number(this.value.grade) as DeveloperGrade
+ : null;
+
+ return {
+ value: Number(this.value.value),
+ quarter: Number(this.value.quarter),
+ year: Number(this.value.year),
+ currency: Number(this.value.currency) as Currency,
+ company: Number(this.value.company) as CompanyType,
+ grade: grade,
+ profession: profession,
+ };
+ }
+
+ this.markAllAsTouched();
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/app/modules/salaries/components/add-salary/add-salary.component.html b/src/app/modules/salaries/components/add-salary/add-salary.component.html
new file mode 100644
index 00000000..88b7d84f
--- /dev/null
+++ b/src/app/modules/salaries/components/add-salary/add-salary.component.html
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+ Для того, чтобы просматривать график зарплат, вам нужно сначала внести свою. График открывается, только если среди данных есть ваша зарплата за последний год.
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/modules/salaries/components/add-salary/add-salary.component.scss b/src/app/modules/salaries/components/add-salary/add-salary.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/modules/salaries/components/add-salary/add-salary.component.spec.ts b/src/app/modules/salaries/components/add-salary/add-salary.component.spec.ts
new file mode 100644
index 00000000..035696de
--- /dev/null
+++ b/src/app/modules/salaries/components/add-salary/add-salary.component.spec.ts
@@ -0,0 +1,28 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddSalaryComponent } from './add-salary.component';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { mostUsedImports, testUtilStubs, mostUsedServices } from '@shared/test-utils';
+
+describe('AddSalaryComponent', () => {
+ let component: AddSalaryComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [AddSalaryComponent],
+ imports: [...mostUsedImports],
+ providers: [...testUtilStubs, ...mostUsedServices],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(AddSalaryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/modules/salaries/components/add-salary/add-salary.component.ts b/src/app/modules/salaries/components/add-salary/add-salary.component.ts
new file mode 100644
index 00000000..24b3073d
--- /dev/null
+++ b/src/app/modules/salaries/components/add-salary/add-salary.component.ts
@@ -0,0 +1,57 @@
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { UserSalariesService } from '@services/user-salaries.service';
+import { AddSalaryForm } from './add-salary-form';
+import { untilDestroyed } from '@shared/subscriptions/until-destroyed';
+import { CompanyTypeSelectItem } from '@shared/select-boxes/company-type-select-item';
+import { DeveloperGradeSelectItem } from '@shared/select-boxes/developer-grade-select-item';
+import { ProfessionSelectItem } from '@shared/select-boxes/profession-select-item';
+import { UserSalary } from '@models/salaries/salary.model';
+
+@Component({
+ selector: 'app-add-salary-modal',
+ templateUrl: './add-salary.component.html',
+ styleUrl: './add-salary.component.scss'
+})
+export class AddSalaryComponent implements OnInit, OnDestroy {
+
+ @Output()
+ closed: EventEmitter = new EventEmitter();
+
+ @Output()
+ salaryAdded: EventEmitter = new EventEmitter();
+
+ addSalaryForm: AddSalaryForm | null = null;
+
+ readonly companyTypes: Array = CompanyTypeSelectItem.allItems();
+ readonly grades: Array = DeveloperGradeSelectItem.allGrades();
+ readonly professions: Array = ProfessionSelectItem.allItems();
+
+ constructor(
+ private readonly service: UserSalariesService) {}
+
+ ngOnInit(): void {
+ this.addSalaryForm = new AddSalaryForm();
+ }
+
+ addSalarySubmitAction(): void {
+ const data = this.addSalaryForm?.createRequestOrNull();
+ if (data == null) {
+ return;
+ }
+
+ this.service
+ .create(data)
+ .pipe(untilDestroyed(this))
+ .subscribe((x) => {
+ this.salaryAdded.emit(x);
+ });
+ }
+
+ ngOnDestroy(): void {
+ // ignored
+ }
+
+ close(): void {
+ this.closed.emit();
+ }
+}
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
new file mode 100644
index 00000000..ad95f4bb
--- /dev/null
+++ b/src/app/modules/salaries/components/salaries-chart/salaries-chart.component.html
@@ -0,0 +1,66 @@
+Зарплаты в Казахстане
+
+
+
+
+
+ На графике можно увидеть зарплаты в Казахстане по разным специальностям IT. Данные заполняются самими пользователями.
+
+
+
+
+
+
+
+
Медианная зарплата:
+
+ {{ salariesChart.medianSalary }}
+ тенге.
+
+
+
+
+
Средняя зарплата:
+
+ {{ salariesChart.averageSalary }}
+ тенге.
+
+
+
+
+
+
+
+
Tech.Interview
Kazakhstan, Almaty
-
2022, © maximgorbatyuk
+
2024, © maximgorbatyuk