From e096f936f9625a756d96d553bc7fc6faa3fd20db Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Mon, 5 Sep 2016 13:54:20 +0200 Subject: [PATCH] Add formulas to results --- app/assets/javascripts/my_modules/results.js | 1 + app/assets/javascripts/results/result_tables.js | 1 + app/views/my_modules/results.html.erb | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/app/assets/javascripts/my_modules/results.js b/app/assets/javascripts/my_modules/results.js index 3bb7b013a..369a277c6 100644 --- a/app/assets/javascripts/my_modules/results.js +++ b/app/assets/javascripts/my_modules/results.js @@ -12,6 +12,7 @@ function initHandsOnTables(root) { rowHeaders: true, colHeaders: true, fillHandle: false, + formulas: true, cells: function (row, col, prop) { var cellProperties = {}; diff --git a/app/assets/javascripts/results/result_tables.js b/app/assets/javascripts/results/result_tables.js index 6c9e91ee8..eca1279d2 100644 --- a/app/assets/javascripts/results/result_tables.js +++ b/app/assets/javascripts/results/result_tables.js @@ -17,6 +17,7 @@ function initEditableHandsOnTable(root) { rowHeaders: true, colHeaders: true, contextMenu: true, + formulas: true, preventOverflow: 'horizontal' }); }); diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb index 07e5e48a6..256f18d6a 100644 --- a/app/views/my_modules/results.html.erb +++ b/app/views/my_modules/results.html.erb @@ -54,3 +54,15 @@ <%= javascript_include_tag "results/result_texts" %> <%= javascript_include_tag "results/result_tables" %> <%= javascript_include_tag "results/result_assets" %> + + +<%= javascript_include_tag "lodash" %> +<%= javascript_include_tag "numeral" %> +<%= javascript_include_tag "numeric" %> +<%= javascript_include_tag "md5" %> +<%= javascript_include_tag "jstat" %> +<%= javascript_include_tag "formula" %> +<%= javascript_include_tag "parser" %> +<%= javascript_include_tag "ruleJS" %> +<%= javascript_include_tag "handsontable.formula" %> +<%= stylesheet_link_tag "handsontable.formula" %>