feat: Добавлена фильтрация и новые функции для приемов.

Добавлены фильтрация по дате для получения приемов и запланированных приемов. Добавлены функции открытия модалок.

web-app/src/Api/appointmentsApi.js

@@ -7,7 +7,10 @@ export const appointmentsApi = createApi({
     tagTypes: ['Appointment'],
     endpoints: (builder) => ({
         getAppointments: builder.query({
-            query: (doctor_id) => `/appointments/doctor/${doctor_id}/`,
+            query: ({ doctor_id, start_date, end_date }) => ({
+                url: `/appointments/doctor/${doctor_id}/`,
+                params: { start_date, end_date },
+            }),
             providesTags: ['Appointment'],
             refetchOnMountOrArgChange: 5,
         }),

web-app/src/Api/scheduledAppointmentsApi.js

@@ -7,7 +7,10 @@ export const scheduledAppointmentsApi = createApi({
     tagTypes: ['ScheduledAppointment'],
     endpoints: (builder) => ({
         getScheduledAppointments: builder.query({
-            query: (doctor_id) => `/scheduled_appointments/doctor/${doctor_id}/`,
+            query: ({ doctor_id, start_date, end_date }) => ({
+                url: `/scheduled_appointments/doctor/${doctor_id}/`,
+                params: { start_date, end_date },
+            }),
             providesTags: ['ScheduledAppointment'],
         }),
         createScheduledAppointment: builder.mutation({

web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js

@@ -6,7 +6,6 @@ import dayjs from "dayjs";
 import {useGetAppointmentsQuery} from "../../../Api/appointmentsApi.js";
 import {Grid} from "antd";
 import {useUploadAppointmentFileMutation} from "../../../Api/appointmentFilesApi.js";
-import Compressor from 'compressorjs';
 
 const {useBreakpoint} = Grid;
 
@@ -30,9 +29,20 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
 
     const [uploadAppointmentFile, {isLoading: isUploadingFile}] = useUploadAppointmentFileMutation();
 
-    const {data: appointments = []} = useGetAppointmentsQuery(userData.id, {
-        pollingInterval: 20000,
-    });
+    const startDate = appointmentDate.startOf('month').utc().format('YYYY-MM-DD');
+    const endDate = appointmentDate.endOf('month').utc().format('YYYY-MM-DD');
+
+    const {
+        data: appointments = [],
+        isLoading: isLoadingAppointments,
+        isError: isErrorAppointments,
+    } = useGetAppointmentsQuery(
+        {doctor_id: userData.id, start_date: startDate, end_date: endDate},
+        {
+            pollingInterval: 60000,
+            skip: !userData.id,
+        }
+    );
 
     const {
         data: previousAppointments = [],
@@ -43,6 +53,16 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
         skip: !selectedPatient,
     });
 
+    useEffect(() => {
+        if (isErrorAppointments) {
+            notification.error({
+                message: 'Ошибка',
+                description: 'Ошибка загрузки приемов.',
+                placement: 'topRight',
+            });
+        }
+    }, [isErrorAppointments]);
+
     const blockStepStyle = {marginBottom: 16};
     const searchInputStyle = {marginBottom: 16};
     const chooseContainerStyle = {maxHeight: 400, overflowY: "auto"};
@@ -180,6 +200,7 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
                         appointment_datetime: dayjs(scheduledData.appointment_datetime),
                         results: scheduledData.results || "",
                     });
+                    setAppointmentDate(dayjs(scheduledData.appointment_datetime));
                 }
             } else {
                 form.setFieldsValue({
@@ -219,9 +240,14 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
         setFormValues({});
         setIsDrawerVisible(false);
         setDraftFiles([]);
+        setAppointmentDate(dayjs(new Date())); // Сбрасываем дату
+    };
+
+    const handleSetAppointmentDate = (date) => {
+        setAppointmentDate(date);
+        form.setFieldsValue({appointment_datetime: date}); // Синхронизируем форму
     };
 
-    const handleSetAppointmentDate = (date) => setAppointmentDate(date);
     const modalWidth = useMemo(() => (screenXS ? 700 : "90%"), [screenXS]);
 
     const showDrawer = () => {
@@ -330,8 +356,8 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
         } catch (error) {
             console.error("Error creating appointment:", error);
             notification.error({
-                message: "Ошибка загрузки файла",
-                description: `Не удалось загрузить файл ${JSON.stringify(error.data?.detail || error.data || error.message || "Неизвестная ошибка", null, 2)}`,
+                message: "Ошибка создания приема",
+                description: `Не удалось создать прием: ${JSON.stringify(error.data?.detail || error.data || error.message || "Неизвестная ошибка", null, 2)}`,
                 placement: "topRight",
             });
         }
@@ -405,6 +431,8 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen
         handleAddFile,
         handleRemoveFile,
         isUploadingFile,
+        isLoadingAppointments,
+        isErrorAppointments,
     };
 };
 

web-app/src/Components/Pages/AppointmentsPage/AppointmentsPage.jsx

@@ -12,12 +12,6 @@ import useAppointments from "./useAppointments.js";
 import dayjs from 'dayjs';
 import LoadingIndicator from "../../Widgets/LoadingIndicator/LoadingIndicator.jsx";
 import AppointmentFormModal from "../../Dummies/AppointmentFormModal/AppointmentFormModal.jsx";
-import { useDispatch } from "react-redux";
-import {
-    openModal,
-    setSelectedAppointment,
-    setSelectedScheduledAppointment
-} from "../../../Redux/Slices/appointmentsSlice.js";
 import AppointmentViewModal from "../../Dummies/AppointmentViewModal/AppointmentViewModal.jsx";
 import ScheduledAppointmentFormModal
     from "../../Dummies/ScheduledAppintmentFormModal/ScheduledAppointmentFormModal.jsx";
@@ -48,16 +42,10 @@ const AppointmentsPage = () => {
         openCreateScheduledAppointmentModal,
         currentMonth,
         handleMonthChange,
+        handleEventClick,
+        openCreateAppointmentModal,
     } = useAppointments();
-    const dispatch = useDispatch();
 
-    const handleEventClick = (event) => {
-        if (event.appointment_datetime) {
-            dispatch(setSelectedAppointment(event));
-        } else {
-            dispatch(setSelectedScheduledAppointment(event));
-        }
-    };
 
     if (isError) return (
         <Result
@@ -200,7 +188,7 @@ const AppointmentsPage = () => {
                     >
                         <FloatButton
                             icon={<PlusOutlined/>}
-                            onClick={() => dispatch(openModal())}
+                            onClick={openCreateAppointmentModal}
                             tooltip="Прием"
                         />
                         <FloatButton

web-app/src/Components/Pages/AppointmentsPage/useAppointments.js

@@ -7,6 +7,7 @@ import {
 } from "../../../Api/appointmentsApi.js";
 import { useGetAllPatientsQuery } from "../../../Api/patientsApi.js";
 import {
+    openModal,
     openScheduledModal,
     setHovered,
     setSelectedAppointment,
@@ -101,10 +102,20 @@ const useAppointments = () => {
         }
     };
 
+    const handleEventClick = (event) => {
+        if (event.appointment_datetime) {
+            dispatch(setSelectedAppointment(event));
+        } else {
+            dispatch(setSelectedScheduledAppointment(event));
+        }
+    };
+
     const openCreateScheduledAppointmentModal = () => {
         dispatch(openScheduledModal());
     };
 
+    const openCreateAppointmentModal = () => dispatch(openModal());
+
     const siderButtonText = useMemo(() =>
             hovered ? (collapsed ? "Показать предстоящие события" : "Скрыть предстоящие события") : "",
         [collapsed, hovered]
@@ -175,6 +186,8 @@ const useAppointments = () => {
         openCreateScheduledAppointmentModal,
         currentMonth,
         handleMonthChange,
+        handleEventClick,
+        openCreateAppointmentModal,
     };
 };