Merge pull request #29 from RallyTechServices/summaryRow

summary row columns for PlanEstimate, TaskRemainingTotal, ToDo and Ta…

Author: tyrjo

src/javascript/app.js

@@ -86,6 +86,7 @@ Ext.define("custom-grid-with-deep-export", {
         if (this.searchAllProjects()) {
             dataContext.project = null;
         }
+        var summaryRowFeature = Ext.create('Rally.ui.grid.feature.SummaryRow');
         this.gridboard = this.down('#display_box').add({
                 xtype: 'rallygridboard',
                 context: context,
@@ -118,9 +119,9 @@ Ext.define("custom-grid-with-deep-export", {
                     {
                         ptype: 'rallygridboardfieldpicker',
                         headerPosition: 'left',
-                        modelNames: this.modelNames
-                        //stateful: true,
-                        //stateId: this.getContext().getScopedStateId('columns-example')
+                        modelNames: this.modelNames,
+                        stateful: true,
+                        stateId: this.getContext().getScopedStateId('field-picker')
                     },
                     {
                         ptype: 'rallygridboardactionsmenu',
@@ -145,8 +146,25 @@ Ext.define("custom-grid-with-deep-export", {
                         context: dataContext
                     },
                     columnCfgs: [
-                        'Name'
-                    ]
+                        'Name',
+                        {
+                            dataIndex: 'PlanEstimate',
+                            summaryType: 'sum'
+                        },
+                        {
+                            dataIndex: 'TaskRemainingTotal',
+                            summaryType: 'sum'
+                        },
+                        {
+                            dataIndex: 'ToDo',
+                            summaryType: 'sum'
+                        },
+                        {
+                            dataIndex: 'TaskEstimateTotal',
+                            summaryType: 'sum'
+                        }
+                    ],
+                    features: [summaryRowFeature]
                 },
                 height: this.getHeight()
         });

src/javascript/utils/overrides.js

@@ -23,3 +23,61 @@ Ext.override(Rally.ui.inlinefilter.PropertyFieldComboBox, {
      */
     defaultWhiteListFields: ['Milestones','Tags']
 });
+
+Ext.override(Rally.ui.grid.TreeGrid, {
+    // Override needed to allow summaryType to be restored when a column with
+    // summaryType config is added by the field picker
+    _mergeColumnConfigs: function(newColumns, oldColumns) {
+        return _.map(newColumns, function(newColumn) {
+            // If the newly selected column is currently in oldColumns (this.columns), then
+            // use the in-use column config to preserve its current settings
+            var result = newColumn;
+            var newColumnName = this._getColumnName(newColumn);
+            var oldColumn = _.find(oldColumns, {dataIndex: newColumnName});
+            if (oldColumn) {
+                result = this._getColumnConfigFromColumn(oldColumn);
+            } else if ( this.config && this.config.columnCfgs ) {
+                // Otherwise, if the newly selected column appears in the original columnCfgs
+                // use that config. (This allows the column picker to get any renderers or summary
+                // config from the column config)
+                var columnCfg = _.find(this.config.columnCfgs, {dataIndex: newColumnName});
+                if ( columnCfg ) {
+                    result = columnCfg;
+                }
+            }
+
+            return result;
+        }, this);
+    },
+    
+    // Override needed to allow summaryType to be included when a column is restored
+    // from state.
+    _applyStatefulColumns: function(columns) {
+        // TODO (tj) test default columns
+        if (this.alwaysShowDefaultColumns) {
+            _.each(this.columnCfgs, function(columnCfg) {
+                if (!_.any(columns, { dataIndex: this._getColumnName(columnCfg) })) {
+                    columns.push(columnCfg);
+                }
+            }, this);
+        }
+
+        if (this.config && this.config.columnCfgs) {
+            // Merge the column config with the stateful column if the dataIndex is the same.
+            // This allows use to pick up summaryType and custom renderers
+            _.each(this.config.columnCfgs, function(columnCfg) {
+                // Search by dataIndex or text
+                var columnName = this._getColumnName(columnCfg);
+                var columnState = _.find(columns, function(value) {
+                    return (value.dataIndex === columnName || value.text === columnName);
+                });
+                if (columnState) {
+                    // merge them (add renderer)
+                    _.merge(columnState, columnCfg);
+                }
+            }, this);
+        }
+
+        this.columnCfgs = columns;
+    }
+});