Merge remote-tracking branch 'origin/master' into update-edit-project

Author: Awakich

projects/skills/src/app/app.component.ts

@@ -55,9 +55,9 @@ export class AppComponent implements OnInit {
    */
   navItems = [
     // { name: "Навыки", icon: "lib", link: "skills" }, // Временно отключено
-    { name: "Старт в карьеру", icon: "trackcar", link: "trackCar" },
-    { name: "Траектории", icon: "receipt", link: "subscription" },
-    { name: "Рейтинг", icon: "growth", link: "rating" },
+    { name: "Детский Форсайт", icon: "trackcar", link: "trackCar" },
+    // { name: "Траектории", icon: "receipt", link: "subscription" },
+    // { name: "Рейтинг", icon: "growth", link: "rating" },
     // { name: "Траектория бизнеса", icon: "trackbuss", link: "trackBuss" }, // Временно отключено
     // { name: "Вебинары", icon: "webinars", link: "webinars" }, // Временно отключено
   ];

projects/skills/src/app/app.routes.ts

@@ -29,25 +29,25 @@ export const routes: Routes = [
     path: "profile",
     loadChildren: () => import("./profile/profile.routes").then(c => c.PROFILE_ROUTES),
   },
-  {
-    path: "skills",
-    loadChildren: () => import("./skills/skills.routes").then(c => c.SKILLS_ROUTES),
-  },
-  {
-    path: "rating",
-    loadChildren: () => import("./rating/rating.routes").then(c => c.RATING_ROUTES),
-  },
-  {
-    path: "task",
-    loadChildren: () => import("./task/task.routes").then(c => c.TASK_ROUTES),
-  },
-  {
-    path: "trackBuss",
-    loadChildren: () =>
-      import("./trajectories/track-bussiness/track-bussiness.routes").then(
-        c => c.TRACK_BUSSINESS_ROUTES
-      ),
-  },
+  // {
+  //   path: "skills",
+  //   loadChildren: () => import("./skills/skills.routes").then(c => c.SKILLS_ROUTES),
+  // },
+  // {
+  //   path: "rating",
+  //   loadChildren: () => import("./rating/rating.routes").then(c => c.RATING_ROUTES),
+  // },
+  // {
+  //   path: "task",
+  //   loadChildren: () => import("./task/task.routes").then(c => c.TASK_ROUTES),
+  // },
+  // {
+  //   path: "trackBuss",
+  //   loadChildren: () =>
+  //     import("./trajectories/track-bussiness/track-bussiness.routes").then(
+  //       c => c.TRACK_BUSSINESS_ROUTES
+  //     ),
+  // },
   {
     path: "trackCar",
     loadChildren: () =>
@@ -58,8 +58,8 @@ export const routes: Routes = [
     loadChildren: () =>
       import("./subscription/subscription.routes").then(c => c.SUBSCRIPTION_ROUTES),
   },
-  {
-    path: "webinars",
-    loadChildren: () => import("./webinars/webinars.routes").then(c => c.WEBINARS_ROUTES),
-  },
+  // {
+  //   path: "webinars",
+  //   loadChildren: () => import("./webinars/webinars.routes").then(c => c.WEBINARS_ROUTES),
+  // },
 ];

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

@@ -101,7 +101,7 @@ export class FeedComponent implements OnInit, AfterViewInit, OnDestroy {
         tap(includes => {
           this.includes.set(includes);
         }),
-        skip(1), // Пропускаем первое значение (уже загружено резолвером)
+        skip(1),
         concatMap(includes => {
           this.totalItemsCount.set(0);
           this.feedPage.set(0);
@@ -112,7 +112,6 @@ export class FeedComponent implements OnInit, AfterViewInit, OnDestroy {
       .subscribe(feed => {
         this.feedItems.set(feed);
 
-        // Плавная прокрутка к началу ленты после фильтрации
         setTimeout(() => {
           this.feedRoot?.nativeElement.children[0].scrollIntoView({ behavior: "smooth" });
         });
@@ -175,7 +174,6 @@ export class FeedComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // Определяем тип новости по структуре contentObject
     if ("email" in item.content.contentObject) {
-      // Новость профиля
       this.profileNewsService
         .toggleLike(
           item.content.contentObject.id as unknown as string,
@@ -195,7 +193,6 @@ export class FeedComponent implements OnInit, AfterViewInit, OnDestroy {
           });
         });
     } else if ("leader" in item.content.contentObject) {
-      // Новость проекта
       this.projectNewsService
         .toggleLike(
           item.content.contentObject.id as unknown as string,

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

@@ -4,7 +4,7 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit, signal } from "@angula
 import { AuthService } from "@auth/services";
 import { FormArray, FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";
 import { ErrorMessage } from "@error/models/error-message";
-import { ControlErrorPipe, ValidationService } from "projects/core";
+import { ControlErrorPipe, ValidationService, YearsFromBirthdayPipe } from "projects/core";
 import { concatMap, Subscription } from "rxjs";
 import { Router } from "@angular/router";
 import { User } from "@auth/models/user.model";

projects/social_platform/src/app/office/program/detail/main/main.component.ts

@@ -39,12 +39,15 @@ import { NewsFormComponent } from "@office/features/news-form/news-form.componen
     ButtonComponent,
     ProgramNewsCardComponent,
     UserLinksPipe,
+    AsyncPipe,
     ParseBreaksPipe,
     ParseLinksPipe,
     ModalComponent,
     MatProgressBarModule,
     SoonCardComponent,
     NewsFormComponent,
+    ModalComponent,
+    MatProgressBarModule,
   ],
 })
 export class ProgramDetailMainComponent implements OnInit, OnDestroy {
@@ -139,6 +142,8 @@ export class ProgramDetailMainComponent implements OnInit, OnDestroy {
         },
       });
 
+    this.loadEvent = fromEvent(window, "load");
+
     this.subscriptions$().push(program$);
     this.subscriptions$().push(programIdSubscription$);
     this.subscriptions$().push(routeModalSub$);
@@ -253,6 +258,8 @@ export class ProgramDetailMainComponent implements OnInit, OnDestroy {
     this.projectAdditionalService.clearAssignProjectToProgramError();
   }
 
+  private loadEvent?: Observable<Event>;
+
   program?: Program;
   registerDateExpired!: boolean;
   descriptionExpandable!: boolean;

projects/social_platform/src/app/office/program/services/program.service.ts

@@ -96,11 +96,16 @@ export class ProgramService {
 
   createProgramFilters(
     programId: number,
-    filters: { filters: { string: string[] } }
+    filters: Record<string, string[]>,
+    params?: HttpParams
   ): Observable<ApiPagination<Project>> {
-    return this.apiService.post(`${this.PROGRAMS_URL}/${programId}/projects/filter/`, {
-      filters,
-    });
+    let url = `${this.PROGRAMS_URL}/${programId}/projects/filter/`;
+
+    if (params) {
+      url += `?${params.toString()}`;
+    }
+
+    return this.apiService.post(url, { filters: filters });
   }
 
   submitCompettetiveProject(relationId: number): Observable<Project> {

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

@@ -206,6 +206,9 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
   // Маркер того является ли проект привязанный к конкурсной программе
   isCompetitive = false;
 
+  // Маркер что проект привязан
+  isProjectBoundToProgram = false;
+
   // Текущий шаг редактирования
   get editingStep(): EditStep {
     return this.projectStepService.getCurrentStep()();
@@ -327,6 +330,21 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
+  /**
+   * Удаление проекта с проверкой удаления у пользователя
+   */
+  deleteProject(): void {
+    if (!confirm("Вы точно хотите удалить проект?")) {
+      return;
+    }
+
+    this.projectService.remove(Number(this.route.snapshot.paramMap.get("projectId"))).subscribe({
+      next: () => {
+        this.router.navigateByUrl(`/office/projects/my`);
+      },
+    });
+  }
+
   /**
    * Сохранение проекта как опубликованного с проверкой доп. полей
    */

projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.ts

@@ -68,6 +68,7 @@ export class ProjectMainStepComponent implements OnInit, OnDestroy {
   @Input() leaderId = 0;
   @Input() projSubmitInitiated = false;
   @Input() projectId!: number;
+  @Input() isProjectBoundToProgram = false;
 
   private subscription = new Subscription();
 

projects/social_platform/src/app/utils/generate-year-list.ts

@@ -0,0 +1,48 @@
+/** @format */
+
+interface yearListElement {
+  id: number; // порядковый номер в массиве
+  value: string; // строка, которую будем показывать в UI
+  label: string; // то же самое, что и value (можно использовать обе подписи)
+}
+
+/**
+ * Генерирует массив годов.
+ *
+ * @param amount – сколько лет нужно вывести.
+ *                Считаем, что список должен начинаться с «текущий‑year‑amount+1» и
+ *                заканчиваться текущим календарным годом.
+ * @returns массив объектов вида { id, value, label }
+ *
+ * Пример:  generateYearList(3)  (при текущем 2025‑м году) →
+ * [
+ *   { id: 0, value: '2023 год', label: '2023 год' },
+ *   { id: 1, value: '2024 год', label: '2024 год' },
+ *   { id: 2, value: '2025 год', label: '2025 год' }
+ * ]
+ */
+export const generateYearList = (amount: number): yearListElement[] => {
+  if (amount <= 0) return [];
+
+  const now = new Date().getFullYear();
+  const firstYear = now - amount + 1;
+  const list: yearListElement[] = [];
+
+  for (let i = 0; i < amount; i++) {
+    const year = firstYear + i;
+    list.push({
+      id: i,
+      value: `${year} год`,
+      label: `${year} год`,
+    });
+  }
+
+  const currentId = amount - 1;
+  list.push({
+    id: currentId,
+    value: `${now} год`,
+    label: "по наст. вр.",
+  });
+
+  return list;
+};