datastake-daf 0.6.100 → 0.6.102

package/src/@daf/core/components/PdfForm/style.scss

@@ -2,7 +2,7 @@
 .pdf-form {
   color: #333;
   background: white;
-  
+
   // Document header styling
   .document-header {
     display: flex;
@@ -151,6 +151,24 @@
           }
         }
         
+        &.level-4.leaf:not(.parent) {
+          &::before {
+            left: 84px !important;
+            right: 0;
+            height: 1px;
+            background-color: #e8e8e8;
+          }
+        }
+        
+        &.level-5.leaf:not(.parent) {
+          &::before {
+            left: 84px !important;
+            right: 0;
+            height: 1px;
+            background-color: #e8e8e8;
+          }
+        }
+        
         .tree-node-content {
           display: flex;
           align-items: center;
@@ -176,6 +194,15 @@
                 width: 1px;
                 background-color: #d9d9d9;
               }
+
+               &.level-4, &.level-5, &.level-6 {
+                &::before {
+                  height: 46px;
+                }
+                &::after {
+                  display: none;
+                }
+              }
               
               &::after {
                 display: none;
@@ -342,13 +369,101 @@
         
         &.level-4 {
           .tree-node-content .tree-node-title .tree-value-container {
-            margin-left: -40px;
+            margin-left: -60px;
           }
         }
         
         &.level-5 {
           .tree-node-content .tree-node-title .tree-value-container {
-            margin-left: -50px;
+            margin-left: -80px;
+          }
+        }
+
+        &.level-6 {
+          .tree-node-content .tree-node-title .tree-value-container {
+            margin-left: -100px;
+          }
+        }
+
+        &.level-4.leaf:not(.parent) {
+          &::before {
+            left: 90px !important;
+            right: 0;
+          }
+        }
+
+        &.level-5.leaf:not(.parent) {
+          &::before {
+            left: 120px !important;
+            right: 0;
+          }
+        }        
+        &.level-6.leaf:not(.parent) {
+          &::before {
+            left: 140px !important;
+            right: 0;
+          }
+        }
+
+        &.parent {
+          &.level-3::after {
+            left: 84px;
+          }
+          
+          &.level-4::after {
+            left: 84px;
+          }
+          
+          &.level-5::after {
+            left: 84px;
+          }
+
+          &.level-6::after {
+            left: 140px;
+          }
+        }
+
+        // Style adjustments for header type elements at different levels
+        &[data-node-type="header"] {
+          &.level-1 {
+            margin-bottom: 15px;
+            
+            > .tree-node-content > .tree-node-title .tree-label {
+              font-size: 13px;
+              font-weight: 700;
+              color: #1a202c;
+              text-transform: uppercase;
+              letter-spacing: 0.5px;
+            }
+          }
+          
+          &.level-2 {
+            margin-bottom: 10px;
+            
+            > .tree-node-content > .tree-node-title .tree-label {
+              font-size: 12px;
+              font-weight: 600;
+              color: #2d3748;
+            }
+          }
+        }
+
+        // Update leaf node styling to match the new line positioning
+        &.level-3.leaf:not(.parent) {
+          &::before {
+            left: 84px;
+          }
+        }
+        
+        &.level-4.leaf:not(.parent) {
+          &::before {
+            left: 84px; // Align with the continuous vertical line
+          }
+        }
+        
+        &.level-5.leaf:not(.parent) {
+          &::before {
+            left: 84px; // Align with the continuous vertical line
           }
         }
       }
@@ -469,3 +584,30 @@
     }
   }
 }
+
+// Alternative approach - target by the content or add a class
+.pdf-form .tree-node .tree-node-content .tree-node-title .tree-label {
+  &[data-is-comment="true"] {
+    font-size: 10px;
+    color: #666;
+    font-weight: 400;
+  }
+}
+
+.tree-node.comment-node .tree-label.comment-label {
+  font-size: 10px !important;
+  color: #666 !important;
+  font-weight: 400 !important;
+}
+
+.tree-node.comment-node {
+  .tree-label.comment-label {
+    font-size: 10px !important;
+    color: #888 !important;
+    font-weight: 400 !important;
+  }
+
+  .tree-node-content {
+    padding-left: 10px;
+  }
+}

package/src/@daf/core/components/PdfForm/utils/fieldData.js

@@ -4,20 +4,93 @@ import { AjaxSelectRenderer } from './ajaxSelectFieldData';
 import { findOptions } from '../../../../../helpers/StringHelper';
 import Geolocation from '../../ViewForm/components/geolocation';
 
+export const evaluateShowIfCondition = (condition, item) => {
+  if (!condition || !item) return false;
+  
+  // Handle boolean AND operations
+  if (condition.includes(' && ')) {
+    const andParts = condition.split(' && ');
+    return andParts.every(part => evaluateShowIfCondition(part.trim(), item));
+  }
+  
+  // Handle "includes" conditions
+  if (condition.includes(' includes ')) {
+    const parts = condition.split(' includes ');
+    if (parts.length === 2) {
+      const [field, expectedValue] = parts.map(p => p.trim());
+      const fieldValue = item[field];
+      if (Array.isArray(fieldValue)) {
+        return fieldValue.includes(expectedValue);
+      }
+      if (typeof fieldValue === 'string') {
+        return fieldValue.split(',').map(v => v.trim()).includes(expectedValue);
+      }
+      return false;
+    }
+  }
+  
+  // Handle "not" conditions
+  if (condition.includes(' not ')) {
+    const parts = condition.split(' not ');
+    if (parts.length === 2) {
+      const [field, expectedValue] = parts.map(p => p.trim());
+      return item[field] !== expectedValue;
+    }
+  }
+  
+  // Handle "is" conditions (existing logic)
+  const parts = condition.split(' is ');
+  if (parts.length === 2) {
+    const [field, expectedValue] = parts.map(p => p.trim());
+    return item[field] === expectedValue;
+  }
+  
+  return false;
+};
+
+export const processConditionalTableKeys = (tableKeys, item) => {
+  const processedKeys = [];
+  
+  tableKeys.forEach(tableKey => {
+    if (typeof tableKey === 'string') {
+      processedKeys.push(tableKey);
+    } else if (tableKey && typeof tableKey === 'object' && tableKey.content) {
+      tableKey.content.forEach(contentItem => {
+        if (contentItem.key) {
+          if (!contentItem.showIf || evaluateShowIfCondition(contentItem.showIf, item)) {
+            processedKeys.push(contentItem.key);
+          }
+        }
+      });
+    } else if (tableKey && typeof tableKey === 'object' && tableKey.key) {
+      if (!tableKey.showIf || evaluateShowIfCondition(tableKey.showIf, item)) {
+        processedKeys.push(tableKey.key);
+      }
+    }
+  });
+  
+  return processedKeys;
+};
 
-export const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app) => {
+export const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues) => {
     switch(type) {
       case 'year':
-        return renderDateFormatted(value, 'YYYY', 'en');
+        return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
       case 'date': {
         const language = user?.language && user?.language === 'sp' ? 'es' : user?.language
-        return renderDateFormatted(value, 'DD MMM YYYY', language || 'en');
+        return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
       case 'select': {
         const options = config?.options || [];
         const option = findOptions(value, options);
         return option
       }
+      case 'multiselect': {
+        const options = config?.options || [];
+        const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
+        const option = findOptions(_val, options);
+        return option.join(', ');
+      }
       case 'ajaxSelect':
         return <AjaxSelectRenderer value={value} config={config} getApiBaseUrl={getApiBaseUrl} getAppHeader={getAppHeader} app={app} />;
       case 'percentage': 
@@ -26,6 +99,12 @@ export const renderFieldData = (type, value, user, config, getApiBaseUrl = () =>
         const val = JSON.parse(value) || {};
         return <Geolocation val={val} showViewOnMap={false} t={() => {}} />;
       }
+      case 'imageUpload': 
+      case 'upload':
+      case 'videoUpload':{
+        const documentName = allValues?.map((item) => item?.name).join(', ');
+        return documentName;
+      }
       default: 
         return value;
     }

package/src/@daf/core/components/PdfForm/utils/fieldRenderer.js

@@ -30,17 +30,17 @@ export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl =
     }).filter(val => val !== '');
     
     const combinedValue = values.join(' ');
-    return combinedValue ? <span className="tree-value groupInputs-type">{combinedValue}</span> : null;
+    return combinedValue ? <span className="tree-value groupInputs-type">{combinedValue}</span> : <span className="tree-value empty">-</span>;
   }
   
   if (hasChildren) return null;
   
   let displayValue = '';  
   if (value === null || value === undefined || value === '') {
-    displayValue = '';
+    displayValue = '-'; // Changed from '' to '-'
   } else if (typeof value === 'object' && value !== null) {
     if (Array.isArray(value)) {
-      displayValue = value.length > 0 ? value.join(', ') : '';
+      displayValue = value.length > 0 ? value.join(', ') : '-'; // Changed from '' to '-'
     } else if (value.name || value.fullName) {
       displayValue = value.name || value.fullName;
     } else if (value.label) {
@@ -54,22 +54,30 @@ export const renderValue = ({ value, hasChildren, config, user, getApiBaseUrl =
 
   const fieldType = config?.type || 'text';
   let cssClass = `tree-value ${fieldType}-type`;
+  
+  if (displayValue === '-') {
+    cssClass += ' empty';
+  }
 
-  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app);
+  displayValue = renderFieldData(fieldType, displayValue, user, config, getApiBaseUrl, getAppHeader, app, value);
 
-  return displayValue ? <span className={cssClass}>{displayValue}</span> : null;
+  return <span className={cssClass}>{displayValue}</span>;
 };
 
 export const determineHasChildren = ({ config, level }) => {
-  // groupInputs should be treated as leaf nodes, not parent nodes
   if (config?.type === 'groupInputs') {
     return false;
   }
   
+  if (config?.type === 'header' && config?.inputs && Object.keys(config.inputs).length > 0) {
+    return true;
+  }
+  
   return config?.inputs || 
          config?.type === 'group' || 
          config?.type === 'dataLinkGroup' || 
          config?.type === 'section' ||
+         config?.type === 'ajaxSubGroup' ||  // Add this line
          (config?.type === 'dataLink' && config?.meta?.tableKeys) ||
          (level === 0 && config && typeof config === 'object' && 
           Object.keys(config).some(key => 

package/src/helpers/Map.js

@@ -1,10 +1,4 @@
-import L from "leaflet";
-const EVENT_COLORS = {
-  MAJOR: "#cf1322", // Red for major incidents
-  MODERATE: "#fa8c16", // Orange for moderate incidents
-  MINOR: "#fadb14", // Yellow for minor incidents
-  CORRECTIVE: "#12b76a", // Green for corrective actions
-};
+import L from 'leaflet';
 
 /**
  * Converts a latitude or longitude coordinate to degrees, minutes and seconds.
@@ -21,7 +15,7 @@ export const toDegreesMinutesAndSeconds = (coordinate) => {
   var minutes = Math.floor(minutesNotTruncated);
   var seconds = Math.floor((minutesNotTruncated - minutes) * 60);
   return degrees + "°" + minutes + "'" + seconds;
-};
+}
 
 /**
  * Converts latitude and longitude coordinates in decimal degrees to degrees, minutes and seconds.
@@ -34,82 +28,12 @@ export const toDegreesMinutesAndSeconds = (coordinate) => {
  */
 export const convertDMS = (lat, lng) => {
   const latitude = toDegreesMinutesAndSeconds(lat);
-  const latitudeCardinal = lat >= 0 ? "N" : "S";
+  const latitudeCardinal = lat >= 0 ? 'N' : 'S';
   const longitude = toDegreesMinutesAndSeconds(lng);
-  const longitudeCardinal = lng >= 0 ? "E" : "W";
-  return [
-    latitude + '"' + latitudeCardinal,
-    longitude + '"' + longitudeCardinal,
-  ];
-};
+  const longitudeCardinal = lng >= 0 ? 'E' : 'W';
+  return [(latitude + '"' + latitudeCardinal), (longitude + '"' + longitudeCardinal)];
+}
 
 export const southWest = L.latLng(85, -180),
   northEast = L.latLng(-85, 180),
   maxBounds = L.latLngBounds(southWest, northEast);
-
-export const getEventMarkerStyle = (data) => {
-  const incidents = data?.data || [];
-
-  const totals = {
-    major: incidents.filter((d) => d.type === "major_incident").length,
-    minor: incidents.filter((d) => d.type === "minor_incident").length,
-    moderate: incidents.filter((d) => d.type === "moderate_incident").length,
-    correctiveActions: incidents.filter((d) => d.type === "correctiveActions")
-      .length,
-  };
-
-  const total = incidents.length;
-  let background = "#f1f1f1";
-
-  if (total > 0) {
-    // Build a dynamic array of categories with colors & percentages
-    const categories = [
-      { key: "major", value: totals.major, color: EVENT_COLORS.MAJOR },
-      {
-        key: "moderate",
-        value: totals.moderate,
-        color: EVENT_COLORS.MODERATE,
-      },
-      { key: "minor", value: totals.minor, color: EVENT_COLORS.MINOR },
-      {
-        key: "corrective",
-        value: totals.correctiveActions,
-        color: EVENT_COLORS.CORRECTIVE,
-      },
-    ]
-      .filter((c) => c.value > 0)
-      .map((c) => ({ ...c, perc: (c.value / total) * 100 }));
-
-    if (categories.length === 1) {
-      background = categories[0].color;
-    } else {
-      let currentStop = 0;
-      const gradientStops = categories.map((cat, index) => {
-        const stop = categories
-          .slice(0, index)
-          .reduce((acc, c) => acc + c.perc, 0);
-
-        return `${cat.color} ${Math.round(stop)}%`;
-      });
-
-      background = `radial-gradient(circle, ${gradientStops.join(", ")})`;
-    }
-  }
-
-  let radius = 35;
-
-  if (data.total > 20) {
-    radius = 65;
-  } else if (data.total > 10) {
-    radius = 50;
-  } else {
-    radius = 40;
-  }
-
-  return {
-    radius,
-    background,
-    totals,
-    total,
-  };
-};

package/src/styles/_index.scss

@@ -6,7 +6,7 @@
 @import "./layout/index";
 @import "./pages/index";
 @import "./xyflow.scss";
-/* @import "./datastake.scss"; */
+@import "./datastake.scss";
 // form classes
 
 .max-char-cont {