ui-soxo-bootstrap-core 2.4.25-dev.49 → 2.4.25-dev.50

package/core/models/doctor/components/doctor-add/doctor-add.js

@@ -7,6 +7,7 @@ import { UsersAPI } from '../../..';
 import SignatureCanvasComponent from '../../../../lib/components/consent/signature-pad';
 
 const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSuccess }) => {
+  console.log('Doctor Data: ', doctorData);
   const [form] = Form.useForm();
   const { t } = useTranslation();
 
@@ -156,35 +157,44 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
     setLoading(true);
 
     const payload = {
-      dbkey: values.dbkey ? Number(values.dbkey) : null,
-      code: values.code || '',
-      name: values.name || '',
-      regno1: values.regno1 || '',
-      regno2: '',
-      qualification: values.qualification || '',
-      desg: values.designation || '',
-      add1: values.address || '',
-      add2: '',
-      place: values.places || '',
-      phone: values.phone_number || '',
-      fax: values.fax || '',
-      mobile: values.alternate_phone || '',
-      email: values.email_id || '',
-      remarks: values.remarks || '',
-      deptptr: '',
-      regfee: values.regfee ? Number(values.regfee) : null,
-      consfee: values.consfee ? Number(values.consfee) : null,
-      gpfee: values.gpfee ? Number(values.gpfee) : null,
-      consdays: values.consdays ? Number(values.consdays) : null,
-      slno: values.slno ? Number(values.slno) : null,
+      dbkey: values.dbkey ?? doctorData?.dbkey ?? null,
+      code: values.code ?? doctorData?.code ?? '',
+      name: values.name ?? doctorData?.name ?? '',
+      regno1: values.regno1 ?? doctorData?.regno1 ?? '',
+      regno2: doctorData?.regno2 ?? '',
+      qualification: values.qualification ?? doctorData?.qualification ?? '',
+      desg: values.designation ?? doctorData?.designation ?? '',
+
+      add1: values.address ?? doctorData?.address1 ?? '',
+      add2: doctorData?.address2 ?? '',
+
+      place: values.places ?? doctorData?.place ?? '',
+      zip: values.pincode ?? doctorData?.zip ?? '',
+
+      phone: values.phone_number ?? doctorData?.phone ?? '',
+      mobile: values.alternate_phone ?? doctorData?.mobile ?? '',
+      email: values.email_id ?? doctorData?.email ?? '',
+      fax: values.fax ?? doctorData?.fax ?? '',
+
+      remarks: values.remarks ?? doctorData?.remarks ?? '',
+
+      deptptr: doctorData?.deptptr ?? '',
+
+      regfee: values.regfee ?? doctorData?.regfee ?? null,
+      consfee: values.consfee ?? doctorData?.consfee ?? null,
+      gpfee: values.gpfee ?? doctorData?.gpfee ?? null,
+      consdays: values.consdays ?? doctorData?.consdays ?? null,
+      slno: values.slno ?? doctorData?.slno ?? null,
+      timeperpatient: values.timeperpatient ?? doctorData?.timeperpatient ?? null,
+
       active: values.active === 'Y' ? 'Y' : 'N',
-      timeperpatient: values.timeperpatient ? Number(values.timeperpatient) : null,
-      username: '',
-      type: values.type || '',
-      signature: fileUrl || '',
-      zip: values.pincode || '',
-    };
 
+      username: doctorData?.username ?? '',
+
+      type: values.type ?? doctorData?.type ?? '',
+
+      signature: fileUrl ?? doctorData?.signature ?? '',
+    };
     try {
       let res;
       if (editMode) {
@@ -384,11 +394,7 @@ const DoctorAdd = ({ visible, onCancel, attributes, doctorId, doctorData, onSucc
                 </Col>
 
                 <Col span={8}>
-                  <Form.Item
-                    label="Email ID"
-                    name="email_id"
-                    rules={[{ type: 'email', message: 'Please enter a valid email address' }]}
-                  >
+                  <Form.Item label="Email ID" name="email_id" rules={[{ type: 'email', message: 'Please enter a valid email address' }]}>
                     <Input placeholder="Enter Email ID" onKeyDown={handleEnterKey} />
                   </Form.Item>
                 </Col>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.4.25-dev.49",
+  "version": "2.4.25-dev.50",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"