diff --git a/client/src/components/center-calendar/CenterCalendar.js b/client/src/components/center-calendar/CenterCalendar.js
index f3e33d6..696c4d8 100644
--- a/client/src/components/center-calendar/CenterCalendar.js
+++ b/client/src/components/center-calendar/CenterCalendar.js
@@ -14,7 +14,7 @@ import { createEventsServicePlugin } from '@schedule-x/events-service';
import { createEventModalPlugin} from '@schedule-x/event-modal';
import { createEventRecurrencePlugin } from "@schedule-x/event-recurrence";
import '@schedule-x/theme-default/dist/calendar.css';
-import { Archive, PencilSquare, Filter, Plus } from "react-bootstrap-icons";
+import { Archive, PencilSquare, Filter, Plus, X } from "react-bootstrap-icons";
import DatePicker from "react-datepicker";
import { vehicleSlice } from "../../store";
import Select from 'react-select';
@@ -911,11 +911,37 @@ const EventsCalendar = () => {
}
}
+ const dismissEventModal = () => {
+ try {
+ calendar?.config?.plugins?.eventModal?.close();
+ } catch (e) {
+ document.querySelectorAll('.sx__event-modal').forEach(el => el.remove());
+ }
+ };
+
const customComponents = {
eventModal: ({calendarEvent}) => {
return <>
-
{currentTab === 'medicalCalendar' ? calendarEvent?.customer : calendarEvent?.title}
+
+
{currentTab === 'medicalCalendar' ? calendarEvent?.customer : calendarEvent?.title}
+
+
{calendarEvent?.doctor && {`${calendarEvent?.doctor}`}
}
{`${calendarEvent?.start}`}
diff --git a/client/src/components/events/EventsCalendar.js b/client/src/components/events/EventsCalendar.js
index 40952d8..a9838b0 100644
--- a/client/src/components/events/EventsCalendar.js
+++ b/client/src/components/events/EventsCalendar.js
@@ -13,7 +13,7 @@ import {
import { createEventsServicePlugin } from '@schedule-x/events-service';
import { createEventModalPlugin} from '@schedule-x/event-modal';
import '@schedule-x/theme-default/dist/calendar.css';
-import { Archive, Filter, PencilSquare } from "react-bootstrap-icons";
+import { Archive, Filter, PencilSquare, X } from "react-bootstrap-icons";
import DatePicker from "react-datepicker";
@@ -317,10 +317,36 @@ const EventsCalendar = () => {
setSelectedColorFilters([]);
}
+ const dismissEventModal = () => {
+ try {
+ calendar?.config?.plugins?.eventModal?.close();
+ } catch (e) {
+ document.querySelectorAll('.sx__event-modal').forEach(el => el.remove());
+ }
+ };
+
const customComponents = {
eventModal: ({calendarEvent}) => {
return <>
-
{calendarEvent?.customer}
+
+
{calendarEvent?.customer}
+
+
{calendarEvent?.doctor &&
{`${calendarEvent?.doctor}`}
}
{`${calendarEvent?.start}`}
{AuthService.canEditMedicalEvents() &&