Merge pull request 'rename vsp.number to vsp.staff_count' (#19) from fix-vsp-filters into test

Reviewed-on: #19

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/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx

@@ -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}
-            helperText={errors.numbers}
+            error={!!errors.staff_count}
+            helperText={errors.staff_count}
             disabled={loading}
             slotProps={{
               htmlInput: { min: 1, step: 1 },

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

@@ -204,7 +204,7 @@ const TableDictVsp = ({
         enableSorting: false,
       },
       {
-        accessorKey: 'numbers',
+        accessorKey: 'staff_count',
         header: 'Штатная численность ВСП',
         size: 170,
         minSize: 140,