datastake-daf 0.6.795 → 0.6.797

package/src/@daf/pages/Summary/Activities/Monitoring/config.js

@@ -1,7 +1,5 @@
 import React from "react";
-import { camelCaseToTitle } from "../../../../../utils";
-
-
+import { camelCaseToTitle, findOptions, renderNumber } from "../../../../../utils";
 
 export const getKeyIndicatorsRowConfig = ({ t, data = {} }) => [
 
@@ -22,7 +20,7 @@ export const getKeyIndicatorsRowConfig = ({ t, data = {} }) => [
   },
   {
     label: t('Monitored Area'),
-    render: () => <div>{data?.totalAreaParcelMonitored ? `${data?.totalAreaParcelMonitored} ha` : '0 ha'}</div>
+    render: () => <div>{data?.totalAreaParcelMonitored ? `${renderNumber(data?.totalAreaParcelMonitored)} ha` : '0 ha'}</div>
   }, 
 
 ];
@@ -49,3 +47,22 @@ export const getSiteConditionsConfig = ({ t, data = {} }) => [
     render: () => <div>{data?.hasDisturbances ? t('Yes') : t('No')}</div>
   },
 ];
+
+export const getEnvironmentalMetricsConfig = ({ t, data = {}, options }) => [
+  {
+    label: t('Soil Type'),
+    render: () => <div>{camelCaseToTitle(data?.soilType) || '-'}</div>
+  },
+  {
+    label: t('Soil Salinity'),
+    render: () => <div>{data?.soilSalinity ? `${ renderNumber(data.soilSalinity)} ${data?.soilSalinityUnit || 'dS/m'}` : '-'}</div>
+  },
+  {
+    label: t('pH Level'),
+    render: () => <div>{renderNumber(data?.phLevel) || '-'}</div>
+  },
+  {
+    label: t('Water Quality'),
+    render: () => <div>{ findOptions(data?.waterQuality, options?.waterQuality) || '-'}</div>
+  },
+];

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

@@ -17,7 +17,13 @@ export const getActivityImages = (activityData) => {
         { 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' }
+        { data: activityData?.photosEndActivity, label: 'End of Activity' },
+        { data: activityData?.plotPhotosMonitoring, label: 'Plot Photos Monitoring' },
+        { data: activityData?.faunaFloraPictures, label: 'Fauna and Flora Photos' },
+        { data: activityData?.pestPlantPhotos, label: 'Pest Plant Photos' },
+        { data: activityData?.soilPhotos, label: 'Soil Photos' },
+        { data: activityData?.otherPictures, label: 'Other Pictures' },
+        { data: activityData?.damagedPlantPhotos, label: 'Damaged Plant Photos' }
     ];
 
     return photoArrays

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

@@ -4,11 +4,13 @@ import { getKeyIndicatorsRowConfig, getSiteConditionsConfig } from './config';
 import { getActivityIndicatorsConfig } from './helper';
 import ActivityLocation from './components/ActivityLocation/index.jsx';
 import ActivityImagery from './components/ActivityImagery/index.jsx';
+import EnvironmentalMetrics from './components/EnvironmentalMetrics/index.jsx';
 import WorkersDistribution from './components/WorkersDistribution/index.jsx';
 import MangroveGrowthAndSurvival from './components/MangroveGrowthAndSurvival/index.jsx';
+import BiodiversityAndHabitat from './components/BiodiversityAndHabitat/index.jsx';
 
 
-const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { } }) => {
+const MonitoringActivitySummary = ({ activityData, supportText, onDownload, downloadDisabled, actionButtons, breadcrumbs, goBackTo, loading, t = () => { }, options }) => {
     const keyIndicatorsConfig = useMemo(() => getKeyIndicatorsRowConfig({ t, data: activityData }), [t, activityData]);
 
     // Activity Indicators Config - mapped from activityData
@@ -18,13 +20,11 @@ const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, do
     );
 
     // Site Conditions Config
-    const siteConditionsConfig = useMemo(() => 
+    const siteConditionsConfig = useMemo(() =>
         getSiteConditionsConfig({ t, data: activityData }),
         [t, activityData]
     );
 
-
-    console.log({activityData});
     return (
         <DashboardLayout
             header={
@@ -53,12 +53,35 @@ const   MonitoringActivitySummary = ({ activityData, supportText, onDownload, do
                 widgetClassName="h-w-btn-header"
             />
 
-            <MangroveGrowthAndSurvival 
-                activityData={activityData} 
-                loading={loading} 
-                t={t} 
+            <MangroveGrowthAndSurvival
+                options={options}
+                activityData={activityData}
+                loading={loading}
+                t={t}
+            />
+
+            <BiodiversityAndHabitat
+                faunaPresent={activityData?.faunaPresent}
+                invasiveSpecies={activityData?.invasiveSpecies}
+                hasInvasiveSpecies={activityData?.hasInvasiveSpecies}
+                loading={loading}
+                t={t}
             />
 
+            <section style={{ display: 'flex', gap: '24px',  }}>
+                <EnvironmentalMetrics
+                    options={options}
+                    activityData={activityData}
+                    loading={loading}
+                    t={t}
+                />
+                <ActivityImagery
+                    activityData={activityData}
+                    loading={loading}
+                    t={t}
+                />
+            </section>
+
         </DashboardLayout>
     )
 }

package/src/@daf/utils/numbers.js

@@ -6,7 +6,7 @@
  */
 export const renderNumber = (val, doubleDigit = false) => {
   if (typeof val !== 'number') {
-    return '--';
+    return '-';
   }
 
   const _string = Number(val).toLocaleString('en-us');

package/src/constants/Vegetation.js

@@ -0,0 +1,15 @@
+const VEGETATION_KEYS = {
+	HEALTHY: "healthy",
+	WHITE_SPOTS: "white",
+	BLACK_SPOTS: "black",
+	REDDISH_SPOTS: "reddish",
+	YELLOWING: "yellowing",
+	MOSAIC: "mosaic",
+	DRY_OR_DEAD: "dryOrDead",
+	NO_LEAVES: "noLeaves",
+	SPIDER_WEBS: "spiderWebs",
+	DAMAGE_FROM_INSECTS: "damageFromInsects",
+};
+
+export { VEGETATION_KEYS };
+

package/src/index.js

@@ -78,6 +78,7 @@ export { default as WidgetCard } from "./@daf/core/components/Dashboard/Widget/W
 export { default as CarouselWidget } from "./@daf/core/components/Dashboard/Widget/CarouselWidget/index.jsx";
 export { default as ImageCarousel } from "./@daf/core/components/Dashboard/Widget/ImageCarousel/index.jsx";
 export { default as StatCard } from "./@daf/core/components/Dashboard/Widget/StatCard/index.js";
+export { default as VegetationHealth } from "./@daf/core/components/Dashboard/Widget/VegetationWidget/index.jsx";
 // export { default as WidgetCatalogue } from "./@daf/core/components/Dashboard/Widget/WidgetCatalogue/index.jsx";
 
 // Forms