diff --git a/app/web/admin/features/requests/RequestsSection.jsx b/app/web/admin/features/requests/RequestsSection.jsx
index e8cfb53..0cbc08f 100644
--- a/app/web/admin/features/requests/RequestsSection.jsx
+++ b/app/web/admin/features/requests/RequestsSection.jsx
@@ -2,16 +2,27 @@ import { OPERATOR_LABELS, REQUEST_UPDATE_EVENT_LABELS, TABLE_SERVER_CONFIG } fro
import { fmtDate, statusLabel } from "../../shared/utils.js";
function renderRequestUpdatesCell(row, role) {
+ const hasServiceRequestUnread = Boolean(row?.has_service_requests_unread);
+ const serviceRequestCount = Number(row?.service_requests_unread_count || 0);
if (role === "LAWYER") {
const has = Boolean(row.lawyer_has_unread_updates);
const eventType = String(row.lawyer_unread_event_type || "").toUpperCase();
- return has ? (
-
-
- {REQUEST_UPDATE_EVENT_LABELS[eventType] || "обновление"}
+ if (!has && !hasServiceRequestUnread) return нет;
+ return (
+
+ {has ? (
+
+
+ {REQUEST_UPDATE_EVENT_LABELS[eventType] || "обновление"}
+
+ ) : null}
+ {hasServiceRequestUnread ? (
+
+
+ {"Запросы: " + String(serviceRequestCount || 1)}
+
+ ) : null}
- ) : (
- нет
);
}
@@ -20,7 +31,7 @@ function renderRequestUpdatesCell(row, role) {
const lawyerHas = Boolean(row.lawyer_has_unread_updates);
const lawyerType = String(row.lawyer_unread_event_type || "").toUpperCase();
- if (!clientHas && !lawyerHas) return нет;
+ if (!clientHas && !lawyerHas && !hasServiceRequestUnread) return нет;
return (
{clientHas ? (
@@ -35,6 +46,12 @@ function renderRequestUpdatesCell(row, role) {
{"Юрист: " + (REQUEST_UPDATE_EVENT_LABELS[lawyerType] || "обновление")}
) : null}
+ {hasServiceRequestUnread ? (
+
+
+ {"Запросы: " + String(serviceRequestCount || 1)}
+
+ ) : null}
);
}
diff --git a/app/web/admin/features/service-requests/ServiceRequestsSection.jsx b/app/web/admin/features/service-requests/ServiceRequestsSection.jsx
new file mode 100644
index 0000000..87d6531
--- /dev/null
+++ b/app/web/admin/features/service-requests/ServiceRequestsSection.jsx
@@ -0,0 +1,138 @@
+import {
+ OPERATOR_LABELS,
+ SERVICE_REQUEST_STATUS_LABELS,
+ SERVICE_REQUEST_TYPE_LABELS,
+ TABLE_SERVER_CONFIG,
+} from "../../shared/constants.js";
+import { fmtDate } from "../../shared/utils.js";
+
+function serviceRequestTypeLabel(value) {
+ const code = String(value || "").toUpperCase();
+ return SERVICE_REQUEST_TYPE_LABELS[code] || code || "-";
+}
+
+function serviceRequestStatusLabel(value) {
+ const code = String(value || "").toUpperCase();
+ return SERVICE_REQUEST_STATUS_LABELS[code] || code || "-";
+}
+
+function unreadLabel(row, role) {
+ if (String(role || "").toUpperCase() === "LAWYER") {
+ return row?.lawyer_unread ? "Да" : "Нет";
+ }
+ return row?.admin_unread ? "Да" : "Нет";
+}
+
+export function ServiceRequestsSection({
+ role,
+ tables,
+ status,
+ getStatus,
+ getFieldDef,
+ getFilterValuePreview,
+ onRefresh,
+ onOpenFilter,
+ onRemoveFilter,
+ onEditFilter,
+ onSort,
+ onPrev,
+ onNext,
+ onLoadAll,
+ onOpenRequest,
+ onMarkRead,
+ onEditRecord,
+ onDeleteRecord,
+ FilterToolbarComponent,
+ DataTableComponent,
+ TablePagerComponent,
+ StatusLineComponent,
+ IconButtonComponent,
+}) {
+ const tableState = tables?.serviceRequests || { rows: [], filters: [], sort: [] };
+ const FilterToolbar = FilterToolbarComponent;
+ const DataTable = DataTableComponent;
+ const TablePager = TablePagerComponent;
+ const StatusLine = StatusLineComponent;
+ const IconButton = IconButtonComponent;
+ const roleCode = String(role || "").toUpperCase();
+
+ return (
+ <>
+
+
+
Запросы
+
Запросы клиента к куратору и обращения на смену юриста.
+
+
+
+
+
+
{
+ const fieldDef = getFieldDef("serviceRequests", clause.field);
+ return (
+ (fieldDef ? fieldDef.label : clause.field) +
+ " " +
+ OPERATOR_LABELS[clause.op] +
+ " " +
+ getFilterValuePreview("serviceRequests", clause)
+ );
+ }}
+ />
+ (
+
+ | {serviceRequestTypeLabel(row.type)} |
+ {serviceRequestStatusLabel(row.status)} |
+ {row.body || "-"} |
+
+ {row.request_id ? (
+
+ ) : (
+ "-"
+ )}
+ |
+ {unreadLabel(row, roleCode)} |
+ {fmtDate(row.created_at)} |
+
+
+ onMarkRead(row.id)} />
+ {roleCode === "ADMIN" ? (
+ <>
+ onEditRecord(row)} />
+ onDeleteRecord(row.id)} tone="danger" />
+
+ ) : null}
+
+ |
+
+ )}
+ />
+
+
+
+ );
+}
+
+export default ServiceRequestsSection;
diff --git a/app/web/admin/hooks/useTablesState.js b/app/web/admin/hooks/useTablesState.js
index 967fa8e..5208824 100644
--- a/app/web/admin/hooks/useTablesState.js
+++ b/app/web/admin/hooks/useTablesState.js
@@ -4,6 +4,7 @@ function createInitialTablesState() {
return {
kanban: createTableState(),
requests: createTableState(),
+ serviceRequests: createTableState(),
invoices: createTableState(),
quotes: createTableState(),
topics: createTableState(),
diff --git a/app/web/admin/shared/constants.js b/app/web/admin/shared/constants.js
index 93220c4..4c9f23c 100644
--- a/app/web/admin/shared/constants.js
+++ b/app/web/admin/shared/constants.js
@@ -16,6 +16,7 @@ export const OPERATOR_LABELS = {
export const ROLE_LABELS = {
ADMIN: "Администратор",
LAWYER: "Юрист",
+ CURATOR: "Куратор",
};
export const STATUS_LABELS = {
@@ -46,6 +47,18 @@ export const REQUEST_UPDATE_EVENT_LABELS = {
STATUS: "статус",
};
+export const SERVICE_REQUEST_TYPE_LABELS = {
+ CURATOR_CONTACT: "Запрос к куратору",
+ LAWYER_CHANGE_REQUEST: "Смена юриста",
+};
+
+export const SERVICE_REQUEST_STATUS_LABELS = {
+ NEW: "Новый",
+ IN_PROGRESS: "В работе",
+ RESOLVED: "Решен",
+ REJECTED: "Отклонен",
+};
+
export const KANBAN_GROUPS = [
{ key: "NEW", label: "Новые" },
{ key: "IN_PROGRESS", label: "В работе" },
@@ -61,6 +74,11 @@ export const TABLE_SERVER_CONFIG = {
endpoint: "/api/admin/requests/query",
sort: [{ field: "created_at", dir: "desc" }],
},
+ serviceRequests: {
+ table: "request_service_requests",
+ endpoint: "/api/admin/crud/request_service_requests/query",
+ sort: [{ field: "created_at", dir: "desc" }],
+ },
invoices: {
table: "invoices",
endpoint: "/api/admin/invoices/query",
@@ -131,6 +149,7 @@ TABLE_MUTATION_CONFIG.invoices = {
};
export const TABLE_KEY_ALIASES = {
+ request_service_requests: "serviceRequests",
form_fields: "formFields",
status_groups: "statusGroups",
topic_required_fields: "topicRequiredFields",
diff --git a/app/web/admin/shared/utils.js b/app/web/admin/shared/utils.js
index 1a0ec21..ed67547 100644
--- a/app/web/admin/shared/utils.js
+++ b/app/web/admin/shared/utils.js
@@ -269,7 +269,18 @@ export function buildUniversalQuery(filters, sort, limit, offset) {
}
export function canAccessSection(role, section) {
- const allowed = new Set(["dashboard", "kanban", "requests", "requestWorkspace", "invoices", "meta", "quotes", "config", "availableTables"]);
+ const allowed = new Set([
+ "dashboard",
+ "kanban",
+ "requests",
+ "serviceRequests",
+ "requestWorkspace",
+ "invoices",
+ "meta",
+ "quotes",
+ "config",
+ "availableTables",
+ ]);
if (!allowed.has(section)) return false;
if (section === "quotes" || section === "config" || section === "availableTables") return role === "ADMIN";
return true;
diff --git a/app/web/client.css b/app/web/client.css
index 5d0b9ad..076c9b5 100644
--- a/app/web/client.css
+++ b/app/web/client.css
@@ -165,6 +165,13 @@ textarea {
margin-top: 0.7rem;
}
+.service-request-actions {
+ margin-top: 0.75rem;
+ display: flex;
+ gap: 0.55rem;
+ flex-wrap: wrap;
+}
+
.meta-row {
border: 1px solid var(--line);
border-radius: 12px;
@@ -347,6 +354,27 @@ textarea {
width: min(760px, 100%);
}
+.service-request-modal {
+ width: min(700px, 100%);
+}
+
+.service-request-body {
+ width: 100%;
+ min-height: 220px;
+ max-height: calc(92vh - 90px);
+ overflow: auto;
+ border: 1px solid var(--line);
+ border-radius: 12px;
+ background: #0f1722;
+ padding: 0.85rem;
+ display: block;
+}
+
+.service-request-form {
+ display: grid;
+ gap: 0.65rem;
+}
+
.data-request-body {
width: 100%;
min-height: 280px;
diff --git a/app/web/client.html b/app/web/client.html
index 1374355..4ec4ef1 100644
--- a/app/web/client.html
+++ b/app/web/client.html
@@ -54,6 +54,10 @@
-