datastake-daf 0.6.778 → 0.6.779

package/dist/components/index.js

@@ -8486,20 +8486,22 @@ const useHeader = _ref => {
 const {
   useToken: useToken$m
 } = antd.theme;
-function BreadCrumbs({
-  breadcrumbs = [],
-  mainContWidth = 0
-}) {
+function BreadCrumbs(_ref) {
+  let {
+    breadcrumbs = [],
+    mainContWidth = 0
+  } = _ref;
   const [splitIndex, setSplitIndex] = React.useState(0);
   const {
     token
   } = useToken$m();
-  const _renderBreadcrumb = (b, i, isLast, noOnClickLast = false) => {
+  const _renderBreadcrumb = function (b, i, isLast) {
+    let noOnClickLast = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     return /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex breadcrumb-item",
-      onClick: noOnClickLast && isLast ? undefined : b?.onClick,
+      onClick: noOnClickLast && isLast ? undefined : b === null || b === void 0 ? void 0 : b.onClick,
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        children: b?.label
+        children: b === null || b === void 0 ? void 0 : b.label
       }), !isLast && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-column justify-content-center",
         children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -8509,7 +8511,7 @@ function BreadCrumbs({
           color: token.baseGray50
         })
       })]
-    }, `breadcrumb-item-${i}`);
+    }, "breadcrumb-item-".concat(i));
   };
   React.useEffect(() => {
     const _placeholderCont = document.getElementById("header-breadcrumbs");
@@ -8552,7 +8554,7 @@ function BreadCrumbs({
         placement: "bottomRight",
         menu: {
           items: groupedBreadCrumbs[2].map((it, i) => ({
-            key: `items-${i}`,
+            key: "items-".concat(i),
             label: it.label,
             onClick: it.onClick
           }))
@@ -9603,27 +9605,25 @@ const renderFieldData = function (type, value, user, config) {
   }
 };
 
-const renderValue = _ref => {
-  let {
-    value,
-    hasChildren,
-    config,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    allData = {}
-  } = _ref;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
-    if (!(config !== null && config !== void 0 && config.inputs)) return null;
+const renderValue = ({
+  value,
+  hasChildren,
+  config,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  allData = {}
+}) => {
+  if (config?.type === 'groupInputs') {
+    if (!config?.inputs) return null;
     const inputKeys = Object.keys(config.inputs).sort((a, b) => {
-      var _config$inputs$a, _config$inputs$b;
-      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
-      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
+      const positionA = config.inputs[a]?.position || 0;
+      const positionB = config.inputs[b]?.position || 0;
       return positionA - positionB;
     });
     const values = inputKeys.map(inputKey => {
-      let inputValue = value === null || value === void 0 ? void 0 : value[inputKey];
+      let inputValue = value?.[inputKey];
       if (inputValue === null || inputValue === undefined || inputValue === '') {
         return '';
       } else if (typeof inputValue === 'object' && inputValue !== null) {
@@ -9664,8 +9664,8 @@ const renderValue = _ref => {
   } else {
     displayValue = String(value);
   }
-  const fieldType = (config === null || config === void 0 ? void 0 : config.type) || 'text';
-  let cssClass = "tree-value ".concat(fieldType, "-type");
+  const fieldType = config?.type || 'text';
+  let cssClass = `tree-value ${fieldType}-type`;
   if (displayValue === '-') {
     cssClass += ' empty';
   }
@@ -9675,21 +9675,19 @@ const renderValue = _ref => {
     children: displayValue
   });
 };
-const determineHasChildren = _ref2 => {
-  var _config$meta;
-  let {
-    config,
-    level
-  } = _ref2;
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'groupInputs') {
+const determineHasChildren = ({
+  config,
+  level
+}) => {
+  if (config?.type === 'groupInputs') {
     return false;
   }
-  if ((config === null || config === void 0 ? void 0 : config.type) === 'header' && config !== null && config !== void 0 && config.inputs && Object.keys(config.inputs).length > 0) {
+  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
     return true;
   }
-  return (config === null || config === void 0 ? void 0 : config.inputs) || (config === null || config === void 0 ? void 0 : config.type) === 'group' || (config === null || config === void 0 ? void 0 : config.type) === 'dataLinkGroup' || (config === null || config === void 0 ? void 0 : config.type) === 'section' || (config === null || config === void 0 ? void 0 : config.type) === 'ajaxSubGroup' ||
+  return config?.inputs || config?.type === 'group' || config?.type === 'dataLinkGroup' || config?.type === 'section' || config?.type === 'ajaxSubGroup' ||
   // Add this line
-  (config === null || config === void 0 ? void 0 : config.type) === 'dataLink' && (config === null || config === void 0 || (_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.tableKeys) || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
+  config?.type === 'dataLink' && config?.meta?.tableKeys || level === 0 && config && typeof config === 'object' && Object.keys(config).some(key => key !== 'id' && key !== 'label' && key !== 'position' && key !== 'subTitle' && typeof config[key] === 'object' && config[key] !== null);
 };
 
 const sortByPosition = (items, getConfig) => {
@@ -9774,28 +9772,30 @@ const handleSectionChildren = ({
   });
 };
 
-const handleArrayChildren = ({
-  value,
-  config,
-  label,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
+const handleArrayChildren = _ref => {
+  let {
+    value,
+    config,
+    label,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
   if (!Array.isArray(value)) {
     return null;
   }
   return value.map((item, itemIndex) => /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "array-item",
     children: Object.keys(config.inputs).sort((a, b) => {
-      const positionA = config.inputs[a]?.position || 0;
-      const positionB = config.inputs[b]?.position || 0;
+      var _config$inputs$a, _config$inputs$b;
+      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
+      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
       return positionA - positionB;
     }).map(subInputKey => {
       const subInputConfig = config.inputs[subInputKey];
@@ -9813,9 +9813,9 @@ const handleArrayChildren = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${itemIndex}-${subInputKey}`);
+      }, "".concat(itemIndex, "-").concat(subInputKey));
     })
-  }, `${itemIndex}`));
+  }, "".concat(itemIndex)));
 };
 
 const noDafApps = ['tif', 'cukura']; //PACKAGE_CHANGE_LATER (remove sbg)
@@ -10170,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 = {};
@@ -10218,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;
@@ -10239,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;
               }
@@ -10247,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);
@@ -10267,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;
@@ -10279,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;
               }
@@ -10287,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 {
@@ -10297,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
@@ -10306,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
         },
@@ -10322,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
@@ -10350,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"
       })
@@ -44839,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
         });
       }
     }, {
@@ -44855,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.778",
+	"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/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"
                 />