Merge pull request 'fix' (#100) from fix-logic-limitation into test

Reviewed-on: #100

web/src/pages/ProjectPages/SummaryPage.jsx

@@ -446,7 +446,8 @@ const SummaryPage = () => {
 				border: '1px solid #e0e0e0',
 				borderRadius: '0 0 1rem 1rem',
 				overflow: 'hidden',
-				height: '35vh',
+				height: '100%',
+				minHeight: 0,
 				display: 'flex',
 				flexDirection: 'column',
 			},

web/src/pages/ProjectPages/columns.js

@@ -1,7 +1,7 @@
 import { Box, IconButton, Tooltip } from '@mui/material';
 import { Back, EditPenSvg, TrashSvg } from '../../components/common/icons/icons';
 import StatusBadge from './components/StatusBadge/StatusBadge';
-import { DEVELOMENT_BLOCK } from './constants';
+import { DEVELOMENT_BLOCK, FUNDING_BY_DECISION } from './constants';
 
 export const createFirstColumns = (handlers) => {
 	const { onDelete, onEdit, onNavigate, orgUnitNames = {} } = handlers;
@@ -72,6 +72,7 @@ export const createFirstColumns = (handlers) => {
 			accessorKey: 'funding_by_ko_decision',
 			header: 'Финансирование по решению КО',
 			size: 150,
+			Cell: ({ cell }) => FUNDING_BY_DECISION.find((v) => v[0] === cell.getValue())?.[1] || '-',
 		},
 		{
 			accessorKey: 'year',

web/src/pages/ProjectPages/components/EditModal/EditModal.jsx

@@ -2,7 +2,7 @@ import CloseIcon from '@mui/icons-material/Close';
 import { Box, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, MenuItem, TextField, Typography } from '@mui/material';
 import React from 'react';
 import { DangerOutlinedButton, PrimaryButton } from '../../../../components/common/Buttons/Buttons';
-import { DEVELOMENT_BLOCK } from '../../constants';
+import { DEVELOMENT_BLOCK, FUNDING_BY_DECISION } from '../../constants';
 
 const EditModal = ({ open, onClose, rowData, onSave, isSaving = false, orgUnitNames = {} }) => {
 	const [formData, setFormData] = React.useState(rowData || {});
@@ -39,7 +39,7 @@ const EditModal = ({ open, onClose, rowData, onSave, isSaving = false, orgUnitNa
 		{ key: 'placement_type', label: 'Размещение', options: ['Собственность', 'Аренда', 'Субаренда'] },
 		{ key: 'staff_count', label: 'Количество сотрудников', type: 'number', valueType: 'number' },
 		{ key: 'total_area', label: 'Общая площадь', type: 'number', valueType: 'number' },
-		{ key: 'funding_by_ko_decision', label: 'Финансирование по решению КО', options: [['prrs_budget', 'Бюджет ПРРС'], ['bank_reserve', 'Резерв Банка']] },
+		{ key: 'funding_by_ko_decision', label: 'Финансирование по решению КО', options: FUNDING_BY_DECISION },
 		{ key: 'krf_decision_date', label: 'Дата решения КРФ', type: 'date' },
 		{ key: 'fk_decision_date', label: 'Дата решения ФК', type: 'date' },
 		{ key: 'board_decision_date', label: 'Дата решения Правления', type: 'date' },

web/src/pages/ProjectPages/constants.js

@@ -1 +1,3 @@
-export const DEVELOMENT_BLOCK = [['out_of_base_plan', 'Вне базового плана'], ['carryover', 'Переходящий'], ['additional_funding', 'Дополнительное финансирование']]
+export const DEVELOMENT_BLOCK = [['out_of_base_plan', 'Вне базового плана'], ['carryover', 'Переходящий'], ['additional_funding', 'Дополнительное финансирование']]
+
+export const FUNDING_BY_DECISION = [['prrs_budget', 'Бюджет ПРРС'], ['bank_reserve', 'Резерв Банка']];