Pull from master

2018-06-08 10:31:02 +06:30
parent b3e85ff25e
commit ce3ab0b0eb
8 changed files with 177 additions and 93 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -219,3 +219,13 @@ function export_to(path)
  var form_params = $("#frm_report").serialize();
  window.location = path+"?"+ form_params;
 }
+
+/* chartkick js YAxis value override */
+Chart.scaleService.updateScaleDefaults('linear', {
+    ticks: {
+        callback: function (value, index, values) {
+            return value/1000 + 'k';
+        }
+    }
+});
+/* chartkick js YAxis value override */