datastake-daf 0.6.811 → 0.6.812

package/dist/components/index.js

@@ -19415,8 +19415,6 @@ function FaunaWidget(_ref) {
         $itemWidth: itemWidth,
         $itemHeight: itemHeight,
         children: faunaConfig.map(item => {
-          // Use colored SVG if the item's key exists in faunaPresent array
-          // Otherwise use default SVG
           const isPresent = Array.isArray(faunaPresent) && faunaPresent.includes(item.key);
           const shouldUseColored = isPresent;
           return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -20026,8 +20024,7 @@ function _checkValue(wantedValue, match, fieldValue) {
   }
   return false;
 }
-function getInputProp$1(prop) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getInputProp$1(prop, formsValue = {}) {
   if (prop && typeof prop === 'object') {
     const validations = Object.keys(prop);
     const key = validations.find(v => {
@@ -20041,9 +20038,7 @@ function getInputProp$1(prop) {
     return prop;
   }
 }
-function getInputLabel$2(input) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let asText = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+function getInputLabel$2(input, formsValue = {}, asText = false) {
   const label = getInputProp$1(input.label, formsValue);
   return input.description && typeof input.description === 'string' && !asText ? /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [ReactHtmlParser__default["default"](label), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -20250,22 +20245,14 @@ const sgbEvaluationIcons = getSgbEvaluationIcons(22, 22);
 const types = {
   MODAL: 'modal'
 };
-const isGroupInput = function (group) {
-  var _group$meta;
-  let repeatable = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  let data = arguments.length > 2 ? arguments[2] : undefined;
+const isGroupInput = (group, repeatable = false, data) => {
   let resp = group.inputs && Object.keys(group.inputs).length && group.repeatable === repeatable && group.type !== 'groupInputs' && group.type !== 'group' && group.type !== 'dataLinkGroup' && group.display !== 'group' && !group.viewGroup && !group.component;
-  if (group.showIf || group !== null && group !== void 0 && (_group$meta = group.meta) !== null && _group$meta !== void 0 && _group$meta.excludeFromView) {
+  if (group.showIf || group?.meta?.excludeFromView) {
     resp = resp && showHideInput$3(group, data);
   }
   return resp;
 };
-const repeatObjects = function (obj) {
-  let fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
-  let filter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-  let sort = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  return filter ? Object.keys(obj).filter(key => filter(obj[key])).map(fn) : sort ? Object.keys(obj).sort(sort).map(fn) : Object.keys(obj).map(fn);
-};
+const repeatObjects = (obj, fn = () => {}, filter = null, sort = null) => filter ? Object.keys(obj).filter(key => filter(obj[key])).map(fn) : sort ? Object.keys(obj).sort(sort).map(fn) : Object.keys(obj).map(fn);
 const conditions = new RegExp(/( is | and | not | notEmpty | includes )/gm);
 const getLastRow = (arr, cols) => {
   let currentInd = -1;
@@ -20331,32 +20318,28 @@ const checkCondition$3 = (condition, formsValue, repeatValues, input) => {
   }
 };
 const showHideInput$3 = (input, formsValue, repeatValues) => {
-  var _input$meta, _input$meta2, _input$meta5, _input$meta7;
-  if (input.showIf && !(input !== null && input !== void 0 && (_input$meta = input.meta) !== null && _input$meta !== void 0 && _input$meta.excludeFromView) && !['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type)) {
+  if (input.showIf && !input?.meta?.excludeFromView && !['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type)) {
     const isOrCond = input.showIf.indexOf('OR') >= 0;
     const allParts = input.showIf.split(/( OR | && )/gmi).filter(c => !['OR', '&&'].includes(c.trim()));
     const parts = allParts.map(condition => checkCondition$3(condition, formsValue, repeatValues, input));
     return parts.length > 0 && (isOrCond && parts.filter(p => p).length >= 1 || parts.filter(p => !p).length === 0);
   }
-  if (typeof (input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.excludeFromView) === 'string') {
-    var _input$meta3, _input$meta4;
-    const isOrCond = (input === null || input === void 0 || (_input$meta3 = input.meta) === null || _input$meta3 === void 0 ? void 0 : _input$meta3.excludeFromView.indexOf('OR')) >= 0;
-    const allParts = input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.excludeFromView.split(/( OR | && )/gmi).filter(c => !['OR', '&&'].includes(c.trim()));
+  if (typeof input?.meta?.excludeFromView === 'string') {
+    const isOrCond = input?.meta?.excludeFromView.indexOf('OR') >= 0;
+    const allParts = input?.meta?.excludeFromView.split(/( OR | && )/gmi).filter(c => !['OR', '&&'].includes(c.trim()));
     const parts = allParts.map(condition => checkCondition$3(condition, formsValue, repeatValues, input));
     const excludeFromView = parts.length > 0 && (isOrCond && parts.filter(p => p).length >= 1 || parts.filter(p => !p).length === 0);
     return !excludeFromView;
   }
-  if (typeof (input === null || input === void 0 || (_input$meta5 = input.meta) === null || _input$meta5 === void 0 ? void 0 : _input$meta5.excludeFromView) === 'boolean') {
-    var _input$meta6;
-    return !(input !== null && input !== void 0 && (_input$meta6 = input.meta) !== null && _input$meta6 !== void 0 && _input$meta6.excludeFromView);
+  if (typeof input?.meta?.excludeFromView === 'boolean') {
+    return !input?.meta?.excludeFromView;
   }
-  if (input !== null && input !== void 0 && (_input$meta7 = input.meta) !== null && _input$meta7 !== void 0 && _input$meta7.excludeFromView || ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type)) {
+  if (input?.meta?.excludeFromView || ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type)) {
     return false;
   }
   return true;
 };
-const groupSubsections = function (form) {
-  let onlyConf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+const groupSubsections = (form, onlyConf = false) => {
   return Object.keys(form).reduce((f, fKey) => {
     if (form[fKey].subSection) {
       let subName = form[fKey].subSection;
@@ -20393,27 +20376,25 @@ const groupSubsections = function (form) {
     return f;
   }, {});
 };
-const renderPlaceholder = _ref => {
-  var _data$meta, _data$meta2, _config$meta;
-  let {
-    data,
-    config,
-    name,
-    withPlaceholder = true,
-    parent,
-    t
-  } = _ref;
-  if ((((data === null || data === void 0 || (_data$meta = data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.inputs) || {})[name] || {}).notApplicable) {
+const renderPlaceholder = ({
+  data,
+  config,
+  name,
+  withPlaceholder = true,
+  parent,
+  t
+}) => {
+  if (((data?.meta?.inputs || {})[name] || {}).notApplicable) {
     return /*#__PURE__*/jsxRuntime.jsx("span", {
       className: "text-muted",
       children: t('Not applicable')
-    }, "".concat(parent, "-").concat(name));
+    }, `${parent}-${name}`);
   }
-  if ((((data === null || data === void 0 || (_data$meta2 = data.meta) === null || _data$meta2 === void 0 ? void 0 : _data$meta2.inputs) || {})[name] || {}).notAvailable) {
+  if (((data?.meta?.inputs || {})[name] || {}).notAvailable) {
     return /*#__PURE__*/jsxRuntime.jsx("span", {
       className: "text-muted",
       children: t('No available information')
-    }, "".concat(parent, "-").concat(name));
+    }, `${parent}-${name}`);
   }
   if (!withPlaceholder) {
     return '';
@@ -20421,9 +20402,9 @@ const renderPlaceholder = _ref => {
   return config.noValue ? /*#__PURE__*/jsxRuntime.jsx("span", {
     className: "text-muted",
     children: config.noValue
-  }, "".concat(parent, "-").concat(name)) : /*#__PURE__*/jsxRuntime.jsxs("span", {
+  }, `${parent}-${name}`) : /*#__PURE__*/jsxRuntime.jsxs("span", {
     className: "text-muted flex",
-    children: [t('Not answered'), config !== null && config !== void 0 && (_config$meta = config.meta) !== null && _config$meta !== void 0 && _config$meta.mandatory ? /*#__PURE__*/jsxRuntime.jsx("div", {
+    children: [t('Not answered'), config?.meta?.mandatory ? /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "ml-1",
       style: {
         marginTop: -1
@@ -20435,10 +20416,9 @@ const renderPlaceholder = _ref => {
         color: "#FFC069"
       })
     }) : null]
-  }, "".concat(parent, "-").concat(name));
+  }, `${parent}-${name}`);
 };
-function getSelectOptions$2(option) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getSelectOptions$2(option, formsValue = {}) {
   if (typeof option.label === 'object') {
     const validations = Object.keys(option.label);
     const key = validations.find(v => {
@@ -20467,15 +20447,13 @@ function numberWithCommas$1(x) {
 }
 const noLabelInputTypes = ['ajaxSubGroup', 'subGroup', 'group', 'groupExpandable'];
 const excludedKeys$1 = ['id', 'label', 'position', 'subTitle'];
-const renderDate = _ref2 => {
-  var _input$meta8;
-  let {
-    item,
-    inputName,
-    input
-  } = _ref2;
+const renderDate = ({
+  item,
+  inputName,
+  input
+}) => {
   const date = moment__default["default"].parseZone(item[inputName] ? item[inputName].toString() : null);
-  if (input !== null && input !== void 0 && (_input$meta8 = input.meta) !== null && _input$meta8 !== void 0 && _input$meta8.checkExpiry) {
+  if (input?.meta?.checkExpiry) {
     const expired = date.isBefore(moment__default["default"]());
     if (expired) {
       return /*#__PURE__*/jsxRuntime.jsxs("div", {

package/dist/pages/index.js

@@ -49119,8 +49119,6 @@ function FaunaWidget({
         $itemWidth: itemWidth,
         $itemHeight: itemHeight,
         children: faunaConfig.map(item => {
-          // Use colored SVG if the item's key exists in faunaPresent array
-          // Otherwise use default SVG
           const isPresent = Array.isArray(faunaPresent) && faunaPresent.includes(item.key);
           const shouldUseColored = isPresent;
           return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
@@ -58733,6 +58731,30 @@ const getMapDataFromActivity = (activityData, t) => {
     });
   }
 
+  // Entry 4: Generic locationCheck marker (independent - show if it exists)
+  const locationCheckLat = activityData?.locationCheck?.latitude;
+  const locationCheckLng = activityData?.locationCheck?.longitude;
+  if (isValidCoordinate(locationCheckLat) && isValidCoordinate(locationCheckLng)) {
+    mapData.push({
+      _id: {},
+      id: `${activityData?.id || activityData?.datastakeId || 'locationcheck'}-locationcheck`,
+      // Include area if it exists, so marker can show on top of polygon
+      area: area && area.length >= 3 ? area : null,
+      color: baseColor,
+      gps: {
+        latitude: typeof locationCheckLat === 'number' ? locationCheckLat : parseFloat(locationCheckLat),
+        longitude: typeof locationCheckLng === 'number' ? locationCheckLng : parseFloat(locationCheckLng)
+      },
+      name: t("Location Check"),
+      plotName: locationName,
+      territoryTitle: t("Associated Plot"),
+      datastakeId: `${datastakeId}-locationcheck`,
+      markerColor: "#016C6E",
+      sources: null,
+      link: null
+    });
+  }
+
   // Return mapData even if empty - let the map component handle empty arrays
   return mapData;
 };
@@ -59188,8 +59210,8 @@ const BiodiversityAndHabitat = ({
           title: t("Observed Fauna"),
           faunaPresent: faunaPresent,
           columnsPerRow: 5,
-          itemWidth: 120,
-          itemHeight: 120,
+          itemWidth: 130,
+          itemHeight: 130,
           loading: loading,
           t: t
         })

package/package.json

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

package/src/@daf/core/components/Dashboard/Widget/FaunaWidget/index.jsx

@@ -29,8 +29,7 @@ export default function FaunaWidget({
 					$itemHeight={itemHeight}
 				>
 					{faunaConfig.map((item) => {
-						// Use colored SVG if the item's key exists in faunaPresent array
-						// Otherwise use default SVG
+						
 						const isPresent = Array.isArray(faunaPresent) && faunaPresent.includes(item.key);
 						const shouldUseColored = isPresent;
 

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

@@ -40,8 +40,8 @@ const BiodiversityAndHabitat = ({
                         title={t("Observed Fauna")}
                         faunaPresent={faunaPresent}
                         columnsPerRow={5}
-                        itemWidth={120}
-                        itemHeight={120}
+                        itemWidth={130}
+                        itemHeight={130}
                         loading={loading}
                         t={t}
                     />

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

@@ -237,6 +237,30 @@ export const getMapDataFromActivity = (activityData, t) => {
         });
     }
 
+    // Entry 4: Generic locationCheck marker (independent - show if it exists)
+    const locationCheckLat = activityData?.locationCheck?.latitude;
+    const locationCheckLng = activityData?.locationCheck?.longitude;
+    if (isValidCoordinate(locationCheckLat) && isValidCoordinate(locationCheckLng)) {
+        mapData.push({
+            _id: {},
+            id: `${activityData?.id || activityData?.datastakeId || 'locationcheck'}-locationcheck`,
+            // Include area if it exists, so marker can show on top of polygon
+            area: area && area.length >= 3 ? area : null,
+            color: baseColor,
+            gps: {
+                latitude: typeof locationCheckLat === 'number' ? locationCheckLat : parseFloat(locationCheckLat),
+                longitude: typeof locationCheckLng === 'number' ? locationCheckLng : parseFloat(locationCheckLng),
+            },
+            name: t("Location Check"),
+            plotName: locationName, 
+            territoryTitle: t("Associated Plot"), 
+            datastakeId: `${datastakeId}-locationcheck`,
+            markerColor: "#016C6E", 
+            sources: null,
+            link: null,
+        });
+    }
+
     // Return mapData even if empty - let the map component handle empty arrays
     return mapData;
 };