ui-soxo-bootstrap-core 2.6.46-dev.6 → 2.6.46-dev.7

package/core/lib/elements/complex/qr-code/qr-code.js

@@ -15,13 +15,15 @@ import QRCode from 'qrcode.react';
 export default function QRCodeElement({
     value,
     className,
-    imageSettings = {}
+    imageSettings = {},
+    size = 80,
+
 }) {
 
 
     return <div className={`${className}`}>
 
 
-        <QRCode size={80} width={20} value={value} imageSettings={imageSettings} />
+        <QRCode size={size} width={20} value={value} imageSettings={imageSettings} />
     </div>;
 }

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { Table, Skeleton, Input, Modal, message, Pagination } from 'antd';
 import { QrcodeOutlined } from '@ant-design/icons';
 import { ExportReactCSV, getExportData, Card, TableComponent, QrScanner } from './../../../../lib/';
@@ -270,10 +270,28 @@ export default function ReportingTable({
     }
   };
 
+  const filtered = useMemo(() => {
+    if (!patients || !query) return patients;
+
+    return patients.filter((record) => {
+      let keys = Object.keys(record);
+      let flag = false;
+      keys.forEach((key) => {
+        let ele = record[key];
+        if (ele && typeof ele === 'string' && ele.toLowerCase().indexOf(query.toLowerCase()) !== -1) {
+          flag = true;
+        }
+      });
+      return flag;
+    });
+  }, [patients, query]);
+
   useEffect(() => {
-    if (patients) {
+    if (filtered) {
       // Export uses the visible display column structure and appends the same
       // summary row that appears in the table when summary columns are enabled.
+      // Uses `filtered` (not the raw `patients`) so the exported file matches
+      // whatever the search box currently shows on screen.
       const exportCols = cols.map((col) => {
         if (col.title && typeof col.title === 'object' && col.title.props) {
           return { ...col, title: col.title.props.title };
@@ -281,10 +299,10 @@ export default function ReportingTable({
         return col;
       });
       const summaryCols = columns.filter((col) => col.enable_summary);
-      let dataToExport = [...patients];
+      let dataToExport = [...filtered];
 
       if (summaryCols.length > 0) {
-        const summaryValues = calculateSummaryValues(summaryCols, patients);
+        const summaryValues = calculateSummaryValues(summaryCols, filtered);
         const summaryRow = { isSummaryRow: true };
 
         cols.forEach((col) => {
@@ -310,22 +328,7 @@ export default function ReportingTable({
         setExportData({ exportDatas });
       }
     }
-  }, [patients, columns]);
-
-  let filtered = patients;
-  if (patients && query) {
-    filtered = patients.filter((record) => {
-      let keys = Object.keys(record);
-      let flag = false;
-      keys.forEach((key) => {
-        let ele = record[key];
-        if (ele && typeof ele === 'string' && ele.toLowerCase().indexOf(query.toLowerCase()) !== -1) {
-          flag = true;
-        }
-      });
-      return flag;
-    });
-  }
+  }, [filtered, columns]);
 
   /**
    * Handles successful QR scans by looking up a matching record and navigating
@@ -449,9 +452,11 @@ export default function ReportingTable({
             {exportData.exportDatas && !isNuradesk && (
               <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}
+                fileName={`${config.caption || 'Report'}.xlsx`}
+                pdfFileName={`${config.caption || 'Report'}.pdf`}
+                dropdown
               />
             )}
           </div>

package/package.json

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