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
Expand Up @@ -132,7 +132,8 @@ export interface ManagementQuery {
caseName?: string;
regionScope?: "all" | "selected" | "without_region";
region?: string;
activity?: "all" | "period" | "never";
activity?: "all" | "period" | "active" | "inactive" | "never";
order?: "registration" | "activity_asc" | "activity_desc";
activityFrom?: string;
activityTo?: string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ describe("Контракт HTTP панели организатора", () => {
regionScope: "selected" as const,
region: "Москва",
activity: "period" as const,
order: "activity_desc" as const,
activityFrom: "2026-10-01",
activityTo: "2026-10-19",
};
Expand All @@ -70,9 +71,30 @@ describe("Контракт HTTP панели организатора", () => {
expect(file.request.params.toString()).toBe(list.request.params.toString());
expect(file.request.params.get("activity_from")).toBe("2026-10-01");
expect(file.request.params.get("region")).toBe("Москва");
expect(file.request.params.get("order")).toBe("activity_desc");
expect(file.request.responseType).toBe("blob");
file.flush(new Blob(["xlsx"]));
});
it("одни параметры наличия активности и сортировки передаются списку и выбору всех", () => {
const query = {
search: "",
offset: 20,
limit: 20,
submission: "all" as const,
caseScope: "all" as const,
activity: "inactive" as const,
order: "activity_asc" as const,
};
adapter.participants(4, query).subscribe();
const list = http.expectOne(r => r.url.endsWith("/participants/"));
list.flush({ count: 0, results: [] });
adapter.selection(4, "participants", query).subscribe();
const selection = http.expectOne(r => r.url.endsWith("/participants/selection/"));
expect(selection.request.params.toString()).toBe(list.request.params.toString());
expect(selection.request.params.get("activity")).toBe("inactive");
expect(selection.request.params.get("order")).toBe("activity_asc");
selection.flush({ ids: [] });
});
it("версия PATCH не теряет точность при преобразовании JSON", () => {
const version = "2026-10-17T12:34:56.123456Z";
adapter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ export class ProgramManagementHttpAdapter implements ProgramManagementRepository
private participantParams(q: ManagementQuery): HttpParams {
let params = this.params(q)
.set("region_scope", q.regionScope ?? "all")
.set("activity", q.activity ?? "all");
.set("activity", q.activity ?? "all")
.set("order", q.order ?? "registration");
if (q.regionScope === "selected" && q.region) params = params.set("region", q.region);
if (q.activity === "period") {
if (q.activityFrom) params = params.set("activity_from", q.activityFrom);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/** @format */

@use "styles/responsive";
@use "styles/ui-foundation";
@use "styles/program-management-controls";

.modal__body.analytics-drilldown-body.analytics-drilldown-body--case {
Expand Down Expand Up @@ -288,7 +289,7 @@
}

&__action:hover {
text-decoration: underline;
color: var(--accent-dark);
}

&__action:disabled {
Expand All @@ -311,16 +312,11 @@
align-items: center;

input {
box-sizing: border-box;
@include ui-foundation.control;

flex: 1 1 220px;
width: 100%;
min-width: 0;
padding: 10px 12px;
font: inherit;
color: var(--black);
background: var(--white);
border: 1px solid var(--medium-grey-for-outline);
border-radius: 8px;
font-size: 12px;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,34 @@ <h2>Эксперты программы</h2>
@if (loading() && !snapshot()) {
<p role="status">Загружаем экспертов…</p>
}
<div class="experts__select-all">
<button
type="button"
appButton="text"
[disabled]="busy() || loading()"
(click)="selectAllExperts()"
>
{{ allExpertsSelected() ? "Снять весь выбор" : "Выбрать всех по фильтрам" }}
</button>
<div class="experts__mobile-tools">
<label class="experts__pick-target">
<input
type="checkbox"
appChoice
aria-label="Выбрать всех экспертов по фильтрам"
[checked]="allExpertsSelected()"
[indeterminate]="!!selectedExpertIds().size && !allExpertsSelected()"
[disabled]="busy() || loading()"
(change)="selectAllExperts()"
/>
Все эксперты
</label>
</div>
<table class="experts__table experts__table--people">
<thead>
<tr>
<th class="experts__pick">
<input
type="checkbox"
appChoice
aria-label="Выбрать всех экспертов по фильтрам"
[checked]="allExpertsSelected()"
[indeterminate]="!!selectedExpertIds().size && !allExpertsSelected()"
[disabled]="busy() || loading()"
(change)="selectAllExperts()"
/>
<label class="experts__pick-target"
><input
type="checkbox"
appChoice
aria-label="Выбрать всех экспертов по фильтрам"
[checked]="allExpertsSelected()"
[indeterminate]="!!selectedExpertIds().size && !allExpertsSelected()"
[disabled]="busy() || loading()"
(change)="selectAllExperts()"
/></label>
</th>
<th>Эксперт</th>
<th>Кейсы</th>
Expand Down Expand Up @@ -260,28 +265,33 @@ <h2>Проекты на оценку</h2>
}
</details>
}
<div class="experts__select-all">
<button
type="button"
appButton="text"
[disabled]="busy() || loading()"
(click)="selectVisibleProjects()"
>
{{ allVisibleSelected() ? "Снять весь выбор" : "Выбрать все проекты по фильтрам" }}
</button>
<div class="experts__mobile-tools">
<label class="experts__pick-target">
<input
type="checkbox"
appChoice
aria-label="Выбрать все проекты по фильтрам"
[checked]="allVisibleSelected()"
[indeterminate]="!!selection().length && !allVisibleSelected()"
[disabled]="busy() || loading()"
(change)="selectVisibleProjects()"
/>
Все проекты
</label>
</div>
<table class="experts__table experts__table--projects">
<thead>
<tr>
<th>
<input
type="checkbox"
appChoice
aria-label="Выбрать все проекты по фильтрам"
[checked]="allVisibleSelected()"
[indeterminate]="!!selection().length && !allVisibleSelected()"
(change)="selectVisibleProjects()"
/>
<label class="experts__pick-target"
><input
type="checkbox"
appChoice
aria-label="Выбрать все проекты по фильтрам"
[checked]="allVisibleSelected()"
[indeterminate]="!!selection().length && !allVisibleSelected()"
(change)="selectVisibleProjects()"
/></label>
</th>
<th>Проект</th>
<th>Кейс</th>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,8 +835,8 @@
}
}

.experts__select-all {
min-height: 32px;
.experts__mobile-tools {
display: none;
}

.experts__bulk {
Expand All @@ -848,6 +848,17 @@
}

@media (max-width: 999px) {
.experts__mobile-tools {
display: block;
}

.experts .experts__mobile-tools .experts__pick-target {
display: flex;
gap: 8px;
justify-content: start;
min-height: 44px;
}

.experts__table--people tr {
position: relative;
}
Expand Down
Loading