ui-soxo-bootstrap-core 2.6.19 → 2.6.20

package/core/lib/modules/generic/generic-list/ExportReactCSV.js

@@ -10,6 +10,8 @@
 import React from 'react';
 // Import XLSX library to handle Excel file creation
 import * as XLSX from 'xlsx';
+// import * as XLSX from 'xlsx-js-style';
+// import * as XLSX from 'xlsx-js-style';
 // Import saveAs from file-saver to trigger file download in browser
 import { saveAs } from 'file-saver';
 import { Button } from 'antd';
@@ -30,7 +32,27 @@ export const ExportReactCSV = ({ csvData, headers, fileName,title }) => {
       // Extract label names for the header row
       const headerLabels = headers.map((h) => h.label);
       // Map data rows according to the headers' key order
-      const rows = csvData.map((row) => headers.map((h) => row[h.key]));
+      const rows = csvData.map((row) =>
+        headers.map((h, hIndex) => {
+          let value = row[h.key];
+          // If it's a summary row, return a cell object with bold styling
+          if (row.isSummaryRow) {
+            // Remove the index value (typically the first column) for the summary row
+            if (hIndex === 0) value = "";
+
+            return {
+              v: value,
+              s: {
+                font: { bold: true },
+                // "Thick" visual indicator via border
+                // Visual indicator via border
+                border: { bottom: { style: "thick", color: { rgb: "000000" } } }
+              }
+            };
+          }
+          return value;
+        })
+      );
       // Create a worksheet from an array of arrays (header + rows)
       const data = [[title || "Report"], [], headerLabels, ...rows];
       // worksheet = XLSX.utils.aoa_to_sheet([headerLabels, ...rows]);
@@ -44,7 +66,11 @@ export const ExportReactCSV = ({ csvData, headers, fileName,title }) => {
     // Append the worksheet to the workbook with the name 'Sheet1'
     XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
     // Write workbook to a buffer as an array
-    const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+    const excelBuffer = XLSX.write(workbook, {
+      bookType: 'xlsx',
+      type: 'array',
+      cellStyles: true, // Required to export styles
+    });
     // Create a Blob object from the buffer with correct MIME type
     const blob = new Blob([excelBuffer], {
       type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

package/core/lib/pages/login/login.js

@@ -306,6 +306,8 @@ function LoginPhone({ history, appSettings }) {
    *
    */
   const sendAuthenticationOtp = () => {
+    if (loading) return;
+
     //  Reset previous error
     setModeError(false);
 
@@ -445,6 +447,8 @@ function LoginPhone({ history, appSettings }) {
    * Otp resend Logic
    */
   const handleResendOTP = () => {
+    if (loading) return;
+
     setOtpValue('');
     setModeError(false);
     setOtpError(false);
@@ -714,7 +718,7 @@ function LoginPhone({ history, appSettings }) {
 
                   {!otpVerification ? (
                     <div className="otp-container">
-                      <Button type="primary" onClick={sendAuthenticationOtp} style={{ marginTop: '6px' }}>
+                      <Button loading={loading} type="primary" onClick={sendAuthenticationOtp} style={{ marginTop: '6px' }}>
                         Send OTP
                       </Button>
                     </div>
@@ -760,7 +764,7 @@ function LoginPhone({ history, appSettings }) {
                         </div>
                       </div>
                       {!otpSuccess && (
-                        <Button type="primary" disabled={otpExpired} onClick={verifyOtp} style={{ marginTop: 16 }}>
+                        <Button loading={loading} type="primary" disabled={otpExpired} onClick={verifyOtp} style={{ marginTop: 16 }}>
                           Verify OTP
                         </Button>
                       )}

package/core/lib/utils/api/api.utils.js

@@ -1,4 +1,4 @@
-import { PostData, GetData, PutData, PatchData, DeleteData } from './../http/http.utils';
+import { PostData, GetData, PutData, PatchData, DeleteData,UploadData } from './../http/http.utils';
 
 let headers = {};
 
@@ -124,33 +124,29 @@ export default class ApiUtils {
     });
   };
 
-  static upload = ({ url, data }) => {
-    return fetch(process.env.REACT_APP_endpoint + url, {
-      // Your POST endpoint
-      method: 'POST',
-      headers: {
-        //   'App-Type': 313,
-        //   'App-Version': '1.0.1',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        // type:'multipart/formData'
-      },
-      //   credentials: 'include',
-      body: data,
-    }).then(
-      (result) => {
-        return result.json();
-      },
-      (error) => {
-        console.log(error);
-        return error;
-      },
-      (progress) => {
-        console.log(progress);
-        return progress;
-      }
-    );
+  // upload document
+  static upload = async ({ url, data, headers: customHeaders = {}, ...props }) => {
+    const dbPtr = localStorage.getItem('db_ptr');
+    
+    // Ensure settings object exists to avoid undefined errors in ApiCall
+    const settings = { 
+        headers: {},
+        getToken: () => localStorage.getItem('access_token') 
+    }; 
+
+    return UploadData({
+        url,
+        formBody: data, 
+        // Your FormData goes here
+        isUpload: true, // Indicate that this is an upload request
+        settings,
+        headers: {
+            ...(dbPtr ? { db_ptr: dbPtr } : {}),
+            ...customHeaders,
+        },
+        ...props,
+    });
   };
-
   /**
    * Get Auth Status
    *

package/core/lib/utils/generic/generic.utils.js

@@ -31,7 +31,8 @@ export function getExportData(records, exportDataColumns) {
     const response = records.map((row, columnIndex) => {
 
         let entry = {
-            'Sl No': columnIndex + 1
+            'Sl No': row.isSummaryRow ? '' : columnIndex + 1,
+            isSummaryRow: row.isSummaryRow
         };
 
         filteredColumns.forEach((column, indexValue) => {

package/core/lib/utils/http/http.utils.js

@@ -70,24 +70,37 @@ export async function DeleteData({ url, ...props }) {
  *
  * @param {*} param
  */
-
 export async function ApiCall({ url, formBody, method, settings, ...props }) {
   const token = props.token || (await settings.getToken());
   const path = window.location.pathname;
   const baseUrl = props.baseUrl || process.env.REACT_APP_endpoint;
 
+  const isFormData = formBody instanceof FormData;
+
   const payload = {
     method,
     headers: {
       ...settings.headers,
-      ...headers,
       ...(props.headers || {}),
       Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json',
     },
-    body: formBody ? JSON.stringify(formBody) : null,
   };
 
+  // ✅ Upload + normal handling
+  if (method !== 'GET' && formBody) {
+    payload.body = formBody;
+
+    if (!isFormData && !(props.isUpload)) {
+      payload.body = JSON.stringify(formBody);
+      payload.headers['Content-Type'] = 'application/json';
+    }
+
+    // ❗ VERY IMPORTANT
+    if (isFormData || (props.isUpload)) {
+      delete payload.headers['Content-Type'];
+    }
+  }
+
   // 🟡 Handles both normal and retried responses
   const handleResponse = async (res) => {
     if (props.responseType === 'blob') {
@@ -156,3 +169,18 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     throw err;
   }
 }
+
+/**
+ * Method for uploading documents
+ * @public
+ */
+export async function UploadData({ url, formBody, ...props }) {
+  return ApiCall({
+    url,
+    formBody,
+    isUpload: true,
+    method: 'POST',
+    returnResponse: true,
+    ...props,
+  });
+}

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

@@ -25,7 +25,7 @@ function getExportDefinition(entry, record) {
  * @param {Array} root0.columns
  * @param {Array} root0.patients
  * @param {boolean} root0.isFixedIndex
- * @param {Object} root0.CustomComponents
+ * @param {Object.<string, React.ComponentType<any>>} root0.CustomComponents
  * @param {Function} root0.refresh
  * @param {Object} [root0.otherDetails={}] - Optional details from the report configuration.
  * @param {boolean} [root0.otherDetails.isFilterEnabled] - Fallback to enable filtering on all columns.

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

@@ -298,7 +298,6 @@ export default function ReportingDashboard({
       }
       // Update patients
       setPatients(resultDetails || []);
-      console.log(parsedColumns);
 
       // Check if columns are not yet defined
       if (parsedColumns.length === 0 && resultDetails.length > 0) {
@@ -601,6 +600,7 @@ function GuestList({
   const [single, setSingle] = useState({});
   const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
 
+  // const otherDetails = config.other_details1 ? JSON.parse(config.other_details1) : {};
   // const [view, setView] = useState(isMobile ? true : false); //Need to check this condition
   const cols = buildDisplayColumns({
     columns,
@@ -608,7 +608,7 @@ function GuestList({
     isFixedIndex,
     CustomComponents,
     refresh,
-    otherDetails
+    otherDetails,
   });
 
   /**
@@ -654,8 +654,39 @@ function GuestList({
         }
         return col;
       });
+      const summaryCols = columns.filter((col) => col.enable_summary);
+      let dataToExport = [...patients];
+
+      if (summaryCols.length > 0) {
+        // Build one synthetic row for CSV export that mirrors the table layout:
+        // numeric summary cells are populated from `calculateSummaryValues`, while
+        // non-summary columns stay blank unless a configured caption should be shown.
+        const summaryValues = calculateSummaryValues(summaryCols, patients);
+        const summaryRow = { isSummaryRow: true };
+
+        cols.forEach((col, index) => {
+          // Start each export column empty so the appended row keeps the same shape
+          // as the data rows and does not leak index/helper values into the export.
+          const colKey = col.field || col.key || col.dataIndex;
+          if (colKey && !summaryRow[colKey]) {
+            summaryRow[colKey] = '';
+          }
 
-      let exportDatas = getExportData(patients, exportCols);
+          if (summaryValues[col.field] !== undefined) {
+            // Fill columns that have an aggregate configured (sum, count, avg, etc.).
+            summaryRow[col.field] = summaryValues[col.field];
+          } else {
+            // If this column is marked as the caption target for a summary column,
+            // place the configured label (for example "Total") into that cell.
+            const captionConfig = columns.find((c) => col.field && c.caption_field === col.field);
+            if (captionConfig) {
+              summaryRow[col.field] = captionConfig.summary_caption || '';
+            }
+          }
+        });
+        dataToExport.push(summaryRow);
+      }
+      let exportDatas = getExportData(dataToExport, exportCols);
 
       if (exportDatas.exportDataColumns.length && exportDatas.exportDataHeaders.length) {
         setExportData({ exportDatas });
@@ -740,6 +771,55 @@ function GuestList({
   const handleCloseEdit = () => {
     setShowEdit(false);
   };
+  /**
+   * Calculates aggregate values for the configured summary columns.
+   *
+   * Each summary definition contributes one value keyed by its `field`. Missing
+   * row values are treated as `0` for numeric operations so the table summary and
+   * export summary row can be built from the same result object.
+   *
+   * Supported functions:
+   * `sum` - totals all numeric values in the field.
+   * `count` - returns the number of rows in the current dataset.
+   * `avg` - returns the arithmetic mean of the field values.
+   * `min` - returns the smallest numeric value in the field.
+   * `max` - returns the largest numeric value in the field.
+   *
+   * @param {Array<Object>} summaryCols - Column configs with `field` and `function`.
+   * @param {Array<Object>} pageData - Rows currently being summarized.
+   * @returns {Object} Aggregate values keyed by field name.
+   */
+  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">
@@ -790,6 +870,7 @@ function GuestList({
             {exportData.exportDatas && (
               <ExportReactCSV
                 title={config.caption}
+                fileName={`${(config.caption || 'Report').trim().replace(/\s+/g, '_')}_${moment().format('YYYY-MM-DD-HH-mm-ss-SSS')}.xlsx`}
                 headers={exportData.exportDatas.exportDataHeaders}
                 csvData={exportData.exportDatas.exportDataColumns}
               />
@@ -814,47 +895,37 @@ function GuestList({
               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]);
-                  });
-                });
+                const summaryCols = columns.filter((col) => col.enable_summary);
+                if (!summaryCols.length) return null;
+                /** calculate summary*/
+
+                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 style={{ fontWeight: 900 }}>{summaryValues[col.field]}</strong>
+                          </Table.Summary.Cell>
+                        );
+                      }
+
+                      const captionConfig = columns.find((c) => col.field && c.caption_field === col.field);
+                      if (captionConfig) {
+                        return (
+                          <Table.Summary.Cell key={index}>
+                            <strong style={{ fontWeight: 900 }}>{captionConfig.summary_caption || ''}</strong>
+                          </Table.Summary.Cell>
+                        );
+                      }
+
+                      return <Table.Summary.Cell key={index} />;
+                    })}
+                  </Table.Summary.Row>
                 );
               }}
             />

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

@@ -5,6 +5,13 @@
     justify-content: space-between;
   }
 
+  .report-summary-row {
+  position: sticky;
+  bottom: 0;
+  background: #fff;
+  z-index: 10;
+}
+
   .table-header {
     display: flex;
     justify-content: space-between;

package/package.json

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