datastake-daf 0.6.747 → 0.6.748

package/src/@daf/core/components/Icon/configs/index.js

@@ -218,6 +218,10 @@ import userIcon from "./userIcon";
 import partnerIcon from "./partnerIcon";
 import LifeCycle from "./LifeCycle";
 import EventCalendar from "./EventCalendar";
+import Aid from "./Aid";
+import Bear from "./Bear";
+import Security from "./Security";
+import Minus from "./Minus";
 
 const config = {
 	AppAdmin,
@@ -440,6 +444,10 @@ const config = {
 	partnerIcon,
 	LifeCycle,
 	EventCalendar,
+	Aid,
+	Bear,
+	Security,
+	Minus,
 };
 
 export default config;

package/src/@daf/pages/Summary/Activities/Restoration/helper.js

@@ -2,6 +2,11 @@
 // REGION: Photo/Image Extraction
 // ============================================================================
 
+/**
+ * Normalize URL by removing trailing colon if present
+ */
+const normalizeUrl = (url) => url?.endsWith(':') ? url.slice(0, -1) : url;
+
 /**
  * Extract images from a photo document
  * Handles both documents with pictures arrays and direct image objects
@@ -16,9 +21,27 @@ export const extractFromPhotoDoc = (photoDoc, label, docIndex) => {
 };
 
 /**
- * Normalize URL by removing trailing colon if present
+ * Extract and process images from activity data
+ * Processes group photos and activity photos (start, during, end) into a flat array
+ * 
+ * @param {Object} activityData - Activity data object containing photo arrays
+ * @returns {Array} - Flat array of image objects with src and alt properties
  */
-const normalizeUrl = (url) => url?.endsWith(':') ? url.slice(0, -1) : url;
+export const getActivityImages = (activityData) => {
+    const photoArrays = [
+        { data: activityData?.groupPhotos, label: 'Group Photo' },
+        { data: activityData?.photosStartActivity, label: 'Start of Activity' },
+        { data: activityData?.photosDuringActivity, label: 'During Activity' },
+        { data: activityData?.photosEndActivity, label: 'End of Activity' }
+    ];
+
+    return photoArrays
+        .flatMap(({ data, label }) =>
+            Array.isArray(data)
+                ? data.flatMap((photoDoc, index) => extractFromPhotoDoc(photoDoc, label, index))
+                : []
+        );
+};
 
 // ============================================================================
 // REGION: Gender Distribution
@@ -95,4 +118,65 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
             },
         ],
     });
+};
+
+// ============================================================================
+// REGION: Activity Indicators
+// ============================================================================
+
+/**
+ * Maps activityData value to indicator type
+ * "yes" or true → "compliant"
+ * "no" or false → "notCompliant"
+ * null or undefined → "empty"
+ */
+export const getIndicatorType = (value) => {
+    if (value === "yes" || value === true) return "compliant";
+    if (value === "no" || value === false) return "notCompliant";
+    if (value === null || value === undefined) return "empty";
+    return "empty"; // default fallback
+};
+
+/**
+ * Special case: Children presence indicator configuration
+ * Children presence is compliant if answered 'no', not compliant if answered 'yes'
+ * Custom icons: "no" (compliant) → X icon with green badge, "yes" (notCompliant) → Check icon with red badge
+ * 
+ * @param {string|boolean|null} value - The presenceOfChildren value from activityData
+ * @returns {Object} - Configuration object with type and optional statusIcon
+ */
+export const getChildrenPresenceConfig = (value) => {
+    if (value === "no" || value === false) {
+        return { type: "compliant", statusIcon: "Close" }; // X icon with green badge
+    }
+    if (value === "yes" || value === true) {
+        return { type: "notCompliant", statusIcon: "Check" }; // Check icon with red badge
+    }
+    return { type: "empty" }; // empty state
+};
+
+/**
+ * Get activity indicators configuration from activityData
+ * Maps activityData fields to indicator config objects with icon, label, type, and optional statusIcon
+ * 
+ * @param {Object} activityData - Activity data object
+ * @param {Function} t - Translation function
+ * @returns {Array} - Array of indicator config objects
+ */
+export const getActivityIndicatorsConfig = (activityData, t) => {
+    const childrenPresenceConfig = getChildrenPresenceConfig(activityData?.presenceOfChildren);
+    
+    return [
+        { icon: "Aid", label: t("Aid kit availability"), type: getIndicatorType(activityData?.aidKitAccessible) },
+        { icon: "MineOperators", label: t("H&S training delivery"), type: getIndicatorType(activityData?.hsTrainingConfirmation) },
+        { icon: "Users", label: t("Workers safe pairing"), type: getIndicatorType(activityData?.duosFormed) },
+        { 
+            icon: "Bear", 
+            label: t("Children presence"), 
+            type: childrenPresenceConfig.type,
+            ...(childrenPresenceConfig.statusIcon && { statusIcon: childrenPresenceConfig.statusIcon })
+        },
+        { icon: "Security", label: t("Security presence"), type: getIndicatorType(activityData?.focalPointPresent) },
+        { icon: "UserCircle", label: t("Relay presence"), type: getIndicatorType(activityData?.relayPresent) },
+    ];
 };

package/src/@daf/pages/Summary/Activities/Restoration/index.jsx

@@ -1,29 +1,14 @@
 import { useMemo, useCallback } from 'react';
-import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart } from '../../../../../../src/index.js'
+import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { extractFromPhotoDoc, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
 import { useResizeContext } from '../../../../../../src/context';
 
 const RestorationActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
     const { isCollapsed, isNestedSidebarCollapsed } = useResizeContext();
     const keyIndicatorsConfig = useMemo(() => getKeyIndicatorsRowConfig({ t, data: activityData }), [t, activityData]);
-    const images = useMemo(() => {
-
-        const photoArrays = [
-            { data: activityData?.groupPhotos, label: 'Group Photo' },
-            { data: activityData?.photosStartActivity, label: 'Start of Activity' },
-            { data: activityData?.photosDuringActivity, label: 'During Activity' },
-            { data: activityData?.photosEndActivity, label: 'End of Activity' }
-        ];
-
-        return photoArrays
-            .flatMap(({ data, label }) =>
-                Array.isArray(data)
-                    ? data.flatMap((photoDoc, index) => extractFromPhotoDoc(photoDoc, label, index))
-                    : []
-            );
-    }, [activityData]);
+    const images = useMemo(() => getActivityImages(activityData), [activityData]);
     const genderDistributionData = useMemo(() => getGenderDistributionData(activityData), [activityData]);
     const isEmpty = useMemo(() => isGenderDistributionEmpty(genderDistributionData), [genderDistributionData]);
     const pieData = useMemo(() => calculateGenderPieData(genderDistributionData), [genderDistributionData]);
@@ -32,6 +17,13 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         (item) => getGenderTooltipChildren(item, isEmpty, genderDistributionData, t, renderTooltipJsx),
         [t, isEmpty, genderDistributionData],
     );
+   
+    // Activity Indicators Config - mapped from activityData
+    const activityIndicatorsConfig = useMemo(() => 
+        getActivityIndicatorsConfig(activityData, t),
+        [activityData, t]
+    );
+
     return (
         <DashboardLayout
             header={
@@ -54,7 +46,7 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
             <section>
                 <Widget
                     title={t("Activity Location")}
-                    className="no-px no-pb-body"
+                    className="no-px no-pt-body  no-p-body no-pb-body"
                     style={{ height: '100%', display: 'flex', flexDirection: 'column' }}
                 >
                     <div style={{ flex: 1, minHeight: 0 }}>
@@ -135,6 +127,15 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                 </Widget>
             </section>
 
+            <section>
+                <ActivityIndicators 
+                    config={activityIndicatorsConfig}
+                    loading={loading}
+                    title={t("Activity Indicators")}
+                    className="small-content"
+                />
+            </section>
+
             <section>
                 <div style={{ maxWidth: "70%", width: "calc(100% - 405px)" }}>
                     <ImageCarousel

package/src/index.js

@@ -57,6 +57,7 @@ export { default as WidgetImage } from "./@daf/core/components/Dashboard/Widget/
 export { default as FlowWidget } from "./@daf/core/components/Dashboard/Widget/FlowWidgets/index.jsx";
 export { default as ActionWidget } from "./@daf/core/components/Dashboard/Widget/ActionWidget/index.jsx";
 export { default as KeyIndicators } from "./@daf/core/components/Dashboard/Widget/KeyIndicators/index.jsx";
+export { default as ActivityIndicators } from "./@daf/core/components/Dashboard/Widget/ActivityIndicators/index.jsx";
 export { default as WidgetLoader } from "./@daf/core/components/Dashboard/Widget/WidgetLoader/index.jsx";
 export { default as TooltipIcon } from "./@daf/core/components/Icon/TooltipIcon.jsx";
 export { default as MineSiteMap } from "./@daf/core/components/Dashboard/Map/index.jsx";