починил поле с форматированным текстом

api/app/controllers/appointments_router.py

@@ -65,7 +65,7 @@ async def create_appointment(
         user=Depends(get_current_user),
 ):
     appointment_service = AppointmentsService(db)
-    return await appointment_service.create_appointment(appointment)
+    return await appointment_service.create_appointment(appointment, user.id)
 
 
 @router.put(

api/app/domain/entities/appointment.py

@@ -15,7 +15,7 @@ class AppointmentEntity(BaseModel):
     appointment_datetime: datetime.datetime
 
     patient_id: int
-    doctor_id: int
+    doctor_id: Optional[int] = None
     type_id: int
 
     patient: Optional[PatientEntity] = None

api/app/infrastructure/appointments_service.py

@@ -62,7 +62,7 @@ class AppointmentsService:
             for appointment in appointments
         ]
 
-    async def create_appointment(self, appointment: AppointmentEntity) -> Optional[AppointmentEntity]:
+    async def create_appointment(self, appointment: AppointmentEntity, doctor_id: int) -> Optional[AppointmentEntity]:
         patient = await self.patients_repository.get_by_id(appointment.patient_id)
 
         if not patient:
@@ -71,7 +71,7 @@ class AppointmentsService:
                 detail='The patient with this ID was not found',
             )
 
-        doctor = await self.users_repository.get_by_id(appointment.doctor_id)
+        doctor = await self.users_repository.get_by_id(doctor_id)
 
         if not doctor:
             raise HTTPException(
@@ -79,6 +79,8 @@ class AppointmentsService:
                 detail='The doctor/user with this ID was not found',
             )
 
+        appointment.doctor_id = doctor_id
+
         appointment_type = await self.appointment_types_repository.get_by_id(appointment.type_id)
 
         if not appointment_type:

web-app/package.json

@@ -19,10 +19,10 @@
     "antd-mask-input": "^2.0.7",
     "axios": "^1.7.9",
     "dayjs": "^1.11.13",
+    "jodit-react": "^5.2.19",
     "prop-types": "^15.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-quill": "^2.0.0",
     "react-redux": "^9.2.0",
     "react-router-dom": "^7.1.1",
     "validator": "^13.12.0"

web-app/src/App/main.jsx

@@ -1,9 +1,2 @@
-import {StrictMode} from 'react'
+import {ComponentPreviews, useInitial} from "../dev/index.js";
-import {createRoot} from 'react-dom/client'
+import {DevSupport} from "@react-buddy/ide-toolbox";
-import App from './App.jsx'
-
-createRoot(document.getElementById('root')).render(
-    <StrictMode>
-        <App/>
-    </StrictMode>
-)

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

@@ -1,5 +1,5 @@
-import ReactQuill from 'react-quill';
+import JoditEditor from 'jodit-react';
-import 'react-quill/dist/quill.snow.css';
+import {useRef} from 'react';
 import dayjs from "dayjs";
 import {
     Button,
@@ -31,6 +31,9 @@ const AppointmentFormModal = ({onCancel}) => {
         appointmentFormModalData.patients,
     );
 
+    const editor = useRef(null);
+
+
     const patientsItems = appointmentFormModalUI.filteredPatients.map((patient) => ({
         key: patient.id,
         label: `${patient.last_name} ${patient.first_name} (${appointmentFormModalUI.getDateString(patient.birthday)})`,
@@ -119,7 +122,8 @@ const AppointmentFormModal = ({onCancel}) => {
                     label="Время приема"
                     rules={[{required: true, message: 'Выберите время'}]}
                 >
-                    <DatePicker maxDate={dayjs(new Date()).add(1, 'day')} defaultValue={dayjs(new Date())}  showTime format="DD.MM.YYYY HH:mm" style={{width: '100%'}}/>
+                    <DatePicker maxDate={dayjs(new Date()).add(1, 'day')} showTime format="DD.MM.YYYY HH:mm"
+                                style={{width: '100%'}}/>
                 </Form.Item>
                 <Form.Item
                     name="days_until_the_next_appointment"
@@ -132,8 +136,17 @@ const AppointmentFormModal = ({onCancel}) => {
                     name="results"
                     label="Результаты приема"
                 >
-                    <ReactQuill theme="snow" style={{height: 150, marginBottom: 40}}/>
+                    <JoditEditor
+                        ref={editor}
+                        value={appointmentFormModalUI.results}
+                        config={{
+                            readonly: false,
+                            height: 150,
+                        }}
+                        onBlur={appointmentFormModalUI.handleResultsChange}
+                    />
                 </Form.Item>
+
             </Form>
         );
     }, [

web-app/src/Components/Pages/AppointmentsPage/Components/AppointmentCalendarTab/Components/AppointmentFormModal/useAppointmentFormModalUI.js

@@ -19,6 +19,7 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
     const [appointmentDate, setAppointmentDate] = useState(dayjs(new Date()));
     const [searchPatientString, setSearchPatientString] = useState("");
     const [formValues, setFormValues] = useState({});
+    const [results, setResults] = useState('');
 
     const {data: appointments = []} = useGetAppointmentsQuery(undefined, {
         pollingInterval: 20000,
@@ -54,20 +55,28 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
             if (selectedAppointment) {
                 const patient = appointments.find(p => p.id === selectedAppointment.patient_id);
                 setSelectedPatient(patient);
-                setCurrentStep(1); // При редактировании начинаем со второго шага
+                setCurrentStep(1);
                 form.setFieldsValue({
                     patient_id: selectedAppointment.patient_id,
                     type_id: selectedAppointment.type_id,
                     appointment_datetime: selectedAppointment.appointment_datetime
                         ? dayjs(selectedAppointment.appointment_datetime)
-                        : null,
+                        : dayjs(new Date()),
                     days_until_the_next_appointment: selectedAppointment.days_until_the_next_appointment,
                     results: selectedAppointment.results,
                 });
+            } else {
+                form.setFieldsValue({
+                    appointment_datetime: dayjs(new Date()),
+                })
             }
         }
     }, [modalVisible, selectedAppointment, form, appointments]);
 
+    const handleResultsChange = (newContent) => {
+        setResults(newContent);
+    };
+
     const handleSetSearchPatientString = (e) => {
         setSearchPatientString(e.target.value);
     };
@@ -105,7 +114,7 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
                 const values = await form.validateFields();
                 setFormValues(values);
                 setCurrentStep(2);
-            } catch (error) {
+            } catch (_) {
                 notification.error({
                     message: 'Ошибка валидации',
                     description: 'Пожалуйста, заполните все обязательные поля.',
@@ -147,7 +156,7 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
                 type_id: values.type_id,
                 appointment_datetime: appointmentTime.format("YYYY-MM-DD HH:mm:ss"),
                 days_until_the_next_appointment: values.days_until_the_next_appointment,
-                results: values.results,
+                results: results,
             };
 
             if (selectedAppointment) {
@@ -201,6 +210,8 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
         currentStep,
         searchPatientString,
         appointmentDate,
+        results,
+        setResults,
         handleSetSearchPatientString,
         filteredPatients,
         handleOk,
@@ -211,6 +222,7 @@ const useAppointmentFormModalUI = (onCancel, createAppointment, updateAppointmen
         handleClickNextButton,
         handleClickBackButton,
         handleSetAppointmentDate,
+        handleResultsChange,
         modalWidth,
         disableBackButton,
         disableNextButton,

web-app/vite.config.js

@@ -7,4 +7,7 @@ export default defineConfig({
         outDir: '../dist',
     },
     publicDir: 'public',
+    optimizeDeps: {
+        include: ['jodit-react']
+    }
 })