Merge branch 'master' of https://git.jkhsakha.ru/HotamovFO/Web-Fuel

2025-09-05 10:42:22 +09:00
parent 08dfec677a e0c70ccbe9
commit 4e70e067f7
5 changed files with 238 additions and 205 deletions
--- a/src/components/Forms/Driver.tsx
+++ b/src/components/Forms/Driver.tsx
@ -0,0 +1,76 @@
+import { useState } from "react";
+import { IDriver, IDriverLicense } from "../../interfaces/Driver";
+import { ActionIcon, Button, Flex, Table, Transition } from "@mantine/core";
+import { stringToSnils } from "../../utils/format";
+import { dateToDDMMYYYY } from "../../utils/date";
+import { IconEdit, IconLinkPlus, IconPlus, IconTrash } from "@tabler/icons-react";
+import DriverLicense from "./DriverLicense";
+
+interface IDriverProps {
+  driver: IDriver,
+  handleEditDriver: (driver: IDriver) => void,
+  handleDeleteDriver: (id: number) => void,
+  handleEditLicense: (license: IDriverLicense) => void,
+  handleDeleteLicense: (id: number) => void
+}
+
+const Driver = ({ driver, handleEditDriver, handleDeleteDriver, handleEditLicense, handleDeleteLicense }: IDriverProps) => {
+  const [opened, setOpened] = useState(false)
+
+  return (
+    <>
+      <Table.Tr style={{ cursor: 'pointer' }} onClick={() => setOpened(!opened)}>
+        <Table.Td>{driver.fullname}</Table.Td>
+        <Table.Td>{stringToSnils(driver.snils)}</Table.Td>
+        <Table.Td>{dateToDDMMYYYY(driver.birthday)}</Table.Td>
+        <Table.Td>{driver.iin}</Table.Td>
+        <Table.Td>
+          <ActionIcon color="blue" onClick={(e) => { e.stopPropagation(); handleEditDriver(driver); }} style={{ marginRight: "10px" }}>
+            <IconEdit />
+          </ActionIcon>
+          <ActionIcon color="red" onClick={(e) => { e.stopPropagation(); handleDeleteDriver(driver.id); }}>
+            <IconTrash />
+          </ActionIcon>
+        </Table.Td>
+      </Table.Tr>
+
+      <Transition
+        mounted={opened}
+        transition={{
+          in: { opacity: 1, transform: 'scaleY(1)' },
+          out: { opacity: 0, transform: 'scaleY(0)' },
+          common: { transformOrigin: 'top' },
+          transitionProperty: 'transform, opacity',
+        }}
+        duration={200}
+        timingFunction='ease'
+        keepMounted
+      >
+        {(transitionStyle) => (
+          <Table.Tr style={{ ...transitionStyle }}>
+            <Table.Td colSpan={5}>
+              <Flex justify='space-evenly'>
+                <Button leftSection={<IconPlus />} onClick={() => handleEditLicense({} as IDriverLicense)}>
+                  Добавить водительские права
+                </Button>
+                <Button leftSection={<IconLinkPlus />}>Привязать существующие права</Button>
+              </Flex>
+            </Table.Td>
+          </Table.Tr>
+        )}
+      </Transition>
+      {opened && driver.license && Array.isArray(driver.license) && driver.license.map((license: IDriverLicense, index) => (
+        <Table.Tr>
+          <DriverLicense
+            key={`licId-${license.id}-${index}`}
+            license={license}
+            handleDeleteLicense={handleDeleteLicense}
+            handleEditLicense={handleEditLicense}
+          />
+        </Table.Tr>
+      ))}
+    </>
+  )
+}
+
+export default Driver
--- a/src/components/Forms/DriverLicense.tsx
+++ b/src/components/Forms/DriverLicense.tsx
@ -0,0 +1,29 @@
+import { ActionIcon, Table } from "@mantine/core"
+import { IDriverLicense } from "../../interfaces/Driver"
+import { dateToDDMMYYYY } from "../../utils/date"
+import { IconEdit, IconTrash } from "@tabler/icons-react"
+
+const DriverLicense = ({ license, handleDeleteLicense, handleEditLicense }: {
+  license: IDriverLicense,
+  handleDeleteLicense: (id: number) => void,
+  handleEditLicense: (license: IDriverLicense) => void
+}) => {
+  return (
+    <>
+      <Table.Td>{license.series_number}</Table.Td>
+      <Table.Td>{dateToDDMMYYYY(license.form_date)}</Table.Td>
+      <Table.Td>{dateToDDMMYYYY(license.to_date)}</Table.Td>
+      <Table.Td>{license.categories?.map((c) => c.name_short).join(", ")}</Table.Td>
+      <Table.Td>
+        <ActionIcon color="blue" onClick={() => handleEditLicense(license)} style={{ marginRight: "10px" }}>
+          <IconEdit />
+        </ActionIcon>
+        <ActionIcon color="red" onClick={() => handleDeleteLicense(license.id)}>
+          <IconTrash />
+        </ActionIcon>
+      </Table.Td>
+    </>
+  )
+}
+
+export default DriverLicense
--- a/src/interfaces/Driver.ts
+++ b/src/interfaces/Driver.ts
@ -4,6 +4,7 @@ export interface IDriver {
    snils: string
    birthday: string
    iin: string
+    license?: IDriverLicense[]
 }

 export interface IDriverLicense {
@ -26,4 +27,19 @@ export interface IDriverLicenseCategory {
    id: number
    name: string
    name_short: string
+}
+
+export interface IDriverConnection {
+    driver_id: number
+    driver_license_id: number
+}
+
+export interface IDriverLicenseConnection {
+    id: number
+}
+
+export interface IDriverLicenseCategoryConnection {
+    id: number
+    driver_license_id: number
+    driver_license_category_id: number
 }
--- a/src/pages/Dictionaries.tsx
+++ b/src/pages/Dictionaries.tsx
@ -72,16 +72,20 @@ const Dictionaries = () => {
  return (
    <div>
      <h3>Справочники</h3>
-      <Select 
-        data={dictionaryOptions} 
-        value={selectedDictionary} 
-        onChange={setSelectedDictionary} 
-        allowDeselect={false} 
-        searchable 
+      <Select
+        data={dictionaryOptions}
+        value={selectedDictionary}
+        onChange={(value) => {
+          if (value) {
+            setSelectedDictionary(value)
+          }
+        }}
+        allowDeselect={false}
+        searchable
        nothingFoundMessage="Не найдено..."
        maxDropdownHeight={300}
-     /><br/>
-      <Button onClick={() => { setCurrentItem(null); setModalOpened(true); }}>Добавить</Button><br/><br/>
+      /><br />
+      <Button onClick={() => { setCurrentItem(null); setModalOpened(true); }}>Добавить</Button><br /><br />

      <DictionaryTable
        data={data}
--- a/src/pages/DriverForm.tsx
+++ b/src/pages/DriverForm.tsx
@ -1,103 +1,13 @@
 import 'dayjs/locale/ru'
 import { useState, useEffect } from "react"
-import { Button, TextInput, Table, ActionIcon, Modal, Checkbox, Tabs, Flex, Transition, Select, MultiSelect } from "@mantine/core"
+import { Button, TextInput, Table, Modal, Checkbox, Tabs, Flex, Select, MultiSelect } from "@mantine/core"
 import { useForm } from "@mantine/form"
-import { IconEdit, IconLinkPlus, IconPlus, IconTrash } from "@tabler/icons-react"
 import { fetchDictionary, createDictionaryItem, updateDictionaryItem, deleteDictionaryItem } from "../api/api"
 import MaskedDateInput from '../components/MaskedDateInput'
 import { IDriver, IDriverLicense, IDriverLicenseCategory } from '../interfaces/Driver'
-import { dateToDDMMYYYY, dateToYYYYMMDD } from '../utils/date'
-import { stringToSnils } from '../utils/format'
-
-const DriverLicense = ({ license, handleDeleteLicense, handleEditLicense }: { 
-  license: IDriverLicense, 
-  handleDeleteLicense: (id: number) => void,
-  handleEditLicense: (license: IDriverLicense) => void 
-}) => {
-  return (
-    <>
-      <Table.Td>{license.series_number}</Table.Td>
-      <Table.Td>{dateToDDMMYYYY(license.form_date)}</Table.Td>
-      <Table.Td>{dateToDDMMYYYY(license.to_date)}</Table.Td>
-      <Table.Td>{license.categories?.map((c) => c.name_short).join(", ")}</Table.Td>
-      <Table.Td>
-        <ActionIcon color="blue" onClick={() => handleEditLicense(license)} style={{ marginRight: "10px" }}>
-          <IconEdit />
-        </ActionIcon>
-        <ActionIcon color="red" onClick={() => handleDeleteLicense(license.id)}>
-          <IconTrash />
-        </ActionIcon>
-      </Table.Td>
-    </>
-  )
-}
-
-interface IDriverProps {
-  driver: IDriver, 
-  handleEditDriver: (driver: IDriver) => void, 
-  handleDeleteDriver: (id: number) => void, 
-  handleEditLicense: (license: IDriverLicense) => void,
-  handleDeleteLicense: (id: number) => void
-}
-
-const Driver = ({ driver, handleEditDriver, handleDeleteDriver, handleEditLicense, handleDeleteLicense }: IDriverProps) => {
-  const [opened, setOpened] = useState(false)
-
-  return (
-    <>
-      <Table.Tr style={{ cursor: 'pointer' }} onClick={() => setOpened(!opened)}>
-        <Table.Td>{driver.fullname}</Table.Td>
-        <Table.Td>{stringToSnils(driver.snils)}</Table.Td>
-        <Table.Td>{dateToDDMMYYYY(driver.birthday)}</Table.Td>
-        <Table.Td>{driver.iin}</Table.Td>
-        <Table.Td>
-          <ActionIcon color="blue" onClick={(e) => { e.stopPropagation(); handleEditDriver(driver); }} style={{ marginRight: "10px" }}>
-            <IconEdit />
-          </ActionIcon>
-          <ActionIcon color="red" onClick={(e) => { e.stopPropagation(); handleDeleteDriver(driver.id); }}>
-            <IconTrash />
-          </ActionIcon>
-        </Table.Td>
-      </Table.Tr>
-
-      <Transition
-        mounted={opened}
-        transition={{
-          in: { opacity: 1, transform: 'scaleY(1)' },
-          out: { opacity: 0, transform: 'scaleY(0)' },
-          common: { transformOrigin: 'top' },
-          transitionProperty: 'transform, opacity',
-        }}
-        duration={200}
-        timingFunction='ease'
-        keepMounted
-      >
-        {(transitionStyle) => (
-          <Table.Tr style={{ ...transitionStyle }}>
-            <Table.Td colSpan={5}>
-              <Flex justify='space-evenly'>
-                <Button leftSection={<IconPlus />} onClick={() => handleEditLicense({} as IDriverLicense)}>
-                  Добавить водительские права
-                </Button>
-                <Button leftSection={<IconLinkPlus />}>Привязать существующие права</Button>
-              </Flex>
-              </Table.Td>
-            </Table.Tr>
-        )}
-      </Transition>
-      {opened && driver.license && Array.isArray(driver.license) && driver.license.map((license: IDriverLicense) => (
-        <Table.Tr>
-          <DriverLicense 
-            key={license.id} 
-            license={license} 
-            handleDeleteLicense={handleDeleteLicense}
-            handleEditLicense={handleEditLicense}
-          />
-        </Table.Tr>
-      ))}
-    </>
-  )
-}
+import { dateToYYYYMMDD } from '../utils/date'
+import DriverLicense from '../components/Forms/DriverLicense'
+import Driver from '../components/Forms/Driver'

 const DriverForm = () => {
  const [drivers, setDrivers] = useState<IDriver[]>([])
@ -181,97 +91,97 @@ const DriverForm = () => {
    setModalOpened(true)
  }

-const handleAddLicense = async (values: any) => {
-  try {
-    const licenseData = {
-      series_number: values.series_number,
-      form_date: dateToYYYYMMDD(values.form_date),
-      to_date: dateToYYYYMMDD(values.to_date),
-      is_actual: values.is_actual,
-    };
+  const handleAddLicense = async (values: any) => {
+    try {
+      const licenseData = {
+        series_number: values.series_number,
+        form_date: dateToYYYYMMDD(values.form_date),
+        to_date: dateToYYYYMMDD(values.to_date),
+        is_actual: values.is_actual,
+      };

-    if (selectedLicense) {
-      // 1. Обновляем данные прав
-      const updatedLicense = await updateDictionaryItem("driver_license", selectedLicense.id, licenseData);
+      if (selectedLicense) {
+        // 1. Обновляем данные прав
+        const updatedLicense = await updateDictionaryItem("driver_license", selectedLicense.id, licenseData);

-      // 2. Для редактирования просто создаем новые связи (старые должны удаляться клиентом)
-      await Promise.all(
-        values.categories.map((categoryId: string) =>
-          createDictionaryItem("driver_license_connection", {
-            driver_license_id: selectedLicense.id,
-            driver_license_category_id: parseInt(categoryId),
-          })
-        )
-      );
+        // 2. Для редактирования просто создаем новые связи (старые должны удаляться клиентом)
+        await Promise.all(
+          values.categories.map((categoryId: string) =>
+            createDictionaryItem("driver_license_connection", {
+              driver_license_id: selectedLicense.id,
+              driver_license_category_id: parseInt(categoryId),
+            })
+          )
+        );

-      // 3. Обновляем связь с водителем
-      await createDictionaryItem("driver_connection", {
-        driver_id: parseInt(values.driverId),
-        driver_license_id: selectedLicense.id,
-      });
-    } else {
-      // 1. Создаем новые права
-      const newLicense = await createDictionaryItem("driver_license", licenseData);
+        // 3. Обновляем связь с водителем
+        await createDictionaryItem("driver_connection", {
+          driver_id: parseInt(values.driverId),
+          driver_license_id: selectedLicense.id,
+        });
+      } else {
+        // 1. Создаем новые права
+        const newLicense = await createDictionaryItem("driver_license", licenseData);

-      // 2. Создаем связи категорий
-      await Promise.all(
-        values.categories.map((categoryId: string) =>
-          createDictionaryItem("driver_license_connection", {
-            driver_license_id: newLicense.id,
-            driver_license_category_id: parseInt(categoryId),
-          })
-        )
-      );
+        // 2. Создаем связи категорий
+        await Promise.all(
+          values.categories.map((categoryId: string) =>
+            createDictionaryItem("driver_license_connection", {
+              driver_license_id: newLicense.id,
+              driver_license_category_id: parseInt(categoryId),
+            })
+          )
+        );

-      // 3. Создаем связь с водителем
-      await createDictionaryItem("driver_connection", {
-        driver_id: parseInt(values.driverId),
-        driver_license_id: newLicense.id,
-      });
+        // 3. Создаем связь с водителем
+        await createDictionaryItem("driver_connection", {
+          driver_id: parseInt(values.driverId),
+          driver_license_id: newLicense.id,
+        });
+      }
+
+      // Обновляем данные
+      const updatedDrivers = await fetchDictionary("driver");
+      setDrivers(updatedDrivers);
+
+      setLicenseModalOpened(false);
+      licenseForm.reset();
+      setSelectedLicense(null);
+    } catch (error) {
+      console.error("Error saving license:", error);
    }
+  };

-    // Обновляем данные
-    const updatedDrivers = await fetchDictionary("driver");
-    setDrivers(updatedDrivers);
+  const handleEditLicense = (license: IDriverLicense) => {
+    // Находим водителя по имеющимся данным (без запроса к API)
+    const driverWithLicense = drivers.find(d =>
+      d.license?.some((l: IDriverLicense) => l.id === license.id)
+    );

-    setLicenseModalOpened(false);
-    licenseForm.reset();
-    setSelectedLicense(null);
-  } catch (error) {
-    console.error("Error saving license:", error);
-  }
-};
+    licenseForm.setValues({
+      series_number: license.series_number,
+      form_date: license.form_date,
+      to_date: license.to_date,
+      is_actual: license.is_actual,
+      categories: license.categories?.map(c => c.id.toString()) || [],
+      driverId: driverWithLicense?.id.toString() || "",
+    });
+    setSelectedLicense(license);
+    setLicenseModalOpened(true);
+  };

-const handleEditLicense = (license: IDriverLicense) => {
-  // Находим водителя по имеющимся данным (без запроса к API)
-  const driverWithLicense = drivers.find(d => 
-    d.license?.some((l: IDriverLicense) => l.id === license.id)
-  );
+  const handleDeleteLicense = async (licenseId: number) => {
+    try {
+      // Удаляем только сами права (связи должны удаляться автоматически на сервере)
+      await deleteDictionaryItem("driver_license", licenseId);

-  licenseForm.setValues({
-    series_number: license.series_number,
-    form_date: license.form_date,
-    to_date: license.to_date,
-    is_actual: license.is_actual,
-    categories: license.categories?.map(c => c.id.toString()) || [],
-    driverId: driverWithLicense?.id.toString() || "",
-  });
-  setSelectedLicense(license);
-  setLicenseModalOpened(true);
-};
-
-const handleDeleteLicense = async (licenseId: number) => {
-  try {
-    // Удаляем только сами права (связи должны удаляться автоматически на сервере)
-    await deleteDictionaryItem("driver_license", licenseId);
-
-    // Обновляем данные
-    const updatedDrivers = await fetchDictionary("driver");
-    setDrivers(updatedDrivers);
-  } catch (error) {
-    console.error("Error deleting license:", error);
-  }
-};
+      // Обновляем данные
+      const updatedDrivers = await fetchDictionary("driver");
+      setDrivers(updatedDrivers);
+    } catch (error) {
+      console.error("Error deleting license:", error);
+    }
+  };

  return (
    <div>
@ -297,11 +207,11 @@ const handleDeleteLicense = async (licenseId: number) => {
              </Table.Tr>
            </Table.Thead>
            <Table.Tbody>
-              {drivers.map((driver) => (
-                <Driver 
-                  key={driver.id} 
-                  driver={driver} 
-                  handleEditDriver={handleEditDriver} 
+              {drivers.map((driver, index) => (
+                <Driver
+                  key={`drvId-${driver.id}-${index}`}
+                  driver={driver}
+                  handleEditDriver={handleEditDriver}
                  handleDeleteDriver={handleDeleteDriver}
                  handleEditLicense={handleEditLicense}
                  handleDeleteLicense={handleDeleteLicense}
@ -328,12 +238,12 @@ const handleDeleteLicense = async (licenseId: number) => {
              </Table.Tr>
            </Table.Thead>
            <Table.Tbody>
-              {drivers.flatMap(driver => 
-                driver.license?.map(license => (
-                  <Table.Tr key={license.id}>
+              {drivers.flatMap(driver =>
+                driver.license?.map((license: IDriverLicense, index) => (
+                  <Table.Tr key={`licId-${license.id}-${index}`}>
                    <Table.Td>{driver.fullname}</Table.Td>
-                    <DriverLicense 
-                      license={license} 
+                    <DriverLicense
+                      license={license}
                      handleDeleteLicense={handleDeleteLicense}
                      handleEditLicense={handleEditLicense}
                    />
@ -362,13 +272,13 @@ const handleDeleteLicense = async (licenseId: number) => {
        </form>
      </Modal>

-      <Modal 
-        opened={licenseModalOpened} 
+      <Modal
+        opened={licenseModalOpened}
        onClose={() => {
          setLicenseModalOpened(false)
          licenseForm.reset()
          setSelectedLicense(null)
-        }} 
+        }}
        title={selectedLicense ? "Редактировать водительские права" : "Добавить водительские права"}
        size="md"
      >
@ -383,29 +293,27 @@ const handleDeleteLicense = async (licenseId: number) => {
            }))}
            required
          />
-          <TextInput 
-            label="Серия и номер" 
-            {...licenseForm.getInputProps("series_number")} 
-            required 
+          <TextInput
+            label="Серия и номер"
+            {...licenseForm.getInputProps("series_number")}
+            required
            mt="sm"
          />
          <Flex gap="sm" mt="sm" justify="center">
            <MaskedDateInput
              label="Дата выдачи"
              required
-              flex={1}
              {...licenseForm.getInputProps("form_date")}
            />
            <MaskedDateInput
              label="Срок действия"
              required
-              flex={1}
              {...licenseForm.getInputProps("to_date")}
            />
          </Flex>
-          <Checkbox 
-            label="Действующее" 
-            {...licenseForm.getInputProps("is_actual", { type: 'checkbox' })} 
+          <Checkbox
+            label="Действующее"
+            {...licenseForm.getInputProps("is_actual", { type: 'checkbox' })}
            mt="sm"
          />
          <MultiSelect