add modals of errors & fix registration fields

Author: Awakich

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.html

@@ -55,7 +55,6 @@ <h3 class="auth__title">
         <fieldset class="years__left">
           <label for="entryYear" class="field-label">Дата начала</label>
           <app-select
-            [selectedId]="selectedEntryYearEducationId()"
             formControlName="entryYear"
             placeholder="2023 год"
             [options]="yearListEducation"
@@ -73,7 +72,6 @@ <h3 class="auth__title">
         <fieldset class="years__right">
           <label for="completionYear" class="field-label">Дата окончания</label>
           <app-select
-            [selectedId]="selectedComplitionYearEducationId()"
             formControlName="completionYear"
             placeholder="2023 год"
             [options]="yearListEducation.slice(5)"
@@ -167,7 +165,7 @@ <h3 class="auth__title">
           class="page__add-education"
           (click)="addEducation()"
         >
-          <span>Добавить образование</span>
+          <span>{{ editEducationClick ? "Созранить изменения" : "Добавить образование" }}</span>
           <i appIcon icon="plus" appSquare="14"></i>
         </app-button>
 
@@ -305,7 +303,7 @@ <h3 class="auth__title">
           class="page__add-education"
           (click)="addWork()"
         >
-          <span>Добавить место работы</span>
+          <span>{{ editWorkClick ? "Сохранить изменения" : "Добавить место работы" }}</span>
           <i appIcon icon="plus" appSquare="14"></i>
         </app-button>
 
@@ -435,7 +433,7 @@ <h3 class="auth__title">
         class="page__add-education"
         (click)="addLanguage()"
       >
-        <span>Добавить язык</span>
+        <span>{{ editLanguageClick ? "Сохранить изменения" : "Добавить язык" }}</span>
         <i appIcon icon="plus" appSquare="14"></i>
       </app-button>
 

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.ts

@@ -579,6 +579,7 @@ export class OnboardingStageZeroComponent implements OnInit, OnDestroy {
 
   onSubmit(): void {
     if (!this.validationService.getFormValidation(this.stageForm)) {
+      this.achievements.markAllAsTouched();
       return;
     }
 

projects/social_platform/src/app/office/profile/edit/edit.component.html

@@ -43,6 +43,7 @@
             <app-avatar-control
               id="avatar"
               formControlName="avatar"
+              type="profile"
               [size]="180"
               [error]="avatar | controlError"
             ></app-avatar-control>
@@ -834,7 +835,15 @@
       ></i>
       <p class="cancel__title text-bold-body-16">Произошла ошибка при редактировании!</p>
     </div>
+    @if (isModalErrorSkillChooseText()) {
     <p class="text-body-14 cancel__text">{{ isModalErrorSkillChooseText() }}.</p>
+    } @else {
+    <p class="text-body-14 cancel__text">
+      Для публикации профиля, нужно заполнить все <strong>обязательные поля</strong> (они будут
+      <strong>подсвечены&nbsp;<span>красным</span></strong
+      >).
+    </p>
+    }
   </div>
 </app-modal>
 

projects/social_platform/src/app/office/profile/edit/edit.component.ts

@@ -739,6 +739,7 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
 
   saveProfile(): void {
     if (!this.validationService.getFormValidation(this.profileForm) || this.profileFormSubmitting) {
+      this.isModalErrorSkillsChoose.set(true);
       return;
     }
 

projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.html

@@ -2,9 +2,8 @@
 
 <div
   [ngStyle]="{
-  border: type === 'project' ? '3px solid var(--accent)' : '3px solid var(--accent)',
-  borderRadius: type === 'project' ? '50%' : '0%',
-}"
+    border: (type === 'project' || type === 'profile') ? '3px solid var(--accent)' : 'none',
+  }"
   class="control"
   [style.width]="size + 'px'"
   [style.height]="size + 'px'"

projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.scss

@@ -1,4 +1,5 @@
 .control {
+  border-radius: 50%;
   &__overlay {
     position: absolute;
     top: 0;

projects/social_platform/src/app/ui/components/avatar-control/avatar-control.component.ts

@@ -28,7 +28,7 @@ export class AvatarControlComponent implements OnInit, ControlValueAccessor {
 
   @Input() size = 140;
   @Input() error = false;
-  @Input() type: "avatar" | "project" = "avatar";
+  @Input() type: "avatar" | "project" | "profile" = "avatar";
 
   ngOnInit(): void {}