change design of achievements, additional, team on half & remove old params in project

Author: Awakich

projects/core/src/consts/navProjectItems.ts

@@ -9,32 +9,26 @@ import { EditStep } from "@office/projects/edit/services/project-step.service";
 export const navItems = [
   {
     step: "main" as EditStep, // Идентификатор шага
-    src: "/assets/images/projects/edit/main.svg", // Путь к иконке
     label: "Основные данные", // Отображаемый текст
   },
   {
     step: "contacts" as EditStep,
-    src: "/assets/images/projects/edit/contacts.svg",
-    label: "Контакты и ссылки",
+    label: "Партнеры и ресурсы",
   },
   {
     step: "achievements" as EditStep,
-    src: "/assets/images/projects/edit/achievements.svg",
     label: "Достижения",
   },
   {
     step: "vacancies" as EditStep,
-    src: "/assets/images/projects/edit/vacancies.svg",
     label: "Вакансии",
   },
   {
     step: "team" as EditStep,
-    src: "/assets/images/projects/edit/team.svg",
     label: "Команда",
   },
   {
     step: "additional" as EditStep,
-    src: "/assets/images/projects/edit/additional.svg",
-    label: "Доп. сведения",
+    label: "Данные для конкурсов",
   },
 ];

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

@@ -1,12 +1,37 @@
 <!-- @format -->
 <div>
   <div class="project__top">
-    <p class="project__title">Редактировать проект</p>
-    <a class="project__back" [routerLink]="'/office/projects/' + profileId">
-      <app-button size="big" [color]="'grey'" customTypographyClass="text-body-12"
-        >Назад</app-button
+    <div class="project__back" [routerLink]="'/office/projects/' + profileId">
+      <i appIcon icon="left-arrow" appSquare="24"></i>
+      <h1 class="project__title">Редактировать проект</h1>
+    </div>
+    <div class="project__save">
+      <app-button
+        size="medium"
+        customTypographyClass="text-body-12"
+        color="red"
+        (click)="deleteProject()"
+      >
+        Удалить проект
+      </app-button>
+      <app-button
+        size="medium"
+        customTypographyClass="text-body-12"
+        appearance="outline"
+        [loader]="projFormIsSubmittingAsDraft"
+        (click)="saveProjectAsDraft()"
       >
-    </a>
+        Сохранить черновик
+      </app-button>
+      <app-button
+        size="medium"
+        customTypographyClass="text-body-12"
+        [loader]="projFormIsSubmittingAsPublished"
+        (click)="saveProjectAsPublished()"
+      >
+        {{ isCompetitive ? "Отправить заявку" : "Сохранить" }}
+      </app-button>
+    </div>
   </div>
   <main class="project">
     <form [formGroup]="projectForm" class="project__form">
@@ -53,28 +78,6 @@
         ></app-project-additional-step>
         }
       </div>
-      <div class="project__save">
-        <app-button customTypographyClass="text-body-12" color="red" (click)="deleteProject()">
-          Удалить проект
-        </app-button>
-        <app-button
-          size="medium"
-          customTypographyClass="text-body-12"
-          color="grey"
-          [loader]="projFormIsSubmittingAsDraft"
-          (click)="saveProjectAsDraft()"
-        >
-          Сохранить черновик
-        </app-button>
-        <app-button
-          size="medium"
-          customTypographyClass="text-body-12"
-          [loader]="projFormIsSubmittingAsPublished"
-          (click)="saveProjectAsPublished()"
-        >
-          {{ isCompetitive ? "Отправить заявку" : "Сохранить" }}
-        </app-button>
-      </div>
     </form>
     <app-modal
       [open]="

projects/social_platform/src/app/office/projects/edit/edit.component.scss

@@ -7,16 +7,21 @@
   position: relative;
   height: 100%;
   min-height: 800px;
-  padding: 24px;
+  padding: 100px 24px;
   background-color: var(--white);
   border-radius: var(--rounded-md);
 
   &__top {
+    position: fixed;
+    top: 5%;
+    left: 20%;
+    z-index: 10;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-top: 17px;
-    margin-bottom: 18px;
+    width: 72%;
+    background-color: var(--white);
+    border-radius: var(--rounded-xl);
   }
 
   &__title {
@@ -30,23 +35,16 @@
   }
 
   &__back {
-    width: 20%;
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    cursor: pointer;
   }
 
   &__form {
     display: flex;
     flex-direction: column;
-    padding: 15px;
     color: var(--black);
-    background-color: var(--white);
-    border: 1px solid var(--grey-button);
-    border-radius: var(--rounded-md);
-
-    @include responsive.apply-desktop {
-      flex-direction: column;
-      align-items: flex-start;
-      padding: 24px;
-    }
   }
 
   &__inner {
@@ -113,13 +111,8 @@
 
   &__save {
     @include responsive.apply-desktop {
-      position: absolute;
-      right: 50px;
-      bottom: 48px;
       display: flex;
       gap: 10px;
-      justify-content: flex-end;
-      order: unset;
     }
   }
 

projects/social_platform/src/app/office/projects/edit/services/project-achievements.service.ts

@@ -56,23 +56,23 @@ export class ProjectAchievementsService {
 
     // Считываем вводимые данные
     const achievementsName = projectForm.get("achievementsName")?.value;
-    const achievementsPrize = projectForm.get("achievementsPrize")?.value;
+    const achievementsDate = projectForm.get("achievementsDate")?.value;
 
     // Проверяем, что поля не пустые
     if (
       !achievementsName ||
-      !achievementsPrize ||
+      !achievementsDate ||
       achievementsName.trim().length === 0 ||
-      achievementsPrize.trim().length === 0
+      achievementsDate.trim().length === 0
     ) {
       return; // Выходим из функции, если поля пустые
     }
 
     // Создаем FormGroup для нового достижения
     const achievementItem = this.fb.group({
       id: achievementsFormArray.length,
-      title: achievementsName.trim(),
-      status: achievementsPrize.trim(),
+      achievementsName: achievementsName.trim(),
+      achievementsDate: achievementsDate.trim(),
     });
 
     // Проверяем, редактируется ли существующее достижение
@@ -97,8 +97,8 @@ export class ProjectAchievementsService {
     projectForm.get("achievementsName")?.reset();
     projectForm.get("achievementsName")?.setValue("");
 
-    projectForm.get("achievementsPrize")?.reset();
-    projectForm.get("achievementsPrize")?.setValue("");
+    projectForm.get("achievementsDate")?.reset();
+    projectForm.get("achievementsDate")?.setValue("");
   }
 
   /**
@@ -120,8 +120,8 @@ export class ProjectAchievementsService {
 
     // Заполняем поля формы проекта для редактирования
     projectForm.patchValue({
-      achievementsName: source?.title || "",
-      achievementsPrize: source?.status || "",
+      achievementsName: source?.achievementsName || "",
+      achievementsDate: source?.achievementsDate || "",
     });
     // Устанавливаем текущий индекс редактирования в сервисе
     this.projectFormService.editIndex.set(index);

projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts

@@ -43,7 +43,6 @@ export class ProjectFormService {
       imageAddress: [""],
       name: ["", [Validators.required]],
       region: ["", [Validators.required]],
-      step: [null, [Validators.required]],
       implementationDeadline: [null],
       trl: [null],
       links: this.fb.array([]),
@@ -52,13 +51,13 @@ export class ProjectFormService {
       description: ["", [Validators.required]],
       presentationAddress: ["", [Validators.required]],
       coverImageAddress: ["", [Validators.required]],
-      actuality: ["", [Validators.max(1000)]],
-      targetAudience: ["", [Validators.required, Validators.max(500)]],
-      problem: ["", [Validators.required, Validators.max(1000)]],
+      actuality: ["", [Validators.maxLength(1000)]],
+      targetAudience: ["", [Validators.required, Validators.maxLength(500)]],
+      problem: ["", [Validators.required, Validators.maxLength(1000)]],
       partnerProgramId: [null],
       achievements: this.fb.array([]),
       achievementsName: [""],
-      achievementsPrize: [""],
+      achievementsDate: [""],
       draft: [null],
     });
 
@@ -99,7 +98,6 @@ export class ProjectFormService {
       imageAddress: project.imageAddress,
       name: project.name,
       region: project.region,
-      step: project.step,
       industryId: project.industry,
       description: project.description,
       implementationDeadline: project.implementationDeadline ?? null,
@@ -146,17 +144,15 @@ export class ProjectFormService {
   private populateAchievementsFormArray(achievements: any[]): void {
     const achievementsFormArray = this.projectForm.get("achievements") as FormArray;
 
-    // Очищаем существующие контролы
     while (achievementsFormArray.length !== 0) {
       achievementsFormArray.removeAt(0);
     }
 
-    // Добавляем новые контролы
     achievements.forEach((achievement, index) => {
       const achievementGroup = this.fb.group({
         id: achievement.id ?? index,
-        title: achievement.title || "",
-        status: achievement.status || "",
+        achievementsName: [achievement.achievementsName || "", Validators.required],
+        achievementsDate: [achievement.achievementsDate || "", Validators.required],
       });
       achievementsFormArray.push(achievementGroup);
     });
@@ -207,10 +203,6 @@ export class ProjectFormService {
     return this.projectForm.get("industryId");
   }
 
-  public get step() {
-    return this.projectForm.get("step");
-  }
-
   public get description() {
     return this.projectForm.get("description");
   }