From ad245db29f0efcae8e0b8838cc1ca0e76275b4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC?= <apervov@alabuga.ru>
Date: Tue, 21 Apr 2026 12:50:55 +0300
Subject: [PATCH] Refactor ChangeEquipmentStatus forms to include new fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added a text input for "Номер" in both ChangeEquipmentStatusCreate and ChangeEquipmentStatusEdit components.
- Rearranged the order of fields in the forms for better user experience.
- Included the StatusChangeAttachmentsInput component to handle file attachments in both forms.
---
 .../ChangeEquipmentStatusCreate.tsx                       | 8 +++++---
 .../change-equipment-status/ChangeEquipmentStatusEdit.tsx | 6 +++---
 .../change-equipment-status/ChangeEquipmentStatusList.tsx | 1 -
 client/src/resources/equipment/EquipmentList.tsx          | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx b/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
index ca5947f..de07b6f 100644
--- a/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
+++ b/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
@@ -8,11 +8,13 @@ import {
   TextInput as RaTextInput,
 } from 'react-admin';
 import { equipmentStatusChoices, equipmentOptionText } from '../equipment/shared';
+import { StatusChangeAttachmentsInput } from './StatusChangeAttachmentsInput';
 
 export function ChangeEquipmentStatusCreate() {
   return (
     <Create>
       <SimpleForm>
+        <RaTextInput source="number" label="Номер" />
         <ReferenceInput source="equipmentId" reference="equipment">
           <AutocompleteInput
             label="Оборудование"
@@ -20,10 +22,10 @@ export function ChangeEquipmentStatusCreate() {
             filterToQuery={(searchText) => ({ q: searchText })}
           />
         </ReferenceInput>
-        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} required />
-        <DateInput source="date" label="Дата" required />
-        <RaTextInput source="number" label="Номер" />
         <RaTextInput source="responsible" label="Ответственный" />
+        <DateInput source="date" label="Дата" required />
+        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} required />
+        <StatusChangeAttachmentsInput />
       </SimpleForm>
     </Create>
   );
diff --git a/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx b/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
index 5094a0e..410797d 100644
--- a/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
+++ b/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
@@ -14,6 +14,7 @@ export function ChangeEquipmentStatusEdit() {
   return (
     <Edit>
       <SimpleForm>
+        <RaTextInput source="number" label="Номер" />
         <ReferenceInput source="equipmentId" reference="equipment">
           <AutocompleteInput
             label="Оборудование"
@@ -21,10 +22,9 @@ export function ChangeEquipmentStatusEdit() {
             filterToQuery={(searchText) => ({ q: searchText })}
           />
         </ReferenceInput>
-        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} />
-        <DateInput source="date" label="Дата" />
-        <RaTextInput source="number" label="Номер" />
         <RaTextInput source="responsible" label="Ответственный" />
+        <DateInput source="date" label="Дата" />
+        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} />
         <StatusChangeAttachmentsInput />
       </SimpleForm>
     </Edit>
diff --git a/client/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx b/client/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx
index 7264630..e8ef7e8 100644
--- a/client/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx
+++ b/client/src/resources/change-equipment-status/ChangeEquipmentStatusList.tsx
@@ -32,7 +32,6 @@ export function ChangeEquipmentStatusList() {
   return (
     <List filters={statusFilters} actions={<ListActions />} sort={{ field: 'date', order: 'DESC' }}>
       <Datagrid rowClick="show">
-        <TextField source="id" />
         <ReferenceField source="equipmentId" reference="equipment" link="show">
           <TextField source="name" />
         </ReferenceField>
diff --git a/client/src/resources/equipment/EquipmentList.tsx b/client/src/resources/equipment/EquipmentList.tsx
index f8c6f79..075f642 100644
--- a/client/src/resources/equipment/EquipmentList.tsx
+++ b/client/src/resources/equipment/EquipmentList.tsx
@@ -28,7 +28,6 @@ export function EquipmentList() {
   return (
     <List filters={equipmentFilters} actions={<ListActions />} sort={{ field: 'name', order: 'ASC' }}>
       <Datagrid rowClick="show">
-        <TextField source="id" />
         <TextField source="name" />
         <TextField source="serialNumber" />
         <DateField source="dateOfInspection" />