datastake-daf 0.6.777 → 0.6.779

package/dist/components/index.js

@@ -9546,24 +9546,29 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
+const renderFieldData = function (type, value, user, config) {
+  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
+  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
+  let app = arguments.length > 6 ? arguments[6] : undefined;
+  let allValues = arguments.length > 7 ? arguments[7] : undefined;
+  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
+        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9578,7 +9583,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
+      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9592,7 +9597,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues?.map(item => item?.name).join(', ');
+        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
         return documentName;
       }
     default:
@@ -9716,19 +9721,18 @@ const resolveDynamicLabel = (labelConfig, item, defaultLabel) => {
   return labelConfig || defaultLabel;
 };
 
-const handleSectionChildren = _ref => {
-  let {
-    config,
-    allData,
-    level,
-    t,
-    rootForm,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
+const handleSectionChildren = ({
+  config,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(level === 0 && config && typeof config === 'object')) {
     return null;
   }
@@ -9742,14 +9746,14 @@ const handleSectionChildren = _ref => {
     let fieldValue;
 
     // Determine field value based on type
-    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData === null || allData === void 0 ? void 0 : allData[fieldKey])) {
+    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData?.[fieldKey])) {
       fieldValue = allData[fieldKey];
-    } else if (fieldConfig.type === 'dataLinkGroup' && allData !== null && allData !== void 0 && allData[fieldKey]) {
+    } else if (fieldConfig.type === 'dataLinkGroup' && allData?.[fieldKey]) {
       fieldValue = allData[fieldKey];
     } else if (fieldConfig.type === 'group') {
       fieldValue = {};
     } else {
-      fieldValue = allData === null || allData === void 0 ? void 0 : allData[fieldKey];
+      fieldValue = allData?.[fieldKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: fieldKey,
@@ -10166,42 +10170,37 @@ const handleDataLinkGroupWithTableKeys = ({
   }
 };
 
-const handleDataLinkWithTableKeys = _ref => {
-  var _inputConfig$meta, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
-  let {
-    inputConfig,
-    inputKey,
-    value,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
-  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
+const handleDataLinkWithTableKeys = ({
+  inputConfig,
+  inputKey,
+  value,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
+  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const isAjaxModal = React.useMemo(() => {
-    var _inputConfig$meta2;
-    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
-  }, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
-    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
+    namespace: inputConfig?.meta?.namespace,
+    skipFetch: inputConfig?.meta?.skipFetch,
     isAjaxModal,
-    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
+    formScope: inputConfig?.meta?.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
+  const dataLinkForm = ajaxModalValues?.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10214,20 +10213,19 @@ const handleDataLinkWithTableKeys = _ref => {
     };
     const isUploadFieldEmpty = (fieldKey, itemToCheck) => {
       if (uploadTypeFields.includes(fieldKey)) {
-        const itemValue = itemToCheck === null || itemToCheck === void 0 ? void 0 : itemToCheck[fieldKey];
+        const itemValue = itemToCheck?.[fieldKey];
         return itemValue === undefined || itemValue === null || Array.isArray(itemValue) && itemValue.length === 0;
       }
       return false;
     };
     const processedTableKeys = processConditionalTableKeys(tableKeys, item);
     processedTableKeys.filter(tableKey => tableKey !== 'datastakeId').filter(tableKey => !isUploadFieldEmpty(tableKey, item)).forEach(tableKey => {
-      var _dataLinkForm$identif;
-      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
+      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
       if (formInputConfig) {
-        var _item$linking, _formInputConfig$meta, _formInputConfig$tabl;
-        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[tableKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10235,7 +10233,7 @@ const handleDataLinkWithTableKeys = _ref => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10243,17 +10241,16 @@ const handleDataLinkWithTableKeys = _ref => {
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$meta = formInputConfig.meta) === null || _formInputConfig$meta === void 0 ? void 0 : _formInputConfig$meta.onNewSetValueKey] || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl = formInputConfig.tableLabel) === null || _formInputConfig$tabl === void 0 ? void 0 : _formInputConfig$tabl.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item[formInputConfig?.meta?.onNewSetValueKey] || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey];
       } else {
-        var _item$linking2;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
+          type: inputConfig?.type
         };
-        values[tableKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
       }
     });
-    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => {
         if (uploadTypeFields.includes(fieldKey)) {
           return !isUploadFieldEmpty(fieldKey, item);
@@ -10263,11 +10260,11 @@ const handleDataLinkWithTableKeys = _ref => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
-        var _item$linking3, _formInputConfig$tabl2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[fieldKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10275,7 +10272,7 @@ const handleDataLinkWithTableKeys = _ref => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10283,7 +10280,7 @@ const handleDataLinkWithTableKeys = _ref => {
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = (item === null || item === void 0 || (_item$linking3 = item.linking) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3.SCL) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking3 === void 0 ? void 0 : _item$linking3.name) || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl2 = formInputConfig.tableLabel) === null || _formInputConfig$tabl2 === void 0 ? void 0 : _formInputConfig$tabl2.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
       });
     }
     return {
@@ -10293,7 +10290,7 @@ const handleDataLinkWithTableKeys = _ref => {
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item === null || item === void 0 ? void 0 : item.datastakeId;
+      const datastakeIdValue = item?.datastakeId;
       const {
         inputs,
         values
@@ -10302,9 +10299,9 @@ const handleDataLinkWithTableKeys = _ref => {
         return null;
       }
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
-          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
           type: 'custom-datalink',
           inputs: inputs
         },
@@ -10318,10 +10315,10 @@ const handleDataLinkWithTableKeys = _ref => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(inputKey, "-").concat(itemIndex));
+      }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    const datastakeIdValue = value === null || value === void 0 ? void 0 : value.datastakeId;
+    const datastakeIdValue = value?.datastakeId;
     const {
       inputs,
       values
@@ -10346,7 +10343,7 @@ const handleDataLinkWithTableKeys = _ref => {
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, "".concat(inputKey, "-single"));
+    }, `${inputKey}-single`);
   }
 };
 

package/dist/pages/index.js

@@ -42770,6 +42770,7 @@ const PlantingLocations = ({
         longitude: locationCheckArrival.longitude
       };
       const color = "#15FFFFB2";
+      const locationName = matchingLocation?.name || locationCheckArrival.name || 'Planting Location';
       return {
         _id: locationCheckArrival._id || event._id || {},
         area: area,
@@ -42777,13 +42778,16 @@ const PlantingLocations = ({
         datastakeId: `LOC-${String(index + 1).padStart(9, '0')}`,
         gps: gps,
         id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
-        name: locationCheckArrival.name || matchingLocation?.name || `Event ${index + 1}`,
+        name: event.name || t("Activity Start"),
+        date: event.date,
         sources: 1,
-        subTitle: locationCheckArrival.name || matchingLocation?.name || 'Planting Location',
+        subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
+        plotName: locationName,
+        territoryTitle: locationName,
         type: 'Planting Location'
       };
     });
-  }, [plantingLocationsData]);
+  }, [plantingLocationsData, t]);
   return /*#__PURE__*/jsxRuntime.jsx("section", {
     children: /*#__PURE__*/jsxRuntime.jsx(Widget, {
       title: t("Planting Locations"),
@@ -42805,7 +42809,66 @@ const PlantingLocations = ({
         onClickLink: () => {},
         onFilterChange: () => {},
         primaryLink: true,
-        renderTooltip: () => {},
+        renderTooltipForLocation: data => {
+          const coordinates = data.gps?.latitude && data.gps?.longitude ? convertDMS(data.gps.latitude, data.gps.longitude) : null;
+          if (!coordinates) {
+            return [];
+          }
+          const iconColor = "#016C6E"; // Activity Start color
+
+          return [{
+            label: t("Coordinates"),
+            value: /*#__PURE__*/jsxRuntime.jsxs("div", {
+              style: {
+                display: 'flex',
+                alignItems: 'center',
+                gap: '6px',
+                flexWrap: 'nowrap'
+              },
+              children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+                style: {
+                  display: 'flex',
+                  alignItems: 'center'
+                },
+                children: [/*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+                  name: "SpacingHeight",
+                  width: 14,
+                  height: 14,
+                  color: iconColor
+                }), /*#__PURE__*/jsxRuntime.jsx("span", {
+                  style: {
+                    fontWeight: 600,
+                    marginLeft: '4px'
+                  },
+                  children: coordinates[0]
+                })]
+              }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+                style: {
+                  display: 'flex',
+                  alignItems: 'center'
+                },
+                children: [/*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+                  name: "SpacingWidth",
+                  width: 14,
+                  height: 14,
+                  color: iconColor
+                }), /*#__PURE__*/jsxRuntime.jsx("span", {
+                  style: {
+                    fontWeight: 600,
+                    marginLeft: '4px'
+                  },
+                  children: coordinates[1]
+                })]
+              })]
+            })
+          }];
+        },
+        renderTooltipForTerritory: data => {
+          return [{
+            label: t("Plot Name"),
+            value: data.plotName || data.name || "--"
+          }];
+        },
         renderTooltipTags: () => {},
         type: "location-territory"
       })
@@ -42957,11 +43020,9 @@ const processChartDateData = ({
   isCumulative = false,
   valueField = 'total'
 }) => {
-  if (!mainData || !Array.isArray(mainData) || mainData.length === 0) {
-    return [];
-  }
   const timeQuantity = getTimeQuantity(filter);
-  const dates = mainData;
+  const dates = mainData || [];
+  const isEmpty = !mainData || !Array.isArray(mainData) || mainData.length === 0;
   const _data = [];
   let end = filters?.timeframe?.endDate || dayjs__default["default"]();
   let start = filters?.timeframe?.startDate || dayjs__default["default"]().add(-12, timeQuantity);
@@ -42993,7 +43054,7 @@ const processChartDateData = ({
   let currentDate = start.clone();
   while (currentDate.isBefore(end) || currentDate.isSame(end, filter === "daily" ? "day" : filter === "weekly" ? "week" : "month")) {
     // Filter data points that fall within this period
-    const score = dates.filter(d => {
+    const score = isEmpty ? 0 : dates.filter(d => {
       if (!d.date) return false;
       switch (filter) {
         case "daily":
@@ -43139,19 +43200,12 @@ const RestoredArea = ({
   } = useTimeFilter({
     defaultFilter: 'monthly'
   });
-
-  // Map restoredAreaChart data to LineChart format with time filter support
-  // Y-axis: total/cumulated value
-  // X-axis: date (formatted based on timeFilter)
-  // Fill all periods in the range, even if empty
   const restoredAreaChartData = React.useMemo(() => {
-    if (!restoredAreaChart || !Array.isArray(restoredAreaChart) || restoredAreaChart.length === 0) {
-      return [];
-    }
+    const dataToProcess = !restoredAreaChart || !Array.isArray(restoredAreaChart) || restoredAreaChart.length === 0 ? [] : restoredAreaChart;
 
     // Process data with cumulative calculation (for restored area)
     return processChartDateData({
-      mainData: restoredAreaChart,
+      mainData: dataToProcess,
       isCumulative: true,
       valueField: 'total'
     });
@@ -43289,18 +43343,12 @@ const PlantingActivitiesTimeline = ({
   } = useTimeFilter({
     defaultFilter: 'monthly'
   });
-
-  // Map activitiesTimelineChart data to ColumnChart format with time filter support
-  // Data structure: [{count: 2, date: "2025-11-03"}]
-  // Fill all periods in the range, even if empty
   const activitiesTimelineData = React.useMemo(() => {
-    if (!activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0) {
-      return [];
-    }
+    const dataToProcess = !activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0 ? [] : activitiesTimelineChart;
 
     // Process data without cumulative calculation (for activities timeline)
     return processChartDateData({
-      mainData: activitiesTimelineChart,
+      mainData: dataToProcess,
       isCumulative: false,
       valueField: 'count'
     });
@@ -44225,14 +44273,13 @@ const JobsTimeline = ({
   });
   const jobsData = Array.isArray(dayJobsTimeline) ? dayJobsTimeline : dayJobsTimeline?.jobsTimeline || dayJobsTimeline?.jobs || dayJobsTimeline?.timeline || [];
   const jobsTimelineData = React.useMemo(() => {
-    if (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) {
-      return [];
-    }
+    // Always process data, even if empty, to generate default date range for x-axis
+    const dataToProcess = !jobsData || !Array.isArray(jobsData) || jobsData.length === 0 ? [] : jobsData;
 
     // Process data without cumulative calculation (for jobs timeline)
     // Try to find value in total, count, jobs, or value fields
     return processChartDateData({
-      mainData: jobsData,
+      mainData: dataToProcess,
       isCumulative: false,
       valueField: 'total' // Will fallback to count/jobs/value if total doesn't exist
     });
@@ -44855,9 +44902,10 @@ const getColumns = ({
             className: "daf-default-cell"
           });
         }
+        const title = findOptions(value, selectOptions?.implPartnersCategory || []) || '-';
         return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-          title: value,
-          children: value || '-'
+          title: title,
+          children: title
         });
       }
     }, {
@@ -44871,9 +44919,10 @@ const getColumns = ({
             className: "daf-default-cell"
           });
         }
+        const title = findOptions(value, selectOptions?.implPartnersSubcategory || []) || '-';
         return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-          title: value,
-          children: value || '-'
+          title: title,
+          children: title
         });
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.777",
+	"version": "0.6.779",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/AssociatedInformation/config.js

@@ -348,7 +348,8 @@ export const getColumns = ({
                     if (all.empty) {
                         return <div className="daf-default-cell" />;
                     }
-                    return <Tooltip title={value}>{value || '-'}</Tooltip>;
+                    const title = findOptions(value, selectOptions?.implPartnersCategory || []) || '-';
+                    return <Tooltip title={title}>{title}</Tooltip>;
                 },
             },
             {
@@ -360,7 +361,8 @@ export const getColumns = ({
                     if (all.empty) {
                         return <div className="daf-default-cell" />;
                     }
-                    return <Tooltip title={value}>{value || '-'}</Tooltip>;
+                    const title = findOptions(value, selectOptions?.implPartnersSubcategory || []) || '-';
+                    return <Tooltip title={title}>{title}</Tooltip>;
                 },
             },
             {

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

@@ -50,6 +50,7 @@ const AssociatedInformation = ({
 }) => {
     const [activeTab, setActiveTab] = useState(ACTIVITIES_TAB);
     const [search, setSearch] = useState('');
+
     
     const searchFields = useMemo(() => searchFieldsMap(activeTab), [activeTab, searchFieldsMap]);
     

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CommunityParticipation/JobsTimeline/index.jsx

@@ -21,14 +21,15 @@ const JobsTimeline = ({
         : (dayJobsTimeline?.jobsTimeline || dayJobsTimeline?.jobs || dayJobsTimeline?.timeline || []);
 
     const jobsTimelineData = useMemo(() => {
-        if (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) {
-            return [];
-        }
+        // Always process data, even if empty, to generate default date range for x-axis
+        const dataToProcess = (!jobsData || !Array.isArray(jobsData) || jobsData.length === 0) 
+            ? [] 
+            : jobsData;
 
         // Process data without cumulative calculation (for jobs timeline)
         // Try to find value in total, count, jobs, or value fields
         return processChartDateData({
-            mainData: jobsData,
+            mainData: dataToProcess,
             isCumulative: false,
             valueField: 'total', // Will fallback to count/jobs/value if total doesn't exist
         });

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

@@ -15,17 +15,15 @@ const PlantingActivitiesTimeline = ({
 }) => {
     const { timeFilter, setTimeFilter, formatDateAxis, processChartDateData } = useTimeFilter({ defaultFilter: 'monthly' });
 
-    // Map activitiesTimelineChart data to ColumnChart format with time filter support
-    // Data structure: [{count: 2, date: "2025-11-03"}]
-    // Fill all periods in the range, even if empty
+
     const activitiesTimelineData = useMemo(() => {
-        if (!activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0) {
-            return [];
-        }
+        const dataToProcess = (!activitiesTimelineChart || !Array.isArray(activitiesTimelineChart) || activitiesTimelineChart.length === 0)
+            ? []
+            : activitiesTimelineChart;
 
         // Process data without cumulative calculation (for activities timeline)
         return processChartDateData({
-            mainData: activitiesTimelineChart,
+            mainData: dataToProcess,
             isCumulative: false,
             valueField: 'count',
         });

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

@@ -15,18 +15,14 @@ const RestoredArea = ({
 }) => {
     const { timeFilter, setTimeFilter, formatDateAxis, processChartDateData } = useTimeFilter({ defaultFilter: 'monthly' });
 
-    // Map restoredAreaChart data to LineChart format with time filter support
-    // Y-axis: total/cumulated value
-    // X-axis: date (formatted based on timeFilter)
-    // Fill all periods in the range, even if empty
     const restoredAreaChartData = useMemo(() => {
-        if (!restoredAreaChart || !Array.isArray(restoredAreaChart) || restoredAreaChart.length === 0) {
-            return [];
-        }
+        const dataToProcess = (!restoredAreaChart || !Array.isArray(restoredAreaChart) || restoredAreaChart.length === 0)
+            ? []
+            : restoredAreaChart;
 
         // Process data with cumulative calculation (for restored area)
         return processChartDateData({
-            mainData: restoredAreaChart,
+            mainData: dataToProcess,
             isCumulative: true,
             valueField: 'total',
         });

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

@@ -1,6 +1,9 @@
 import React, { useMemo } from 'react';
 import { Widget, MineSiteMap } from '../../../../../../../../src/index.js';
 import { useWidgetFetch } from '../../../../../../hooks/useWidgetFetch.js';
+import { convertDMS } from '../../../../../../../../src/helpers/Map';
+import CustomIcon from '../../../../../../../../src/@daf/core/components/Icon/CustomIcon.jsx';
+import { renderDateFormatted } from '../../../../../../../../src/helpers/Forms';
 
 const PlantingLocations = ({
     id,
@@ -76,6 +79,8 @@ const PlantingLocations = ({
          
             const color = "#15FFFFB2"
 
+            const locationName = matchingLocation?.name || locationCheckArrival.name || 'Planting Location';
+
             return {
                 _id: locationCheckArrival._id || event._id || {},
                 area: area,
@@ -83,13 +88,16 @@ const PlantingLocations = ({
                 datastakeId: `LOC-${String(index + 1).padStart(9, '0')}`,
                 gps: gps,
                 id: matchingLocation?.id || locationCheckArrival._id || `event-${index}`,
-                name: locationCheckArrival.name || matchingLocation?.name || `Event ${index + 1}`,
+                name: event.name || t("Activity Start"),
+                date: event.date,
                 sources: 1,
-                subTitle: locationCheckArrival.name || matchingLocation?.name || 'Planting Location',
+                subTitle: event.date ? renderDateFormatted(event.date, "DD MMM YY") : locationName,
+                plotName: locationName,
+                territoryTitle: locationName,
                 type: 'Planting Location'
             };
         });
-    }, [plantingLocationsData]);
+    }, [plantingLocationsData, t]);
 
     return (
         <section>
@@ -107,7 +115,55 @@ const PlantingLocations = ({
                     onClickLink={() => { }}
                     onFilterChange={() => { }}
                     primaryLink
-                    renderTooltip={() => { }}
+                    renderTooltipForLocation={(data) => {
+                        const coordinates = data.gps?.latitude && data.gps?.longitude
+                            ? convertDMS(data.gps.latitude, data.gps.longitude)
+                            : null;
+
+                        if (!coordinates) {
+                            return [];
+                        }
+
+                        const iconColor = "#016C6E"; // Activity Start color
+
+                        return [
+                            {
+                                label: t("Coordinates"),
+                                value: (
+                                    <div style={{ display: 'flex', alignItems: 'center', gap: '6px', flexWrap: 'nowrap' }}>
+                                        {/* Latitude icon (vertical) */}
+                                        <div style={{ display: 'flex', alignItems: 'center' }}>
+                                            <CustomIcon 
+                                                name="SpacingHeight" 
+                                                width={14} 
+                                                height={14} 
+                                                color={iconColor}
+                                            />
+                                            <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[0]}</span>
+                                        </div>
+                                        {/* Longitude icon (horizontal) */}
+                                        <div style={{ display: 'flex', alignItems: 'center' }}>
+                                            <CustomIcon 
+                                                name="SpacingWidth" 
+                                                width={14} 
+                                                height={14} 
+                                                color={iconColor}
+                                            />
+                                            <span style={{ fontWeight: 600, marginLeft: '4px' }}>{coordinates[1]}</span>
+                                        </div>
+                                    </div>
+                                ),
+                            },
+                        ];
+                    }}
+                    renderTooltipForTerritory={(data) => {
+                        return [
+                            {
+                                label: t("Plot Name"),
+                                value: data.plotName || data.name || "--",
+                            },
+                        ];
+                    }}
                     renderTooltipTags={() => { }}
                     type="location-territory"
                 />

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

@@ -99,12 +99,9 @@ export const processChartDateData = ({
     isCumulative = false,
     valueField = 'total'
 }) => {
-    if (!mainData || !Array.isArray(mainData) || mainData.length === 0) {
-        return [];
-    }
-
     const timeQuantity = getTimeQuantity(filter);
-    const dates = mainData;
+    const dates = mainData || [];
+    const isEmpty = !mainData || !Array.isArray(mainData) || mainData.length === 0;
 
     const _data = [];
     let end = filters?.timeframe?.endDate || dayjs();
@@ -140,7 +137,7 @@ export const processChartDateData = ({
     let currentDate = start.clone();
     while (currentDate.isBefore(end) || currentDate.isSame(end, filter === "daily" ? "day" : filter === "weekly" ? "week" : "month")) {
         // Filter data points that fall within this period
-        const score = dates
+        const score = isEmpty ? 0 : dates
             .filter((d) => {
                 if (!d.date) return false;
                 switch (filter) {