ui-soxo-bootstrap-core 2.6.1-dev.2 → 2.6.1-dev.20

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

@@ -1,11 +1,9 @@
 import React, { useState, useEffect, useContext, useRef } from 'react';
 
-import { Table, Skeleton, Input, Tag, Modal, message, Pagination, Tooltip } from 'antd';
+import { Table, Skeleton, Input, Modal, message, Pagination } from 'antd';
 
 import { QrcodeOutlined } from '@ant-design/icons';
 
-import * as Icons from '@ant-design/icons';
-
 import { Location, FormCreator, GlobalContext, ExportReactCSV, getExportData, Card, TableComponent, QrScanner } from './../../../../lib/';
 
 import { CoreScripts } from './../../../../models/';
@@ -14,15 +12,15 @@ import moment from 'moment-timezone';
 
 import Button from '../../../../lib/elements/basic/button/button';
 
-import { Link } from 'react-router-dom';
-
 import './reporting-dashboard.scss';
 
 // import MenuDashBoard from '../../../../pages/homepage-api/menu-dashboard';
 import MenuDashBoardComponent from '../../../../lib/elements/basic/menu-dashboard/menu-dashboard';
 import { useHistory } from 'react-router-dom';
-
 import * as ReportingDashboardComp from '../index';
+import buildDisplayColumns from './display-columns/build-display-columns';
+import { getRedirectLink } from './display-columns/display-cell-renderer';
+import AdvancedSearchSelect from './adavance-search/advance-search';
 
 // import { isPdfFile } from 'pdfjs-dist';
 
@@ -64,6 +62,10 @@ export default function ReportingDashboard({
 
   const [cardLoading, setCardLoading] = useState(true);
 
+  const [searchParameters, setSearchParameters] = useState([]);
+
+  const [searchValues, setSearchValues] = useState({});
+
   const [dashboardVisible, setDashBoardVisible] = useState(false);
 
   const [formContents, setformContents] = useState({});
@@ -107,16 +109,6 @@ 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 {
-      //   console.log("ssssssssssssssssssss")
-      //   // Reset columns if no display columns exist
-
-      //   setColumns([]);
-      // }
       let parsedColumns = [];
 
       if (result.display_columns) {
@@ -181,6 +173,8 @@ export default function ReportingDashboard({
     parameters = record.input_parameters ? JSON.parse(record.input_parameters) : null;
 
     let formContent = {};
+    const searchFields = parameters.filter((p) => p.type === 'search' && p.search_enabled === 'yes');
+    setSearchParameters([...searchFields]);
 
     parameters = await parameters?.map((record) => {
       // Only if the url params does have a matching value ,
@@ -224,11 +218,17 @@ export default function ReportingDashboard({
       if (record.type === 'date' && !formContent[record.field]) {
         formContent[record.field] = moment().tz(process.env.REACT_APP_TIMEZONE);
       }
-
+      // if (record.type === 'search') {
+      //   return {
+      //     ...record,
+      //     component: AdvancedSearchSelect,
+      //     required: record.required,
+      //   };
+      // }
       if (['reference-select', 'reference-search', 'select'].indexOf(record.type) !== -1) {
         // let model = "";
         let model = CustomModels[record.modelName];
-        formContent[record.modelName] = model;
+
         return {
           ...record,
           model,
@@ -256,7 +256,7 @@ export default function ReportingDashboard({
     } else {
       //// Filter the array "parameters" and keep only elements where "type" is present (truthy)
       //Keep only parameters that have a "type" → used for UI display
-      let filter = parameters.filter((ele) => ele.type);
+      let filter = parameters.filter((ele) => ele.type && ele.type !== 'search');
       // Update the "details" state with the filtered results
 
       setDetails([...filter]);
@@ -269,7 +269,7 @@ export default function ReportingDashboard({
     getPatientDetails();
   }
 
-  const fetchReportData = async (id, values, dbPtr, pagination, parsedColumns,paramsString) => {
+  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;
@@ -278,23 +278,10 @@ export default function ReportingDashboard({
     try {
       // Prepare payload for backend: format only here
       const formattedValues = {};
-      let inputParams = [];
-      inputParams = JSON.parse(paramsString);
-      // Iterate through all keys in the values object
-
-      inputParams.forEach(({ field }) => {
-        const val = values[field];
-
-        // field exists in values → format & assign
-        if (val !== undefined) {
-          formattedValues[field] = moment.isMoment(val) ? val.format('YYYY-MM-DD') : val;
-        }
-        // field missing in values → set null
-        else {
-          formattedValues[field] = null;
-        }
+      Object.keys(values).forEach((key) => {
+        const val = values[key];
+        formattedValues[key] = moment.isMoment(val) ? val.format('YYYY-MM-DD') : val;
       });
-      // });
       // Pagination Data
       const paginationData = {
         page: pagination.current || 1,
@@ -314,13 +301,18 @@ export default function ReportingDashboard({
 
       // Fetch result
       const result = await CoreScripts.getReportingLisitng(coreScriptId, formBody, dbPtr);
+
+      const apiData = Array.isArray(result) ? result : Array.isArray(result?.result) ? result.result : [];
+
       // Handle both result formats
-      let resultDetails = result[0];
+      let resultDetails = apiData[0] || [];
       if (result?.result && result?.result[0]) {
         resultDetails = result.result[0];
       }
       // Update patients
       setPatients(resultDetails || []);
+      console.log(parsedColumns);
+
       // Check if columns are not yet defined
       if (parsedColumns.length === 0 && resultDetails.length > 0) {
         // Create columns dynamically from resultDetails keys
@@ -346,40 +338,104 @@ export default function ReportingDashboard({
       }
     } catch (error) {
       console.error('Error fetching report data:', error);
-      message.warn('Please try again');
     } finally {
       // Always runs, success or error
       setLoading(false);
     }
   };
 
-  // Handle Submit
   const handleSubmit = (values) => {
+    const hasSearchValues = Object.values(searchValues).some((v) => Array.isArray(v) && v.length > 0);
+
+    if (!hasSearchValues) {
+      runSubmit(values);
+      return;
+    }
+
+    // Check if form values changed (date or others)
+    const formChanged = Object.keys(values).some((key) => {
+      const newVal = values[key];
+      const oldVal = formContents[key];
+
+      if (moment.isMoment(newVal) && moment.isMoment(oldVal)) {
+        return !newVal.isSame(oldVal, 'day');
+      }
+
+      return newVal !== oldVal;
+    });
+
+    if (formChanged) {
+      Modal.confirm({
+        title: 'Filters changed',
+        content: 'You changed some filters. Do you want to search using these filters also?',
+        okText: 'Yes',
+        cancelText: 'No',
+
+        onOk() {
+          // YES → send form values + search condition
+          const finalValues = {
+            ...values,
+            search_values: searchValues,
+          };
+
+          runSubmit(finalValues);
+        },
+
+        onCancel() {
+          // NO → reset form values
+          const resetValues = {};
+          Object.keys(values).forEach((key) => {
+            resetValues[key] = null;
+          });
+
+          const finalValues = {
+            ...resetValues,
+            search_values: searchValues,
+          };
+
+          runSubmit(finalValues);
+        },
+      });
+    } else {
+      // no form change
+      const resetValues = {};
+      Object.keys(values).forEach((key) => {
+        resetValues[key] = null;
+      });
+
+      const finalValues = {
+        ...resetValues,
+        search_values: searchValues,
+      };
+
+      runSubmit(finalValues);
+    }
+  };
+
+  const runSubmit = (finalValues) => {
     const { pageSize } = pagination;
     const resetPage = 1;
 
-    // Reset script id on Submit
     scriptId.current = null;
 
-    // Get current query params
-    const currentUrlParams = Location.search();
-    const { script_id, selected_card, ...cleanParams } = currentUrlParams;
+    const hasSearchValues = finalValues.search_values && Object.values(finalValues.search_values).some((v) => Array.isArray(v) && v.length > 0);
 
-    // Construct new query string
-    const newParams = new URLSearchParams({
-      ...cleanParams,
-      current: resetPage,
-      pageSize,
-    });
+    if (!hasSearchValues) {
+      const currentUrlParams = Location.search();
+      const { script_id, selected_card, ...cleanParams } = currentUrlParams;
+
+      const newParams = new URLSearchParams({
+        ...cleanParams,
+        current: resetPage,
+        pageSize,
+      });
 
-    // Replace URL
-    const newUrl = `${window.location.pathname}?${newParams.toString()}`;
-    window.history.replaceState({}, '', newUrl);
+      const newUrl = `${window.location.pathname}?${newParams.toString()}`;
+      window.history.replaceState({}, '', newUrl);
+    }
 
-    // Trigger submit handler
-    onFinish(values, resetPage);
+    onFinish(finalValues, resetPage);
   };
-
   /**
    *
    * @param {*} values
@@ -432,7 +488,7 @@ export default function ReportingDashboard({
         Object.entries(urlsToUpdate).filter(([_, value]) => value !== undefined && value !== null && value !== '')
       );
 
-      setformContents((prev) => ({ ...prev, ...formContent }));
+      setformContents(formContent);
       Location.search({ ...Location.search(), ...filteredParams });
     }
 
@@ -445,7 +501,7 @@ export default function ReportingDashboard({
 
     // Call API
     try {
-      await fetchReportData(id, values, dbPtr, paginationData, parsedColumns,paramsString);
+      await fetchReportData(id, values, dbPtr, paginationData, parsedColumns);
     } finally {
       setLoading(false);
       setCardLoading(false);
@@ -470,23 +526,6 @@ export default function ReportingDashboard({
     <Card className="reporting-dashboard card card-shadow">
       {/** If dashBoardIds exist and contain elements, render MenuDashBoard*/}
 
-      {/* Page Header */}
-      {/* <div className="page-header">
-                <div>
-                    <Title style={{ marginBottom: '0px' }} level={4}>
-                        {config.caption || 'Report'}
-                    </Title>
-                </div>
-
-                <div className="right">
-                    <div className="date-and-fltr">
-                        <Button onClick={refresh} type="secondary" size={'small'}>
-                            <ReloadOutlined />
-                        </Button>
-                    </div>
-                </div>
-            </div> */}
-      {/* Page Header Ends */}
       {dashBoardIds?.length > 0 ? (
         <MenuDashBoardComponent
           dashBoardIds={dashBoardIds} //Pass the available dashboard IDs to the componen
@@ -556,6 +595,51 @@ export default function ReportingDashboard({
               />
             ) : null}
             {/* </Card> */}
+            <div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', marginTop: 10 }}>
+              {searchParameters.length > 0
+                ? searchParameters.map((param) => (
+                    <AdvancedSearchSelect
+                      key={param.field}
+                      parameter={param}
+                      field={param}
+                      reportId={reportId}
+                      value={searchValues[param.field] || []}
+                      onChange={(value) => {
+                        setSearchValues((prev) => ({
+                          ...prev,
+                          [param.field]: value,
+                        }));
+                      }}
+                      onReset={() => {
+                        setSearchValues((prev) => {
+                          const updated = {
+                            ...prev,
+                            [param.field]: [],
+                          };
+
+                          // const finalValues = {
+                          //   ...formContents,
+                          //   search_values: updated,
+                          // };
+                          // console.log(finalValues);
+                          // runSubmit(finalValues); // 🔥 refresh report correctly
+                          getPatientDetails();
+
+                          return updated;
+                        });
+                      }}
+                      // onReset={() => {
+                      //   setSearchValues((prev) => ({
+                      //     ...prev,
+                      //     [param.field]: [],
+                      //   }));
+
+                      //   handleSubmit(formContents); // 🔥 refresh report
+                      // }}
+                    />
+                  ))
+                : null}
+            </div>
           </div>
 
           {/** GuestList component start*/}
@@ -608,7 +692,6 @@ function GuestList({
   attributes,
   fetchReportData,
 }) {
-  
   /**
    * @param {*} propValues
    */
@@ -639,269 +722,17 @@ function GuestList({
 
   const { isMobile, dispatch } = useContext(GlobalContext);
   const [single, setSingle] = useState({});
-
-  const getRedirectLink = (entry, record) => {
-    let redirectLink = entry.redirect_link;
-    if (entry.replace_variables) {
-      entry.replace_variables.forEach((replacement) => {
-        const value = record[replacement.field] || '';
-        redirectLink = redirectLink.replace(new RegExp(`@${replacement.field};`, 'g'), value);
-      });
-    }
-    return redirectLink;
-  };
+  const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
 
   // const [view, setView] = useState(isMobile ? true : false); //Need to check this condition
-  const cols = [
-    ...[
-      {
-        title: '#',
-        dataIndex: 'index',
-        key: 'ColumnIndex',
-        width: 60,
-        render: (value, item, index) => index + 1,
-        key: 'ColumnIndex',
-        fixed: isFixedIndex ? 'left' : null,
-      },
-    ],
-    ...columns.map((entry) => {
-      // if (entry.sort) {
-      //     return {
-      //         render: (record) => {
-
-      //             if (entry.render) {
-
-      //                 return entry.render(record);
-      //             } else {
-      //                 return record[entry.dataIndex]
-      //             }
-      //         },
-      //         title: entry.title,
-      //         key: entry.field,
-      //         sorter: (a, b) => entry.sort(a, b),
-      //         sortDirections: ['ascend', 'descend', 'ascend'],
-      //     };
-      // } else {
-      return {
-        render: (record) => {
-          let textColor = 'inherit';
-
-          if (entry.color) {
-            textColor = entry.color;
-          }
-          /** We can have x types of components that is to be rendered here */
-
-          /**1. Column Data */
-
-          /**2. Action  */
-
-          /**3. Custom Component - In future .   */
-
-          if (entry.render) {
-            return entry.render(record);
-
-            // The type of component can be differentiated by type/ we can also reuse
-            // any field present in the columns to avoid any additional field
-          } else if (entry.type === 'link') {
-            //Cheacking type of action to be done ie,If it contains a type then it will match with the record
-            // for example initally we are implementing it for a type link
-            // ie, we will return a link in query with the field as link and type link in display_columns
-            //So here we match the field returned by query with the type in display_columns
-
-            if (record[entry.field]) {
-              return (
-                <a href={record[entry.field]} target="_blank" rel="noopener noreferrer">
-                  View
-                </a>
-              );
-            }
-          } else if (entry.field === 'action') {
-            let redirectLink = entry.redirect_link;
-
-            // The variables to be replaced can be maintained
-            // as a configuration in the entry or the column configuration
-
-            // We iterate through all the variables that are present in the configuration
-            // and replace the link to generate the final link
-
-            entry.replace_variables.forEach((replacement) => {
-              redirectLink = redirectLink.replace(new RegExp('@' + replacement.field + ';', 'g'), record[replacement.field]);
-            });
-
-            return <Link to={`${redirectLink}`}>{entry.display_name_link ? entry.display_name_link : 'View'}</Link>;
-          } else if (entry.field === 'custom') {
-            // Make all the components in modules available for use in custom column of core script
-            // var genericComponents = require('./../../../../../../../nura-api-new/nura-desk/src/modules');
-            var genericComponents = CustomComponents;
-
-            // Arrive the component name
-            let componentName = entry.component;
-
-            let LoadedComponent = null;
-            // If there is custom components mensioned in the display_columns,
-            // then matching the custom components with the generic components
-            if (componentName) {
-              if (componentName && genericComponents[componentName]) {
-                LoadedComponent = genericComponents[componentName];
-              }
-            }
-
-            let propValue = {};
-            // If there is props value
-            if (entry.props) {
-              // Looping the props from the props mensioned in display_columns,
-              // Matching the field of record props field with the and return the
-              entry.props.forEach((values) => {
-                // Matching the fields of record with the props field
-                let valueCreation = record[values.field];
-                // Returning the values of field matched by fields
-                propValue[values.value] = valueCreation;
-              });
-            }
-
-            return (
-              <LoadedComponent
-                // Configuration will define
-                {...entry.config}
-                callback={() => {
-                  refresh();
-                }}
-                // record={record}
-
-                {...record}
-                // assigning the props
-                {...propValue}
-              />
-            );
-          } else {
-            // Check if both `color_code` exists in the record and `enableColor` is true
-            if (record.color_code && entry.enableColor) {
-              // If the column type is 'tag', render the field inside an Ant Design <Tag> with color
-              if (entry.columnType === 'tag') {
-                return <Tag color={record.color_code}>{record[entry.field]}</Tag>;
-
-                // If the column type is 'span', render the field inside a <span> with inline color style
-              } else if (entry.columnType === 'span') {
-                return <span style={{ color: record.color_code, overflowWrap: 'break-word', WebkitLineClamp: 3 }}>{record[entry.field]}</span>;
-              }
-            } else {
-              /**
-               * This code dynamically displays icons based on  data and a configuration
-               * When a column's configuration includes a displayIcons JSON, the code will check the corresponding data field.
-               *  If the field's value (e.g., "Pending") matches a key in that JSON,
-               * the system will display the specified icon with its defined color and size.
-               */
-              if (entry.displayIcons) {
-                // Get the field value
-                const fieldValue = record[entry.field]?.toString();
-
-                // Get the configuration for the icon from the JSON.
-                const displayConfig = entry.displayIcons[fieldValue];
-                if (displayConfig) {
-                  // Look up the actual component from our iconMap using the name from the JSON.
-                  const DynamicIcon = Icons[displayConfig.icon];
-                  // If a component is found, render it with the specified color and size.
-                  if (DynamicIcon) {
-                    return (
-                      <DynamicIcon
-                        style={{
-                          color: displayConfig.color,
-                          fontSize: displayConfig.size,
-                        }}
-                      />
-                    );
-                  }
-                }
-              } else {
-                //If the value is neither 'Y' nor 'N', return the actual field value
-                return <span style={{ color: textColor, whiteSpace: 'pre-wrap', overflowWrap: 'break-word' }}>{record[entry.field]}</span>;
-              }
-            }
-          }
-        },
-        field: entry.field,
-        // title: entry.title,
-        // title: (
-        //   <Tooltip title={entry.title}>
-        //     {entry.title}
-        //   </Tooltip>
-        // ),
-        title: (
-          <Tooltip title={entry.tooltip || entry.title}>
-            <span>{entry.title}</span>
-          </Tooltip>
-        ),
-        key: entry.field,
-        width: entry.width ? parseInt(entry.width) : 160,
-        fixed: entry.isFixedColumn ? entry.isFixedColumn : null, // Conditionally setting the 'fixed' key to 'left' if 'isColumnStatic' is true; otherwise, setting it to null.
-        // Check if filtering is enabled and patients is an array
-        filters:
-          entry.isFilterEnabled && Array.isArray(patients)
-            ? [...new Set(patients.map((item) => item[entry.field]).filter(Boolean))].map((value) => ({ text: value, value }))
-            : null,
-        // Apply the filter only if it's enabled for the column
-        onFilter: entry.isFilterEnabled ? (value, record) => record[entry.field] === value : null,
-        //If sorting is enabled for this entry, provide a sorter function
-        sorter: entry.isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
-
-        // Apply the filter search
-        filterSearch: entry.isFilterEnabled ? entry.isFilterEnabled : false,
-        exportDefinition: (record) => {
-          //Custom components should not be downloaded
-          // return entry.field === 'custom' ? null : record[entry.field];
-          if (entry.field === 'custom') {
-            // Find the field key in props that corresponds to 'description'
-            const description = entry.props?.find((p) => p.value === 'description')?.field;
-
-            // Return the value from record.props if it exists
-            return description && record[description] ? record[description] : null;
-          }
-          return record[entry.field];
-        },
-        // Add align property based on column type
-        align: entry.type === 'number' ? 'right' : 'left',
-      };
-      // }
-    }),
-    // ...[
-    //     {
-    //         title: '',
-    //         key: 'action',
-    //         render: (text, record) => {
-    //             let detail = model.slice(0, model.length - 1);
-
-    //             return (
-    //                 <Space size="middle">
-    //                     {!schema.hideView && !actions.length ? <Link to={`/${city}/${model}/${text.id}`}>View</Link> : null}
-
-    //                     {actions.map((action) => (
-    //                         <Link to={action.url(record)}>{action.caption}</Link>
-    //                     ))}
-    //                 </Space>
-    //             );
-    //         },
-    //     },
-    // ],
-
-    // ...[
-    //     {
-    //         title: '',
-    //         key: 'action',
-    //         render: (text, record) => {
-    //             let detail = model.slice(0, model.length - 1);
-
-    //             return (
-    //                 <Link to={`${menu.path.replace(':id',visitid)}?op_no=${OpNo}`}>
-    //                     <Button size={'small'}>
-    //                         <PlayCircleOutlined />
-    //                         Go to Menu
-    //                     </Button>
-    //                 </Link>
-    //             );
-    //         },
-    //     },
-    // ],
-  ];
+  const cols = buildDisplayColumns({
+    columns,
+    patients,
+    isFixedIndex,
+    CustomComponents,
+    refresh,
+    otherDetails,
+  });
 
   /**
    *
@@ -928,10 +759,6 @@ function GuestList({
   useEffect(() => {
     //Cheaking if there is patient data exists
     if (patients) {
-      // Commented due to a production issue:
-      // When displayColumns is not defined, rowIndex and dispatch fields were getting displayed in the table.
-      // Also, the `data` variable is not used in the code below, and the setData state is already commented out.
-
       // let data = patients?.map((entry) => {
       //   entry.rowIndex = entry.opb_id;
 
@@ -1003,7 +830,7 @@ function GuestList({
       setRedirectPatient(matched);
       message.success(`Match found for ${code}, redirecting...`);
 
-      const actionColumn = columns.find((col) => col.field === 'action');
+      const actionColumn = columns.find((col) => col.field === 'action') || columns.find((col) => col.type === 'action');
       if (actionColumn) {
         const redirectLink = getRedirectLink(actionColumn, patient);
         // history.push(redirectLink);
@@ -1036,6 +863,40 @@ function GuestList({
   const handleCloseEdit = () => {
     setShowEdit(false);
   };
+  /**
+   *
+   */
+  function calculateSummaryValues(summaryCols, pageData) {
+    const summaryValues = {};
+
+    summaryCols.forEach((col) => {
+      const field = col.field;
+
+      if (col.function === 'sum') {
+        summaryValues[field] = pageData.reduce((total, row) => total + Number(row[field] || 0), 0);
+      }
+
+      if (col.function === 'count') {
+        summaryValues[field] = pageData.length;
+      }
+
+      if (col.function === 'avg') {
+        const total = pageData.reduce((sum, row) => sum + Number(row[field] || 0), 0);
+        summaryValues[field] = pageData.length ? total / pageData.length : 0;
+      }
+      if (col.function === 'min') {
+        const values = pageData.map((row) => Number(row[field] || 0));
+        summaryValues[field] = values.length ? Math.min(...values) : 0;
+      }
+
+      if (col.function === 'max') {
+        const values = pageData.map((row) => Number(row[field] || 0));
+        summaryValues[field] = values.length ? Math.max(...values) : 0;
+      }
+    });
+
+    return summaryValues;
+  }
   return (
     <>
       <div className="table-header">
@@ -1095,12 +956,6 @@ function GuestList({
       </div>
 
       <div>
-        {/* {view ? (
-                    <>
-                        <CardList dataSource={data} columns={columns} />
-                    </>
-                ) : (
-                    <> */}
         <Card>
           {loading ? (
             <>
@@ -1109,54 +964,139 @@ function GuestList({
           ) : (
             <TableComponent
               size="small"
+              // scroll={{ x: 'max-content' }}
               scroll={{ x: 'max-content', y: '60vh' }}
-              tableLayout="fixed"
-              sticky
               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) => {
+              //   // Variable to save the summary data
+              //   let summary = {};
+
+              //   let summaryColumns = [
+              //     { field: 'opb_amt', title: 'Amount' },
+              //     { field: 'opb_netamt', title: 'Net Amount' },
+              //   ];
+
+              //   let tableColumns = cols;
+
+              //   // Creating a copy of columns to append the summary configuration that is needed to set
+              //   tableColumns.forEach((record, index) => {
+              //     summaryColumns.forEach((inner) => {
+              //       if (record.field === inner.field) {
+              //         tableColumns[index].summary = inner;
+              //       }
+              //     });
+              //   });
+
+              //   // Initialize
+              //   summaryColumns.map((item) => {
+              //     return (summary[item.field] = 0);
+              //   });
+
+              //   // Find the total
+              //   summaryColumns.map((item) => {
+              //     pageData.forEach((entry) => {
+              //       return (summary[item.field] = summary[item.field] + entry[item.field]);
+              //     });
+              //   });
+
+              //   return (
+              //     <>
+              //       <Table.Summary.Row>
+              //         {tableColumns.map((column, key) => {
+              //           return <Table.Summary.Cell key={key}>{column.summary ? <>{summary[column.summary.field]}</> : null}</Table.Summary.Cell>;
+              //         })}
+              //       </Table.Summary.Row>
+              //     </>
+              //   );
+              // }}
+              //  summary={(pageData) => {
+              //   const summaryCols = columns.filter((col) => col.enable_summary);
+              //   if (!summaryCols.length) return null;
+
+              //   const summaryValues = {};
+
+              //   summaryCols.forEach((col) => {
+              //     const field = col.field;
+
+              //     if (col.function === 'sum') {
+              //       summaryValues[field] = pageData.reduce((total, row) => total + Number(row[field] || 0), 0);
+              //     }
+
+              //     if (col.function === 'count') {
+              //       summaryValues[field] = pageData.length;
+              //     }
+
+              //     if (col.function === 'avg') {
+              //       const total = pageData.reduce((sum, row) => sum + Number(row[field] || 0), 0);
+              //       summaryValues[field] = pageData.length ? total / pageData.length : 0;
+              //     }
+              //   });
+
+              //   return (
+              //     <Table.Summary.Row className="report-summary-row">
+              //       {cols.map((col, index) => {
+              //         // show summary value
+              //         if (summaryValues[col.field] !== undefined) {
+              //           return (
+              //             <Table.Summary.Cell key={index}>
+              //               <strong>{summaryValues[col.field]}</strong>
+              //             </Table.Summary.Cell>
+              //           );
+              //         }
+
+              //         // caption before summary column
+              //         const nextCol = cols[index + 1];
+              //         if (nextCol && summaryValues[nextCol.field] !== undefined) {
+              //           const configCol = columns.find((c) => c.field === nextCol.field);
+              //           return (
+              //             <Table.Summary.Cell key={index}>
+              //               <strong>{configCol?.summary_caption || 'Total'}</strong>
+              //             </Table.Summary.Cell>
+              //           );
+              //         }
+
+              //         return <Table.Summary.Cell key={index} />;
+              //       })}
+              //     </Table.Summary.Row>
+              //   );
+              // }}
+
               summary={(pageData) => {
-                // Variable to save the summary data
-                let summary = {};
-
-                let summaryColumns = [
-                  { field: 'opb_amt', title: 'Amount' },
-                  { field: 'opb_netamt', title: 'Net Amount' },
-                ];
-
-                let tableColumns = cols;
-
-                // Creating a copy of columns to append the summary configuration that is needed to set
-                tableColumns.forEach((record, index) => {
-                  summaryColumns.forEach((inner) => {
-                    if (record.field === inner.field) {
-                      tableColumns[index].summary = inner;
-                    }
-                  });
-                });
-
-                // Initialize
-                summaryColumns.map((item) => {
-                  return (summary[item.field] = 0);
-                });
-
-                // Find the total
-                summaryColumns.map((item) => {
-                  pageData.forEach((entry) => {
-                    return (summary[item.field] = summary[item.field] + entry[item.field]);
-                  });
-                });
+                const summaryCols = columns.filter((col) => col.enable_summary);
+                if (!summaryCols.length) return null;
+
+                const summaryValues = calculateSummaryValues(summaryCols, pageData);
 
                 return (
-                  <>
-                    <Table.Summary.Row>
-                      {tableColumns.map((column, key) => {
-                        return <Table.Summary.Cell key={key}>{column.summary ? <>{summary[column.summary.field]}</> : null}</Table.Summary.Cell>;
-                      })}
-                    </Table.Summary.Row>
-                  </>
+                  <Table.Summary.Row className="report-summary-row">
+                    {cols.map((col, index) => {
+                      if (summaryValues[col.field] !== undefined) {
+                        return (
+                          <Table.Summary.Cell key={index}>
+                            <strong>{summaryValues[col.field]}</strong>
+                          </Table.Summary.Cell>
+                        );
+                      }
+
+                      const nextCol = cols[index + 1];
+                      if (nextCol && summaryValues[nextCol.field] !== undefined) {
+                        const configCol = columns.find((c) => c.field === nextCol.field);
+
+                        return (
+                          <Table.Summary.Cell key={index}>
+                            <strong>{configCol?.summary_caption || 'Total'}</strong>
+                          </Table.Summary.Cell>
+                        );
+                      }
+
+                      return <Table.Summary.Cell key={index} />;
+                    })}
+                  </Table.Summary.Row>
                 );
               }}
             />
@@ -1183,53 +1123,3 @@ function GuestList({
     </>
   );
 }
-
-// //Mobile view card Section
-// function CardList({ dataSource, url }) {
-//     const { user = {}, dispatch } = useContext(GlobalContext);
-
-//     function onClick(item) {
-//         Location.navigate({
-//             url: `/lab-detail/${item.BillID}`,
-//         });
-
-//         dispatch({ type: 'index', payload: item.rowIndex });
-//     }
-
-//     return dataSource.map((item, index) => {
-//         // to={`/lab-detail/${item.BillID}`}
-//         return (
-//             <div
-//                 key={index}
-//                 className="report-item"
-//                 onClick={() => {
-//                     onClick(item);
-//                 }}
-//             >
-//                 <GuestCard record={item} />
-//             </div>
-//         );
-//     });
-// }
-
-// function GuestCard({ record }) {
-//     return (
-//         <Card className="card vehicle-card">
-//             <div className="card">
-//                 <h2 className="title">{record.PName}</h2>
-
-//                 <h4 className="values">{record.OpNo}</h4>
-
-//                 <h3 className="values">{record.Test}</h3>
-
-//                 <h3 className="values">Primary Result : {record.PrimaryResult || 'Pending'}</h3>
-
-//                 <Text type="secondary">{record.Mobile}</Text>
-
-//                 <h4 className="values">{record.Date}</h4>
-//             </div>
-//         </Card>
-//     );
-// }
-//     );
-// }