logs: логируем время

2026-06-25 16:00:46 +03:00
19 changed files with 202 additions and 248 deletions
--- a/api/alembic/versions/sql/0002_functions.sql
+++ b/api/alembic/versions/sql/0002_functions.sql
@ -3244,7 +3244,7 @@ BEGIN
    LEFT JOIN collegial_approval ca ON ca.line_id = bl.id AND s_ca
    LEFT JOIN ckk ck               ON ck.line_id = bl.id AND (s_ckk OR s_need_bk)
    LEFT JOIN contract_detail cd   ON cd.line_id = bl.id AND (s_cd  OR s_need_bk)
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet
      AND (s_need_ap OR s_cs OR s_ca OR s_ckk OR s_cd OR s_need_bk)
    GROUP BY bl.expense_item_id
  ),
@ -3257,7 +3257,7 @@ BEGIN
      SUM(blq.transfer_to_q2) AS tq2, SUM(blq.transfer_to_q3) AS tq3, SUM(blq.transfer_to_q4) AS tq4
    FROM budget_line bl JOIN expense_item ei ON ei.id = bl.expense_item_id
    LEFT JOIN budget_line_quarter blq ON blq.line_id = bl.id AND blq.quarter = 1
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q1 AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q1
    GROUP BY bl.expense_item_id
  ),
  aq2 AS (
@ -3270,7 +3270,7 @@ BEGIN
      SUM(blq.transfer_to_q3) AS tq3, SUM(blq.transfer_to_q4) AS tq4
    FROM budget_line bl JOIN expense_item ei ON ei.id = bl.expense_item_id
    LEFT JOIN budget_line_quarter blq ON blq.line_id = bl.id AND blq.quarter = 2
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q2 AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q2
    GROUP BY bl.expense_item_id
  ),
  aq3 AS (
@ -3283,7 +3283,7 @@ BEGIN
      SUM(blq.transfer_to_q4) AS tq4
    FROM budget_line bl JOIN expense_item ei ON ei.id = bl.expense_item_id
    LEFT JOIN budget_line_quarter blq ON blq.line_id = bl.id AND blq.quarter = 3
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q3 AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_q3
    GROUP BY bl.expense_item_id
  ),
  aq4 AS (
@ -3296,7 +3296,7 @@ BEGIN
      SUM(blq.actual_spod) AS spod
    FROM budget_line bl JOIN expense_item ei ON ei.id = bl.expense_item_id
    LEFT JOIN budget_line_quarter blq ON blq.line_id = bl.id AND blq.quarter = 4
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND (s_q4 OR s_tot) AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND (s_q4 OR s_tot)
    GROUP BY bl.expense_item_id
  ),
  atot AS (
@ -3308,7 +3308,7 @@ BEGIN
      SUM(blq.payment_amount) AS pay
    FROM budget_line bl JOIN expense_item ei ON ei.id = bl.expense_item_id
    LEFT JOIN budget_line_quarter blq ON blq.line_id = bl.id
-    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_tot AND (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+    WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet AND s_tot
    GROUP BY bl.expense_item_id
  ),
  -- ═══ Pre-computed per-node aggregates (one pass over tw × agg) ═════════
@ -4427,7 +4427,7 @@ BEGIN
      LEFT JOIN v3.sequestration sg ON sg.line_id = bl.id AND sg.actor='SSP_GO' AND s_need_ap
      LEFT JOIN v3.reserve r ON r.line_id = bl.id AND s_need_ap
      LEFT JOIN v3.ckk ck ON ck.line_id = bl.id AND s_book
-      WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet and (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+      WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet
        AND (s_need_ap OR s_book)
      GROUP BY bl.expense_item_id
    ),
@ -4453,7 +4453,7 @@ BEGIN
      FROM v3.budget_line bl
      JOIN v3.expense_item ei ON ei.id = bl.expense_item_id
      JOIN v3.budget_line_quarter q ON q.line_id = bl.id
-      WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet and (p_direction is null OR bl.direction is null or bl.direction = p_direction)
+      WHERE bl.budget_form_id = p_form_id AND ei.sheet = p_sheet
      GROUP BY bl.expense_item_id, q.quarter
    ),
    -- Tree-rollup
--- a/api/src/api/v1/auth.py
+++ b/api/src/api/v1/auth.py
@ -6,13 +6,13 @@ from src.db.session import get_db
 from src.domain.schemas import LoginRequest, RefreshRequest, Token
 from src.services.auth_service import AuthService

-# if not settings.DEBUG:
-#     from raisa_fastapi_protected_api import UserInfo, get_user_dependency
+if not settings.DEBUG:
+    from raisa_fastapi_protected_api import UserInfo, get_user_dependency

 router = APIRouter(prefix="/auth", tags=["auth"])


-# if settings.DEBUG:
+if settings.DEBUG:

    @router.post("/login", response_model=Token)
    async def login(
@ -29,23 +29,23 @@ async def login(
            )
        return token

-# else:
+else:

-#     @router.post("/login", response_model=Token)
-#     async def login(
-#         login_data: LoginRequest,
-#         db: AsyncSession = Depends(get_db),
-#         user: UserInfo = Depends(get_user_dependency),
-#     ):
-#         auth_service = AuthService(db)
-#         token = await auth_service.authenticate_user_via_email(user.email)
-#         if not token:
-#             raise HTTPException(
-#                 status_code=status.HTTP_401_UNAUTHORIZED,
-#                 detail="Неверное имя пользователя или пароль",
-#                 headers={"WWW-Authenticate": "Bearer"},
-#             )
-#         return token
+    @router.post("/login", response_model=Token)
+    async def login(
+        login_data: LoginRequest,
+        db: AsyncSession = Depends(get_db),
+        user: UserInfo = Depends(get_user_dependency),
+    ):
+        auth_service = AuthService(db)
+        token = await auth_service.authenticate_user_via_email(user.email)
+        if not token:
+            raise HTTPException(
+                status_code=status.HTTP_401_UNAUTHORIZED,
+                detail="Неверное имя пользователя или пароль",
+                headers={"WWW-Authenticate": "Bearer"},
+            )
+        return token


@router.post("/login-form", response_model=Token)
--- a/api/src/api/v1/deps.py
+++ b/api/src/api/v1/deps.py
@ -12,7 +12,7 @@ from src.repository.user_repository import UserRepository
 security = HTTPBearer()


-# if settings.DEBUG:
+if settings.DEBUG:

    async def get_user_by_token(
            token: str,
@ -52,22 +52,22 @@ async def get_current_user(
    ) -> AppUser:
        return await get_user_by_token(token=credentials.credentials, db=db)

-# else:
-#     from raisa_fastapi_protected_api import UserInfo, get_user_dependency
+else:
+    from raisa_fastapi_protected_api import UserInfo, get_user_dependency

-#     async def get_current_user(
-#         user: UserInfo = Depends(get_user_dependency),
-#         db: AsyncSession = Depends(get_db),
-#     ) -> AppUser:
-#         user_repo = UserRepository(db)
-#         db_user = await user_repo.get_by_email(user.email)
-#         if db_user is None:
-#             raise HTTPException(
-#                 status_code=status.HTTP_401_UNAUTHORIZED,
-#                 detail="Пользователь не найден",
-#                 headers={"WWW-Authenticate": "Bearer"},
-#             )
-#         return db_user
+    async def get_current_user(
+        user: UserInfo = Depends(get_user_dependency),
+        db: AsyncSession = Depends(get_db),
+    ) -> AppUser:
+        user_repo = UserRepository(db)
+        db_user = await user_repo.get_by_email(user.email)
+        if db_user is None:
+            raise HTTPException(
+                status_code=status.HTTP_401_UNAUTHORIZED,
+                detail="Пользователь не найден",
+                headers={"WWW-Authenticate": "Bearer"},
+            )
+        return db_user


 async def get_current_active_user(current_user: AppUser = Depends(get_current_user)) -> AppUser:
--- a/api/src/api/v1/vsp.py
+++ b/api/src/api/v1/vsp.py
@ -59,13 +59,12 @@ async def get_vsp(
@router.get("/dropdown", response_model=BaseListResponse[VSPInDB])
 async def get_vsp_dropdown(
    ssp_id: int | None = None,
-    form_id: int | None = None,
    db: AsyncSession = Depends(get_db),
    current_user: AppUser = Depends(require_executor),
 ):
    """Получение записей для выпадающего списка INFO."""
    service = VSPService(db)
-    result = await service.get_dropdown(user=current_user, ssp_id=ssp_id, form_id=form_id, with_count=True)
+    result = await service.get_dropdown(user=current_user, ssp_id=ssp_id, with_count=True)
    return BaseListResponse(
        success=True,
        message="Список INFO для выпадающего списка",
--- a/api/src/main.py
+++ b/api/src/main.py
@ -22,18 +22,18 @@ from src.db.base import engine
 from src.db.session import create_tables


-
 logging.basicConfig(level=logging.INFO)

-# if not settings.DEBUG:
-#     from raisa_fastapi_protected_api import (
-#         AuthorizationMiddleware,
-#         OpenEndpoint,
-#         ProtectedOAuthSettings,
-#         ProtectedRolesSettings,
-#         ProtectedSettings,
-#         SearchType,
-#     )
+
+if not settings.DEBUG:
+    from raisa_fastapi_protected_api import (
+        AuthorizationMiddleware,
+        OpenEndpoint,
+        ProtectedOAuthSettings,
+        ProtectedRolesSettings,
+        ProtectedSettings,
+        SearchType,
+    )


 _AUDIT_CLEANUP_LOCK_KEY = 21987431
@ -104,13 +104,13 @@ async def lifespan(app: FastAPI):
    cleanup_task: asyncio.Task | None = None
    if not settings.DEBUG:
        await create_tables()
-        # ProtectedSettings(
-        #     ProtectedOAuthSettings(JWKS_URI=settings.JWKS_URL),
-        #     ProtectedRolesSettings(
-        #         APP_NAMESPACE=settings.APP_NAMESPACE,
-        #         APP_NAME=settings.APP_NAME,
-        #     ),
-        # )
+        ProtectedSettings(
+            ProtectedOAuthSettings(JWKS_URI=settings.JWKS_URL),
+            ProtectedRolesSettings(
+                APP_NAMESPACE=settings.APP_NAMESPACE,
+                APP_NAME=settings.APP_NAME,
+            ),
+        )
        cleanup_task = asyncio.create_task(_audit_cleanup_loop())
    try:
        yield
@ -185,41 +185,41 @@ async def readyz(response: Response):



-# if not settings.DEBUG:
-#     app.add_middleware(
-#         AuthorizationMiddleware,
-#         open_endpoints=[
-#             OpenEndpoint(path="", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(path=settings.ROOT_PATH + "", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(path="/", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(path=settings.ROOT_PATH + "/", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(path="/healthcheck", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(
-#                 path=settings.ROOT_PATH + "/healthcheck",
-#                 type_search=SearchType.ABSOLUTE,
-#             ),
-#             OpenEndpoint(path="/healthz", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(
-#                 path=settings.ROOT_PATH + "/healthz",
-#                 type_search=SearchType.ABSOLUTE,
-#             ),
-#             OpenEndpoint(path="/readyz", type_search=SearchType.ABSOLUTE),
-#             OpenEndpoint(
-#                 path=settings.ROOT_PATH + "/readyz",
-#                 type_search=SearchType.ABSOLUTE,
-#             ),
-#             OpenEndpoint(path="/openapi.json", type_search=SearchType.START),
-#             OpenEndpoint(
-#                 path=settings.ROOT_PATH + "/openapi.json",
-#                 type_search=SearchType.START,
-#             ),
-#             OpenEndpoint(path="/docs", type_search=SearchType.START),
-#             OpenEndpoint(
-#                 path=settings.ROOT_PATH + "/docs",
-#                 type_search=SearchType.START,
-#             ),
-#         ],
-#     )
+if not settings.DEBUG:
+    app.add_middleware(
+        AuthorizationMiddleware,
+        open_endpoints=[
+            OpenEndpoint(path="", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(path=settings.ROOT_PATH + "", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(path="/", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(path=settings.ROOT_PATH + "/", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(path="/healthcheck", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(
+                path=settings.ROOT_PATH + "/healthcheck",
+                type_search=SearchType.ABSOLUTE,
+            ),
+            OpenEndpoint(path="/healthz", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(
+                path=settings.ROOT_PATH + "/healthz",
+                type_search=SearchType.ABSOLUTE,
+            ),
+            OpenEndpoint(path="/readyz", type_search=SearchType.ABSOLUTE),
+            OpenEndpoint(
+                path=settings.ROOT_PATH + "/readyz",
+                type_search=SearchType.ABSOLUTE,
+            ),
+            OpenEndpoint(path="/openapi.json", type_search=SearchType.START),
+            OpenEndpoint(
+                path=settings.ROOT_PATH + "/openapi.json",
+                type_search=SearchType.START,
+            ),
+            OpenEndpoint(path="/docs", type_search=SearchType.START),
+            OpenEndpoint(
+                path=settings.ROOT_PATH + "/docs",
+                type_search=SearchType.START,
+            ),
+        ],
+    )

 app.add_middleware(
    CORSMiddleware,
--- a/api/src/services/export_service/export_writers.py
+++ b/api/src/services/export_service/export_writers.py
@ -181,7 +181,7 @@ class DepthSheetWriter:
            worksheet.column_dimensions[col_letter].width = adjusted_width

    def _set_color_to_row(self, ws: Worksheet, item_type: str) -> None:
-        if not self.palette or item_type in ("SUB_ITEM", "INPUT"):
+        if not self.palette:
            return

        row = ws.max_row
--- a/api/src/services/vsp_service.py
+++ b/api/src/services/vsp_service.py
@ -7,7 +7,6 @@ from openpyxl import Workbook
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession

-from src.repository.budget_form_repository import BudgetFormRepository
 from src.core.errors import AccessDeniedException, ValidationException
 from src.db.models import AppUser, UserRoleEnum, Vsp
 from src.domain.schemas import VSPCreate, VSPUpdate
@ -30,7 +29,6 @@ class VSPService:
    def __init__(self, db: AsyncSession):
        self.db = db
        self.vsp_repo = VSPRepository(db)
-        self.form_repo = BudgetFormRepository(db)
        self.user_repo = UserRepository(db)

    async def get(self, vsp_id: int, user: AppUser, load_org_unit: bool = False) -> Optional[Vsp]:
@ -96,27 +94,19 @@ class VSPService:
            self, 
            user: AppUser, 
            ssp_id: int | None = None,
-            form_id: int | None = None,
            with_count: bool = False,
    ) -> list[Vsp]:
        ssp_ids = await self._get_scoped_ssp_ids(user=user)

-        checking_ssps = set()
        if ssp_id is not None:
-            checking_ssps.add(ssp_id)
-        if form_id is not None:
-            form = await self.form_repo.get(budget_form_id=form_id)
-            if form is not None:
-                checking_ssps.add(form.org_unit_id)
-        if checking_ssps:
            if ssp_ids is None:
-                ssp_ids = list(checking_ssps)
-            elif not checking_ssps & set(ssp_ids):
+                ssp_ids = [ssp_id]
+            elif ssp_id not in set(ssp_ids):
                if with_count:
                    return 0, []
                return []
            else:
-                ssp_ids = list(checking_ssps & set(ssp_ids))
+                ssp_ids = [ssp_id]

        return await self.vsp_repo.get_list(
            ssp_ids=ssp_ids,
--- a/api/tests/integration/test_vsp.py
+++ b/api/tests/integration/test_vsp.py
@ -37,25 +37,14 @@ def test_vsp_dropdown_smoke(client, admin_tokens, auth_headers):
    assert isinstance(payload["result"], list)


-@pytest.mark.parametrize(
-    "params, count",
-    [
-        ([("ssp_id", 2)], 1),
-        ([("form_id", 1)], 0),
-        ([("form_id", 2)], 1),
-        ([("ssp_id", 2), ("form_id", 1)], 1),
-    ]
-)
-def test_vsp_dropdown_with_filter(client, admin_tokens, auth_headers, params, count):
-    filters = "&".join([f"{el[0]}={el[1]}" for el in params])
+def test_vsp_dropdown_with_ssp_filter(client, admin_tokens, auth_headers):
    response = client.get(
-        f"/api/v1/dict/info/dropdown?{filters}",
+        "/api/v1/dict/info/dropdown?ssp_id=1",
        headers=auth_headers(admin_tokens),
    )
    assert response.status_code == 200
    payload = response.json()
    assert isinstance(payload["result"], list)
-    assert len(payload["result"]) == count


 def test_vsp_get_by_id(client, admin_tokens, auth_headers):
--- a/api/tests/sqls/fixture.sql
+++ b/api/tests/sqls/fixture.sql
@ -15,9 +15,8 @@ INSERT INTO v3.user_org (id,user_id,org_unit_id) VALUES
 SELECT setval('v3.user_org_id_seq', 3);

 INSERT INTO v3.budget_form (id,form_type_code,"year",created_by,created_at,updated_by,updated_at,org_unit_id) VALUES
-	 (1,'FORM_1',2027,NULL,'2026-05-06 16:57:38.066371',NULL,'2026-06-11 14:35:53.783017',1),
-	 (4,'FORM_2',2026,NULL,'2026-05-08 09:08:12.230445',NULL,'2026-05-08 09:08:12.230445',2);
-SELECT setval('v3.budget_form_id_seq', 4);
+	 (1,'FORM_1',2027,NULL,'2026-05-06 16:57:38.066371',NULL,'2026-06-11 14:35:53.783017',1);
+SELECT setval('v3.budget_form_id_seq', 1);

 INSERT INTO v3.budget_line (id,budget_form_id,expense_item_id,"name",internal_order,vsp_id,project_id,justification,created_by,created_at,updated_by,updated_at,direction) VALUES
 	 (1,1,88,'1234',NULL,NULL,NULL,NULL,NULL,'2026-05-06 16:58:05.793083',NULL,'2026-06-22 17:41:54.255313','Support');
@ -27,6 +26,5 @@ INSERT INTO v3.form_phase (budget_form_id,sheet,phase_code,"role",column_keys,op
 	 (1,'AHR','test','DFIP','{{plan.q1}}','2026-05-05 03:00:00+03','2026-06-06 03:00:00+03');

 INSERT INTO v3.vsp (id,branch_id,reg_number,address,format,opened_at,placement_type,staff_count,total_area,closed_at,is_active,updated_at,is_deleted,created_at,created_by,system_code,updated_by,vsp_type,notes,location_form,numbers,rent_contract_num,rent_end_date) VALUES
-	 (1,2,'Тестовый всп 1','Тестовая 12','укукк','2026-05-07','ывс',2026,230,'2026-06-16',false,'2026-06-18 15:46:38.611903',false,'2026-06-04 14:36:59.737727',1,'1233',91,'','','встроенное помещение',NULL,'',NULL),
-     (2,2,'Test12 -----','Тестовая 125','формат 15 ','2026-06-08',NULL,NULL,58,NULL,true,'2026-06-16 18:53:17.986651',false,'2026-06-09 09:04:33.29858',91,'123-1234',91,'субаренда','Работает ','аренда',155,'12-45','2026-10-02');
-SELECT setval('v3.vsp_id_seq', 2);
+	 (1,2,'Тестовый всп 1','Тестовая 12','укукк','2026-05-07','ывс',2026,230,'2026-06-16',false,'2026-06-18 15:46:38.611903',false,'2026-06-04 14:36:59.737727',1,'1233',91,'','','встроенное помещение',NULL,'',NULL);
+SELECT setval('v3.vsp_id_seq', 1);
--- a/web/src/components/RealtimeTable/RealtimeTable.jsx
+++ b/web/src/components/RealtimeTable/RealtimeTable.jsx
@ -143,7 +143,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
        }
      },
      columnVirtualizerOptions: ({ table }) => ({
-        overscan: 10,
+        overscan: 1,
        measureElement: (el) => {
          if (!el) return 150;
          const index = Number(el?.getAttribute?.('data-index'));
@ -152,6 +152,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
            const colId = table.getState().columnPinning.left[index];
            const column = table.getColumn(colId);
            return column.columnDef.size;
+
          }
          const allCols = [...table.getLeftVisibleLeafColumns(), ...table.getCenterVisibleLeafColumns()]
          return allCols[index]?.getSize() ?? 150;
--- a/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx
+++ b/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx
@ -168,7 +168,7 @@ const SettingPanel = ({
            <ExportDefaultButton
              onClick={handleExport}
              disabled={!formId || !sheetName || isExporting}
-              text={isExporting ? 'Экспорт...' : 'Экспорт'}
+              text={isExporting ? 'Экспорт...' : 'Экспорт в Excel'}
            />
          </GroupByObject>
        </Stack>
--- a/web/src/components/Stages/AddStagesModal.jsx
+++ b/web/src/components/Stages/AddStagesModal.jsx
@ -38,12 +38,13 @@ export const AddStagesModal = ({
  sheetOptions = [], // [{ value: 'sheet1', label: 'Лист 1' }]
  formType = '',
  defaultSheet = '',
+  defaultRole,
 }) => {
  const [startDate, setStartDate] = useState(null);
  const [endDate, setEndDate] = useState(null);
  const [stageName, setStageName] = useState('');
  const [selectedSheet, setSelectedSheet] = useState(defaultSheet);
-  const [selectedRole, setSelectedRole] = useState();
+  const [selectedRole, setSelectedRole] = useState(defaultRole);
  const [columnsConfig, setColumnsConfig] = useState({ columns: [], colors: {} });
  const [selectedColumns, setSelectedColumns] = useState([]);

@ -88,10 +89,10 @@ export const AddStagesModal = ({
      setEndDate(null);
      setStageName('');
      setSelectedSheet(defaultSheet);
-      setSelectedRole();
+      setSelectedRole(defaultRole);
      setSelectedColumns([]);
    }
-  }, [stage, isOpen, defaultSheet]);
+  }, [stage, isOpen, defaultSheet, defaultRole]);

  const handleSave = () => {
    const opensAt = formatDateForApi(startDate);
@ -128,7 +129,7 @@ export const AddStagesModal = ({
    setEndDate(null);
    setStageName('');
    setSelectedSheet(defaultSheet);
-    setSelectedRole();
+    setSelectedRole(defaultRole);
    setSelectedColumns([]);
    onClose();
  };
@ -237,7 +238,6 @@ export const AddStagesModal = ({
                  placeholderSelect="Выбрано столбцов: "
                  selectedIds={selectedColumns}
                  onSelectNode={handleColumnsSelect}
-                  forStage={true}
                />
              </FormControl>
            </Stack>
@ -247,7 +247,7 @@ export const AddStagesModal = ({
            <FormControl fullWidth>
              <FormLabel>Роль</FormLabel>
              <Select
-                value={selectedRole ?? ''}
+                value={selectedRole}
                onChange={(e) => setSelectedRole(e.target.value)}
                displayEmpty
                size="small"
--- a/web/src/components/Stages/SettingModal.jsx
+++ b/web/src/components/Stages/SettingModal.jsx
@ -76,59 +76,41 @@ export const SettingModal = ({
    setIsAddEditModalOpen(true);
  };
  const transformToSheetOptions = (data) => {
-    // TO DO пока не добавили direction для этапов
+    const sheetMap = new Map();

-    // const sheetMap = new Map();
+    data.forEach(item => {
+      const key = item.direction ? `${item.sheet}_${item.direction}` : item.sheet;

-    // data.forEach(item => {
-    //   const key = item.direction ? `${item.sheet}_${item.direction}` : item.sheet;
+      if (!sheetMap.has(key)) {
+        sheetMap.set(key, {
+          sheet: item.sheet,
+          direction: item.direction,
+          names: []
+        });
+      }

-    //   if (!sheetMap.has(key)) {
-    //     sheetMap.set(key, {
-    //       sheet: item.sheet,
-    //       direction: item.direction,
-    //       names: []
-    //     });
-    //   }
-
-    //   const entry = sheetMap.get(key);
-    //   if (!entry.names.includes(item.name)) {
-    //     entry.names.push(item.name);
-    //   }
-    // });
-
-    // const sheetOptions = [];
-
-    // sheetMap.forEach((value) => {
-    //   let label = value.names.join(' / ');
-
-    //   if (value.direction) {
-    //     label += ` (${value.direction})`;
-    //   }
-
-    //   sheetOptions.push({
-    //     value: value.direction ? `${value.sheet}_${value.direction}` : value.sheet,
-    //     label: label,
-    //     sheet: value.sheet,
-    //     direction: value.direction
-    //   });
-    // });
-
-    // return sheetOptions;
+      const entry = sheetMap.get(key);
+      if (!entry.names.includes(item.name)) {
+        entry.names.push(item.name);
+      }
+    });

    const sheetOptions = [];
-    data.forEach((value) => {
-      if (sheetOptions.find(s => s.sheet == value.sheet)) {
-        return;
+
+    sheetMap.forEach((value) => {
+      let label = value.names.join(' / ');
+
+      if (value.direction) {
+        label += ` (${value.direction})`;
      }

      sheetOptions.push({
-        value: value.sheet,
-        label: value.name,
+        value: value.direction ? `${value.sheet}_${value.direction}` : value.sheet,
+        label: label,
        sheet: value.sheet,
-        direction: value.direction,
-      })
-    })
+        direction: value.direction
+      });
+    });

    return sheetOptions;
  };
--- a/web/src/components/common/Buttons/ButtonsActions.jsx
+++ b/web/src/components/common/Buttons/ButtonsActions.jsx
@ -34,7 +34,7 @@ export const ExportWithTextButton = (props) => {
      <Stack sx={{ flexDirection: 'row', alignItems: 'center', gap: '.375rem' }}>
        <ExportSvg size="1rem" color="#45881c" strokeWidth={'.33px'} />
        <span style={{ fontSize: '.88rem' }}>
-          {props?.text || 'Экспорт'}
+          {props?.text || 'Экспорт в Excel'}
        </span>
      </Stack>
    </PrimaryOutlinedButton>
@ -57,7 +57,7 @@ export const ExportDefaultButton = (props) => {
    <DefaultOutlinedButton {...props}>
      <Stack sx={{ flexDirection: 'row', alignItems: 'center', gap: '.375rem' }}>
        <ExportSvg color="#4a5565" strokeWidth={'.33'} size="1rem" />
-        <span>{props?.text || 'Экспорт'}</span>
+        <span>{props?.text || 'Экспорт в Excel'}</span>
      </Stack>
    </DefaultOutlinedButton>
  );
--- a/web/src/components/common/CollapsibleTree.jsx
+++ b/web/src/components/common/CollapsibleTree.jsx
@ -21,7 +21,6 @@ const CollapsibleTree = ({
  placeholderSelect = 'Скрыто столбцов: ',
  selectedIds = [],
  onSelectNode,
-  forStage = false
 }) => {
  const [expandedItems, setExpandedItems] = useState([]);
  const [anchorEl, setAnchorEl] = useState(null);
@ -145,7 +144,7 @@ const CollapsibleTree = ({
    setAnchorEl(null);
  };

-  const selectedCount =  forStage ? selectedNodes.length : selectedNodes.length - 1; //1 колонка всегда скрыта
+  const selectedCount = selectedNodes.length - 1; //1 колонка всегда скрыта

  const isAllSelected = () => {
    if (!columnTree) return false;
--- a/web/src/components/common/TableCard/TableCard.jsx
+++ b/web/src/components/common/TableCard/TableCard.jsx
@ -1,4 +1,3 @@
-import { DIRECTION_TRANSLATE, FORM_TYPE_OPTIONS } from '../../../constants';
 import {
  Section,
  SectionStartPart,
@ -23,7 +22,7 @@ const TableCard = ({ table, onNavigate }) => {
          </div>
          <SectionTitle>
            <h2>{table.name}</h2>
-            <h2>{DIRECTION_TRANSLATE[table?.direction]}</h2>
+            <h2>{table?.direction}</h2>
            {/* <UsersList>
              <div className="img-user"></div>
            </UsersList> */}
--- a/web/src/constants.jsx
+++ b/web/src/constants.jsx
@ -37,7 +37,6 @@ export const EDIT_ACCESS_RUSSIAN = {

 export const FORM_TYPE_OPTIONS = ['FORM_1', 'FORM_2', 'FORM_3', 'FORM_4'];
 export const FROM_TYPE_TRANSLATE = { 'FORM_1': 'Смета ССП', 'FORM_2': 'Смета РФ', 'FORM_3': 'Программа развитие ПРРС', 'FORM_4': 'Проектная деятельность' };
-export const DIRECTION_TRANSLATE = { 'Support': 'Поддержка', 'Development': 'Развитие' };

 export const ORG_UNIT_TYPE_OPTIONS = [
  { value: 'ssp', label: 'ССП' },
--- a/web/src/pages/TaskPage/TaskPage.jsx
+++ b/web/src/pages/TaskPage/TaskPage.jsx
@ -22,7 +22,7 @@ import { ModalCreateProject } from './ModalCreateProject';
 import { ExportWithTextButton } from '../../components/common/Buttons/ButtonsActions';
 import { exportSingleForm } from '../../utils/exportForm';
 import TablesList from '../../components/common/TableList/TableList';
-import { DIRECTION_TRANSLATE, FROM_TYPE_TRANSLATE, SHEET_NAME } from '../../constants';
+import { FROM_TYPE_TRANSLATE, SHEET_NAME } from '../../constants';

 const TaskInfo = ({ task }) => {
  const portalContent = (
@ -61,10 +61,9 @@ export default function TaskPage() {
        const mappedTables = data.result.all_sheets.map(sheet => ({
          name: SHEET_NAME[sheet.sheet_name] || sheet.sheet_name,
          sheet: sheet.sheet_name,
-          direction: sheet.direction,
+          direction: sheet.direction
        }));
-        //пока скрыт
-        setTables(mappedTables.filter(t => t.sheet !== "OTCH9F",));
+        setTables(mappedTables);
      } catch (error) {
        toast.error(
          error?.response?.data?.detail || 'Ошибка получения данных задачи',
--- a/web/src/pages/TasksPage/TasksPage.jsx
+++ b/web/src/pages/TasksPage/TasksPage.jsx
@ -26,7 +26,6 @@ import {
  FORM_TYPE_OPTIONS,
  ORG_UNIT_TYPE_OPTIONS,
  ROLES_NAME_ID,
-  FROM_TYPE_TRANSLATE
 } from '../../constants';
 import { useAuth } from '../../app/context/AuthProvider';
 import { SspApi } from '../../api/ssp';
@ -414,7 +413,7 @@ export default function TasksPage() {
              onChange={(e) => handleFormChange('formTypeCode', e.target.value)}
              renderValue={(selected) =>
                selected ? (
-                  FROM_TYPE_TRANSLATE[selected]
+                  selected
                ) : (
                  <span style={{ color: 'rgba(0,0,0,0.6)' }}>Не выбрана</span>
                )
@ -424,7 +423,7 @@ export default function TasksPage() {
            >
              {FORM_TYPE_OPTIONS.map((formType) => (
                <MenuItem key={formType} value={formType}>
-                  {FROM_TYPE_TRANSLATE[formType]}
+                  {formType}
                </MenuItem>
              ))}
            </Select>