ui-soxo-bootstrap-core 2.4.26 → 2.5.1

package/core/lib/elements/basic/switch/switch.js

@@ -1,36 +1,46 @@
 /**
  * Component for antd switch
  */
-
-import React, { useState, useContext, useEffect } from 'react';
-import { GlobalContext } from '../../../Store';
-
+import React, { useContext } from 'react';
 import { Switch as AntdSwitch } from 'antd';
-
+import { GlobalContext } from '../../../Store';
 import PropTypes from 'prop-types';
 
-export default function Switch({ onChange, checked }) {
+export default function Switch({
+  checked,
+  defaultChecked,
+  onChange,
+  disabled,
+  id,
+  size,
+  checkedChildren,
+  unCheckedChildren,
+  className,
+  style,
+}) {
   const { state } = useContext(GlobalContext);
 
-  useEffect(() => {
-    // Reacting to theme changes
-  }, [state.theme.colors]);
-
   return (
-    <div>
-      <>
-        <AntdSwitch
-          checked={checked}
-          onChange={onChange}
-          // checked={ }
-          style={{
-            backgroundColor: checked ? state.theme.colors.primaryButtonBg : state.theme.colors.primaryButtonDisabledBg, // Use disabled color when unchecked
-            borderColor: checked ? state.theme.colors.primaryButtonBg : state.theme.colors.primaryButtonDisabledBg,
-          }}
-          listType="picture-card"
-        />
-      </>
-    </div>
+    <AntdSwitch
+      id={id}
+      checked={checked}
+      defaultChecked={defaultChecked}
+      onChange={onChange}
+      disabled={disabled}
+      size={size}
+      checkedChildren={checkedChildren}
+      unCheckedChildren={unCheckedChildren}
+      className={className}
+      style={{
+        backgroundColor: checked
+          ? state.theme.colors.primaryButtonBg
+          : state.theme.colors.primaryButtonDisabledBg,
+        borderColor: checked
+          ? state.theme.colors.primaryButtonBg
+          : state.theme.colors.primaryButtonDisabledBg,
+        ...style,
+      }}
+    />
   );
 }
 

package/core/models/dashboard/dashboard.js

@@ -81,6 +81,20 @@ class Dashboard extends Base {
     ];
   }
 
+  loadProcess(id) {
+    return ApiUtils.get({
+      url: `process/${id}`,
+    });
+  }
+  
+  processLog(formBody) {
+    return ApiUtils.post({
+      url: `process/process-log`,
+      formBody,
+    });
+  }
+
+
   /**
    * Function to load dashboards based on user information
    * @param {*} user

package/core/modules/index.js

@@ -16,14 +16,14 @@ import PopQueryDashboard from './dashboard/components/pop-query-dashboard/pop-qu
 
 import HomePageAPI from './../pages/homepage-api/homepage-api';
 
-import { Profile, ChangePassword } from './../lib';
-
 import ReportingDashboard from '../modules/reporting/components/reporting-dashboard/reporting-dashboard';
 
 import ChangeInfo from './Informations/change-info/change-info';
 // All Dashboard Components Ends
+import ProcessStepsPage from './steps/steps';
 
 export {
+  ProcessStepsPage,
   GenericList,
   GenericAdd,
   GenericEdit,
@@ -32,9 +32,7 @@ export {
   DashboardCard,
   PopQueryDashboard,
   HomePageAPI,
-  Profile,
   ReportingDashboard,
-  ChangePassword,
   ChangeInfo,
 };
 

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

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, useRef } from 'react';
 
-import { Table, Skeleton, Input, Tag, Modal, message, Pagination } from 'antd';
+import { Table, Skeleton, Input, Tag, Modal, message, Pagination, Tooltip } from 'antd';
 
 import { QrcodeOutlined } from '@ant-design/icons';
 
@@ -106,8 +106,17 @@ export default function ReportingDashboard({
     setPatients([]);
     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
+
+        setColumns([]);
+      }
       await prepareInputParameters(result);
-      setColumns(JSON.parse(result.display_columns));
 
       if (result.summary_columns) {
         setSummaryColumns(JSON.parse(result.summary_columns));
@@ -160,11 +169,12 @@ export default function ReportingDashboard({
     if (urlParams.script_id) scriptId.current = urlParams.script_id;
 
     let otherDetails = record.other_details1 ? JSON.parse(record.other_details1) : null;
-    parameters = JSON.parse(record.input_parameters);
+
+    parameters = record.input_parameters ? JSON.parse(record.input_parameters) : null;
 
     let formContent = {};
 
-    parameters = await parameters.map((record) => {
+    parameters = await parameters?.map((record) => {
       // Only if the url params does have a matching value ,
       // we should not consider the default  value
 
@@ -289,6 +299,17 @@ export default function ReportingDashboard({
       }
       // Update patients
       setPatients(resultDetails || []);
+      // Check if columns are not yet defined
+      if (columns.length === 0 && resultDetails.length > 0) {
+        // Create columns dynamically from resultDetails keys
+        setColumns((prev) => {
+          if (prev.length > 0) return prev;
+          return Object.keys(resultDetails[0]).map((key) => ({
+            title: key,
+            field: key,
+          }));
+        });
+      }
 
       if (result.length) {
         // Set Pgination data into URL
@@ -565,7 +586,6 @@ function GuestList({
   attributes,
   fetchReportData,
 }) {
-  console.log(attributes, '_____________________________________');
   /**
    * @param {*} propValues
    */
@@ -683,7 +703,7 @@ function GuestList({
               redirectLink = redirectLink.replace(new RegExp('@' + replacement.field + ';', 'g'), record[replacement.field]);
             });
 
-            return <Link to={`${redirectLink}`}>View</Link>;
+            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');
@@ -737,7 +757,7 @@ function GuestList({
 
                 // 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 }}>{record[entry.field]}</span>;
+                return <span style={{ color: record.color_code, overflowWrap: 'break-word', WebkitLineClamp: 3 }}>{record[entry.field]}</span>;
               }
             } else {
               /**
@@ -769,14 +789,25 @@ function GuestList({
                 }
               } else {
                 //If the value is neither 'Y' nor 'N', return the actual field value
-                return <span style={{ color: textColor }}>{record[entry.field]}</span>;
+                return <span style={{ color: textColor, whiteSpace: 'pre-wrap', overflowWrap: 'break-word' }}>{record[entry.field]}</span>;
               }
             }
           }
         },
         field: entry.field,
-        title: entry.title,
+        // 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:
@@ -800,7 +831,6 @@ function GuestList({
             // 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
@@ -884,13 +914,21 @@ function GuestList({
       // setData(data);
 
       // Define export data
-      let exportDatas = getExportData(patients, cols);
+      // Sanitize cols for export to ensure titles are strings
+      const exportCols = cols.map((col) => {
+        if (col.title && typeof col.title === 'object' && col.title.props) {
+          return { ...col, title: col.title.props.title };
+        }
+        return col;
+      });
+
+      let exportDatas = getExportData(patients, exportCols);
 
       if (exportDatas.exportDataColumns.length && exportDatas.exportDataHeaders.length) {
         setExportData({ exportDatas });
       }
     }
-  }, [patients]);
+  }, [patients, columns]);
 
   let filtered;
 
@@ -1042,7 +1080,7 @@ function GuestList({
           ) : (
             <TableComponent
               size="small"
-              scroll={{ x: true }}
+              scroll={{ x: 'max-content' }}
               rowKey={(record) => record.OpNo}
               dataSource={filtered ? filtered : patients} // In case if there is no filtered values we can use patient data
               columns={cols}
@@ -1162,3 +1200,5 @@ function GuestList({
 //         </Card>
 //     );
 // }
+//     );
+// }

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

@@ -0,0 +1,76 @@
+/**
+ * ActionButtons
+ * Handles navigation and action controls for a multi-step process,
+ * including dynamic content rendering and process completion actions.
+ */
+import React, { useState } from 'react';
+import { Skeleton } from 'antd';
+import { Button } from '../../lib';
+import './action-buttons.scss';
+
+export default function ActionButtons({
+  loading,
+  steps,
+  activeStep,
+  isStepCompleted,
+  renderDynamicComponent,
+  handlePrevious,
+  handleNext,
+  handleSkip,
+  handleFinish,
+  handleStartNextProcess,
+  nextProcessId,
+  timelineCollapsed,
+}) {
+  const [showNextProcess, setShowNextProcess] = useState(false);
+
+  return (
+    <>
+      <div style={{ minHeight: 300 }}>{loading ? <Skeleton active /> : renderDynamicComponent()}</div>
+      <>
+        <div className="action-buttons-container">
+          {/* Back button */}
+          <Button disabled={activeStep === 0} onClick={handlePrevious}>
+            Back
+          </Button>
+
+          {/* Skip button */}
+          {steps.length > 0 && steps[activeStep]?.allow_skip === 'Y' && (
+            <Button type="default" onClick={handleSkip} disabled={activeStep === steps.length - 1}>
+              Skip
+            </Button>
+          )}
+
+          {/* Next / Finish / Start Next */}
+          {steps[activeStep]?.order_seqtype === 'E' ? (
+            <>
+              {!showNextProcess && (
+                <Button
+                  type="primary"
+                  onClick={async () => {
+                    const success = await handleFinish();
+                    if (success && nextProcessId?.next_process_id) {
+                      setShowNextProcess(true);
+                    }
+                  }}
+                >
+                  Finish
+                </Button>
+              )}
+              
+              {showNextProcess && nextProcessId?.next_process_id && (
+                <Button type="primary" onClick={handleStartNextProcess}>
+                  Start {nextProcessId.next_process_name}
+                </Button>
+              )}
+            </>
+          ) : (
+            <Button type="primary" disabled={activeStep === steps.length - 1 || !isStepCompleted} onClick={handleNext}>
+              Next →
+            </Button>
+          )}
+        </div>
+      </>
+    </>
+  );
+}

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

@@ -0,0 +1,16 @@
+.action-buttons-container {
+  margin-top: 38px;
+  display: flex;
+  justify-content: flex-start;
+  gap: 10px;
+  position: sticky;
+  bottom: 0;
+  z-index: 1000;
+  background: #fff;
+  padding: 10px 0;
+  border-top: 1px solid #f0f0f0;
+
+  .ant-btn {
+    border-radius: 4px;
+  }
+}