Item-level formula evaluation basic implementation

apps/dg/components/case_table/hier_table_view.js

@@ -470,6 +470,9 @@ DG.HierTableView = SC.ScrollView.extend( (function() {
    */
   refresh: function() {
     this.get('contentView').refreshTables();
+
+    // For when the table is updated by internal value change (no UI event)
+    this.refreshDividers();
   },
 
   /**

apps/dg/controllers/data_context.js

@@ -682,8 +682,12 @@ DG.DataContext = SC.Object.extend((function() // closure
       collection.casesController.endPropertyChanges();
     }
 
+    // Always regenerate the collection to ensure proper table structure with formulas.
+    // TODO: Only regenerate when dependency attributes change.
+    var casesAffected = this.regenerateCollectionCases(this.get('collections'));
+
     // invalidate dependents; aggregate functions may need to recalculate
-    this.invalidateAttrsOfCollections([collection], iChange);
+    this.invalidateAttrsOfCollections(casesAffected.collections, iChange);
 
     return result;
   },
@@ -1028,6 +1032,9 @@ DG.DataContext = SC.Object.extend((function() // closure
                     });
     this.invalidateDependentsAndNotify(attrNodes, iChange);
 
+    // Formula attribute may require regenerating the hierarchical structure.
+    this.regenerateCollectionCases(this.get('collections'));
+
     return { success: true, caseIDs: iChange.caseIDs };
   },
   /**
@@ -2358,6 +2365,10 @@ DG.DataContext = SC.Object.extend((function() // closure
     var attr = DG.Attribute.getAttributeByID(attrID),
         attrNodes = [{ type: DG.DEP_TYPE_ATTRIBUTE, id: attrID, name: attr.get('name') }];
     this.invalidateDependentsAndNotify(attrNodes);
+
+    // Always regenerate collection to ensure the proper table structure.
+    var casesAffected = this.regenerateCollectionCases(this.get('collections'));
+    this.invalidateAttrsOfCollections(casesAffected.collections);
   },
 
   /**

apps/dg/formula/collection_formula_context.js

@@ -355,19 +355,18 @@ DG.CollectionFormulaContext = DG.GlobalFormulaContext.extend((function() {
       // evaluation time.
       // Client is responsible for putting '_case_' into evaluation context.
       var attributeID = attribute.get('id');
-      this.attrFns[ iName] = isValidAttrReference()
-                              ? function(iEvalContext) {
-                                  var tCase = iEvalContext._caseMap_
-                                                ? iEvalContext._caseMap_[collectionID]
-                                                : iEvalContext._case_,
-                                      tValue = tCase && tCase.getRawValue(attributeID);
-                                  // Propagate error values immediately
-                                  if( tValue instanceof Error) throw tValue;
-                                  return tValue;
-                                }
-                              : function(iEvalContext) {
-                                  throw new DG.HierReferenceError(iName);
-                                };
+
+      // Previously, we had limited the formula attribute reference to be inside a collection (except for aggregates.)
+      // We have since removed this restriction to always evaluate at item level.
+      this.attrFns[ iName] = function(iEvalContext) {
+        var tCase = iEvalContext._caseMap_
+          ? iEvalContext._caseMap_[collectionID]
+          : iEvalContext._case_,
+          tValue = tCase && tCase.getRawValue(attributeID);
+        // Propagate error values immediately
+        if( tValue instanceof Error) throw tValue;
+        return tValue;
+      };
 
       // Track the number of attribute references for each collection
       // This needs to be tracked per aggregate function instance so

apps/dg/models/case_model.js

@@ -148,31 +148,23 @@ DG.Case = DG.BaseModel.extend((function() {
      * @returns {Number | String | null}
      */
     getRawValue: function( iAttrID) {
-
       if( !SC.none( iAttrID)) {
-
-        // If we have an attribute formula, we must evaluate it.
         var tAttr = DG.Attribute.getAttributeByID( iAttrID);
         var valuesMap = this.get('_valuesMap');
-        if (tAttr && tAttr.get('hasFormula') &&
-          // we only do the evaluation if it's one of this case's attributes
-          (this.getPath('collection.id') === tAttr.getPath('collection.id'))) {
-          return tAttr.evalFormula( this);
-        }
 
-        // If we have a cached value, simply return it
-
-        if( tAttr && valuesMap && (!SC.none(valuesMap[iAttrID])) &&
-              // we only do the evaluation if it's one of this case's attributes
-            (this.getPath('collection.id') === tAttr.getPath('collection.id'))) {
-          return valuesMap[iAttrID];
+        // If we have an attribute formula, we must evaluate it.
+        if (tAttr && tAttr.get('hasFormula')) {
+          var calculatedValue = tAttr.evalFormula(this);
+
+          // If formula is invalid, return the cached value.
+          if (SC.empty(calculatedValue) && !SC.none(valuesMap[iAttrID])) {
+            return valuesMap[iAttrID];
+          } else {
+            return calculatedValue;
+          }
+        } else {
+          return valuesMap[iAttrID]; // Otherwise return the cached item value for iAttrID.
         }
-
-        // one last chance if we've got a parent and it has 'getValue'
-        // Need for this seems to have been brought about by a particular import of boundary file data. Can't hurt.
-        var tParent = this.get('parent');
-        if( tParent /*&& tParent.getValue*/)
-          return tParent.getRawValue( iAttrID);
       }
       // if we get here, return value is undefined
     },

apps/dg/models/collection_model.js

@@ -563,18 +563,12 @@ DG.Collection = DG.BaseModel.extend( (function() // closure
       var childCollection = this.children[0];
       var itemGroups = {};  // a hash value representing the values for the
                             // attributes of this collection
-      var attrs = [];
 
       if (SC.none(items)) {
         items = this.dataSet.getDataItems()
                   .filter(function (item) { return !item.deleted; });
       }
 
-      attrs = this.attrs.filter(function (attr) {
-        return SC.empty(attr.formula);
-      });
-
-
       // We are going to walk the itemGroups hash-map creating cases.
       // If we are the base collection we will have a case for each item in the
       // order defined by the item list.
@@ -590,7 +584,24 @@ DG.Collection = DG.BaseModel.extend( (function() // closure
         // values for this collection's attributes and the values being arrays of items
         items.forEach(function (item) {
           if (!item.deleted) {
-            var values = attrs.map(function (attr) { return item.values[attr.id];}).join();
+            var values = this.attrs.map(function (attr) {
+              // Here, we pre-fill the item hash-map with evaluated formula values
+              // so the collection / table will be configured with the right number of cases.
+              if (attr.get('hasFormula')) {
+                // A temporary case (item) object to evaluate the formula.
+                // Note: We could try to reuse a single DG.Case instance,
+                // but we need a function for updating just the following fields.
+                var tCase = DG.Case.createCase({
+                  collection: attr.get('collection'),
+                  item: item
+                });
+                var calculatedValue = attr.evalFormula(tCase);
+                tCase.destroy();
+                return item.values[attr.id] = calculatedValue;
+              } else {
+                return item.values[attr.id];
+              }
+            }.bind(this)).join();
             var list = itemGroups[values] || [];
             if (list.length === 0) {
               itemGroups[values] = list;
@@ -612,7 +623,7 @@ DG.Collection = DG.BaseModel.extend( (function() // closure
           createdCases = createdCases.concat(childCases);
         }.bind(this));
       }
-      //this.updateCaseIDToIndexMap();
+      this.updateCaseIDToIndexMap();
       return createdCases;
     },