fix rating-card redoRating & additoinal step info if no additional fields

Author: Awakich

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

@@ -152,7 +152,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
 
   get isUserExpert() {
     const type = this.userType();
-    return type !== undefined && type !== 1;
+    return type !== undefined && type === 3;
   }
 
   // Методы для управления состоянием ошибок через сервис

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.html

@@ -79,15 +79,21 @@
         size="big"
         [loader]="submitLoading() || confirmLoading()"
         [color]="showRatedWithEdit ? 'green' : 'primary'"
-        [disabled]="showConfirmedState"
-        [appearance]="showConfirmedState ? 'outline' : 'inline'"
+        [disabled]="programDateFinished()"
+        [appearance]="programDateFinished() ? 'outline' : 'inline'"
         [style.opacity]="showConfirmedState ? '0.5' : '1'"
         (click)="showRatingForm ? confirmRateProject() : null"
       >
-        {{ showRatingForm ? "оценить проект" : "проект оценен" }}
+        {{
+          programDateFinished()
+            ? "проект оценен"
+            : showRatingForm
+            ? "оценить проект"
+            : "проект оценен"
+        }}
       </app-button>
 
-      @if (showRatedWithEdit) {
+      @if (showRatedWithEdit && !programDateFinished()) {
       <app-button
         appearance="outline"
         size="small"
@@ -111,14 +117,27 @@
           <i appIcon icon="check" appSquare="60"></i>
         </div>
 
-        <app-button
-          size="big"
-          class="cancel__button"
-          customTypographyClass="text-body-12"
-          (click)="confirmRateProject()"
-        >
-          подтверждаю
-        </app-button>
+        <div class="cancel__buttons">
+          <app-button
+            size="big"
+            class="cancel__button"
+            customTypographyClass="text-body-12"
+            (click)="confirmRateProject()"
+            style="width: 100%"
+          >
+            подтверждаю
+          </app-button>
+
+          <app-button
+            size="big"
+            class="cancel__button"
+            customTypographyClass="text-body-12"
+            (click)="showConfirmRateModal.set(false)"
+            style="width: 100%"
+          >
+            исправить оценку
+          </app-button>
+        </div>
       </div>
     </app-modal>
   </div>

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.scss

@@ -191,4 +191,12 @@
     color: var(--dark-grey);
     text-align: center;
   }
+
+  &__buttons {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    align-items: center;
+    justify-content: center;
+  }
 }

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts

@@ -19,7 +19,16 @@ import { CommonModule } from "@angular/common";
 import { ProjectRate } from "@office/program/models/project-rate";
 import { ControlErrorPipe, ParseBreaksPipe, ParseLinksPipe } from "projects/core";
 import { expandElement } from "@utils/expand-element";
-import { debounceTime, finalize, fromEvent, map, Observable, Subscription } from "rxjs";
+import {
+  debounceTime,
+  filter,
+  finalize,
+  fromEvent,
+  map,
+  Observable,
+  Subscription,
+  tap,
+} from "rxjs";
 import { BreakpointObserver } from "@angular/cdk/layout";
 import { IndustryService } from "@office/services/industry.service";
 import { ProjectRatingComponent } from "@office/features/project-rating/project-rating.component";
@@ -28,6 +37,7 @@ import { ProjectRatingService } from "@office/program/services/project-rating.se
 import { RouterLink } from "@angular/router";
 import { TagComponent } from "@ui/components/tag/tag.component";
 import { ModalComponent } from "@ui/components/modal/modal.component";
+import { ProgramDataService } from "@office/program/services/program-data.service";
 
 /**
  * Компонент карточки оценки проекта
@@ -92,6 +102,7 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
   constructor(
     public industryService: IndustryService,
     private projectRatingService: ProjectRatingService,
+    private readonly programDataService: ProgramDataService,
     private breakpointObserver: BreakpointObserver,
     private cdRef: ChangeDetectorRef
   ) {}
@@ -128,6 +139,8 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
 
   isProjectCriterias = signal(0);
 
+  programDateFinished = signal(false);
+
   desktopMode$: Observable<boolean> = this.breakpointObserver
     .observe("(min-width: 920px)")
     .pipe(map(result => result.matches));
@@ -140,6 +153,19 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
       this.projectConfirmed.set(isScored);
       this.projectRated.set(isScored);
     }
+
+    const program$ = this.programDataService.program$
+      .pipe(
+        filter(program => !!program),
+        tap(program => {
+          if (program && program.datetimeFinished) {
+            this.programDateFinished.set(Date.now() > Date.parse(program.datetimeFinished));
+          }
+        })
+      )
+      .subscribe();
+
+    this.subscriptions$().push(program$);
   }
 
   ngAfterViewInit(): void {
@@ -198,24 +224,23 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   redoRating(): void {
-    if (!this.projectConfirmed()) {
-      this.projectRated.set(false);
-    }
+    this.projectRated.set(false);
+    this.projectConfirmed.set(false);
   }
 
   get canEdit(): boolean {
-    return !this.projectConfirmed();
+    return !this.programDateFinished();
   }
 
   get showRatingForm(): boolean {
     return !this.projectRated() && this.canEdit;
   }
 
   get showRatedWithEdit(): boolean {
-    return this.projectRated() && !this.projectConfirmed();
+    return (this.projectRated() || this.projectConfirmed()) && this.canEdit;
   }
 
   get showConfirmedState(): boolean {
-    return this.projectConfirmed();
+    return this.projectConfirmed() && !this.canEdit;
   }
 }

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

@@ -76,6 +76,7 @@ <h1 class="project__title">редактировать проект</h1>
         <app-project-additional-step
           #additionalStepComponent
           style="width: 100%"
+          [isProjectAssignToProgram]="isProjectAssignToProgram"
         ></app-project-additional-step>
         }
       </div>

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

@@ -214,6 +214,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
 
   // Маркер того является ли проект привязанный к конкурсной программе
   isCompetitive = false;
+  isProjectAssignToProgram = false;
 
   // Маркер что проект привязан
   isProjectBoundToProgram = false;
@@ -660,6 +661,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
 
           if (project.partnerProgram) {
             this.isCompetitive = project.partnerProgram.canSubmit;
+            this.isProjectAssignToProgram = !!project.partnerProgram.programId;
 
             this.projectAdditionalService.initializeAdditionalForm(
               project.partnerProgram?.programFields,

projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.html

@@ -92,7 +92,14 @@
         </div>
         } }
       </fieldset>
-      } } @else {
+      } } @else { @if (isProjectAssignToProgram) {
+      <div class="project__additional--no-items">
+        <p class="text-body-12">
+          проект привязан к программе, но дополнительных полей для заполнения нет
+        </p>
+        <i appIcon icon="info" appSquare="20" class="project__no-items"></i>
+      </div>
+      } @else {
       <div class="project__additional--no-items">
         <p class="text-body-12">пока ты не участвуешь ни в одной программе</p>
         <a routerLink="/office/program/all">
@@ -112,7 +119,7 @@
 
         <i appIcon icon="sad-smile" appSquare="20" class="project__no-items"></i>
       </div>
-      }
+      } }
     </div>
   </div>
 </div>

projects/social_platform/src/app/office/projects/edit/shared/project-additional-step/project-additional-step.component.scss

@@ -95,7 +95,7 @@
       }
 
       @include responsive.apply-desktop {
-        width: 60%;
+        width: 70%;
 
         ::ng-deep {
           app-input {

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

@@ -47,6 +47,8 @@ export class ProjectAdditionalStepComponent implements OnInit {
 
   readonly errorMessage = ErrorMessage;
 
+  @Input() isProjectAssignToProgram?: boolean;
+
   ngOnInit(): void {
     // Инициализация уже должна быть выполнена в родительском компоненте
     this.cdRef.detectChanges();