diff --git a/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx b/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx index 96bbc5f..02c659c 100644 --- a/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx +++ b/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx @@ -9,28 +9,28 @@ import { Button, Popconfirm, Typography, - Result, Tooltip + Result, + Tooltip } from "antd"; import { BuildOutlined, PlusOutlined, SortAscendingOutlined, - SortDescendingOutlined, TableOutlined, - TeamOutlined + SortDescendingOutlined, + TableOutlined, + TeamOutlined, } from "@ant-design/icons"; import PatientListCard from "../../Dummies/PatientListCard.jsx"; import PatientFormModal from "../../Dummies/PatientFormModal/PatientFormModal.jsx"; import SelectViewMode from "../../Widgets/SelectViewMode/SelectViewMode.jsx"; import LoadingIndicator from "../../Widgets/LoadingIndicator/LoadingIndicator.jsx"; import usePatients from "./usePatients.js"; -import usePatientsUI from "./usePatientsUI.js"; -const { Option } = Select; -const { Title } = Typography; +const {Option} = Select; +const {Title} = Typography; const PatientsPage = () => { const patientsData = usePatients(); - const patientsUI = usePatientsUI(patientsData.patients, patientsData.totalCount); const columns = [ { @@ -55,7 +55,7 @@ const PatientsPage = () => { title: "Дата рождения", dataIndex: "birthday", sorter: true, - render: patientsUI.formatDate, + render: patientsData.formatDate, }, { title: "Телефон", @@ -71,7 +71,7 @@ const PatientsPage = () => { render: (_, record) => ( - + { { value: "tile", label: "Плитка", - icon: + icon: }, { value: "table", label: "Таблица", - icon: + icon: } ]; @@ -110,25 +110,27 @@ const PatientsPage = () => { ); return ( -
+
<TeamOutlined/> Пациенты - + patientsUI.handleSetSearchText(e.target.value)} - style={patientsUI.formItemStyle} + value={patientsData.searchText} + onChange={(e) => patientsData.handleSetSearchText(e.target.value)} + onPressEnter={patientsData.handleSearch} + style={patientsData.formItemStyle} allowClear + onClear={patientsData.handleClearSearch} /> - {patientsUI.viewMode === "tile" && ( + {patientsData.viewMode === "tile" && (