add program_id disabled & result routing

Author: Awakich

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

@@ -30,11 +30,12 @@ <h1 class="info__title text-body-12">{{ course()!.title }}</h1>
         >
 
         <app-button
-          [disabled]="true"
+          [disabled]="isDisabled()"
           [class.info__actions--disabled]="isDisabled()"
           size="big"
           customTypographyClass="text-body-12"
           appearance="outline"
+          (click)="redirectToProgram()"
           >вернуться в программу</app-button
         >
       </div>

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

@@ -47,7 +47,7 @@ export class CourseDetailComponent implements OnInit {
         next: ([course, _]: [CourseDetail, CourseStructure]) => {
           this.course.set(course);
 
-          if (course.accessType !== "program_members") {
+          if (!course.partnerProgramId) {
             this.isDisabled.set(true);
           }
         },
@@ -69,10 +69,14 @@ export class CourseDetailComponent implements OnInit {
    * Перенаправляет на страницу с информацией в завивисимости от listType
    */
   redirectDetailInfo(courseId?: number): void {
-    if (this.course()) {
+    if (courseId != null) {
       this.router.navigateByUrl(`/office/courses/${courseId}`);
     } else {
       this.router.navigateByUrl("/office/courses/all");
     }
   }
+
+  redirectToProgram(): void {
+    this.router.navigateByUrl(`/office/program/${this.course()?.partnerProgramId}`);
+  }
 }

projects/social_platform/src/app/office/courses/lesson/lesson.component.html

@@ -28,7 +28,9 @@
   </div>
   } @else {
   <div class="task__main" [class.task__complete]="isComplete()">
-    @if (currentTask(); as task) {
+    <router-outlet></router-outlet>
+
+    @if (!isComplete() && currentTask(); as task) {
     <div class="task__content">
       <!-- informationalType === "text" или "video_text" и answerType === null → info-task -->
       @if (task.answerType === null && (task.informationalType === 'text' || task.informationalType
@@ -92,8 +94,6 @@
       </div>
     </div>
     }
-
-    <router-outlet></router-outlet>
   </div>
   }
 </div>

projects/social_platform/src/app/office/courses/lesson/lesson.component.ts

@@ -107,7 +107,17 @@ export class LessonComponent implements OnInit {
             lessonInfo.tasks.find(t => t.isAvailable && !t.isCompleted)?.id ??
             null;
 
-          if (nextTaskId === null) {
+          const allCompleted = lessonInfo.tasks.every(t => t.isCompleted);
+          const onResultsPage = this.router.url.includes("results");
+
+          if (onResultsPage && !allCompleted) {
+            // Находимся на results, но не все задания выполнены — редирект обратно
+            this.currentTaskId.set(nextTaskId);
+            setTimeout(() => {
+              this.loading.set(false);
+              this.router.navigate(["./"], { relativeTo: this.route });
+            }, 500);
+          } else if (nextTaskId === null && allCompleted) {
             // Все задания выполнены, редирект на results
             setTimeout(() => {
               this.loading.set(false);

projects/social_platform/src/app/office/courses/lesson/lesson.routes.ts

@@ -22,7 +22,7 @@ export const LESSON_ROUTES: Routes = [
     },
     children: [
       {
-        path: "results", // Маршрут для отображения результатов
+        path: "results",
         component: TaskCompleteComponent,
       },
     ],

projects/social_platform/src/app/office/courses/shared/course-module-card/course-module-card.component.html

@@ -6,7 +6,7 @@
       <app-avatar [size]="50" [url]="courseModule.avatarUrl"></app-avatar>
 
       <div class="skill-card__info">
-        <p class="skill-card__title text-body-12">Модуль {{ courseModule.id }}</p>
+        <p class="skill-card__title text-body-12">Модуль {{ courseModule.order }}</p>
 
         <p class="skill-card__text text-body-12">
           {{ courseModule.title }}

projects/social_platform/src/app/office/courses/shared/course/course.component.ts

@@ -37,7 +37,6 @@ export class CourseComponent implements OnInit {
   ngOnInit(): void {
     this.accessType();
     this.actions();
-    console.log(this.course);
   }
 
   protected readonly isLock = signal<boolean>(false);

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

@@ -48,6 +48,7 @@ export interface CourseDetail {
   endDate: Date;
   dateLabel: string;
   isAvailable: boolean;
+  partnerProgramId: number;
   progressStatus: "not_started" | "in_progress" | "completed" | "blocked";
   percent: number;
   analyticsStub: any;