Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/** @format */

import { inject, Injectable } from "@angular/core";
import { ResultsQuery } from "@domain/program/program-results.model";
import { ManagementCriteriaWrite } from "@domain/program/program-criteria.model";
import { ProgramManagementRepositoryPort } from "@domain/program/ports/program-management.repository.port";
import { ManagementProjectFormWrite } from "@domain/program/program-project-form.model";
Expand All @@ -14,6 +15,12 @@ import {
@Injectable()
export class ProgramManagementUseCase {
private readonly repository = inject(ProgramManagementRepositoryPort);
results(id: number) {
return this.repository.results(id);
}
exportResults(id: number, query: ResultsQuery) {
return this.repository.exportResults(id, query);
}
criteria(id: number) {
return this.repository.criteria(id);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/** @format */

import { Observable } from "rxjs";
import { ProgramResults, ResultsQuery } from "../program-results.model";
import { ManagementCriteria, ManagementCriteriaWrite } from "../program-criteria.model";
import { ManagementProjectForm, ManagementProjectFormWrite } from "../program-project-form.model";
import {
Expand All @@ -17,6 +18,8 @@ import {
} from "../program-management.model";

export abstract class ProgramManagementRepositoryPort {
abstract results(programId: number): Observable<ProgramResults>;
abstract exportResults(programId: number, query: ResultsQuery): Observable<Blob>;
abstract criteria(programId: number): Observable<ManagementCriteria>;
abstract saveCriteria(
programId: number,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export type ManagementSection =
| "participants"
| "projects"
| "experts"
| "results"
| "analytics"
| "settings"
| "evaluation";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/** @format */
import { ManagementCriterion } from "./program-criteria.model";

export interface ResultExpert {
userId: number;
name: string;
email: string;
avatar: string | null;
complete: boolean;
total: number | null;
values: { criterionId: number; value: string | null }[];
}
export interface ResultProject {
id: number;
projectId: number;
name: string;
caseName: string | null;
completed: number;
required: number;
ready: boolean;
score: number | null;
place: number | null;
averages: Record<string, number>;
experts: ResultExpert[];
}
export interface ResultsGroup {
caseName: string | null;
projects: ResultProject[];
}
export interface ProgramResults {
programId: number;
programName: string;
generatedAt: string;
requiredEvaluators: number;
maximum: number | null;
hasNumericCriteria: boolean;
caseOptions: string[];
criteria: ManagementCriterion[];
groups: ResultsGroup[];
}
export interface ResultsQuery {
search: string;
caseScope: "all" | "selected" | "without_case";
caseName?: string;
order: "asc" | "desc";
scope: "current" | "all";
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { inject, Injectable } from "@angular/core";
import { HttpParams } from "@angular/common/http";
import { ApiService } from "@corelib";
import { ProgramResults, ResultsQuery } from "@domain/program/program-results.model";
import {
ManagementCriteria,
ManagementCriteriaWrite,
Expand All @@ -28,6 +29,18 @@ import {
@Injectable()
export class ProgramManagementHttpAdapter implements ProgramManagementRepositoryPort {
private readonly api = inject(ApiService);
results(id: number) {
return this.api.get<ProgramResults>(`${this.root(id)}/results/`);
}
exportResults(id: number, query: ResultsQuery) {
let params = new HttpParams()
.set("search", query.search)
.set("case_scope", query.caseScope)
.set("order", query.order)
.set("scope", query.scope);
if (query.caseName) params = params.set("case_name", query.caseName);
return this.api.getFile(`${this.root(id)}/results/export/`, params);
}
criteria(id: number) {
return this.api.get<ManagementCriteria>(`${this.root(id)}/criteria/`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { inject, Injectable } from "@angular/core";
import { tap } from "rxjs";
import { ResultsQuery } from "@domain/program/program-results.model";
import { ManagementCriteriaWrite } from "@domain/program/program-criteria.model";
import { ManagementProjectFormWrite } from "@domain/program/program-project-form.model";
import { EventBus } from "@domain/shared/event-bus";
Expand All @@ -18,6 +19,12 @@ import {
@Injectable()
export class ProgramManagementRepository implements ProgramManagementRepositoryPort {
private readonly adapter = inject(ProgramManagementHttpAdapter);
results(id: number) {
return this.adapter.results(id);
}
exportResults(id: number, query: ResultsQuery) {
return this.adapter.exportResults(id, query);
}
private readonly events = inject(EventBus);
criteria(id: number) {
return this.adapter.criteria(id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ <h2>{{ requestError() }}</h2>
Загружаем данные программы…
</section>
} @else if (state.program(); as program) {
@if (section() === "results") {
<app-management-results [programId]="program.id" />
}
@if (section() === "experts") {
<app-management-experts
[programId]="program.id"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,10 +552,6 @@
inset: -6px 0;
content: "";
}

&:nth-last-child(-n + 2) {
grid-column: span 3;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import { ProgramBrandingPreviewComponent } from "./branding-preview/branding-pre
import { ManagementProjectFormComponent } from "./project-form/project-form.component";
import { ManagementCriteriaComponent } from "./criteria/criteria.component";
import { ManagementExpertsComponent } from "./experts/experts.component";
import { ManagementResultsComponent } from "./results/results.component";
import { presentationHref } from "@utils/program-case-analytics";
import { evaluationLabel, fromMoscowInput, toMoscowInput } from "@utils/program-management";
import { DEFAULT_IMAGE_FRAME, programImageFraming } from "@utils/program-branding";
Expand Down Expand Up @@ -81,6 +82,7 @@ import { ProgramImageFraming, ProgramImageKey } from "@domain/program/program-im
ManagementProjectFormComponent,
ManagementCriteriaComponent,
ManagementExpertsComponent,
ManagementResultsComponent,
],
providers: [
ProgramManagementService,
Expand Down Expand Up @@ -147,6 +149,7 @@ export class ProgramManagementComponent implements OnInit {
{ id: "participants", label: "Участники" },
{ id: "projects", label: "Проекты" },
{ id: "experts", label: "Эксперты" },
{ id: "results", label: "Результаты" },
{ id: "analytics", label: "Аналитика" },
{ id: "settings", label: "Настройки" },
];
Expand Down Expand Up @@ -278,6 +281,7 @@ export class ProgramManagementComponent implements OnInit {
"participants",
"projects",
"experts",
"results",
"analytics",
"settings",
"evaluation",
Expand Down
Loading