ui-soxo-bootstrap-core 2.6.1-dev.11 → 2.6.1-dev.13

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

@@ -344,144 +344,6 @@ export default function ReportingDashboard({
     }
   };
 
-  /**
-   *
-   * @param {*} searchValues
-   * @param {*} searchParameters
-   * @returns
-   */
-  const buildSearchCondition = (searchValues, searchParameters) => {
-    let searchCondition = '';
-
-    Object.keys(searchValues).forEach((key) => {
-      const arr = searchValues[key];
-      if (!Array.isArray(arr) || arr.length === 0) return;
-
-      const param = searchParameters.find((p) => p.field === key);
-      if (!param) return;
-
-      const operator = (param.search_operator || '').trim().toUpperCase();
-      const column = param.db_column || key;
-
-      if (operator === 'LIKE') {
-        const likeConditions = arr.map((v) => `${column} LIKE '${v}'`).join(' OR ');
-        searchCondition += ` AND (${likeConditions})`;
-      } else if (operator === 'IN') {
-        const valueList = arr.map((v) => `'${v}'`).join(',');
-        searchCondition += ` AND ${column} IN (${valueList})`;
-      } else if (operator === '=') {
-        const eqConditions = arr.map((v) => `${column} = '${v}'`).join(' OR ');
-        searchCondition += ` AND (${eqConditions})`;
-      } else if (operator === '!=') {
-        const neqConditions = arr.map((v) => `${column} != '${v}'`).join(' AND ');
-        searchCondition += ` AND (${neqConditions})`;
-      } else {
-        // fallback for other operators like > < >= <=
-        const conditions = arr.map((v) => `${column} ${operator} '${v}'`).join(' OR ');
-        searchCondition += ` AND (${conditions})`;
-      }
-    });
-
-    return searchCondition;
-  };
-  // const handleSubmit = (values) => {
-  //     const hasSearchValues = Object.values(searchValues).some((v) => Array.isArray(v) && v.length > 0);
-
-  //     // Check if regular form values have changed since the last submission.
-  //     const regularValuesChanged = (() => {
-  //       const newKeys = Object.keys(values);
-  //       const oldKeys = Object.keys(formContents);
-
-  //       if (newKeys.length !== oldKeys.length) return true;
-
-  //       for (const key of newKeys) {
-  //         const newValue = values[key];
-  //         const oldValue = formContents[key];
-
-  //         if (moment.isMoment(newValue) && moment.isMoment(oldValue)) {
-  //           if (!newValue.isSame(oldValue)) {
-  //             return true;
-  //           }
-  //         } else if (newValue !== oldValue) {
-  //           // This is a shallow comparison, but should work for primitives and new array/object references.
-  //           return true;
-  //         }
-  //       }
-  //       return false;
-  //     })();
-
-  //     if (hasSearchValues && regularValuesChanged) {
-  //       Modal.confirm({
-  //         title: 'Combine Filters',
-  //         content: 'You have applied both standard and advanced filters. Do you want to combine them?',
-  //         okText: 'Yes, Apply Both',
-  //         cancelText: 'No, Use Advanced Only',
-  //         onOk: () => {
-  //           // User chose to combine filters.
-  //           const searchCondition = buildSearchCondition(searchValues, searchParameters);
-  //           const finalValues = {
-  //             ...values,
-  //             search_condition: searchCondition,
-  //           };
-  //           onFinish(finalValues, 1);
-  //         },
-  //         onCancel: () => {
-  //           // User chose to use only advanced search.
-  //           const searchCondition = buildSearchCondition(searchValues, searchParameters);
-  //           const resetValues = {};
-  //           Object.keys(values).forEach((key) => {
-  //             resetValues[key] = null;
-  //           });
-  //           const finalValues = {
-  //             ...resetValues,
-  //             search_condition: searchCondition,
-  //           };
-  //           onFinish(finalValues, 1);
-  //         },
-  //       });
-  //       return; // Stop further execution, wait for modal response.
-  //     }
-
-  //     // --- Default behavior if the condition for the modal is not met ---
-
-  //     let finalValues = values;
-  //     if (hasSearchValues) {
-  //       // If only advanced search has values (or regular filters haven't changed), reset regular filters.
-  //       const searchCondition = buildSearchCondition(searchValues, searchParameters);
-  //       const resetValues = {};
-  //       Object.keys(values).forEach((key) => {
-  //         resetValues[key] = null;
-  //       });
-  //       finalValues = {
-  //         ...resetValues,
-  //         search_condition: searchCondition,
-  //       };
-  //     }
-
-  //     const { pageSize } = pagination;
-  //     const resetPage = 1;
-
-  //     scriptId.current = null;
-
-  //     // Update URL only when NOT using advanced search
-  //     if (!hasSearchValues) {
-  //       const currentUrlParams = Location.search();
-  //       const { script_id, selected_card, ...cleanParams } = currentUrlParams;
-
-  //       const newParams = new URLSearchParams({
-  //         ...cleanParams,
-  //         current: resetPage,
-  //         pageSize,
-  //       });
-
-  //       const newUrl = `${window.location.pathname}?${newParams.toString()}`;
-  //       window.history.replaceState({}, '', newUrl);
-  //     }
-
-  //     // Call report API
-  //     onFinish(finalValues, resetPage);
-  //   };
-
   const handleSubmit = (values) => {
     const hasSearchValues = Object.values(searchValues).some((v) => Array.isArray(v) && v.length > 0);
 
@@ -511,11 +373,9 @@ export default function ReportingDashboard({
 
         onOk() {
           // YES → send form values + search condition
-          const searchCondition = buildSearchCondition(searchValues, searchParameters);
-
           const finalValues = {
             ...values,
-            search_condition: searchCondition,
+            search_values: searchValues,
           };
 
           runSubmit(finalValues);
@@ -523,8 +383,6 @@ export default function ReportingDashboard({
 
         onCancel() {
           // NO → reset form values
-          const searchCondition = buildSearchCondition(searchValues, searchParameters);
-
           const resetValues = {};
           Object.keys(values).forEach((key) => {
             resetValues[key] = null;
@@ -532,7 +390,7 @@ export default function ReportingDashboard({
 
           const finalValues = {
             ...resetValues,
-            search_condition: searchCondition,
+            search_values: searchValues,
           };
 
           runSubmit(finalValues);
@@ -540,8 +398,6 @@ export default function ReportingDashboard({
       });
     } else {
       // no form change
-      const searchCondition = buildSearchCondition(searchValues, searchParameters);
-
       const resetValues = {};
       Object.keys(values).forEach((key) => {
         resetValues[key] = null;
@@ -549,7 +405,7 @@ export default function ReportingDashboard({
 
       const finalValues = {
         ...resetValues,
-        search_condition: searchCondition,
+        search_values: searchValues,
       };
 
       runSubmit(finalValues);
@@ -562,7 +418,7 @@ export default function ReportingDashboard({
 
     scriptId.current = null;
 
-    const hasSearchValues = finalValues.search_condition;
+    const hasSearchValues = finalValues.search_values && Object.values(finalValues.search_values).some((v) => Array.isArray(v) && v.length > 0);
 
     if (!hasSearchValues) {
       const currentUrlParams = Location.search();
@@ -746,6 +602,7 @@ export default function ReportingDashboard({
                       key={param.field}
                       parameter={param}
                       field={param}
+                      reportId={reportId}
                       value={searchValues[param.field] || []}
                       onChange={(value) => {
                         setSearchValues((prev) => ({
@@ -753,6 +610,32 @@ export default function ReportingDashboard({
                           [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}
@@ -978,6 +861,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">
@@ -1053,46 +970,131 @@ function GuestList({
               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>
+                    {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>
                 );
               }}
             />

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/core/modules/steps/action-buttons.js

@@ -13,6 +13,8 @@ export default function ActionButtons({
   steps,
   activeStep,
   isStepCompleted,
+  isFullscreen,
+  onToggleFullscreen,
   renderDynamicComponent,
   handlePrevious,
   handleNext,
@@ -37,6 +39,10 @@ export default function ActionButtons({
           Back
         </Button>
 
+        <Button type="default" onClick={onToggleFullscreen}>
+          {isFullscreen ? 'Exit Full Screen' : 'Switch to Full Screen'}
+        </Button>
+
         {/* Skip button */}
         {steps.length > 0 && steps[activeStep]?.allow_skip === 'Y' && (
           <Button type="default" onClick={handleSkip} disabled={activeStep === steps.length - 1}>

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

@@ -11,6 +11,7 @@
   overflow-y: auto;
   overflow-x: hidden;
   overscroll-behavior: contain;
+
   padding-bottom: 8px;
 }
 
@@ -27,7 +28,6 @@
   border-top: 1px solid #f0f0f0;
   box-shadow: 0 -2px 10px rgba(15, 23, 42, 0.04);
 
-
   width: 61%;
   padding: 10px;
   position: fixed;
@@ -37,9 +37,15 @@
   display: flex;
   border-radius: 4px;
   box-shadow: -1px -4px 10px 2px #f7f7f76e;
-
+  flex-wrap: wrap;
 
   .ant-btn {
     border-radius: 4px;
   }
-}
+}
+
+.process-steps-page.is-fullscreen .action-buttons-container {
+  width: calc(100% - 24px);
+  left: 12px;
+  right: 12px;
+}

package/core/modules/steps/steps.js

@@ -8,7 +8,7 @@
  * - Handles process submission and optional chaining to the next process.
  * - Provides a collapsible timeline view and action controls.
  */
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Row, Col, Empty } from 'antd';
 import { Card } from './../../lib';
 import * as genericComponents from './../../lib';
@@ -36,8 +36,11 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
   const [timelineCollapsed, setTimelineCollapsed] = useState(false);
   const [showExternalWindow, setShowExternalWindow] = useState(false);
   const [externalWin, setExternalWin] = useState(null);
+  const [isFullscreen, setIsFullscreen] = useState(false);
+  const processStepsRef = useRef(null);
 
   const urlParams = Location.search();
+  const isConsultationMode = String(urlParams?.consultation).toLowerCase() === 'true';
   let processId = urlParams.processId;
   const [currentProcessId, setCurrentProcessId] = useState(processId);
   // Load process details based on the current process ID
@@ -271,13 +274,49 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
     };
   }, [activeStep, steps, externalWin]);
 
+  useEffect(() => {
+    const syncFullscreenState = () => {
+      setIsFullscreen(document.fullscreenElement === processStepsRef.current);
+    };
+
+    document.addEventListener('fullscreenchange', syncFullscreenState);
+    syncFullscreenState();
+
+    return () => {
+      document.removeEventListener('fullscreenchange', syncFullscreenState);
+    };
+  }, []);
+
+  const handleToggleFullscreen = async () => {
+    const element = processStepsRef.current;
+    if (!element) return;
+
+    try {
+      if (document.fullscreenElement === element) {
+        if (document.exitFullscreen) {
+          await document.exitFullscreen();
+        }
+        return;
+      }
+
+      if (element.requestFullscreen) {
+        await element.requestFullscreen();
+      }
+    } catch (error) {
+      console.error('Unable to toggle full screen for steps page:', error);
+    }
+  };
+
   /**
    * Renders the main process UI including timeline, step details,
    * and action buttons. This content is reused in both normal view
    * and external window view.
    */
-  const renderContent = () => (
-    <div className="process-steps-page">
+  const renderContent = (attachRef = true) => (
+    <div
+      ref={attachRef ? processStepsRef : null}
+      className={`process-steps-page ${isConsultationMode ? 'consultation-mode' : ''} ${isFullscreen ? 'is-fullscreen' : ''}`}
+    >
       <Card className="process-steps-card">
         <Row gutter={20} className="process-steps-row" align="stretch">
           <Col xs={24} sm={24} lg={timelineCollapsed ? 2 : 6} className="process-steps-timeline-col">
@@ -302,6 +341,8 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
               steps={steps}
               activeStep={activeStep}
               isStepCompleted={isStepCompleted}
+              isFullscreen={isFullscreen}
+              onToggleFullscreen={handleToggleFullscreen}
               renderDynamicComponent={DynamicComponent}
               handlePrevious={handlePrevious}
               handleNext={handleNext}
@@ -335,9 +376,9 @@ export default function ProcessStepsPage({ match, CustomComponents = {}, ...prop
           width={props.ExternalWindowWidth || 1000}
           height={props.ExternalWindowHeight || 1000}
         >
-          {renderContent()}
+          {renderContent(false)}
         </ExternalWindow>
-        {renderContent()}
+        {renderContent(true)}
       </>
     );
   }