diff --git a/Web/Scripts/nodes.js b/Web/Scripts/nodes.js index 35895ba..abd6872 100644 --- a/Web/Scripts/nodes.js +++ b/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) }); }; diff --git a/Web/Scripts/tools.js b/Web/Scripts/tools.js index c275877..d3c559e 100644 --- a/Web/Scripts/tools.js +++ b/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; }; diff --git a/Web/Views/Shared/_FooterPartial.cshtml b/Web/Views/Shared/_FooterPartial.cshtml index 3e0017a..a461af1 100644 --- a/Web/Views/Shared/_FooterPartial.cshtml +++ b/Web/Views/Shared/_FooterPartial.cshtml @@ -1,6 +1,5 @@ -@using System.Reflection; @{ - var version = typeof(Program).GetTypeInfo().Assembly.GetCustomAttribute().Version; + var version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version; }