Merge pull request #262 from PROCOLLAB-github/fix-course

add course navigation from program page & update lesson button texts

Author: Awakich

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

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

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

@@ -5,7 +5,7 @@
     <img alt="complete img" src="/assets/images/courses/complete.svg" />
 
     <div class="complete__text">
-      <p class="text-body-12-bold">поздравялем!</p>
+      <p class="text-body-12-bold">поздравляем!</p>
       <p class="text-body-12">урок пройден</p>
     </div>
 

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

@@ -89,7 +89,13 @@
           class="action__button"
           (click)="onSubmitAnswer()"
         >
-          {{ isLastTask() ? "завершить тест" : "следующее задание" }}
+          {{
+            isLastTask()
+              ? "завершить урок"
+              : currentTask()?.answerType === null
+              ? "отправить задание"
+              : "отправить ответ"
+          }}
         </app-button>
       </div>
     </div>

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

@@ -104,7 +104,6 @@
 
   &__body,
   &__content {
-    flex-grow: 1;
     min-height: 358px;
     padding: 24px;
     background-color: var(--light-white);
@@ -113,14 +112,16 @@
   }
 
   &__body {
-    max-width: 422px;
+    flex: 1;
 
     &--hasContent {
       max-width: 333px;
     }
   }
 
   &__content {
+    max-width: 350px;
+
     &--hasContent {
       min-width: 333px;
     }

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

@@ -14,16 +14,20 @@
 
   &__header,
   &__content {
-    flex-grow: 1;
     min-height: 358px;
     padding: 24px;
     background: var(--light-white);
     border: 0.5px solid var(--medium-grey-for-outline);
     border-radius: var(--rounded-lg);
   }
 
+  &__header {
+    flex: 1;
+  }
+
   &__content {
     min-width: 333px;
+    max-width: 350px;
     padding: 12px 24px;
 
     ::ng-deep {

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

@@ -110,7 +110,6 @@
 
   &__body,
   &__content {
-    flex-grow: 1;
     min-height: 358px;
     padding: 24px;
     background-color: var(--light-white);
@@ -119,7 +118,7 @@
   }
 
   &__body {
-    max-width: 422px;
+    flex: 1;
 
     &--hasContent {
       display: flex;
@@ -143,6 +142,8 @@
   }
 
   &__content {
+    max-width: 350px;
+
     &--hasContent {
       min-width: 333px;
     }

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

@@ -13,16 +13,20 @@
 
   &__header,
   &__content {
-    flex-grow: 1;
     min-height: 358px;
     padding: 24px;
     background: var(--light-white);
     border: 0.5px solid var(--medium-grey-for-outline);
     border-radius: var(--rounded-lg);
   }
 
+  &__header {
+    flex: 1;
+  }
+
   &__content {
     min-width: 333px;
+    max-width: 350px;
     padding: 12px 24px;
   }
 

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

@@ -4,7 +4,6 @@
 <div class="course">
   <div class="course__cover">
     <app-avatar [size]="68" [url]="course.avatarUrl"></app-avatar>
-    <img src="assets\icons\svg\rocket.svg" class="course__rocket" />
     <app-button
       customTypographyClass="text-body-10"
       [color]="isMember() ? 'primary' : isSubs() ? 'red' : 'green'"

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

@@ -181,6 +181,15 @@
               участники
             </app-button>
           </a>
+          } @else { @if (info().courseId || queryCourseId()) {
+          <a
+            class="info__contacts"
+            [routerLink]="'/office/courses/' + (info().courseId || queryCourseId())"
+          >
+            <app-button appearance="outline" size="medium" customTypographyClass="text-body-12">
+              перейти в курс
+            </app-button>
+          </a>
           } @else {
           <a class="info__contacts">
             <app-button
@@ -193,7 +202,7 @@
               информация с ссылок
             </app-button>
           </a>
-          } }
+          } } }
 
           <app-modal
             [open]="isAssignProjectToProgramModalOpen()"

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

@@ -80,6 +80,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
   profile?: User;
   profileProjects = signal<User["projects"]>([]);
   listType: "project" | "program" | "profile" = "project";
+  queryCourseId = signal<number | null>(null);
 
   // Переменная для подсказок
   isTooltipVisible = false;
@@ -158,6 +159,12 @@ 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();