ui-soxo-bootstrap-core 2.6.7 → 2.6.9

package/core/components/extra-info/extra-info-details.js

@@ -21,7 +21,7 @@ import ExtraInfo from './extra-info';
 
 const { TabPane } = Tabs;
 
-export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, ...record }) {
+export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition = 'left', showDrawerData, dbPtr, callback, drawerWidth = '35%', ...record }) {
   // State to control drawer
   const [open, setOpen] = useState(false);
 
@@ -121,7 +121,7 @@ export default function ExtraInfoDetail({ modeValue, icon, title, tabPosition =
         {/*  */}
 
         {/*  */}
-        <Drawer width={'35%'} title={title} onClose={onClose} open={open}>
+        <Drawer width={drawerWidth} title={title} onClose={onClose} open={open}>
           <div className="main-drawer-content">
             <div className="drawer-container">
               <div className="drawer-click">

package/core/models/users/components/user-add/user-add.js

@@ -95,7 +95,11 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
   const [body, setBody] = useState(formContent);
 
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
-  const [visible, setVisible] = useState(false);
+
+  // state for doctor and staff visibility
+  const [doctorVisible, setDoctorVisible] = useState(false);
+  const [staffVisible, setStaffVisible] = useState(false);
+
 
   const formData = {
     ...body,
@@ -541,7 +545,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                             borderTop: '1px solid #f0f0f0',
                             color: '#1890ff',
                           }}
-                          onClick={() => setVisible(true)}
+                          onClick={() => setDoctorVisible(true)}
                         >
                           + Add New Doctor
                         </div>
@@ -570,7 +574,7 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
                             borderTop: '1px solid #f0f0f0',
                             color: '#1890ff',
                           }}
-                          onClick={() => setVisible(true)}
+                          onClick={() => setStaffVisible(true)}
                         >
                           + Add New Staff
                         </div>
@@ -832,15 +836,15 @@ const UserAdd = ({ model, callback, edit, history, formContent, match, additiona
       )}
       {/* Render DoctorAdd OUTSIDE the Select */}
       <DoctorAdd
-        visible={visible}
-        onCancel={() => setVisible(false)}
+        visible={doctorVisible}
+        onCancel={() => setDoctorVisible(false)}
         attributes={attributes}
         doctorData={selectedDoctor}
         doctorId={doctorID}
         onSuccess={getDoctors}
       />
 
-      <StaffAdd visible={visible} onCancel={() => setVisible(false)} staffData={selectedStaff} staffId={staffID} onSuccess={getStaff} />
+      <StaffAdd visible={staffVisible} onCancel={() => setStaffVisible(false)} staffData={selectedStaff} staffId={staffID} onSuccess={getStaff} />
     </section>
   );
 };

package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.js

@@ -37,6 +37,7 @@ export default function buildDisplayColumns({ columns = [], patients = [], isFix
       render: (value, item, index) => index + 1,
       key: 'ColumnIndex',
       fixed: isFixedIndex ? 'left' : null,
+      width: 2,
     },
   ];
 

package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js

@@ -105,16 +105,14 @@ export default function ReportingDashboard({
     const fetchId = idOverride || id;
     await CoreScripts.getRecord({ id: fetchId, dbPtr }).then(async ({ result }) => {
       // Check if display columns are provided from backend
-      if (result.display_columns) {
-        // Parse and set columns from stored JSON
-
-        setColumns(JSON.parse(result.display_columns));
-      } else {
-        // Reset columns if no display columns exist
+      let parsedColumns = [];
 
-        setColumns([]);
+      if (result.display_columns) {
+        parsedColumns = JSON.parse(result.display_columns);
       }
-      await prepareInputParameters(result);
+      setColumns(parsedColumns);
+
+      await prepareInputParameters(result, parsedColumns);
 
       if (result.summary_columns) {
         setSummaryColumns(JSON.parse(result.summary_columns));
@@ -159,7 +157,7 @@ export default function ReportingDashboard({
    */
 
   //Prepare input parameters by mapping default values and binding models if needed
-  async function prepareInputParameters(record) {
+  async function prepareInputParameters(record, parsedColumns) {
     setLoading(true);
     let urlParams = Location.search();
 
@@ -235,7 +233,7 @@ export default function ReportingDashboard({
     setformContents(formContent);
 
     // Trigger form submission
-    onFinish(formContent, null, record.input_parameters);
+    onFinish(formContent, null, record.input_parameters, parsedColumns);
 
     setLoading(false);
 
@@ -259,7 +257,7 @@ export default function ReportingDashboard({
     getPatientDetails();
   }
 
-  const fetchReportData = async (id, values, dbPtr, pagination) => {
+  const fetchReportData = async (id, values, dbPtr, pagination, parsedColumns) => {
     const { current, pageSize } = pagination || {};
     // If card script id is exist load that id otherwise load id
     const coreScriptId = scriptId.current ? scriptId.current : id;
@@ -300,8 +298,10 @@ export default function ReportingDashboard({
       }
       // Update patients
       setPatients(resultDetails || []);
+      console.log(parsedColumns);
+         
       // Check if columns are not yet defined
-      if (columns.length === 0 && resultDetails.length > 0) {
+      if (parsedColumns.length === 0 && resultDetails.length > 0) {
         // Create columns dynamically from resultDetails keys
         setColumns((prev) => {
           if (prev.length > 0) return prev;
@@ -363,7 +363,7 @@ export default function ReportingDashboard({
    * @param {*} values
    */
 
-  const onFinish = async (values, resetPage, inputParamsString) => {
+  const onFinish = async (values, resetPage, inputParamsString, parsedColumns) => {
     setLoading(true);
     setCardLoading(true);
     // // Check if the dashboard is visible and both start and end values are provided
@@ -423,7 +423,7 @@ export default function ReportingDashboard({
 
     // Call API
     try {
-      await fetchReportData(id, values, dbPtr, paginationData);
+      await fetchReportData(id, values, dbPtr, paginationData, parsedColumns);
     } finally {
       setLoading(false);
       setCardLoading(false);
@@ -634,13 +634,13 @@ function GuestList({
   useEffect(() => {
     //Cheaking if there is patient data exists
     if (patients) {
-      let data = patients?.map((entry) => {
-        entry.rowIndex = entry.opb_id;
+      // let data = patients?.map((entry) => {
+      //   entry.rowIndex = entry.opb_id;
 
-        entry.dispatch = dispatch;
+      //   entry.dispatch = dispatch;
 
-        return entry;
-      });
+      //   return entry;
+      // });
 
       // setData(data);
 
@@ -797,7 +797,6 @@ function GuestList({
       </div>
 
       <div>
-      
         <Card>
           {loading ? (
             <>
@@ -806,10 +805,12 @@ function GuestList({
           ) : (
             <TableComponent
               size="small"
-              scroll={{ x: 'max-content' }}
+              // scroll={{ x: 'max-content' }}
+              scroll={{ x: 'max-content', y: '60vh' }}
               rowKey={(record) => record.OpNo}
               dataSource={filtered ? filtered : patients} // In case if there is no filtered values we can use patient data
               columns={cols}
+              sticky
               pagination={false}
               // title={config.caption}
               summary={(pageData) => {

package/core/modules/steps/action-buttons.js

@@ -3,7 +3,7 @@
  * Handles navigation and action controls for a multi-step process,
  * including dynamic content rendering and process completion actions.
  */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Skeleton } from 'antd';
 import { Button } from '../../lib';
 import './action-buttons.scss';
@@ -23,7 +23,9 @@ export default function ActionButtons({
   timelineCollapsed,
 }) {
   const [showNextProcess, setShowNextProcess] = useState(false);
-
+  useEffect(() => {
+    setShowNextProcess(false);
+  }, [steps]);
   return (
     <div className="action-buttons-layout">
       <div className="action-buttons-content">{loading ? <Skeleton active /> : renderDynamicComponent()}</div>

package/package.json

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