Merge pull request #261 from PROCOLLAB-github/features-backlog

backlog fixes

Author: Awakich

projects/core/src/consts/lists/education-info-list.const.ts

@@ -44,4 +44,9 @@ export const educationUserLevel = [
     value: "Высшее образование – аспирантура",
     label: "высшее образование – аспирантура",
   },
+  // {
+  //   id: 5,
+  //   value: "Дополнительное профессиональное образования",
+  //   label: "дополнительное профессиональное образования"
+  // },
 ];

projects/social_platform/src/app/office/courses/detail/course-detail.component.ts

@@ -77,8 +77,6 @@ export class CourseDetailComponent implements OnInit {
   }
 
   redirectToProgram(): void {
-    this.router.navigate([`/office/program/${this.course()?.partnerProgramId}`], {
-      queryParams: { courseId: this.course()?.id },
-    });
+    this.router.navigateByUrl(`/office/program/${this.course()?.partnerProgramId}`);
   }
 }

projects/social_platform/src/app/office/courses/lesson/shared/exclude-task/exclude-task.component.scss

@@ -29,7 +29,7 @@
         display: block;
         align-self: center;
         width: 100%;
-        max-width: 295px;
+        max-width: 395px;
         height: 223px;
         aspect-ratio: 16 / 9;
         border: 0;
@@ -82,6 +82,8 @@
   }
 
   .read-more {
+    align-items: start;
+    align-self: self-start;
     margin-top: 12px;
     color: var(--accent);
     cursor: pointer;

projects/social_platform/src/app/office/courses/lesson/shared/file-task/file-task.component.scss

@@ -105,7 +105,7 @@
       display: block;
       align-self: center;
       width: 100%;
-      max-width: 295px;
+      max-width: 395px;
       height: 223px;
       aspect-ratio: 16 / 9;
       border: 0;
@@ -155,6 +155,8 @@
   }
 
   .read-more {
+    align-items: start;
+    align-self: self-start;
     margin-top: 12px;
     color: var(--accent);
     cursor: pointer;

projects/social_platform/src/app/office/courses/lesson/shared/radio-select-task/radio-select-task.component.scss

@@ -33,6 +33,8 @@
   }
 
   .read-more {
+    align-items: start;
+    align-self: self-start;
     margin-top: 12px;
     color: var(--accent);
     cursor: pointer;
@@ -132,7 +134,7 @@
         display: block;
         align-self: center;
         width: 100%;
-        max-width: 295px;
+        max-width: 395px;
         height: 223px;
         aspect-ratio: 16 / 9;
         border: 0;

projects/social_platform/src/app/office/courses/lesson/shared/video-task/info-task.component.scss

@@ -17,7 +17,7 @@
       display: block;
       align-self: center;
       width: 100%;
-      max-width: 295px;
+      max-width: 395px;
       height: 223px;
       aspect-ratio: 16 / 9;
       border: 0;
@@ -75,6 +75,8 @@
   }
 
   .read-more {
+    align-items: start;
+    align-self: self-start;
     margin-top: 12px;
     color: var(--accent);
     cursor: pointer;

projects/social_platform/src/app/office/courses/lesson/shared/write-task/write-task.component.scss

@@ -49,7 +49,7 @@
       display: block;
       align-self: center;
       width: 100%;
-      max-width: 295px;
+      max-width: 395px;
       height: 223px;
       aspect-ratio: 16 / 9;
       border: 0;
@@ -63,6 +63,8 @@
   }
 
   .read-more {
+    align-items: start;
+    align-self: self-start;
     margin-top: 12px;
     color: var(--accent);
     cursor: pointer;

projects/social_platform/src/app/office/features/detail/detail.component.html

@@ -181,11 +181,8 @@
               участники
             </app-button>
           </a>
-          } @else { @if (info().courseId || queryCourseId()) {
-          <a
-            class="info__contacts"
-            [routerLink]="'/office/courses/' + (info().courseId || queryCourseId())"
-          >
+          } @else { @if (info().courses?.length) {
+          <a class="info__contacts" [routerLink]="'/office/courses/' + info().courses[0].id">
             <app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
               перейти в курс
             </app-button>

projects/social_platform/src/app/office/features/detail/detail.component.ts

@@ -80,7 +80,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
   profile?: User;
   profileProjects = signal<User["projects"]>([]);
   listType: "project" | "program" | "profile" = "project";
-  queryCourseId = signal<number | null>(null);
 
   // Переменная для подсказок
   isTooltipVisible = false;
@@ -159,12 +158,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
       this.listType = data["listType"];
     });
 
-    const queryParamsSub$ = this.route.queryParams.subscribe(params => {
-      const courseId = params["courseId"];
-      this.queryCourseId.set(courseId ? +courseId : null);
-    });
-    this.subscriptions.push(queryParamsSub$);
-
     this.initializeBackPath();
 
     this.updatePageStates();

projects/social_platform/src/app/office/features/news-card/news-card.component.ts

@@ -25,7 +25,7 @@ import { FileService } from "@core/services/file.service";
 import { nanoid } from "nanoid";
 import { expandElement } from "@utils/expand-element";
 import { FileModel } from "@models/file.model";
-import { forkJoin, noop, Observable, tap } from "rxjs";
+import { catchError, forkJoin, noop, Observable, of, tap } from "rxjs";
 import { ButtonComponent, IconComponent } from "@ui/components";
 import { FileItemComponent } from "@ui/components/file-item/file-item.component";
 import { FileUploadItemComponent } from "@ui/components/file-upload-item/file-upload-item.component";
@@ -279,6 +279,11 @@ export class NewsCardComponent implements OnInit {
               fileObj.src = file.url;
               fileObj.loading = false;
               fileObj.tempFile = null;
+            }),
+            catchError(() => {
+              fileObj.loading = false;
+              fileObj.error = true;
+              return of(null);
             })
           )
         );
@@ -301,6 +306,11 @@ export class NewsCardComponent implements OnInit {
               fileObj.loading = false;
               fileObj.src = file.url;
               fileObj.tempFile = null;
+            }),
+            catchError(() => {
+              fileObj.loading = false;
+              fileObj.error = "Ошибка загрузки";
+              return of(null);
             })
           )
         );