diff --git a/web-app/src/Api/lensesApi.js b/web-app/src/Api/lensesApi.js index 1d6953c..a4900cc 100644 --- a/web-app/src/Api/lensesApi.js +++ b/web-app/src/Api/lensesApi.js @@ -44,7 +44,7 @@ export const lensesApi = createApi({ method: 'POST', body: lens }), - invalidatesTags: ['Lens'] + invalidatesTags: ['Lenses'] }), updateLens: builder.mutation({ query: ({id, ...lens}) => ({ @@ -52,14 +52,14 @@ export const lensesApi = createApi({ method: 'PUT', body: lens }), - invalidatesTags: ['Lens'] + invalidatesTags: ['Lenses'] }), deleteLens: builder.mutation({ query: (id) => ({ url: `/lenses/${id}/`, method: 'DELETE' }), - invalidatesTags: ['Lens'] + invalidatesTags: ['Lenses'] }), }), }); diff --git a/web-app/src/Api/patientsApi.js b/web-app/src/Api/patientsApi.js index 0f6f826..3a88710 100644 --- a/web-app/src/Api/patientsApi.js +++ b/web-app/src/Api/patientsApi.js @@ -23,7 +23,7 @@ export const patientsApi = createApi({ url: '/patients/', params: { all_params: true }, }), - providesTags: ['Patient'], + providesTags: ['Patients'], transformResponse: (response) => { if (!response || !Array.isArray(response.patients)) { console.warn('Unexpected patients API response:', response); @@ -38,7 +38,7 @@ export const patientsApi = createApi({ method: 'POST', body: patient }), - invalidatesTags: ['Patient'] + invalidatesTags: ['Patients'] }), updatePatient: builder.mutation({ query: ({id, ...patient}) => ({ @@ -46,14 +46,14 @@ export const patientsApi = createApi({ method: 'PUT', body: patient }), - invalidatesTags: ['Patient'] + invalidatesTags: ['Patients'] }), deletePatient: builder.mutation({ query: (id) => ({ url: `/patients/${id}/`, method: 'DELETE' }), - invalidatesTags: ['Patient'] + invalidatesTags: ['Patients'] }), }), }); diff --git a/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx b/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx index acc5474..baea0c8 100644 --- a/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx +++ b/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx @@ -229,6 +229,7 @@ const AppointmentFormModal = () => { const ConfirmStep = useMemo(() => { const values = appointmentFormModalUI.form.getFieldsValue(); + const formValues = appointmentFormModalUI.formValues; const patient = appointmentFormModalData.patients.find((p) => p.id === values.patient_id); const appointmentType = appointmentFormModalData.appointmentTypes.find((t) => t.id === values.type_id); @@ -251,7 +252,7 @@ const AppointmentFormModal = () => {
Результаты приема:
- +Прикрепленные файлы:
diff --git a/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js b/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js index da82d62..5206740 100644 --- a/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js +++ b/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js @@ -422,6 +422,7 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen screenXS, direction, isDrawerVisible, + formValues, showDrawer, closeDrawer, isLoadingPreviousAppointments, diff --git a/web-app/src/Components/Layouts/MainLayout.jsx b/web-app/src/Components/Layouts/MainLayout.jsx index 4ac17c1..9129c53 100644 --- a/web-app/src/Components/Layouts/MainLayout.jsx +++ b/web-app/src/Components/Layouts/MainLayout.jsx @@ -21,23 +21,23 @@ const MainLayout = () => { const mainLayoutUI = useMainLayoutUI(mainLayoutData.user); const menuItems = [ - mainLayoutUI.getItem("Главная", "/",