datastake-daf 0.6.826 → 0.6.827

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleIndicators/HealthAndSafety/helper.js

@@ -1,3 +1,28 @@
+
+// Custom tooltip labels per field/value
+const FIELD_TOOLTIP_LABELS = {
+    aidKitAccessible: {
+        compliant: "Available",           
+        notCompliant: "Not available",   
+        empty: "No data",
+    },
+    hsTrainingConfirmation: {
+        compliant: "Training delivered",
+        notCompliant: "No training",
+        empty: "No data",
+    },
+    duosFormed: {
+        compliant: "Duos formed",
+        notCompliant: "Not implemented",
+        empty: "No data",
+    },
+    presenceOfChildren: {
+        compliant: "None reported",        
+        notCompliant: "Children present",  
+        empty: "No data",
+    },
+};
+
 const HEALTH_SAFETY_COLORS = {
     compliant: '#016C6E',
     notCompliant: '#F97066',
@@ -11,11 +36,6 @@ const getIndicatorType = (value) => {
     return "empty";
 };
 
-/**
- * Gets health and safety distribution data from activity data
- * @param {Object} activityData - Activity data object
- * @returns {Object} Distribution object with compliant, notCompliant, and empty counts
- */
 export const getHealthAndSafetyDistributionData = (activityData) => {
     // Define health and safety indicator fields
     const indicators = [
@@ -42,23 +62,12 @@ export const getHealthAndSafetyDistributionData = (activityData) => {
     return distribution;
 };
 
-/**
- * Checks if the health and safety distribution data is empty
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @returns {boolean} True if all values are 0 or empty
- */
 export const isHealthAndSafetyDistributionEmpty = (healthAndSafetyDistributionData) => {
     return Object.values(healthAndSafetyDistributionData).every(val => !val || val === 0);
 };
 
-/**
- * Calculates pie chart data from health and safety distribution
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @param {Function} t - Translation function
- * @returns {Array} Array of pie chart data points with value, percent, color, label, and key
- */
-export const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData, t) => {
-    const total = Object.values(healthAndSafetyDistributionData).reduce((all, val) => all + (val || 0), 0);
+export const calculateHealthAndSafetyPieData = (data, t, selectedField) => {
+    const total = Object.values(data).reduce((a, v) => a + (v || 0), 0);
 
     const labels = {
         compliant: t("Available"),
@@ -66,31 +75,27 @@ export const calculateHealthAndSafetyPieData = (healthAndSafetyDistributionData,
         empty: t("Not answered"),
     };
 
-    return Object.keys(healthAndSafetyDistributionData).map((key) => {
-        const color = HEALTH_SAFETY_COLORS[key] || '#D9D9D9';
-
-        return {
-            value: healthAndSafetyDistributionData[key] || 0,
-            percent: total > 0 ? (healthAndSafetyDistributionData[key] || 0) / total : 0,
-            color: color,
-            label: labels[key] || key,
-            key: key,
-        };
-    });
+    return Object.keys(data).map((key) => ({
+        value: data[key] || 0,
+        percent: total > 0 ? (data[key] || 0) / total : 0,
+        color: HEALTH_SAFETY_COLORS[key] || '#D9D9D9',
+        label: labels[key] || key,
+        key,
+        keyOfField: selectedField,   //  <-- ADD THIS
+    }));
 };
 
-/**
- * Generates tooltip content for health and safety pie chart
- * Shows all statuses with their percentages
- * @param {Object} item - The pie chart item being hovered (not used, but kept for compatibility)
- * @param {boolean} isEmpty - Whether the distribution is empty
- * @param {Object} healthAndSafetyDistributionData - Distribution object
- * @param {Function} t - Translation function
- * @param {Function} renderTooltipJsx - Function to render tooltip JSX
- * @param {string} tooltipTitle - Title to display in the tooltip (defaults to "Health and Safety")
- * @returns {JSX.Element|null} Tooltip content or null
- */
-export const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, tooltipTitle = "Health and Safety") => {
+
+export const getHealthAndSafetyTooltipChildren = (
+    item,
+    isEmpty,
+    healthAndSafetyDistributionData,
+    t,
+    renderTooltipJsx,
+    tooltipTitle = "Health and Safety",
+    selectedField
+) => {
+
     // If empty or no data, return null to display nothing
     if (isEmpty || !Object.keys(healthAndSafetyDistributionData).length) {
         return null;
@@ -104,10 +109,10 @@ export const getHealthAndSafetyTooltipChildren = (item, isEmpty, healthAndSafety
         return null;
     }
     
-    const labels = {
+    const labels = FIELD_TOOLTIP_LABELS[item?.keyOfField] || {
         compliant: t("Available"),
         notCompliant: t("Not available"),
-        empty: t("Not answered"),
+        empty: t("No data"),
     };
 
     // Filter items with values > 0

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleIndicators/HealthAndSafety/index.jsx

@@ -54,7 +54,6 @@ const HealthAndSafety = ({
         getData: customGetData
     });
 
-    // Process the fetched pie chart data
     // The API returns data in format: [{count: 1, [field]: "null"}, {count: 1, [field]: "no"}, {count: 1, [field]: "yes"}]
     const healthAndSafetyDistributionData = useMemo(() => {
         if (!pieChartData) return { compliant: 0, notCompliant: 0, empty: 0 };
@@ -90,7 +89,10 @@ const HealthAndSafety = ({
     }, [pieChartData, selectedField]);
 
     const isEmpty = useMemo(() => isHealthAndSafetyDistributionEmpty(healthAndSafetyDistributionData), [healthAndSafetyDistributionData]);
-    const pieData = useMemo(() => calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t), [healthAndSafetyDistributionData, t]);
+    const pieData = useMemo(() => 
+        calculateHealthAndSafetyPieData(healthAndSafetyDistributionData, t, selectedField),
+    [healthAndSafetyDistributionData, t, selectedField]);
+    
 
     // Get the label for the selected field to use as tooltip title
     const selectedFieldLabel = useMemo(() => {
@@ -99,7 +101,16 @@ const HealthAndSafety = ({
     }, [selectedField]);
 
     const getTooltipChildren = useCallback(
-        (item) => getHealthAndSafetyTooltipChildren(item, isEmpty, healthAndSafetyDistributionData, t, renderTooltipJsx, selectedFieldLabel),
+        (item) =>
+            getHealthAndSafetyTooltipChildren(
+                item,
+                isEmpty,
+                healthAndSafetyDistributionData,
+                t,
+                renderTooltipJsx,
+                selectedFieldLabel,
+                selectedField
+            ),
         [t, isEmpty, healthAndSafetyDistributionData, selectedFieldLabel],
     );
 
@@ -110,8 +121,9 @@ const HealthAndSafety = ({
     return (
         <Widget
             loading={loading || pieChartLoading}
-            title={<div>{t("Health and Safety")}</div>}
-            className="with-border-header h-w-btn-header "
+            title={<div>{t("Operational Health & Safety")}</div>}
+            className="with-border-header h-w-btn-header"
+            description={t("Across all activities in this cycle.")}
             addedHeader={
                 <>
                     <div className="flex-1" />

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/PlantingActivitiesTimeline.jsx

@@ -15,21 +15,28 @@ const PlantingActivitiesTimeline = ({
 }) => {
     const { timeFilter, setTimeFilter, formatDateAxis, processChartDateData } = useTimeFilter({ defaultFilter: 'monthly' });
 
-
+   
     const activitiesTimelineData = useMemo(() => {
         const dataToProcess = (!activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0)
             ? []
             : activitiesTimelineChart;
-
+    
         // Process data without cumulative calculation (for activities timeline)
-        return processChartDateData({
+        const processedData = processChartDateData({
             mainData: dataToProcess,
             isCumulative: false,
             valueField: 'count',
         });
+    
+        // Remove trailing periods with 0 jobs (optional: remove all zero if you prefer)
+        let lastNonZeroIndex = processedData.length - 1;
+        while (lastNonZeroIndex >= 0 && (processedData[lastNonZeroIndex].jobs || 0) === 0) {
+            lastNonZeroIndex--;
+        }
+    
+        return processedData.slice(0, lastNonZeroIndex + 1);
     }, [activitiesTimelineChart, processChartDateData]);
-
-    // Calculate max value for Y-axis (default to 100 if all values are 0 or very small)
+    
     const maxActivitiesYValue = useMemo(() => {
         if (!activitiesTimelineData || activitiesTimelineData.length === 0) {
             return 100;