Fixing issue #46: Invalid aggregation functions shown

Author: d4nt

Web/Scripts/nodes.js

@@ -845,6 +845,9 @@ nodes.Summarize = function(properties) {
         return instance.AllInputColumnInfos().filter(function (col) { return tools.IsNumericType(col.Type); });
     });
 
+    instance.AggFunctions = ko.computed(function() {
+        return instance.Tool.AggFunctions().filter(function(aggFunc) { return aggFunc.requiresNumeric === false || instance.AggColumns().length > 0 });
+    });
 
     var innerGetCoreSettings = instance.GetCoreSettings;
     instance.GetCoreSettings = function () {
@@ -855,7 +858,7 @@ nodes.Summarize = function(properties) {
         settings.AggColumnIndexes = [];
         $.each(instance.Statistics(), function (i, statistic) {
             settings.AggFunctions.push(statistic.AggFunction());
-            settings.AggColumnIndexes.push(statistic.AggColumn());
+            settings.AggColumnIndexes.push(statistic.AggColumn());            
         });
         return settings;
     }
@@ -898,7 +901,7 @@ nodes.Summarize = function(properties) {
     instance.AddStatistic = function () {
         instance.Statistics.push({
             "AggFunction": ko.observable(2),
-            "AggColumn": ko.observable()
+            "AggColumn": ko.observable(0)
         });
     };
 

Web/Scripts/tools.js

@@ -252,12 +252,12 @@ tools.Summarize = function () {
     });
 
     instance.AggFunctions = ko.observableArray([
-        { id: 1, text: "Number of Rows" },
-        { id: 2, text: "Total" },
-        { id: 3, text: "Minimum" },
-        { id: 4, text: "Maximum" },
-        { id: 5, text: "Average" },
-        { id: 6, text: "Median" }
+        { id: 1, text: "Number of Rows", requiresNumeric: false },
+        { id: 2, text: "Total", requiresNumeric: true },
+        { id: 3, text: "Minimum", requiresNumeric: true },
+        { id: 4, text: "Maximum", requiresNumeric: true },
+        { id: 5, text: "Average", requiresNumeric: true },
+        { id: 6, text: "Median", requiresNumeric: true }
     ]);
 
     instance.DateFunctions = ko.observableArray([
@@ -267,7 +267,7 @@ tools.Summarize = function () {
     ]);
 
     instance.MaxInputs = 1;
-    instance.HelpUrl = "http://querytreeapp.com/help/tools/summarize/";
+    instance.HelpUrl = "http://querytreeapp.com/help/tools/statistics/";
 
     return instance;
 };

Web/Views/Simple/Create.cshtml

@@ -161,7 +161,7 @@
         <!--ko foreach: Statistics-->
         <div class="form-inline">
             <div class="form-group">
-                <select name="AggFunction" data-bind="options: $parent.Tool.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction" class="form-control"></select>
+                <select name="AggFunction" data-bind="options: $parent.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction" class="form-control"></select>
             </div>
             <!--ko if: AggFunction() != 1-->
             <div class="form-group">

Web/Views/Simple/Edit.cshtml

@@ -163,7 +163,7 @@
         <!--ko foreach: Statistics-->
         <div class="form-inline">
             <div class="form-group">
-                <select name="AggFunction" data-bind="options: $parent.Tool.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction" class="form-control"></select>
+                <select name="AggFunction" data-bind="options: $parent.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction" class="form-control"></select>
             </div>
             <!--ko if: AggFunction() != 1-->
             <div class="form-group">

Web/wwwroot/partials/Summarize.html

@@ -6,7 +6,7 @@
     <!--ko foreach: Statistics-->
     <div class="form-group">
         <label>Calculate the</label>
-        <select class="form-control" name="AggFunction" data-bind="options: $parent.Tool.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction"></select>
+        <select class="form-control" name="AggFunction" data-bind="options: $parent.AggFunctions, optionsText: 'text', optionsValue: 'id', value: AggFunction"></select>
     </div>
     <!--ko if: AggFunction() != 1-->
     <div class="form-group">