From fea773bb15c184c34495d85e455ee9d73f4ab9aa 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 13:24:29 +0300
Subject: [PATCH] Enhance ChangeEquipmentStatus forms and EquipmentEdit layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Updated ChangeEquipmentStatusCreate and ChangeEquipmentStatusEdit components to include fullWidth properties for better layout consistency.
- Added a required DateInput field for "Дата" in both ChangeEquipmentStatus forms.
- Improved EquipmentEdit component by making fields fullWidth and adding helper text for the serial number input.
- Rearranged fields in EquipmentEdit for improved user experience.
---
 .../ChangeEquipmentStatusCreate.tsx           | 15 +++++++++----
 .../ChangeEquipmentStatusEdit.tsx             | 15 +++++++++----
 .../StatusChangeAttachmentsInput.tsx          |  6 +-----
 .../src/resources/equipment/EquipmentEdit.tsx | 21 ++++++++++++++-----
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx b/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
index de07b6f..0e1359d 100644
--- a/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
+++ b/client/src/resources/change-equipment-status/ChangeEquipmentStatusCreate.tsx
@@ -14,17 +14,24 @@ export function ChangeEquipmentStatusCreate() {
   return (
     <Create>
       <SimpleForm>
-        <RaTextInput source="number" label="Номер" />
+        <RaTextInput source="number" label="Номер" fullWidth />
+        <DateInput source="date" label="Дата" required fullWidth />
         <ReferenceInput source="equipmentId" reference="equipment">
           <AutocompleteInput
             label="Оборудование"
             optionText={equipmentOptionText}
             filterToQuery={(searchText) => ({ q: searchText })}
+            fullWidth
           />
         </ReferenceInput>
-        <RaTextInput source="responsible" label="Ответственный" />
-        <DateInput source="date" label="Дата" required />
-        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} required />
+        <SelectInput
+          source="newStatus"
+          label="Новый статус"
+          choices={equipmentStatusChoices}
+          required
+          fullWidth
+        />
+        <RaTextInput source="responsible" label="Ответственный" fullWidth />
         <StatusChangeAttachmentsInput />
       </SimpleForm>
     </Create>
diff --git a/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx b/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
index 410797d..919c3e9 100644
--- a/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
+++ b/client/src/resources/change-equipment-status/ChangeEquipmentStatusEdit.tsx
@@ -14,17 +14,24 @@ export function ChangeEquipmentStatusEdit() {
   return (
     <Edit>
       <SimpleForm>
-        <RaTextInput source="number" label="Номер" />
+        <RaTextInput source="number" label="Номер" fullWidth />
+        <DateInput source="date" label="Дата" fullWidth />
         <ReferenceInput source="equipmentId" reference="equipment">
           <AutocompleteInput
             label="Оборудование"
             optionText={equipmentOptionText}
             filterToQuery={(searchText) => ({ q: searchText })}
+            fullWidth
           />
         </ReferenceInput>
-        <RaTextInput source="responsible" label="Ответственный" />
-        <DateInput source="date" label="Дата" />
-        <SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} />
+        <SelectInput
+          source="newStatus"
+          label="Новый статус"
+          choices={equipmentStatusChoices}
+          fullWidth
+          required
+        />
+        <RaTextInput source="responsible" label="Ответственный" fullWidth />
         <StatusChangeAttachmentsInput />
       </SimpleForm>
     </Edit>
diff --git a/client/src/resources/change-equipment-status/StatusChangeAttachmentsInput.tsx b/client/src/resources/change-equipment-status/StatusChangeAttachmentsInput.tsx
index 45eefde..4bab463 100644
--- a/client/src/resources/change-equipment-status/StatusChangeAttachmentsInput.tsx
+++ b/client/src/resources/change-equipment-status/StatusChangeAttachmentsInput.tsx
@@ -1,4 +1,4 @@
-import { Button, Chip, Stack, Typography } from '@mui/material';
+import { Button, Stack, Typography } from '@mui/material';
 import { useNotify, useRecordContext, useRefresh } from 'react-admin';
 import { useCallback, useMemo, useState, type ChangeEvent } from 'react';
 import { ensureFreshToken, getAccessToken } from '../../auth/keycloak';
@@ -8,7 +8,6 @@ import { StatusChangeAttachmentLink } from './StatusChangeAttachmentLink';
 export type StatusChangeAttachmentValue = {
   id: string;
   originalFileName?: string | null;
-  contentType?: string | null;
   sizeBytes?: number | null;
 }[];
 
@@ -138,9 +137,6 @@ export function StatusChangeAttachmentsInput() {
                   />
                 </Typography>
                 <Stack direction="row" spacing={1} alignItems="center">
-                  {att.contentType ? (
-                    <Chip size="small" label={att.contentType} variant="outlined" />
-                  ) : null}
                   {formatBytes(att.sizeBytes) ? (
                     <Typography variant="caption" color="text.secondary">
                       {formatBytes(att.sizeBytes)}
diff --git a/client/src/resources/equipment/EquipmentEdit.tsx b/client/src/resources/equipment/EquipmentEdit.tsx
index cd68308..38530eb 100644
--- a/client/src/resources/equipment/EquipmentEdit.tsx
+++ b/client/src/resources/equipment/EquipmentEdit.tsx
@@ -13,11 +13,22 @@ export function EquipmentEdit() {
   return (
     <Edit>
       <SimpleForm>
-        <DateInput source="dateOfInspection" label={equipmentLabels.dateOfInspection} />
-        <DateInput source="commissionedAt" label={equipmentLabels.commissionedAt} />
-        <RaTextInput source="name" label={equipmentLabels.name} />
-        <RaTextInput source="serialNumber" label={equipmentLabels.serialNumber} />
-        <SelectInput source="status" label={equipmentLabels.status} choices={equipmentStatusChoices} />
+        <RaTextInput source="name" label={equipmentLabels.name} fullWidth required />
+        <RaTextInput
+          source="serialNumber"
+          label={equipmentLabels.serialNumber}
+          fullWidth
+          helperText="Введите заводской (серийный) номер"
+        />
+        <SelectInput
+          source="status"
+          label={equipmentLabels.status}
+          choices={equipmentStatusChoices}
+          fullWidth
+          required
+        />
+        <DateInput source="commissionedAt" label={equipmentLabels.commissionedAt} fullWidth />
+        <DateInput source="dateOfInspection" label={equipmentLabels.dateOfInspection} fullWidth />
       </SimpleForm>
     </Edit>
   );