Merge branch 'test' into project-front

Reviewed-on: #21
Reviewed-by: tsygankoviva <tsygankov.itis@gmail.com>

api/alembic/versions/0001_initial_schema.py

@@ -920,7 +920,6 @@ def upgrade() -> None:
         sa.Column('vsp_type', sa.String(100)),
         sa.Column('notes', sa.Text()),
         sa.Column('location_form', sa.String()),
-        sa.Column('numbers', sa.Integer()),
         sa.Column('rent_contract_num', sa.String()),
         sa.Column('rent_end_date', sa.Date()),
         schema='v3',

api/alembic/versions/sql/0002_functions.sql

@@ -1123,9 +1123,9 @@ END;
 $function$
 ;
 
--- DROP FUNCTION v3.add_vsp(int4, varchar, varchar, varchar, date, varchar, int4, numeric, date, bool, bool, varchar, int4, varchar, text, varchar, int4, varchar, date);
+-- DROP FUNCTION v3.add_vsp(int4, varchar, varchar, varchar, date, varchar, int4, numeric, date, bool, bool, varchar, int4, varchar, text, varchar, date);
 
-CREATE OR REPLACE FUNCTION v3.add_vsp(p_branch_id integer, p_reg_number character varying DEFAULT NULL::character varying, p_address character varying DEFAULT NULL::character varying, p_format character varying DEFAULT NULL::character varying, p_opened_at date DEFAULT NULL::date, p_placement_type character varying DEFAULT NULL::character varying, p_staff_count integer DEFAULT NULL::integer, p_total_area numeric DEFAULT NULL::numeric, p_closed_at date DEFAULT NULL::date, p_is_active boolean DEFAULT true, p_is_deleted boolean DEFAULT false, p_system_code character varying DEFAULT NULL::character varying, p_created_by integer DEFAULT NULL::integer, p_vsp_type character varying DEFAULT NULL::character varying, p_notes text DEFAULT NULL::text, p_location_form character varying DEFAULT NULL::character varying, p_numbers integer DEFAULT NULL::integer, p_rent_contract_num character varying DEFAULT NULL::character varying, p_rent_end_date date DEFAULT NULL::date)
+CREATE OR REPLACE FUNCTION v3.add_vsp(p_branch_id integer, p_reg_number character varying DEFAULT NULL::character varying, p_address character varying DEFAULT NULL::character varying, p_format character varying DEFAULT NULL::character varying, p_opened_at date DEFAULT NULL::date, p_placement_type character varying DEFAULT NULL::character varying, p_staff_count integer DEFAULT NULL::integer, p_total_area numeric DEFAULT NULL::numeric, p_closed_at date DEFAULT NULL::date, p_is_active boolean DEFAULT true, p_is_deleted boolean DEFAULT false, p_system_code character varying DEFAULT NULL::character varying, p_created_by integer DEFAULT NULL::integer, p_vsp_type character varying DEFAULT NULL::character varying, p_notes text DEFAULT NULL::text, p_rent_contract_num character varying DEFAULT NULL::character varying, p_rent_end_date date DEFAULT NULL::date)
  RETURNS integer
  LANGUAGE plpgsql
 AS $function$
@@ -1153,14 +1153,12 @@ BEGIN
         (branch_id, reg_number, address, format, opened_at,
          placement_type, staff_count, total_area, closed_at,
          is_active, is_deleted, system_code, created_by,
-         vsp_type, notes, location_form, numbers,
+         vsp_type, notes, rent_contract_num, rent_end_date)
-         rent_contract_num, rent_end_date)
     VALUES
         (p_branch_id, p_reg_number, p_address, p_format, p_opened_at,
          p_placement_type, p_staff_count, p_total_area, p_closed_at,
          p_is_active, p_is_deleted, p_system_code, p_created_by,
-         p_vsp_type, p_notes, p_location_form, p_numbers,
+         p_vsp_type, p_notes, p_rent_contract_num, p_rent_end_date)
-         p_rent_contract_num, p_rent_end_date)
     RETURNING id INTO v_id;
 
     PERFORM v3.log_event(
@@ -1184,8 +1182,6 @@ BEGIN
             'created_by',        p_created_by,
             'vsp_type',          p_vsp_type,
             'notes',             p_notes,
-            'location_form',     p_location_form,
-            'numbers',           p_numbers,
             'rent_contract_num', p_rent_contract_num,
             'rent_end_date',     v3._diff_val(p_rent_end_date),
             'user_email',        v_actor_email,
@@ -1574,7 +1570,7 @@ AS $function$
 DECLARE
   v_report_id INT;
   v_eid       INT;
-  v_org_id INT;
+  v_form_id   INT;
   v_ei_path   INT[];
 BEGIN
   -- Извлекаем report_id + ei ДО DELETE (нужен для path)
@@ -1588,21 +1584,33 @@ BEGIN
 
   v_ei_path := v3._expense_item_path_set(ARRAY[v_eid]);
 
+  SELECT bf.id
+    INTO v_form_id
+    FROM v3.rf_project_report r
+    JOIN v3.project p
+      ON p.id = r.project_id
+    LEFT JOIN v3.budget_form bf
+      ON bf.form_type_code = 'FORM_3'
+     AND bf.year = r.year
+     AND bf.org_unit_id = p.org_unit_id
+   WHERE r.id = v_report_id
+   LIMIT 1;
+
   -- Каскад (FK без ON DELETE CASCADE)
   DELETE FROM v3.rf_project_report_quarter WHERE rf_project_report_line_id = p_line_id;
   DELETE FROM v3.rf_project_report_line    WHERE id = p_line_id;
 
-    SELECT org_unit_id INTO v_org_id FROM v3.project WHERE id = v_report_id;
   -- Аудит: ROW_DELETE
   PERFORM v3.log_event(
     'ROW_DELETE', 'ROW',
     jsonb_build_object(
       'sheet',           'FORM_3',
       'line_id',         p_line_id,
-      'entity_id',         p_line_id,
+      'form_id',         v_form_id,
       'report_id',       v_report_id,
       'expense_item_id', v_eid
-    ), null, null, v_org_id
+    ),
+    v_form_id
   );
 
   -- Возврат: только иерархия по пути удалённой (INPUT уже нет)
@@ -2738,9 +2746,9 @@ END;
 $function$
 ;
 
--- DROP FUNCTION v3.upd_vsp(int4, int4, varchar, varchar, varchar, date, varchar, int4, numeric, date, bool, bool, varchar, int4, varchar, text, varchar, int4, varchar, date);
+-- DROP FUNCTION v3.upd_vsp(int4, int4, varchar, varchar, varchar, date, varchar, int4, numeric, date, bool, bool, varchar, int4, varchar, text, varchar, date);
 
-CREATE OR REPLACE FUNCTION v3.upd_vsp(p_vsp_id integer, p_branch_id integer DEFAULT NULL::integer, p_reg_number character varying DEFAULT NULL::character varying, p_address character varying DEFAULT NULL::character varying, p_format character varying DEFAULT NULL::character varying, p_opened_at date DEFAULT NULL::date, p_placement_type character varying DEFAULT NULL::character varying, p_staff_count integer DEFAULT NULL::integer, p_total_area numeric DEFAULT NULL::numeric, p_closed_at date DEFAULT NULL::date, p_is_active boolean DEFAULT NULL::boolean, p_is_deleted boolean DEFAULT NULL::boolean, p_system_code character varying DEFAULT NULL::character varying, p_updated_by integer DEFAULT NULL::integer, p_vsp_type character varying DEFAULT NULL::character varying, p_notes text DEFAULT NULL::text, p_location_form character varying DEFAULT NULL::character varying, p_numbers integer DEFAULT NULL::integer, p_rent_contract_num character varying DEFAULT NULL::character varying, p_rent_end_date date DEFAULT NULL::date)
+CREATE OR REPLACE FUNCTION v3.upd_vsp(p_vsp_id integer, p_branch_id integer DEFAULT NULL::integer, p_reg_number character varying DEFAULT NULL::character varying, p_address character varying DEFAULT NULL::character varying, p_format character varying DEFAULT NULL::character varying, p_opened_at date DEFAULT NULL::date, p_placement_type character varying DEFAULT NULL::character varying, p_staff_count integer DEFAULT NULL::integer, p_total_area numeric DEFAULT NULL::numeric, p_closed_at date DEFAULT NULL::date, p_is_active boolean DEFAULT NULL::boolean, p_is_deleted boolean DEFAULT NULL::boolean, p_system_code character varying DEFAULT NULL::character varying, p_updated_by integer DEFAULT NULL::integer, p_vsp_type character varying DEFAULT NULL::character varying, p_notes text DEFAULT NULL::text, p_rent_contract_num character varying DEFAULT NULL::character varying, p_rent_end_date date DEFAULT NULL::date)
  RETURNS void
  LANGUAGE plpgsql
 AS $function$
@@ -2758,8 +2766,7 @@ BEGIN
     SELECT v.branch_id, v.reg_number, v.address, v.format, v.opened_at,
            v.placement_type, v.staff_count, v.total_area, v.closed_at,
            v.is_active, v.is_deleted, v.system_code,
-           v.vsp_type, v.notes, v.location_form, v.numbers,
+           v.vsp_type, v.notes, v.rent_contract_num, v.rent_end_date
-           v.rent_contract_num, v.rent_end_date
       INTO v_old
       FROM v3.vsp v
      WHERE v.id = p_vsp_id;
@@ -2892,20 +2899,6 @@ BEGIN
                                'after',  v3._diff_val(p_notes)));
     END IF;
 
-    IF p_location_form IS NOT NULL AND p_location_form IS DISTINCT FROM v_old.location_form THEN
-        UPDATE v3.vsp SET location_form = p_location_form WHERE id = p_vsp_id;
-        v_changes := v_changes || jsonb_build_object('location_form',
-            jsonb_build_object('before', v3._diff_val(v_old.location_form),
-                               'after',  v3._diff_val(p_location_form)));
-    END IF;
-
-    IF p_numbers IS NOT NULL AND p_numbers IS DISTINCT FROM v_old.numbers THEN
-        UPDATE v3.vsp SET numbers = p_numbers WHERE id = p_vsp_id;
-        v_changes := v_changes || jsonb_build_object('numbers',
-            jsonb_build_object('before', v3._diff_val(v_old.numbers),
-                               'after',  v3._diff_val(p_numbers)));
-    END IF;
-
     IF p_rent_contract_num IS NOT NULL AND p_rent_contract_num IS DISTINCT FROM v_old.rent_contract_num THEN
         UPDATE v3.vsp SET rent_contract_num = p_rent_contract_num WHERE id = p_vsp_id;
         v_changes := v_changes || jsonb_build_object('rent_contract_num',
@@ -4085,26 +4078,12 @@ $function$
 
 -- DROP FUNCTION v3.v_form1_smeta(int4, int4);
 
-
+CREATE OR REPLACE FUNCTION v3.v_form1_smeta(p_year integer, p_org_unit_id integer)
-CREATE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT)
+ RETURNS TABLE(row_type character varying, depth integer, section_code character varying, name character varying, supp_plan_q1 numeric, supp_plan_q2 numeric, supp_plan_q3 numeric, supp_plan_q4 numeric, supp_plan_year numeric, dev_plan_q1 numeric, dev_plan_q2 numeric, dev_plan_q3 numeric, dev_plan_q4 numeric, dev_plan_year numeric, total_plan_year numeric, supp_appr_q1 numeric, supp_appr_q2 numeric, supp_appr_q3 numeric, supp_appr_q4 numeric, supp_appr_year numeric, dev_appr_q1 numeric, dev_appr_q2 numeric, dev_appr_q3 numeric, dev_appr_q4 numeric, dev_appr_year numeric, total_appr_year numeric, supp_act_q1 numeric, supp_act_q2 numeric, supp_act_q3 numeric, supp_act_q4 numeric, supp_act_year numeric, dev_act_q1 numeric, dev_act_q2 numeric, dev_act_q3 numeric, dev_act_q4 numeric, dev_act_year numeric, total_act_year numeric, supp_corr_q2 numeric, supp_corr_q3 numeric, supp_corr_q4 numeric, dev_corr_q2 numeric, dev_corr_q3 numeric, dev_corr_q4 numeric)
-RETURNS TABLE (
+ LANGUAGE plpgsql
-  row_type        VARCHAR,
+ STABLE
-  depth           INT,
+ SET search_path TO 'v3', 'pg_catalog'
-  section_code    VARCHAR,
+AS $function$
-  name            VARCHAR,
-  supp_plan_q1 NUMERIC, supp_plan_q2 NUMERIC, supp_plan_q3 NUMERIC, supp_plan_q4 NUMERIC, supp_plan_year NUMERIC,
-  dev_plan_q1  NUMERIC, dev_plan_q2  NUMERIC, dev_plan_q3  NUMERIC, dev_plan_q4  NUMERIC, dev_plan_year  NUMERIC,
-  total_plan_year NUMERIC,
-  supp_appr_q1 NUMERIC, supp_appr_q2 NUMERIC, supp_appr_q3 NUMERIC, supp_appr_q4 NUMERIC, supp_appr_year NUMERIC,
-  dev_appr_q1  NUMERIC, dev_appr_q2  NUMERIC, dev_appr_q3  NUMERIC, dev_appr_q4  NUMERIC, dev_appr_year  NUMERIC,
-  total_appr_year NUMERIC,
-  supp_act_q1 NUMERIC, supp_act_q2 NUMERIC, supp_act_q3 NUMERIC, supp_act_q4 NUMERIC, supp_act_year NUMERIC,
-  dev_act_q1  NUMERIC, dev_act_q2  NUMERIC, dev_act_q3  NUMERIC, dev_act_q4  NUMERIC, dev_act_year  NUMERIC,
-  total_act_year NUMERIC,
-  supp_corr_q2 NUMERIC, supp_corr_q3 NUMERIC, supp_corr_q4 NUMERIC,
-  dev_corr_q2  NUMERIC, dev_corr_q3  NUMERIC, dev_corr_q4  NUMERIC
-)
-AS $$
 #variable_conflict use_column
 DECLARE
   v_ahr INT; v_cap INT; v_oper INT;
@@ -4234,8 +4213,8 @@ BEGIN
   FROM merged m
   ORDER BY m.sc;
 END;
-$$ LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog;
+$function$
-
+;
 -- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text);
 
 CREATE OR REPLACE FUNCTION v3.v_form2_sheet_sections(p_form_id integer, p_sheet character varying, p_sections text[] DEFAULT NULL::text[])

api/requirements-dev.txt

@@ -14,3 +14,4 @@ aiosqlite==0.20.0
 asyncpg==0.30.0
 pytest==8.3.2
 pytest-asyncio==0.24.0
+openpyxl==3.1.5

api/src/api/v1/org_unit.py

@@ -6,7 +6,7 @@ from src.core.errors import AccessDeniedException
 from src.api.v1.deps import get_current_active_user, require_admin
 from src.db.models.app_user import AppUser
 from src.db.session import get_db
-from src.domain.schemas import BaseListResponse, BaseSingleResponse, OrgUnitBaseSchema, OrgUnitListSchema, OrgUnitSchema, OrgUnitUpdateSchema, ResponseBase
+from src.domain.schemas import BaseListResponse, BaseSingleResponse, OrgUnitCreateSchema, OrgUnitListSchema, OrgUnitSchema, OrgUnitUpdateSchema, ResponseBase
 from src.services.org_unit_service import OrgUnitService
 
 
@@ -66,7 +66,7 @@ async def org_unit_id(
 
 @router.post("/")
 async def create_ssp(
-    org_data: OrgUnitBaseSchema,
+    org_data: OrgUnitCreateSchema,
     db: AsyncSession = Depends(get_db),
     current_user: AppUser = Depends(require_admin),
 ) -> BaseSingleResponse[OrgUnitSchema]:

api/src/api/v1/vsp.py

@@ -27,9 +27,9 @@ async def get_vsp(
     ssp_id: int | None = None,
     open_date_start: date | None = None,
     open_date_end: date | None = None,
-    location_form: str | None = None,
+    placement_type: str | None = None,
-    numbers_min: int | None = None,
+    staff_count_min: int | None = None,
-    numbers_max: int | None = None,
+    staff_count_max: int | None = None,
     db: AsyncSession = Depends(get_db),
     current_user: AppUser = Depends(require_executor),
 ):
@@ -42,9 +42,9 @@ async def get_vsp(
         ssp_id=ssp_id,
         open_date_start=open_date_start,
         open_date_end=open_date_end,
-        location_form=location_form,
+        placement_type=placement_type,
-        numbers_min=numbers_min,
+        staff_count_min=staff_count_min,
-        numbers_max=numbers_max,
+        staff_count_max=staff_count_max,
         load_org_unit=True,
         with_count=True,
     )
@@ -89,9 +89,9 @@ async def export_info(
         ssp_ids=body.ssp_ids,
         open_date_start=body.open_date_start,
         open_date_end=body.open_date_end,
-        location_form=body.location_form,
+        placement_type=body.placement_type,
-        numbers_min=body.numbers_min,
+        staff_count_min=body.staff_count_min,
-        numbers_max=body.numbers_max,
+        staff_count_max=body.staff_count_max,
     )
     return StreamingResponse(
         stream,

api/src/db/models/vsp.py

@@ -45,8 +45,6 @@ class Vsp(Base):
     )
     vsp_type: Mapped[str | None] = mapped_column(String(100), nullable=True)
     notes: Mapped[str | None] = mapped_column(Text, nullable=True)
-    location_form: Mapped[str | None] = mapped_column(String, nullable=True)
-    numbers: Mapped[int | None] = mapped_column(Integer, nullable=True)
     rent_contract_num: Mapped[str | None] = mapped_column(String, nullable=True)
     rent_end_date : Mapped[date | None]= mapped_column(Date, nullable=True)
 

api/src/domain/schemas.py

@@ -233,6 +233,10 @@ class OrgUnitBaseSchema(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
+class OrgUnitCreateSchema(OrgUnitBaseSchema):
+    title: str = Field(..., min_length=1)
+
+
 class OrgUnitUpdateSchema(OrgUnitBaseSchema):
     title: Optional[str] = None
     is_ssp: Optional[bool] = None
@@ -490,8 +494,8 @@ class VSPBase(BaseModel):
         serialization_alias='approved_format',
     )
     notes: Optional[str] = Field(None, description="Примечания")
-    location_form: Optional[str] = Field(None, description="Форма расположения")
+    placement_type: Optional[str] = Field(None, description="Тип размещения")
-    numbers: Optional[int] = Field(None, description="Штатная численность")
+    staff_count: Optional[int] = Field(None, description="Штатная численность")
     area: Optional[float] = Field(
         None, 
         description="Арендная площадь", 
@@ -539,8 +543,8 @@ class VSPEditBase(BaseModel):
         serialization_alias='format',
     )
     notes: Optional[str] = Field(None, description="Примечания")
-    location_form: Optional[str] = Field(None, description="Форма расположения")
+    placement_type: Optional[str] = Field(None, description="Тип размещения")
-    numbers: Optional[int] = Field(None, description="Штатная численность")
+    staff_count: Optional[int] = Field(None, description="Штатная численность")
     total_area: Optional[float] = Field(
         None, 
         description="Арендная площадь", 
@@ -611,9 +615,9 @@ class VSPExportRequest(BaseModel):
     ssp_ids: Optional[List[int]] = None
     open_date_start: Optional[date] = None
     open_date_end: Optional[date] = None
-    location_form: Optional[str] = None
+    placement_type: Optional[str] = None
-    numbers_min: Optional[int] = None
+    staff_count_min: Optional[int] = None
-    numbers_max: Optional[int] = None
+    staff_count_max: Optional[int] = None
 
 
 class ExpenseItemBaseSchema(BaseModel):    

api/src/repository/vsp_repository.py

@@ -36,9 +36,9 @@ class VSPRepository:
         ssp_ids: list[int] | None = None,
         open_date_start: date | None = None,
         open_date_end: date | None = None,
-        location_form: str | None = None,
+        placement_type: str | None = None,
-        numbers_min: int | None = None,
+        staff_count_min: int | None = None,
-        numbers_max: int | None = None,
+        staff_count_max: int | None = None,
         is_active: bool | None = True,
         close_date_is_null: bool | None = None,
         load_org_unit: bool = False,
@@ -53,11 +53,11 @@ class VSPRepository:
         filters = [
             ("registration_number", registration_number),
             ("address", address),
-            ("location_form", location_form),
+            ("placement_type", placement_type),
             ("open_date_start", open_date_start),
             ("open_date_end", open_date_end),
-            ("numbers_min", numbers_min),
+            ("staff_count_min", staff_count_min),
-            ("numbers_max", numbers_max),
+            ("staff_count_max", staff_count_max),
             ("is_active", is_active),
         ]
         for filter_name, filter_value in filters:
@@ -67,16 +67,16 @@ class VSPRepository:
                     queries.append(Vsp.reg_number.ilike(f"%{value}%"))
                 case ("address", str(value)) if value:
                     queries.append(Vsp.address.ilike(f"%{value}%"))
-                case ("location_form", str(value)) if value:
+                case ("placement_type", str(value)) if value:
-                    queries.append(Vsp.location_form.ilike(f"%{value}%"))
+                    queries.append(Vsp.placement_type.ilike(f"%{value}%"))
                 case ("open_date_start", value) if value is not None:
                     queries.append(Vsp.opened_at >= value)
                 case ("open_date_end", value) if value is not None:
                     queries.append(Vsp.opened_at <= value)
-                case ("numbers_min", value) if value is not None:
+                case ("staff_count_min", value) if value is not None:
-                    queries.append(Vsp.numbers >= value)
+                    queries.append(Vsp.staff_count >= value)
-                case ("numbers_max", value) if value is not None:
+                case ("staff_count_max", value) if value is not None:
-                    queries.append(Vsp.numbers <= value)
+                    queries.append(Vsp.staff_count <= value)
                 case ("is_active", value) if value is not None:
                     queries.append(Vsp.is_active == value)
                 case _:
@@ -116,6 +116,7 @@ class VSPRepository:
 
     async def create(self, payload: VSPCreate, created_by: int, load_org_unit: bool = False) -> Vsp:
         data = payload.model_dump()
+
         vsp_id = (
             await self.db.execute(
                 text("""
@@ -124,8 +125,7 @@ class VSPRepository:
                         :p_opened_at, :p_placement_type, :p_staff_count,
                         :p_total_area, :p_closed_at, :p_is_active, :p_is_deleted,
                         :p_system_code, :p_created_by, :p_vsp_type, :p_notes,
-                        :p_location_form, :p_numbers, :p_rent_contract_num,
+                        :p_rent_contract_num, :p_rent_end_date
-                        :p_rent_end_date
                     )
                 """),
                 {
@@ -144,8 +144,6 @@ class VSPRepository:
                     "p_created_by": created_by,
                     "p_vsp_type": data.get("vsp_type"),
                     "p_notes": data.get("notes"),
-                    "p_location_form": data.get("location_form"),
-                    "p_numbers": data.get("numbers"),
                     "p_rent_contract_num": data.get("rent_contract_num"),
                     "p_rent_end_date": data.get("rent_end_date"),
                 }
@@ -176,9 +174,9 @@ class VSPRepository:
             "opened_at": "p_opened_at",
             "closed_at": "p_closed_at",
             "format": "p_format",
+            "placement_type": "p_placement_type",
+            "staff_count": "p_staff_count",
             "notes": "p_notes",
-            "location_form": "p_location_form",
-            "numbers": "p_numbers",
             "total_area": "p_total_area",
             "rent_contract_num": "p_rent_contract_num",
             "rent_end_date": "p_rent_end_date",
@@ -190,8 +188,7 @@ class VSPRepository:
         params = {"p_vsp_id": vsp.id, "p_updated_by": updated_by}
         for field, param in FIELD_TO_PARAM.items():
             params[param] = data.get(field)
-        params.setdefault("p_placement_type", data.get("placement_type"))
+
-        params.setdefault("p_staff_count", data.get("staff_count"))
         await self.db.execute(
             text("""
                 SELECT v3.upd_vsp(
@@ -199,8 +196,7 @@ class VSPRepository:
                     :p_format, :p_opened_at, :p_placement_type, :p_staff_count,
                     :p_total_area, :p_closed_at, :p_is_active, :p_is_deleted,
                     :p_system_code, :p_updated_by, :p_vsp_type, :p_notes,
-                    :p_location_form, :p_numbers, :p_rent_contract_num,
+                    :p_rent_contract_num, :p_rent_end_date
-                    :p_rent_end_date
                 )
             """),
             params,

api/src/services/vsp_service.py

@@ -20,8 +20,8 @@ _info_close_sync_lock = asyncio.Lock()
 
 class VSPService:
     EXECUTOR_EDITABLE_FIELDS = {
-        "location_form",
+        "placement_type",
-        "numbers",
+        "staff_count",
         "total_area",
         "rent_contract_num",
         "rent_end_date",
@@ -54,9 +54,9 @@ class VSPService:
         ssp_ids: list[int] | None = None,
         open_date_start: date | None = None,
         open_date_end: date | None = None,
-        location_form: str | None = None,
+        placement_type: str | None = None,
-        numbers_min: int | None = None,
+        staff_count_min: int | None = None,
-        numbers_max: int | None = None,
+        staff_count_max: int | None = None,
         is_active: bool | None = None,
         load_org_unit: bool = False,
         with_count: bool = False,
@@ -84,9 +84,9 @@ class VSPService:
             ssp_ids=effective_ssp_ids,
             open_date_start=open_date_start,
             open_date_end=open_date_end,
-            location_form=location_form,
+            placement_type=placement_type,
-            numbers_min=numbers_min,
+            staff_count_min=staff_count_min,
-            numbers_max=numbers_max,
+            staff_count_max=staff_count_max,
             is_active=is_active,
             load_org_unit=load_org_unit,
             with_count=with_count,
@@ -154,9 +154,9 @@ class VSPService:
         ssp_ids: list[int] | None = None,
         open_date_start: date | None = None,
         open_date_end: date | None = None,
-        location_form: str | None = None,
+        placement_type: str | None = None,
-        numbers_min: int | None = None,
+        staff_count_min: int | None = None,
-        numbers_max: int | None = None,
+        staff_count_max: int | None = None,
     ) -> tuple[io.BytesIO, str]:
         data = await self.get_list(
             user=user,
@@ -165,9 +165,9 @@ class VSPService:
             ssp_ids=ssp_ids,
             open_date_start=open_date_start,
             open_date_end=open_date_end,
-            location_form=location_form,
+            placement_type=placement_type,
-            numbers_min=numbers_min,
+            staff_count_min=staff_count_min,
-            numbers_max=numbers_max,
+            staff_count_max=staff_count_max,
             is_active=None,
             load_org_unit=True,
         )
@@ -188,8 +188,8 @@ class VSPService:
                 "open_date",
                 "close_date",
                 "notes",
-                "location_form",
+                "placement_type",
-                "numbers",
+                "staff_count",
                 "area",
                 "rent_contract_num",
                 "rent_end_date",
@@ -215,8 +215,8 @@ class VSPService:
                     item.opened_at.isoformat() if item.opened_at else None,
                     item.closed_at.isoformat() if item.closed_at else None,
                     item.notes or None,
-                    item.location_form or None,
+                    item.placement_type or None,
-                    item.numbers if item.numbers is not None else None,
+                    item.staff_count if item.staff_count is not None else None,
                     float(item.total_area) if item.total_area is not None else None,
                     item.rent_contract_num or None,
                     item.rent_end_date.isoformat() if item.rent_end_date else None,

api/tests/integration/test_vsp.py

@@ -40,10 +40,10 @@ def test_vsp_dropdown_smoke(client, admin_tokens, auth_headers):
 @pytest.mark.parametrize(
     "params, count",
     [
-        ([("ssp_id", 2)], 1),
+        ([("ssp_id", 2)], 2),
         ([("form_id", 1)], 0),
-        ([("form_id", 2)], 1),
+        ([("form_id", 2)], 2),
-        ([("ssp_id", 2), ("form_id", 1)], 1),
+        ([("ssp_id", 2), ("form_id", 1)], 2),
     ]
 )
 def test_vsp_dropdown_with_filter(client, admin_tokens, auth_headers, params, count):
@@ -110,8 +110,8 @@ def test_vsp_create_with_all_fields(client, admin_tokens, auth_headers):
             "close_date": "2025-12-31",
             "approved_format": "Стандарт",
             "notes": "Тестовое примечание",
-            "location_form": "Встроенное",
+            "placement_type": "Аренда",
-            "numbers": 10,
+            "staff_count": 10,
             "area": 150.5,
             "rent_contract_num": "Д-123/24",
             "rent_end_date": "2025-12-31",
@@ -127,8 +127,8 @@ def test_vsp_create_with_all_fields(client, admin_tokens, auth_headers):
     assert payload["result"]["open_date"] == "2024-01-15"
     assert payload["result"]["close_date"] == "2025-12-31"
     assert payload["result"]["approved_format"] == "Стандарт"
-    assert payload["result"]["location_form"] == "Встроенное"
+    assert payload["result"]["placement_type"] == "Аренда"
-    assert payload["result"]["numbers"] == 10
+    assert payload["result"]["staff_count"] == 10
     assert payload["result"]["area"] == 150.5
     assert payload["result"]["rent_contract_num"] == "Д-123/24"
     assert payload["result"]["rent_end_date"] == "2025-12-31"

api/tests/sqls/fixture.sql

@@ -26,7 +26,7 @@ SELECT setval('v3.budget_line_id_seq', 1);
 INSERT INTO v3.form_phase (budget_form_id,sheet,phase_code,"role",column_keys,opens_at,closes_at) VALUES
 	 (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
+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,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),
+	 (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),
-     (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');
+     (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,'субаренда','Работает ','аренда','12-45','2026-10-02');
 SELECT setval('v3.vsp_id_seq', 2);

web/src/api/projects.js

@@ -14,7 +14,7 @@ export const ProjectsApi = {
   },
 
   update: (id, data) => {
-    return api.put(`/projects/${id}`, data).then((r) => r.data);
+    return api.patch(`/projects/${id}`, data).then((r) => r.data);
   },
 
   delete: (id) => {

web/src/app/Routes.jsx

@@ -41,6 +41,7 @@ export const AppRoutes = () => {
           <Route path="/projects" element={<ProjectsPage />}/>
           <Route path="/forms" element={<FormsPage />} />
           <Route path="/task/:taskId" element={<TaskPage />} />
+          <Route path="/project/:projectId" element={<TaskPage />} />
           <Route path="/table/:tableId" element={<TablePage />} />
           <Route path="/table-temp/:tableId" element={<TableTempPage />} />
           <Route path="/admin_panel/users" element={<UsersPage />} />

web/src/components/HeaderMenu/HeaderSwitch.jsx

@@ -4,7 +4,7 @@ import { NavLink } from 'react-router-dom';
 import styled from '@emotion/styled';
 import { TasksSvg, AdminPanelSvg, DictSvg } from '../common/icons/icons';
 import { useAuth } from '../../app/context/AuthProvider';
-import { ROLES_NAME_ID } from '../../constants';
+import { ROLES_NAME_ID } from '../../constants/constants';
 
 const Switch = styled.div`
   margin-left: 1rem;

web/src/components/RealtimeTable/RealtimeTable.jsx

@@ -26,7 +26,7 @@ import { useRealtime } from './contexts/RealtimeContext';
 import { toast } from 'react-toastify';
 import { CircularProgress } from '@mui/material';
 import { additionVspRowTable } from './constants/addingRowConfig';
-import { SelectVspModal } from './Modals/selectVspModal';
+import { SelectVspModal } from './Modals/SelectVspModal';
 import { getRowId } from './utils/rowUtils';
 
 const RealtimeTable = ({ formType, formId, sheetName, direction }) => {

web/src/components/Stages/AddStagesModal.jsx

@@ -25,7 +25,7 @@ import { StageStatusChip } from './StageStatusChip';
 import { formatDateForApi } from './utils';
 import CollapsibleTree from '../common/CollapsibleTree';
 import { collectLeafColumns } from '../RealtimeTable/utils/columnUtils';
-import { STAGE_ROLE_RUSSIAN_NAME } from '../../constants';
+import { STAGE_ROLE_RUSSIAN_NAME } from '../../constants/constants';
 
 export const AddStagesModal = ({
   isOpen,

web/src/components/Stages/StageInfoForTooltip.jsx

@@ -1,6 +1,6 @@
 import { Box, Divider, Stack } from '@mui/material';
 import { UnLockedSvg } from '../common/icons/icons';
-import { ROLES_ID_RUSSIAN_NAME, EDIT_ACCESS_RUSSIAN } from '../../constants';
+import { ROLES_ID_RUSSIAN_NAME, EDIT_ACCESS_RUSSIAN } from '../../constants/constants';
 
 export const StageInfoForTooltip = ({ stageData = [] }) => {
   const accessData = stageData[0] || [];

web/src/components/Stages/StagesTable/StagesTable.jsx

@@ -20,7 +20,7 @@ import {
 import { getStageStatus, getStatusColors } from './utils';
 import { formatDate } from '../../../utils/formatDate';
 import { StageStatusChip } from '../StageStatusChip';
-import { ROLES_NAME_ID, SHEET_NAME, STAGE_ROLE_RUSSIAN_NAME } from '../../../constants';
+import { ROLES_NAME_ID, SHEET_NAME, STAGE_ROLE_RUSSIAN_NAME } from '../../../constants/constants';
 import { useAuth } from '../../../app/context/AuthProvider';
 
 export const StagesTable = ({ stages, onEdit, onDelete }) => {

web/src/components/common/PaginatedList.jsx

@@ -56,7 +56,7 @@ export function PaginatedList({
   extraActions = null,
   enableExport = true,
   limitOptions = [10, 20, 50, 100, 200],
-  maxHeight = 'calc(110vh - 300px)',
+  maxHeight = 'calc(100vh - 300px)',
   enableScroll = true,
 }) {
   const [exportMode, setExportMode] = useState(false);

web/src/components/common/Selects/Selects.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState, useRef } from 'react';
-import { EDIT_ACCESS_RUSSIAN, ROLES_ID_RUSSIAN_NAME } from '../../../constants';
+import { EDIT_ACCESS_RUSSIAN, ROLES_ID_RUSSIAN_NAME } from '../../../constants/constants';
 import {
   SelectWrapper,
   SelectContainer,

web/src/components/common/SwitchFormTask/SwitchFormTask.jsx

@@ -1,5 +1,5 @@
 import { useAuth } from '../../../app/context/AuthProvider';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 import { Switch, Buttons, StyledNavLink } from './SwitchFormTask.style';
 
 export function SwitchFormTask() {

web/src/components/common/TableCard/TableCard.jsx

@@ -1,4 +1,4 @@
-import { DIRECTION_TRANSLATE, FORM_TYPE_OPTIONS } from '../../../constants';
+import { DIRECTION_TRANSLATE, FORM_TYPE_OPTIONS } from '../../../constants/constants';
 import {
   Section,
   SectionStartPart,

web/src/components/common/TableList/TableList.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Box, Stack, Typography } from '@mui/material';
 import { useNavigate } from 'react-router-dom';
 import TableCard from '../TableCard/TableCard';
@@ -12,6 +12,9 @@ const TablesList = ({
   formInfo
 }) => {
   const navigate = useNavigate();
+  const isProject = useMemo(() => {
+    return !!projects;
+  }, [projects])
 
   const handleNavigate = (path) => {
     navigate(path);
@@ -22,7 +25,7 @@ const TablesList = ({
     if (!formInfo){
       return;
     }
-    const path = `${basePath}/form/${formInfo.id}/form-type/${formInfo.form_type_code}/${table.sheet}/${table?.direction}`;
+    const path = `${basePath}/form/${formInfo.id}/form-type/${isProject ? 'project' : formInfo.form_type_code}/${table.sheet}/${table?.direction}`;
 
     return (
       <TableCard

web/src/components/common/TaskCardComponent.jsx

@@ -26,7 +26,7 @@ import { formatDate } from '../../utils/formatDate';
 import { IconWithContent } from './IconWithContent';
 import { Chip } from '../styles/StyledChip';
 import { ExportButton } from '../common/Buttons/ButtonsActions';
-import { FORM_TYPE_TRANSLATE } from '../../constants';
+import { FORM_TYPE_TRANSLATE } from '../../constants/constants';
 
 const TaskCard = styled.div`
   width: 26.8rem;

web/src/constants/projectConfig.jsx

@@ -0,0 +1,90 @@
+export const DEFAULT_PROJECT_CONFIG = {
+    'ССП/РФ': {
+        type: 'multiselect',
+        options: [],
+        placeholder: 'Выберите ССП/РФ',
+        defaultValue: null,
+        required_field: true,
+    },
+    'Год': {
+        type: 'number',
+        placeholder: 'Введите год',
+        defaultValue: null,
+        min: 0,
+        step: 1,
+        required_field: true,
+    },
+    'Тип проекта развития': {
+        type: 'multiselect',
+        options: [
+            'Открытие ВСП',
+            'Закрытие ВСП',
+            'Переезд ВСП',
+            'Реновация РФ',
+            'Открытие УРМ',
+        ],
+        placeholder: 'Выберите тип проекта',
+        defaultValue: null,
+        required_field: false,
+
+    },
+    'Название проекта': {
+        type: 'text',
+        placeholder: 'Введите название проекта',
+        defaultValue: null,
+        required_field: true,
+    },
+    'Формат ВСП': {
+        type: 'multiselect',
+        options: [
+            'Фланговый',
+            'Типовой',
+            'Розничный',
+            'МСБ',
+            'Лёгкий',
+            'Мини',
+            'Розничный-киоск',
+            'МБО',
+            'Офис самообслуживания',
+            'Другое',
+        ],
+        placeholder: 'Выберите формат ВСП',
+        defaultValue: null,
+        required_field: false,
+
+    },
+    'Адрес объекта': {
+        type: 'text',
+        placeholder: 'Введите адрес объекта',
+        defaultValue: '',
+        required_field: false,
+
+    },
+    'Целевая численность, чел.': {
+        type: 'number',
+        placeholder: 'Введите число',
+        defaultValue: 0,
+        min: 0,
+        step: 1,
+        required_field: false,
+
+    },
+    'Тип размещения': {
+        type: 'multiselect',
+        options: ['Собственность', 'Аренда', 'Субаренда'],
+        placeholder: 'Выберите тип размещения',
+        defaultValue: null,
+        required_field: false,
+
+    },
+    'Площадь размещения, м2': {
+        type: 'number',
+        placeholder: 'Введите число',
+        defaultValue: 0,
+        min: 0,
+        step: 1,
+        required_field: false,
+
+    },
+
+};

web/src/pages/AdminPanel/AuditLogsPage/AuditLogsPage.jsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { PageContainer } from '../../StyledForPage';
 import { HeaderSwitch } from '../../../components/HeaderMenu/HeaderSwitch.jsx';
 import { SwitchUserSsp } from '../../../components/AdminPanel/SwitchUserSsp';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 import { useAuth } from '../../../app/context/AuthProvider';
 import { Box } from '@mui/material';
 import { toast } from 'react-toastify';

web/src/pages/AdminPanel/AuditLogsPage/components/AuditLogsTable.jsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 import { Box, Typography, Link, Chip } from '@mui/material';
-import { ROLES_ID_RUSSIAN_NAME } from '../../../../constants';
+import { ROLES_ID_RUSSIAN_NAME } from '../../../../constants/constants';
 import {
   ENTITY_RUSSIAN_NAMES,
   getRussianNamesForType,

web/src/pages/AdminPanel/AuditLogsPage/utils/transformers.jsx

@@ -4,7 +4,7 @@ import { FormsApi } from '../../../../api/forms';
 import { SspApi } from '../../../../api/ssp';
 import { TasksApi } from '../../../../api/tasks';
 import { UsersApi } from '../../../../api/users';
-import { DIRECTION_TRANSLATE, FORM_TYPE_TRANSLATE, ROLES_ID_RUSSIAN_NAME, SHEET_NAME, STAGE_ROLE_RUSSIAN_NAME } from '../../../../constants';
+import { DIRECTION_TRANSLATE, FORM_TYPE_TRANSLATE, ROLES_ID_RUSSIAN_NAME, SHEET_NAME, STAGE_ROLE_RUSSIAN_NAME } from '../../../../constants/constants';
 
 export const VALUE_TRANSFORMERS = {
   Роль: transformRole,

web/src/pages/AdminPanel/SppsPage/SppsPage.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect, useCallback } from 'react';
 import { PageContainer } from '../../StyledForPage';
 import { HeaderSwitch } from '../../../components/HeaderMenu/HeaderSwitch';
 import { SwitchUserSsp } from '../../../components/AdminPanel/SwitchUserSsp';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 import { useAuth } from '../../../app/context/AuthProvider';
 import {
   Box,

web/src/pages/AdminPanel/UsersPage/ModalEditUserSsp.jsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import Modal from '../../../components/common/Modal/Modal';
 import { Box, Button, Typography } from '@mui/material';
 import SelectWithOptions from '../components/SelectWithOptions';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 import { AutocompleteForChangeOptions } from '../components/AutocompleteForChangeOptions';
 
 export const ModalEditUserSsp = ({

web/src/pages/AdminPanel/UsersPage/UserTable/EditUserModal.jsx

@@ -15,7 +15,7 @@ import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import {
   ROLES_ID_RUSSIAN_NAME_ARRAY as ROLES,
   ROLES_ID_RUSSIAN_NAME,
-} from '../../../../constants';
+} from '../../../../constants/constants';
 import SelectWithOptions from '../../components/SelectWithOptions';
 import useAbbreviation from './hooks/useAbbreviation';
 import {

web/src/pages/AdminPanel/UsersPage/UserTable/UserTable.jsx

@@ -5,12 +5,12 @@ import {
   CheckedIcon,
   IndeterminateIcon,
 } from '../../IconsForTable/icons';
-import { ROLES_NAME_ID } from '../../../../constants';
+import { ROLES_NAME_ID } from '../../../../constants/constants';
 import { createFilterData } from '../../utils/filters';
 import {
   ROLES_ID_RUSSIAN_NAME_ARRAY as ROLES,
   ROLES_ID_NAME,
-} from '../../../../constants';
+} from '../../../../constants/constants';
 import SelectWithOptions from '../../components/SelectWithOptions';
 import RowActionsMenu from './RowActionMenu';
 import DepartmentCell from './DepartmentCell';

web/src/pages/AdminPanel/UsersPage/UserTableForAdd.jsx

@@ -12,7 +12,7 @@ import {
 } from '@mui/material';
 import { CheckIcon, CheckedIcon } from '../IconsForTable/icons';
 import { TrashSvg } from '../../../components/common/icons/icons';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 
 const StyleForChecked = {
   display: 'flex',

web/src/pages/AdminPanel/UsersPage/UsersActionBar.jsx

@@ -6,7 +6,7 @@ import { Button, Stack } from '@mui/material';
 import Select from '@mui/material/Select';
 import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
-import { ROLES_ID_RUSSIAN_NAME } from '../../../constants';
+import { ROLES_ID_RUSSIAN_NAME } from '../../../constants/constants';
 import { UserIcon, TrashSvg } from '../../../components/common/icons/icons';
 import {
   DangerOutlinedButton,

web/src/pages/AdminPanel/UsersPage/UsersPage.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
 import { PageContainer } from '../../StyledForPage';
 import { HeaderSwitch } from '../../../components/HeaderMenu/HeaderSwitch';
 import { SwitchUserSsp } from '../../../components/AdminPanel/SwitchUserSsp';
-import { ROLES_ID_RUSSIAN_NAME_ARRAY, ROLES_NAME_ID } from '../../../constants';
+import { ROLES_ID_RUSSIAN_NAME_ARRAY, ROLES_NAME_ID } from '../../../constants/constants';
 import { useAuth } from '../../../app/context/AuthProvider';
 import { Box, TextField, Autocomplete, FormLabel } from '@mui/material';
 import SearchComponent from '../../../components/common/SearchComponent';
@@ -10,7 +10,7 @@ import { toast } from 'react-toastify';
 import { SspApi } from '../../../api/ssp';
 import { UsersApi } from '../../../api/users';
 import UserTable from './UserTable/UserTable';
-import { ROLES_ID_RUSSIAN_NAME } from '../../../constants';
+import { ROLES_ID_RUSSIAN_NAME } from '../../../constants/constants';
 import { ModalEditUserSsp } from './ModalEditUserSsp';
 import { ModalAddUsers } from './ModalAddUsers';
 import UsersActionBar from './UsersActionBar';

web/src/pages/DictVspPage/DictVspPage.jsx

@@ -13,7 +13,7 @@ import TableDictVsp from './components/TableDictVsp';
 import { PageContainer } from '../StyledForPage';
 import { SspApi } from '../../api/ssp';
 import { useAuth } from '../../app/context/AuthProvider';
-import { ROLES_NAME_ID } from '../../constants';
+import { ROLES_NAME_ID } from '../../constants/constants';
 import DictVspFilters from './components/DictVspFilters';
 
 const DictVspInfo = () => {

web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx

@@ -14,7 +14,7 @@ import {
   PrimaryButton,
 } from '../../../../components/common/Buttons/Buttons';
 import { useAuth } from '../../../../app/context/AuthProvider';
-import { ROLES_NAME_ID } from '../../../../constants';
+import { ROLES_NAME_ID } from '../../../../constants/constants';
 import {
   ModalContainer,
   FieldContainer,
@@ -95,7 +95,7 @@ const ModalEditAddVsp = ({
           : null,
         notes: initialData.notes || '',
         location_form: initialData.location_form || '',
-        numbers: initialData.numbers?.toString() || '',
+        numbers: initialData.staff_count?.toString() || '',
         area: initialData.area || null,
         rent_contract_num: initialData.rent_contract_num || '',
         rent_end_date: initialData.rent_end_date
@@ -215,7 +215,7 @@ const ModalEditAddVsp = ({
 
     const submitData = {
       ...formData,
-      numbers: formData.numbers ? parseInt(formData.numbers, 10) : null,
+      numbers: formData.staff_count ? parseInt(formData.staff_count, 10) : null,
       area: formData.area ? parseFloat(formData.area) : null,
       open_date: formData.open_date
         ? formData.open_date.toLocaleDateString('en-CA')
@@ -495,11 +495,11 @@ const ModalEditAddVsp = ({
           <FieldLabel>Штатная численность ВСП</FieldLabel>
           <StyledTextField
             type="text"
-            value={formData.numbers}
+            value={formData.staff_count}
             onChange={handleNumberChange('numbers')}
             placeholder="Введите численность"
-            error={!!errors.numbers}
+            error={!!errors.staff_count}
-            helperText={errors.numbers}
+            helperText={errors.staff_count}
             disabled={loading}
             slotProps={{
               htmlInput: { min: 1, step: 1 },

web/src/pages/DictVspPage/components/TableDictVsp.jsx

@@ -11,7 +11,7 @@ import {
   PrimaryOutlinedButton,
 } from '../../../components/common/Buttons/Buttons';
 import { useAuth } from '../../../app/context/AuthProvider';
-import { ROLES_NAME_ID } from '../../../constants';
+import { ROLES_NAME_ID } from '../../../constants/constants';
 import ModalExport from './Modals/ModalExport';
 
 const TableDictVsp = ({
@@ -204,7 +204,7 @@ const TableDictVsp = ({
         enableSorting: false,
       },
       {
-        accessorKey: 'numbers',
+        accessorKey: 'staff_count',
         header: 'Штатная численность ВСП',
         size: 170,
         minSize: 140,

web/src/pages/NewFormTablePage.jsx

@@ -8,7 +8,7 @@ import { useParams } from 'react-router-dom';
 import { RealtimeProvider } from '../components/RealtimeTable/contexts/RealtimeContext';
 import { useAuth } from '../app/context/AuthProvider';
 import { BackButton } from '../components/common/Buttons/BackButton';
-import { SHEET_NAME } from '../constants';
+import { SHEET_NAME } from '../constants/constants';
 
 const TableInfo = ({ formId, sheetName }) => {
   const portalContent = (

web/src/pages/ProjectsPage/ModalCreateProject.jsx

@@ -1,4 +1,5 @@
-import { useState } from 'react';
+// src/components/common/ProjectCardComponent/ModalCreateProject.jsx
+import { useState, useEffect } from 'react';
 import { Box, Button, Divider, TextField, Typography } from '@mui/material';
 import SelectWithOptions from '../AdminPanel/components/SelectWithOptions';
 import Modal from '../../components/common/Modal/Modal';
@@ -9,25 +10,103 @@ export const ModalCreateProject = ({
   onClose,
   onCreate,
   config = {},
+  initialData = null,
+  isEdit = false,
+  projectId = null,
 }) => {
   const [projectData, setProjectData] = useState(() => {
-    const initialData = {};
+    // Если есть initialData, используем её, иначе создаем из конфига
+    if (initialData) {
+      return { ...initialData };
+    }
+    const initial = {};
     Object.keys(config).forEach((key) => {
-      initialData[key] = config[key].defaultValue;
+      initial[key] = config[key].defaultValue;
     });
-    return initialData;
+    return initial;
   });
 
+  const [errors, setErrors] = useState({});
+
+  // Обновляем данные при изменении initialData
+  useEffect(() => {
+    if (initialData) {
+      setProjectData({ ...initialData });
+    } else {
+      const initial = {};
+      Object.keys(config).forEach((key) => {
+        initial[key] = config[key].defaultValue;
+      });
+      setProjectData(initial);
+    }
+    setErrors({});
+  }, [initialData, config]);
+
   const handleChange = (field, value) => {
     setProjectData((prev) => ({
       ...prev,
       [field]: value,
     }));
+    // Очищаем ошибку для поля при изменении
+    if (errors[field]) {
+      setErrors((prev) => ({
+        ...prev,
+        [field]: undefined,
+      }));
+    }
+  };
+
+  const validateField = (fieldName, config) => {
+    if (config.required_field) {
+      const value = projectData[fieldName];
+
+      // Проверка для разных типов полей
+      if (config.type === 'multiselect') {
+        if (!value || (Array.isArray(value) && value.length === 0) || value === '') {
+          return `Поле "${fieldName}" обязательно для заполнения`;
+        }
+      } else if (config.type === 'text') {
+        if (!value || value.trim() === '') {
+          return `Поле "${fieldName}" обязательно для заполнения`;
+        }
+      } else if (config.type === 'number') {
+        if (value === null || value === undefined || value === '') {
+          return `Поле "${fieldName}" обязательно для заполнения`;
+        }
+        // Проверка на минимальное значение
+        if (config.min !== undefined && Number(value) < config.min) {
+          return `Значение должно быть не меньше ${config.min}`;
+        }
+        // Проверка на максимальное значение
+        if (config.max !== undefined && Number(value) > config.max) {
+          return `Значение должно быть не больше ${config.max}`;
+        }
+      }
+    }
+    return null;
+  };
+
+  const validateAllFields = () => {
+    const newErrors = {};
+    let hasErrors = false;
+
+    Object.entries(config).forEach(([fieldName, fieldConfig]) => {
+      const error = validateField(fieldName, fieldConfig);
+      if (error) {
+        newErrors[fieldName] = error;
+        hasErrors = true;
+      }
+    });
+
+    setErrors(newErrors);
+    return !hasErrors;
   };
 
   const handleClickCreate = () => {
-    onCreate(projectData);
+    if (validateAllFields()) {
-    onClose();
+      onCreate(projectData);
+      // Не закрываем модалку здесь, пусть это делает родительский компонент
+    }
   };
 
   const handleClose = () => {
@@ -36,10 +115,14 @@ export const ModalCreateProject = ({
       resetData[key] = config[key].defaultValue;
     });
     setProjectData(resetData);
+    setErrors({});
     onClose();
   };
 
   const renderField = (fieldName, config) => {
+    const hasError = !!errors[fieldName];
+    const errorText = errors[fieldName];
+
     switch (config.type) {
       case 'multiselect':
         return (
@@ -50,9 +133,13 @@ export const ModalCreateProject = ({
                 fontWeight: '400',
                 fontSize: '0.75rem',
                 paddingBottom: '.25rem',
+                color: hasError ? 'var(--error-color, #d32f2f)' : 'var(--grey-dark)',
               }}
             >
               {fieldName}
+              {config.required_field && (
+                <span style={{ color: 'var(--error-color, #d32f2f)', marginLeft: '4px' }}>*</span>
+              )}
             </Typography>
             <SelectWithOptions
               className="sameSize"
@@ -61,7 +148,22 @@ export const ModalCreateProject = ({
               placeholder={config.placeholder}
               onChange={(value) => handleChange(fieldName, value)}
               width="28.25rem"
+              style={{
+                borderColor: hasError ? 'var(--error-color, #d32f2f)' : undefined,
+                borderWidth: hasError ? '2px' : undefined,
+              }}
             />
+            {hasError && (
+              <Typography
+                sx={{
+                  color: 'var(--error-color, #d32f2f)',
+                  fontSize: '0.75rem',
+                  marginTop: '4px',
+                }}
+              >
+                {errorText}
+              </Typography>
+            )}
           </Box>
         );
 
@@ -73,11 +175,14 @@ export const ModalCreateProject = ({
               sx={{
                 fontWeight: '400',
                 fontSize: '0.75rem',
-                color: 'var(--grey-dark)',
+                color: hasError ? 'var(--error-color, #d32f2f)' : 'var(--grey-dark)',
                 paddingBottom: '.25rem',
               }}
             >
               {fieldName}
+              {config.required_field && (
+                <span style={{ color: 'var(--error-color, #d32f2f)', marginLeft: '4px' }}>*</span>
+              )}
             </Typography>
             <TextField
               className="sameSize"
@@ -85,6 +190,14 @@ export const ModalCreateProject = ({
               onChange={(e) => handleChange(fieldName, e.target.value)}
               placeholder={config.placeholder}
               size="small"
+              error={hasError}
+              helperText={hasError ? errorText : ''}
+              FormHelperTextProps={{
+                sx: {
+                  marginLeft: 0,
+                  fontSize: '0.75rem',
+                },
+              }}
             />
           </Box>
         );
@@ -97,11 +210,14 @@ export const ModalCreateProject = ({
               sx={{
                 fontWeight: '400',
                 fontSize: '0.75rem',
-                color: 'var(--grey-dark)',
+                color: hasError ? 'var(--error-color, #d32f2f)' : 'var(--grey-dark)',
                 paddingBottom: '.25rem',
               }}
             >
               {fieldName}
+              {config.required_field && (
+                <span style={{ color: 'var(--error-color, #d32f2f)', marginLeft: '4px' }}>*</span>
+              )}
             </Typography>
             <TextField
               className="sameSize"
@@ -118,6 +234,8 @@ export const ModalCreateProject = ({
               }}
               placeholder={config.placeholder}
               size="small"
+              error={hasError}
+              helperText={hasError ? errorText : ''}
               slotProps={{
                 htmlInput: {
                   min: config.min,
@@ -125,6 +243,12 @@ export const ModalCreateProject = ({
                   step: config.step || 1,
                 },
               }}
+              FormHelperTextProps={{
+                sx: {
+                  marginLeft: 0,
+                  fontSize: '0.75rem',
+                },
+              }}
             />
           </Box>
         );
@@ -136,7 +260,7 @@ export const ModalCreateProject = ({
 
   return (
     <Modal
-      title={'Создание проекта'}
+      title={isEdit ? 'Редактирование проекта' : 'Создание проекта'}
       open={open}
       onClose={handleClose}
       customSize={'43.75'}
@@ -154,7 +278,7 @@ export const ModalCreateProject = ({
             onClick={handleClickCreate}
             style={{ height: '2.5rem' }}
           >
-            Создать
+            {isEdit ? 'Сохранить' : 'Создать'}
           </PrimaryButton>
         </>
       }
@@ -180,4 +304,4 @@ export const ModalCreateProject = ({
       <Divider />
     </Modal>
   );
-};
+};

web/src/pages/ProjectsPage/ProjectCard.jsx

@@ -25,6 +25,7 @@ import {
 } from '../../components/common/icons/icons';
 import { IconWithContent } from '../../components/common/IconWithContent';
 import { ExportButton } from '../../components/common/Buttons/ButtonsActions';
+import { ModalCreateProject } from './ModalCreateProject';
 
 const ProjectCard = styled.div`
   width: 26.8rem;
@@ -137,17 +138,9 @@ const getStatusLabel = (status) => {
   return statusMap[status] || status || 'Не указан';
 };
 
-const getLevelLabel = (level) => {
-  const levelMap = {
-    project: 'Проект',
-    subproject: 'Подпроект',
-    task: 'Задача',
-  };
-  return levelMap[level] || level || 'Не указан';
-};
-
 export const ProjectCardComponent = ({
   project,
+  projectDataInit,
   exportMode = false,
   isLoadingFile = false,
   onAddForExport,
@@ -172,22 +165,41 @@ export const ProjectCardComponent = ({
   } = project;
 
   const [isEditModalOpen, setEditModalOpen] = useState(false);
-  const [editedName, setEditedName] = useState('');
   const [currentName, setCurrentName] = useState(name || '');
   const [isChecked, setIsChecked] = useState(false);
+  const [editFormData, setEditFormData] = useState({});
+  const [projectData, setProjectData] = useState(projectDataInit);
 
   useEffect(() => {
     setIsChecked(false);
   }, [exportMode]);
 
+
+
+  // Функция для подготовки данных проекта к редактированию
+  const prepareProjectDataForEdit = () => {
+    return {
+      'ССП/РФ': project.org_unit_id || null,
+      'Год': year || null,
+      'Тип проекта развития': project_type || null,
+      'Название проекта': currentName,
+      'Формат ВСП': vsp_format || null,
+      'Адрес объекта': object_address || '',
+      'Целевая численность, чел.': staff_count || 0,
+      'Тип размещения': placement_type || null,
+      'Площадь размещения, м2': total_area || 0,
+    };
+  };
+
   const handleOpenEdit = (event) => {
     event.stopPropagation();
-    setEditedName(currentName);
+    setEditFormData(prepareProjectDataForEdit());
     setEditModalOpen(true);
   };
 
   const handleCloseEdit = () => {
     setEditModalOpen(false);
+    setEditFormData({});
   };
 
   const handleCheckboxClick = (event) => {
@@ -211,30 +223,39 @@ export const ProjectCardComponent = ({
     }
   };
 
-  const updateProject = async (nextName) => {
+  // Обновленная функция обновления проекта
+  const updateProject = async (formData) => {
     try {
-      await ProjectsApi.update(id, { name: nextName });
+      const projectData = {
-      setCurrentName(nextName);
+        name: formData['Название проекта'] || currentName,
+        project_type: formData['Тип проекта развития'] || null,
+        vsp_format: formData['Формат ВСП'] || null,
+        object_address: formData['Адрес объекта'] || '',
+        staff_count: Number(formData['Целевая численность, чел.']) || 0,
+        placement_type: formData['Тип размещения'] || null,
+        total_area: Number(formData['Площадь размещения, м2']) || 0,
+        year: formData['Год'] ? Number(formData['Год']) : null,
+        branch_id: formData['ССП/РФ'] || null,
+      };
+
+      await ProjectsApi.update(id, projectData);
+
+      // Обновляем локальные данные
+      setCurrentName(projectData.name);
       setEditModalOpen(false);
-      toast.success('Название проекта обновлено');
+      toast.success('Данные проекта успешно обновлены');
+
+      // Можно добавить рефреш данных или перезагрузку страницы
+      window.location.reload(); // или используйте callback для обновления списка
     } catch (error) {
       toast.error(
-        error?.response?.data?.detail || 'Не удалось обновить название проекта',
+        error?.response?.data?.detail || 'Не удалось обновить данные проекта',
       );
     }
   };
 
-  const handleSaveName = async () => {
+  const handleSaveProject = async (formData) => {
-    const nextName = editedName.trim();
+    await updateProject(formData);
-    if (!nextName) {
-      toast.error('Название не может быть пустым');
-      return;
-    }
-    if (nextName === currentName) {
-      setEditModalOpen(false);
-      return;
-    }
-    await updateProject(nextName);
   };
 
   const getInitials = (name) => {
@@ -252,18 +273,21 @@ export const ProjectCardComponent = ({
         <Box sx={{ width: '100%' }}>
           <CardHeader>
             <ProjectId>ID: {id}</ProjectId>
-            <Stack direction={'row'} spacing={'.5rem'} alignItems="center">
+            <Stack direction={'row'} spacing={'.5rem'} sx={{
+
+            }} >
               {!exportMode && (
                 <>
                   {status && (
-                    <StatusChip 
+                    <StatusChip
-                      status={status} 
+                      status={status}
-                      label={getStatusLabel(status)} 
+                      label={getStatusLabel(status)}
                       size="small"
                     />
                   )}
-                  <ExportButton onClick={handleExportProject} />
+                  {/* {Пока нет редактирование + экспорт} */}
-                  <Edit onClick={handleOpenEdit} />
+                  {/* <ExportButton onClick={handleExportProject} />
+                  <Edit onClick={handleOpenEdit} /> */}
                 </>
               )}
             </Stack>
@@ -272,18 +296,13 @@ export const ProjectCardComponent = ({
           <ProjectTitle>{currentName}</ProjectTitle>
 
           <ProjectInfoGrid>
-            {level && (
-              <LevelChip label={getLevelLabel(level)} size="small" />
-            )}
             {project_type && (
               <InfoChip label={`Тип: ${project_type}`} size="small" />
             )}
             {report_count !== undefined && report_count !== null && (
               <InfoChip label={`Отчетов: ${report_count}`} size="small" />
             )}
-            {parent_id && (
+
-              <InfoChip label={`Родитель: ${parent_id}`} size="small" />
-            )}
           </ProjectInfoGrid>
         </Box>
 
@@ -302,18 +321,6 @@ export const ProjectCardComponent = ({
             <IconWithContent icon={<UserIcon />}>
               {org_unit_name || 'Организация не указана'}
             </IconWithContent>
-            {object_address && (
-              <IconWithContent >
-                {object_address}
-              </IconWithContent>
-            )}
-            {(staff_count || total_area) && (
-              <IconWithContent >
-                {staff_count && `👥 ${staff_count}`}
-                {staff_count && total_area && ' | '}
-                {total_area && `📐 ${total_area} м²`}
-              </IconWithContent>
-            )}
           </CardBody>
 
           {exportMode && (
@@ -327,6 +334,16 @@ export const ProjectCardComponent = ({
           )}
         </Stack>
       </ProjectCard>
+
+      <ModalCreateProject
+        open={isEditModalOpen}
+        onClose={handleCloseEdit}
+        onCreate={handleSaveProject}
+        config={projectData}
+        initialData={editFormData}
+        isEdit={true}
+        projectId={id}
+      />
     </>
   );
 };

web/src/pages/ProjectsPage/ProjectsPage.jsx

@@ -1,4 +1,3 @@
-// src/pages/ProjectsPage/ProjectsPage.jsx
 import { useEffect, useMemo, useState } from 'react';
 import { ProjectsApi } from '../../api/projects';
 import { CardsSkeleton } from '../../components/common/Skeleton';
@@ -18,12 +17,14 @@ import {
   Typography,
   IconButton,
   Tooltip,
+  TextField,
+  Autocomplete,
 } from '@mui/material';
 import { toast } from 'react-toastify';
 import { ModalCreateProject } from './ModalCreateProject';
 import {
   ROLES_NAME_ID,
-} from '../../constants';
+} from '../../constants/constants';
 import { useAuth } from '../../app/context/AuthProvider';
 import { PrimaryButton } from '../../components/common/Buttons/Buttons';
 import {
@@ -34,79 +35,20 @@ import { exportBulkForms, exportSingleForm } from '../../utils/exportForm';
 import { WhitePlus } from '../../components/common/icons/icons';
 import { useNavigate } from 'react-router-dom';
 import { PaginatedList } from '../../components/common/PaginatedList';
+import { DEFAULT_PROJECT_CONFIG } from '../../constants/projectConfig';
+import { SspApi } from '../../api/ssp';
 
-
+export { DEFAULT_PROJECT_CONFIG } from '../../constants/projectConfig';
-// Конфигурация для создания проекта
-const defaultProjectConfig = {
-  'Тип проекта развития': {
-    type: 'multiselect',
-    options: [
-      'Открытие ВСП',
-      'Закрытие ВСП',
-      'Переезд ВСП',
-      'Реновация РФ',
-      'Открытие УРМ',
-    ],
-    placeholder: 'Выберите тип проекта',
-    defaultValue: null,
-  },
-  'Название проекта': {
-    type: 'text',
-    placeholder: 'Введите название проекта',
-    defaultValue: '',
-  },
-  'Формат ВСП': {
-    type: 'multiselect',
-    options: [
-      'Фланговый',
-      'Типовой',
-      'Розничный',
-      'МСБ',
-      'Лёгкий',
-      'Мини',
-      'Розничный-киоск',
-      'МБО',
-      'Офис самообслуживания',
-      'Другое',
-    ],
-    placeholder: 'Выберите формат ВСП',
-    defaultValue: null,
-  },
-  'Адрес объекта': {
-    type: 'text',
-    placeholder: 'Введите адрес объекта',
-    defaultValue: '',
-  },
-  'Целевая численность, чел.': {
-    type: 'number',
-    placeholder: 'Введите число',
-    defaultValue: 0,
-    min: 0,
-    step: 1,
-  },
-  'Тип размещения': {
-    type: 'multiselect',
-    options: ['Собственность', 'Аренда', 'Субаренда'],
-    placeholder: 'Выберите тип размещения',
-    defaultValue: null,
-  },
-  'Площадь размещения, м2': {
-    type: 'number',
-    placeholder: 'Введите число',
-    defaultValue: 0,
-    min: 0,
-    step: 1,
-  },
-};
 
 export default function ProjectsPage() {
   const navigate = useNavigate();
   const [items, setItems] = useState([]);
   const [loading, setLoading] = useState(false);
   const [modalOpen, setModalOpen] = useState(false);
-  const [query, setQuery] = useState('');
+
-  const [statusFilter, setStatusFilter] = useState('');
+  // Новые фильтры
-  const [levelFilter, setLevelFilter] = useState('');
+  const [yearFilter, setYearFilter] = useState('');
+  const [branchFilter, setBranchFilter] = useState('');
 
   // Pagination state
   const [page, setPage] = useState(1);
@@ -118,11 +60,47 @@ export default function ProjectsPage() {
   const [exportMode, setExportMode] = useState(false);
   const [exportList, setExportList] = useState([]);
 
+  const [projectData, setProjectData] = useState(DEFAULT_PROJECT_CONFIG);
+
+  // Получаем список годов для фильтра (можно динамически или задать диапазон)
+  const yearOptions = useMemo(() => {
+    const currentYear = new Date().getFullYear();
+    const years = [];
+    for (let year = currentYear - 5; year <= currentYear + 2; year++) {
+      years.push(year);
+    }
+    return years;
+  }, []);
+
+  useEffect(() => {
+    if (!user) return;
+    if (user.role_id == ROLES_NAME_ID.admin) {
+      SspApi.getAll().then(data => {
+        if (data.success) {
+          setProjectData(prev => ({
+            ...prev, 'ССП/РФ': {
+              ...prev['ССП/РФ'],
+              options: data.result
+            }
+          }))
+          return;
+        }
+        toast.error('Ошибка при получении ССП/РФ');
+      });
+      return;
+    }
+    setProjectData(prev => ({
+      ...prev, 'ССП/РФ': {
+        ...prev['ССП/РФ'],
+        options: user.org_units,
+      }
+    }))
+  }, [user])
+
   const openModal = () => {
     setModalOpen(true);
   };
 
-  // Маппинг полей из модалки в API
   const mapFormDataToApi = (formData) => {
     const apiData = {
       name: formData['Название проекта'] || '',
@@ -132,12 +110,9 @@ export default function ProjectsPage() {
       staff_count: formData['Целевая численность, чел.'] || 0,
       placement_type: formData['Тип размещения'] || null,
       total_area: formData['Площадь размещения, м2'] || 0,
-      // Добавляем значения по умолчанию для обязательных полей
+      year: formData['Год'] || null,
-      year: new Date().getFullYear(),
+      branch_id: formData['ССП/РФ'] || null,
-      org_unit_id: user?.org_unit_id || null,
+
-      form_type_code: 'project', // или другое значение по умолчанию
-      status: 'active',
-      level: 'project',
     };
     return apiData;
   };
@@ -169,6 +144,9 @@ export default function ProjectsPage() {
       const params = {
         offset: skip,
         limit: currentLimit,
+        // Добавляем фильтры в параметры запроса
+        ...(yearFilter && { year: parseInt(yearFilter) }),
+        ...(branchFilter && { branch_id: parseInt(branchFilter.id) }),
       };
 
       const res = await ProjectsApi.list(params);
@@ -184,10 +162,11 @@ export default function ProjectsPage() {
     }
   };
 
+  // Сбрасываем страницу при изменении любых фильтров
   useEffect(() => {
     setPage(1);
     loadProjects(1, limit);
-  }, [query, statusFilter, levelFilter]);
+  }, [yearFilter, branchFilter]);
 
   const handlePageChange = (event, value) => {
     setPage(value);
@@ -201,6 +180,13 @@ export default function ProjectsPage() {
     loadProjects(1, newLimit);
   };
 
+  // Сброс всех фильтров
+  const handleClearFilters = () => {
+    setYearFilter('');
+    setBranchFilter('');
+    setPage(1);
+  };
+
   useEffect(() => {
     loadProjects(page, limit);
   }, []);
@@ -253,6 +239,68 @@ export default function ProjectsPage() {
           </Typography>
         </Box>
 
+        {/* Фильтры */}
+        <Box sx={{ mb: 3, display: 'flex', gap: 2, flexWrap: 'wrap', alignItems: 'center' }}>
+
+          {/* Фильтр по году */}
+          <FormControl size="small" sx={{ minWidth: 150, height:'2.5rem' }}>
+            <Select
+              displayEmpty
+              value={yearFilter}
+              onChange={(e) => setYearFilter(e.target.value)}
+            >
+              <MenuItem value="">Все годы</MenuItem>
+              {yearOptions.map((year) => (
+                <MenuItem key={year} value={year}>
+                  {year}
+                </MenuItem>
+              ))}
+            </Select>
+          </FormControl>
+
+          {/* Фильтр по ССП/РФ */}
+          <FormControl size="small" sx={{ minWidth: '10rem' }}>
+            <Autocomplete
+              size="small"
+              options={projectData['ССП/РФ']?.options ?? []}
+              noOptionsText="Не найдено"
+              getOptionLabel={(option) => option.title || option.name || '-'}
+              value={
+                branchFilter
+              }
+              onChange={(event, newValue) => {
+                setBranchFilter(newValue);
+              }}
+              sx={{ height: '2.5rem', minWidth: '21.25rem' }}
+              renderInput={(params) => (
+                <TextField
+                  {...params}
+                  placeholder="Все"
+                  sx={{
+                    height: '2.5rem',
+                    width: '21.25rem',
+                    '& .MuiOutlinedInput-root': {
+                      height: '2.5rem',
+                      '& fieldset': {
+                        borderRadius: '0.5rem',
+                        borderColor: 'rgba(0,0,0,0.1)',
+                      },
+                    },
+                  }}
+                />
+              )}
+            />
+          </FormControl>
+          <Button
+            variant="outlined"
+            size="small"
+            onClick={handleClearFilters}
+            sx={{ ml: 'auto' }}
+          >
+            Сбросить фильтры
+          </Button>
+        </Box>
+
         <PaginatedList
           items={items}
           loading={loading}
@@ -267,6 +315,7 @@ export default function ProjectsPage() {
             <ProjectCardComponent
               key={project.id}
               project={project}
+              projectDataInit={projectData}
               {...exportProps}
             />
           )}
@@ -286,7 +335,7 @@ export default function ProjectsPage() {
         open={modalOpen}
         onClose={() => setModalOpen(false)}
         onCreate={handleCreateProject}
-        config={defaultProjectConfig}
+        config={projectData}
       />
     </>
   );

web/src/pages/TablePage.jsx

@@ -57,7 +57,7 @@ export default function TablePage() {
 
     const connection = connectToTable(tableId, user?.id, {
       onError: () => {
-        toast.error('Ошибка подключения к серверу реального времени');
+        toast.error('Ошибка подключения к серверу');
       },
       onClose: (event) => {
         if (isUnmountingRef.current) {

web/src/pages/TaskPage/TaskPage.jsx

@@ -3,6 +3,7 @@ import { createPortal } from 'react-dom';
 import { useParams, useNavigate } from 'react-router-dom';
 import { TasksApi } from '../../api/tasks';
 import { TablesApi } from '../../api/tables';
+import { ProjectsApi } from '../../api/projects'; // Добавьте импорт API для проектов
 import {
   TaskInfoContainer,
   NameTask,
@@ -21,13 +22,13 @@ import { FormsApi } from '../../api/forms';
 import { ExportWithTextButton } from '../../components/common/Buttons/ButtonsActions';
 import { exportSingleForm } from '../../utils/exportForm';
 import TablesList from '../../components/common/TableList/TableList';
-import { DIRECTION_TRANSLATE, FORM_TYPE_TRANSLATE, SHEET_NAME } from '../../constants';
+import { DIRECTION_TRANSLATE, FORM_TYPE_TRANSLATE, SHEET_NAME } from '../../constants/constants';
 
-const TaskInfo = ({ task }) => {
+const TaskInfo = ({ task, isProject }) => {
   const portalContent = (
     <TaskInfoContainer>
-      <BackButton to="/tasks" />
+      <BackButton to={isProject ? "/projects" : "/tasks"} />
-      <NameTask>{FORM_TYPE_TRANSLATE[task.form_type_code] || ''}</NameTask>
+      <NameTask>{isProject ? 'Проект' : FORM_TYPE_TRANSLATE[task.form_type_code] || ''}</NameTask>
     </TaskInfoContainer>
   );
 
@@ -39,9 +40,13 @@ const TaskInfo = ({ task }) => {
 };
 
 export default function TaskPage() {
-  const { taskId } = useParams();
+  const { taskId, projectId } = useParams();
   const navigate = useNavigate();
-  const id = Number(taskId);
+
+  // Определяем, что у нас за ID и какой тип
+  const isProject = !!projectId;
+  const id = isProject ? Number(projectId) : Number(taskId);
+
   const [task, setTask] = useState(null);
   const [tables, setTables] = useState([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -50,23 +55,42 @@ export default function TaskPage() {
   const [modalProjectOpen, setModalProjectOpen] = useState(false);
   const [tempProjects, setTempProjects] = useState([]);
   const [projects, setProjects] = useState([]);
+  const [isProjectData, setIsProjectData] = useState(false);
 
   useEffect(() => {
-    const getSheets = async () => {
+    const getData = async () => {
       setIsLoading(true);
       try {
-        const data = await TasksApi.getSheets(id);
+        if (isProject) {
-        // Преобразуем данные с учетом direction
+          // Получаем информацию о проекте
-        const mappedTables = data.result.all_sheets.map(sheet => ({
+          const projectData = await ProjectsApi.get(id);
-          name: SHEET_NAME[sheet.sheet_name] || sheet.sheet_name,
+          setTask(projectData.result);
-          sheet: sheet.sheet_name,
+          setIsProjectData(true);
-          direction: sheet.direction,
+          console.log(projectData.result.reports);
-        }));
+
-        //пока скрыт
+          const mappedTables = projectData.result.reports.map(sheet => ({
-        setTables(mappedTables.filter(t => t.sheet !== "OTCH9F",));
+            name: SHEET_NAME[sheet.report_type] || sheet.report_type,
+            sheet: sheet.report_type,
+          }));
+          setTables(mappedTables);
+        } else {
+          // Получаем информацию о задаче
+          const taskData = await TasksApi.getById(id);
+          setTask(taskData.result);
+          setIsProjectData(false);
+
+          // Получаем таблицы задачи
+          const tablesData = await TasksApi.getSheets(id);
+          const mappedTables = tablesData.result.all_sheets.map(sheet => ({
+            name: SHEET_NAME[sheet.sheet_name] || sheet.sheet_name,
+            sheet: sheet.sheet_name,
+            direction: sheet.direction,
+          }));
+          setTables(mappedTables.filter(t => t.sheet !== "OTCH9F"));
+        }
       } catch (error) {
         toast.error(
-          error?.response?.data?.detail || 'Ошибка получения данных задачи',
+          error?.response?.data?.detail || `Ошибка получения данных ${isProject ? 'проекта' : 'задачи'}`,
         );
       } finally {
         setIsLoading(false);
@@ -74,27 +98,11 @@ export default function TaskPage() {
     };
 
     if (Number.isFinite(id)) {
-      getSheets();
+      getData();
     }
-  }, [id]);
+  }, [id, isProject]);
 
-  useEffect(() => {
+  // Объединили два useEffect в один
-    const getFormInfo = async () => {
-      setIsLoading(true);
-      try {
-        const data = await TasksApi.getById(id);
-        setTask(data.result);
-      } catch (error) {
-        // обработка ошибки
-      } finally {
-        setIsLoading(false);
-      }
-    };
-
-    if (Number.isFinite(id)) {
-      getFormInfo();
-    }
-  }, [id]);
 
   const handleCreateProject = (projectData) => {
     // логика создания проекта
@@ -106,6 +114,14 @@ export default function TaskPage() {
     return searchString.includes(query.toLowerCase());
   });
 
+  // Функция для экспорта
+  const handleExport = () => {
+    const fileName = isProject
+      ? `project_${task?.title || id}`
+      : `form_${task?.title || taskId}`;
+    exportSingleForm(id, fileName);
+  };
+
   if (isLoading) {
     return (
       <div className="flex justify-center pt-12">
@@ -116,7 +132,7 @@ export default function TaskPage() {
 
   return (
     <>
-      {task && <TaskInfo task={task} />}
+      {task && <TaskInfo task={task} isProject={isProject} />}
       <Box
         sx={{
           display: 'flex',
@@ -142,9 +158,7 @@ export default function TaskPage() {
               onChange={setQuery}
             />
             <Stack sx={{ flexDirection: 'row', spacing: '.5rem', justifyContent: 'end', gap: '.5rem' }}>
-              <ExportWithTextButton
+              <ExportWithTextButton onClick={handleExport} />
-                onClick={() => exportSingleForm(taskId, task?.title ?? 'form')}
-              />
               <PrimaryOutlinedButton
                 variant="outlined"
                 onClick={() => setModalStageOpen(true)}
@@ -155,9 +169,10 @@ export default function TaskPage() {
               <SettingStageModal
                 isOpen={modalStageOpen}
                 onClose={() => setModalStageOpen(false)}
-                taskId={taskId}
+                taskId={isProject ? undefined : taskId}
-                mode="task"
+                projectId={isProject ? projectId : undefined}
-                formTypeCode={task?.form_type_code || ''}
+                mode={isProject ? "project" : "task"}
+                formTypeCode={ task?.form_type_code || ''}
                 sheets={tables}
               />
 
@@ -168,8 +183,9 @@ export default function TaskPage() {
             query={query}
             projects={projects}
             filteredTables={filteredTables}
-            basePath="/table"
+            basePath={"/table"}
             formInfo={task}
+            isProject={isProject}
           />
         </Box>
       </Box>

web/src/pages/TasksPage/TasksPage.jsx

@@ -27,7 +27,7 @@ import {
   ORG_UNIT_TYPE_OPTIONS,
   ROLES_NAME_ID,
   FORM_TYPE_TRANSLATE
-} from '../../constants';
+} from '../../constants/constants';
 import { useAuth } from '../../app/context/AuthProvider';
 import { SspApi } from '../../api/ssp';
 import { PrimaryButton } from '../../components/common/Buttons/Buttons';
@@ -256,7 +256,6 @@ export default function TasksPage() {
     <>
       <PageContainer>
         <HeaderSwitch />
-        <HeaderSwitch />
 
         <PaginatedList
           items={items}