change snackbar, skill-group modal, add input type radio, goal service & logic to chosing

Author: Awakich

projects/social_platform/src/app/office/models/goals.model.ts

@@ -0,0 +1,28 @@
+/**
+ * Основная модель целей проекта
+ * Представляет цели со всей необходимой информацией
+ *
+ * Goal содержит:
+ * - Основную информацию (проект, ответственного, название и дату)
+ * - выполнена или нет цель
+ * - полную информацию о человеке, который ответсвенен за цель
+ *
+ * @format
+ */
+
+class responsibleInfo {
+  id!: number;
+  firstName!: string;
+  lastName!: string;
+  avatar!: string | null;
+}
+
+export class Goal {
+  id!: number;
+  project!: number;
+  title!: string;
+  completionDate!: string;
+  responsibleId!: number;
+  responsibleInfo!: responsibleInfo;
+  isDone!: boolean;
+}

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

@@ -177,7 +177,7 @@ <h3 class="text-bold-body-16">📢 Внимание!</h3>
 
 <app-modal [open]="skillsGroupsModalOpen()" class="modal">
   <div class="modal__wrapper">
-    <h4 class="text-heading-4">Библиотека навыков</h4>
+    <p class="text-body-14">Библиотека навыков</p>
     <div class="modal__content">
       <div class="modal__skills-groups">
         <ul>
@@ -187,7 +187,10 @@ <h4 class="text-heading-4">Библиотека навыков</h4>
               [title]="skillsGroup.name"
               [options]="skillsGroup.skills"
               [selected]="this.vacancyForm.getRawValue().skills"
+              [hasOpenGroups]="hasOpenSkillsGroups"
+              [disabled]="hasOpenSkillsGroups && !openGroupIds.has(skillsGroup.id)"
               (optionToggled)="onToggleSkill($event)"
+              (groupToggled)="onGroupToggled($event, skillsGroup.id)"
             ></app-skills-group>
           </li>
           }

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

@@ -49,6 +49,9 @@ import { ProjectTeamService } from "./services/project-team.service";
 import { ProjectAdditionalStepComponent } from "./shared/project-additional-step/project-additional-step.component";
 import { ProjectAdditionalService } from "./services/project-additional.service";
 import { ProjectAchievementsService } from "./services/project-achievements.service";
+import { Goal } from "@office/models/goals.model";
+import { ProjectGoalService } from "./services/project-goals.service";
+import { SnackbarService } from "@ui/services/snackbar.service";
 
 /**
  * Компонент редактирования проекта
@@ -116,6 +119,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     private readonly projectVacancyService: ProjectVacancyService,
     private readonly projectTeamService: ProjectTeamService,
     private readonly projectAchievementsService: ProjectAchievementsService,
+    private readonly snackBarService: SnackbarService,
     private readonly skillsService: SkillsService,
     private readonly projectAdditionalService: ProjectAdditionalService
   ) {}
@@ -210,6 +214,10 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     return this.projectStepService.getCurrentStep()();
   }
 
+  get hasOpenSkillsGroups(): boolean {
+    return this.openGroupIds.size > 0;
+  }
+
   // Состояние компонента
   isCompleted = false;
   isSendDescisionToPartnerProgramProject = false;
@@ -251,6 +259,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
   projSubmitInitiated = false;
   projFormIsSubmittingAsPublished = false;
   projFormIsSubmittingAsDraft = false;
+  openGroupIds = new Set<number>();
 
   /**
    * Навигация между шагами редактирования
@@ -260,6 +269,14 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     this.projectStepService.navigateToStep(step);
   }
 
+  onGroupToggled(isOpen: boolean, groupId: number) {
+    if (isOpen) {
+      this.openGroupIds.add(groupId);
+    } else {
+      this.openGroupIds.delete(groupId);
+    }
+  }
+
   /**
    * Привязка проекта к программе выбранной
    * Перенаправление её на редактирование "нового" проекта
@@ -382,6 +399,8 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
       this.projectVacancyService.submitVacancy(projectId);
     }
 
+    console.log(payload.goals);
+
     if (
       !this.validationService.getFormValidation(this.projectForm) ||
       !this.validationService.getFormValidation(this.additionalForm) ||
@@ -391,15 +410,17 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     this.setProjFormIsSubmitting(true);
-    this.projectService.updateProject(projectId, payload).subscribe({
-      next: () => {
-        this.setProjFormIsSubmitting(false);
-        this.router.navigateByUrl(`/office/projects/my`);
-      },
-      error: () => {
-        this.setProjFormIsSubmitting(false);
-      },
-    });
+    // this.projectService.updateProject(projectId, payload).subscribe({
+    //   next: () => {
+    //     this.snackBarService.success("Данные успешно сохранены");
+    //     this.setProjFormIsSubmitting(false);
+    //     this.router.navigateByUrl(`/office/projects/my`);
+    //   },
+    //   error: () => {
+    //     this.setProjFormIsSubmitting(false);
+    //     this.snackBarService.error("Что-то пошло не так!");
+    //   },
+    // });
   }
 
   // Методы для работы с модальными окнами
@@ -565,9 +586,9 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
         concatMap(() => this.route.data),
         map(d => d["data"])
       )
-      .subscribe(([project, invites]: [Project, Invite[]]) => {
+      .subscribe(([project, goals, invites]: [Project, Goal[], Invite[]]) => {
         // Используем сервис для инициализации данных проекта
-        this.projectFormService.initializeProjectData(project);
+        this.projectFormService.initializeProjectData(project, goals);
         this.projectTeamService.setInvites(invites);
         this.projectTeamService.setCollaborators(project.collaborators);
 

projects/social_platform/src/app/office/projects/edit/edit.resolver.ts

@@ -7,6 +7,7 @@ import { ProjectService } from "@services/project.service";
 import { Project } from "@models/project.model";
 import { InviteService } from "@services/invite.service";
 import { Invite } from "@models/invite.model";
+import { Goal } from "@office/models/goals.model";
 
 /**
  * Resolver для загрузки данных редактирования проекта
@@ -30,16 +31,17 @@ import { Invite } from "@models/invite.model";
  * Применяет forkJoin для параллельной загрузки данных проекта и приглашений,
  * что оптимизирует время загрузки страницы.
  */
-export const ProjectEditResolver: ResolveFn<[Project, Invite[]]> = (
+export const ProjectEditResolver: ResolveFn<[Project, Goal[], Invite[]]> = (
   route: ActivatedRouteSnapshot
 ) => {
   const projectService = inject(ProjectService);
   const inviteService = inject(InviteService);
 
   const projectId = Number(route.paramMap.get("projectId"));
 
-  return forkJoin<[Project, Invite[]]>([
+  return forkJoin<[Project, Goal[], Invite[]]>([
     projectService.getOne(projectId),
+    projectService.getGoals(projectId),
     inviteService.getByProject(projectId),
   ]);
 };

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

@@ -55,24 +55,19 @@ export class ProjectAchievementsService {
     this.initializeAchievementsItems(achievementsFormArray);
 
     // Считываем вводимые данные
-    const achievementsName = projectForm.get("achievementsName")?.value;
-    const achievementsDate = projectForm.get("achievementsDate")?.value;
+    const title = projectForm.get("title")?.value;
+    const status = projectForm.get("status")?.value;
 
     // Проверяем, что поля не пустые
-    if (
-      !achievementsName ||
-      !achievementsDate ||
-      achievementsName.trim().length === 0 ||
-      achievementsDate.trim().length === 0
-    ) {
+    if (!title || !status || title.trim().length === 0 || status.trim().length === 0) {
       return; // Выходим из функции, если поля пустые
     }
 
     // Создаем FormGroup для нового достижения
     const achievementItem = this.fb.group({
       id: achievementsFormArray.length,
-      achievementsName: achievementsName.trim(),
-      achievementsDate: achievementsDate.trim(),
+      title: title.trim(),
+      status: status.trim(),
     });
 
     // Проверяем, редактируется ли существующее достижение
@@ -94,11 +89,11 @@ export class ProjectAchievementsService {
     }
 
     // Очищаем поля ввода формы проекта
-    projectForm.get("achievementsName")?.reset();
-    projectForm.get("achievementsName")?.setValue("");
+    projectForm.get("title")?.reset();
+    projectForm.get("title")?.setValue("");
 
-    projectForm.get("achievementsDate")?.reset();
-    projectForm.get("achievementsDate")?.setValue("");
+    projectForm.get("status")?.reset();
+    projectForm.get("status")?.setValue("");
   }
 
   /**

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

@@ -1,7 +1,7 @@
 /** @format */
 
 import { inject, Injectable, signal } from "@angular/core";
-import { FormArray, FormBuilder, FormGroup, FormControl } from "@angular/forms";
+import { FormArray, FormBuilder, FormGroup, FormControl, Validators } from "@angular/forms";
 import { ProjectFormService } from "./project-form.service";
 
 /**
@@ -104,7 +104,7 @@ export class ProjectContactsService {
     } else {
       // Добавляем новую ссылку в сигнал и FormArray
       this.linksItems.update(items => [...items, trimmedLink.value]);
-      linksFormArray.push(trimmedLink);
+      linksFormArray.push(this.fb.control(trimmedLink, Validators.required));
     }
 
     // Очищаем поле ввода формы проекта

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

@@ -10,6 +10,7 @@ import {
   ValidatorFn,
 } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
+import { Goal } from "@office/models/goals.model";
 import { PartnerProgramFields } from "@office/models/partner-program-fields.model";
 import { Project } from "@office/models/project.model";
 import { ProjectService } from "@office/services/project.service";
@@ -56,8 +57,14 @@ export class ProjectFormService {
       problem: ["", [Validators.required, Validators.maxLength(1000)]],
       partnerProgramId: [null],
       achievements: this.fb.array([]),
-      achievementsName: [""],
-      achievementsDate: [""],
+      title: [""],
+      status: [""],
+
+      goals: this.fb.array([]),
+      goalName: [""],
+      goalDate: [""],
+      goalLeader: [null],
+
       draft: [null],
     });
 
@@ -92,7 +99,7 @@ export class ProjectFormService {
    * Заполняет основную форму данными существующего проекта.
    * @param project экземпляр Project с текущими данными
    */
-  public initializeProjectData(project: Project): void {
+  public initializeProjectData(project: Project, goals: Goal[]): void {
     // Заполняем простые поля
     this.projectForm.patchValue({
       imageAddress: project.imageAddress,
@@ -117,6 +124,8 @@ export class ProjectFormService {
     this.populateLinksFormArray(project.links || []);
 
     this.populateAchievementsFormArray(project.achievements || []);
+
+    this.populateGoalsFormArray(goals || []);
   }
 
   /**
@@ -131,7 +140,7 @@ export class ProjectFormService {
     }
 
     links.forEach(link => {
-      linksFormArray.push(this.fb.control(link));
+      linksFormArray.push(this.fb.control(link, [Validators.required]));
     });
   }
 
@@ -149,13 +158,35 @@ export class ProjectFormService {
     achievements.forEach((achievement, index) => {
       const achievementGroup = this.fb.group({
         id: achievement.id ?? index,
-        achievementsName: [achievement.achievementsName || "", Validators.required],
-        achievementsDate: [achievement.achievementsDate || "", Validators.required],
+        title: [achievement.title || "", Validators.required],
+        status: [achievement.status || "", Validators.required],
       });
       achievementsFormArray.push(achievementGroup);
     });
   }
 
+  /**
+   * Заполняет FormArray цели данными из проекта
+   * @param goals массив целей из проекта
+   */
+  private populateGoalsFormArray(goals: any[]): void {
+    const goalsFormArray = this.projectForm.get("goals") as FormArray;
+
+    while (goalsFormArray.length !== 0) {
+      goalsFormArray.removeAt(0);
+    }
+
+    goals.forEach(goal => {
+      const goalsGroup = this.fb.group({
+        goalName: [goal.goalName || "", Validators.required],
+        goalDate: [goal.goalDate || "", Validators.required],
+        goalLeader: [goal.goalLeader || "", Validators.required],
+        isDone: false,
+      });
+      goalsFormArray.push(goalsGroup);
+    });
+  }
+
   /**
    * Возвращает основную форму проекта.
    * @returns FormGroup экземпляр формы проекта