-
-
Client Name
-
{currentCustomer?.name || ''}
+
+
Client
+ *
+
+
-
-
Preferred Name
-
{currentCustomer?.name_cn || ''}
-
-
-
Pharmacy
-
{currentCustomer?.pharmacy || ''}
-
-
-
Care Provider
-
{currentCustomer?.care_provider || ''}
-
-
-
Birthday
-
{currentCustomer?.birth_date || ''}
+
-
- }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {
+ currentCustomer && <>
+
Client Information
+
+
+
Client Name
+
{currentCustomer?.name || ''}
+
+
+
Preferred Name
+
{currentCustomer?.name_cn || ''}
+
+
+
Pharmacy
+
{currentCustomer?.pharmacy || ''}
+
+
+
+
+
Care Provider
+
{currentCustomer?.care_provider || ''}
+
+
+
Birthday
+
{currentCustomer?.birth_date || ''}
+
+
+
Note
+
{currentCustomer?.note || ''}
+
+
+
+ }
+
diff --git a/client/src/components/events/EventsMultipleList.js b/client/src/components/events/EventsMultipleList.js
index b71ff05..4ab401f 100644
--- a/client/src/components/events/EventsMultipleList.js
+++ b/client/src/components/events/EventsMultipleList.js
@@ -489,7 +489,7 @@ const EventsMultipleList = () => {
{table('active')}
-
+
From
{setFromDate(v); setSelectedItems([]);}} />
diff --git a/client/src/components/events/UpdateEvent.js b/client/src/components/events/UpdateEvent.js
index 87e44f8..6d827d2 100644
--- a/client/src/components/events/UpdateEvent.js
+++ b/client/src/components/events/UpdateEvent.js
@@ -6,6 +6,7 @@ import { AuthService, CustomerService, EventsService, ResourceService } from "..
import Select from 'react-select';
import { Button, Modal } from "react-bootstrap";
import DatePicker from "react-datepicker";
+import { Spinner, Breadcrumb, BreadcrumbItem, Tabs, Tab } from "react-bootstrap";
const UpdateEvent = () => {
const navigate = useNavigate();
@@ -70,9 +71,6 @@ const UpdateEvent = () => {
}
const saveEvent = () => {
- console.log('customer', currentCustomer);
- console.log('resource', currentResource);
-
let newEventDataClientAndResource = {};
let newEventClientAndResource = {};
if (currentCustomer) {
@@ -142,8 +140,6 @@ const UpdateEvent = () => {
edit_history: currentEvent?.edit_history? [...currentEvent.edit_history, { employee: localStorage.getItem('user') && JSON.parse(localStorage.getItem('user'))?.name, date: new Date() }] : [{ employee: localStorage.getItem('user') && JSON.parse(localStorage.getItem('user'))?.name, date: new Date() }],
...newEventClientAndResource
}
-
- console.log('new Event', newEvent);
if (params.get('event')) {
if (currentCustomer && currentResource)
EventsService.createNewEvent(newEvent).then(data => redirectTo());
@@ -192,7 +188,6 @@ const UpdateEvent = () => {
setTimeData(timeDatas.data);
if (!currentEvent) {
if (params.get('event')) {
- console.log('event', JSON.parse(params.get('event')));
setCurrentEvent(JSON.parse(params.get('event')));
} else {
EventsService.getEvent(urlParams.id).then(eventData => {
@@ -269,20 +264,315 @@ const UpdateEvent = () => {
return (
<>
-
-
-
-
-
{ params.get('event') ? 'Create Medical Event from Request' : 'Update Medical Event'}
+
+
+ Medical
+
+ Medical Appointment Information
+
+
+ { params.get('event') ? 'Create Medical Event from Request' : 'Update Medical Event'}
+
+
+
+
{ params.get('event') ? 'Create Medical Event from Request' : 'Update Medical Event'}
+
+
+
+
+
+
+ { !hideCreateFields &&
+
+
+
+
Client And Start Time
+
+
+
Client
+ *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ currentCustomer && <>
+
Client Information
+
+
+
Client Name
+
{currentCustomer?.name || ''}
+
+
+
Preferred Name
+
{currentCustomer?.name_cn || ''}
+
+
+
Pharmacy
+
{currentCustomer?.pharmacy || ''}
+
+
+
+
+
Care Provider
+
{currentCustomer?.care_provider || ''}
+
+
+
Birthday
+
{currentCustomer?.birth_date || ''}
+
+
+
Note
+
{currentCustomer?.note || ''}
+
+
+
+ }
+
+
+
+
+
+
Appointment Details
+
+
+
Resource
+ *
+
+ {currentResource ?
+ (<>
{currentResource?.name} ) :
+ (currentEvent?.data?.resource_name ? <>
{currentEvent?.data?.resource_name} :
)}
+
+
+
+
+
Title
+ *
+
+
setTitle(e.target.value)}/>
+
+
+
Tag
+ *
+
+
+
+
+
Customer Information
+
+
+
New Patient
+
+
+
+
+
Doctor's Order
+
+
+
+
+
Fasting Required
+
+
+
+
+
+
+
Need Id
+
+
+
+
+
Need Medication List
+
+
+
+
+
Assistance
+
+
+
Language Support
+ *
+
+
+
+
+
Transportation Needed
+
+
+
+
+
Additional Information
+