Merge branch 'master' into develop

d4software · Jul 1, 2019 · c088967 · c088967
2 parents 2d6486e + 39c1268
commit c088967
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,5 @@
-@using System.Reflection;
 @{
-    var version = typeof(Program).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
+    var version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
 }
 
 <footer class="footer">

diff --git a/Web/Views/Simple/Create.cshtml b/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">

diff --git a/Web/Views/Simple/Edit.cshtml b/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">

diff --git a/Web/wwwroot/partials/Summarize.html b/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">