Replaces Highcharts with Chart.js

codeRIT · Feb 22, 2024 · f707273 · f707273
1 parent ad8c264
commit f707273
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -83,7 +83,6 @@ gem 'sprockets'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'selectize-rails'
-gem 'highcharts-rails', '~> 6.0'
 gem 'bootstrap', '~> 4.6.0'
 gem 'fullcalendar-rails'
 gem 'momentjs-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -222,8 +222,6 @@ GEM
       railties (>= 5.1)
     hashdiff (1.1.0)
     hashie (5.0.0)
-    highcharts-rails (6.0.3)
-      railties (>= 3.1)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -557,7 +555,6 @@ DEPENDENCIES
   guard
   guard-minitest
   haml-rails
-  highcharts-rails (~> 6.0)
   httparty
   importmap-rails
   jbuilder

diff --git a/app/assets/javascripts/application.assets.js b/app/assets/javascripts/application.assets.js
@@ -14,7 +14,7 @@
 //= require activestorage
 //= require jquery
 //= require jquery-ui/widgets/autocomplete
-//= require highcharts
+//= require Chart.bundle
 //= require chartkick
 //= require ./vendor/debounce
 //= require_directory .

diff --git a/app/assets/javascripts/manage/application.js b/app/assets/javascripts/manage/application.js
@@ -15,7 +15,7 @@ function applicationReady() {
   $('select[data-bulk-row-edit]').bulkRowEdit();
   $().bulkRowSelect();
   $('body').chartkickAutoReload();
-  setupHighcharts();
+  setupChartJs();
   $('[data-toggle="popover"]').popover();
   $('[data-message-live-preview="textarea"]').messageLivePreview();
   setupSimpleMde();

diff --git a/...javascripts/manage/lib/setupHighcharts.js → ...ts/javascripts/manage/lib/setupChartJs.js b/...javascripts/manage/lib/setupHighcharts.js → ...ts/javascripts/manage/lib/setupChartJs.js
@@ -1,4 +1,4 @@
-var setupHighcharts = function() {
+var setupChartJs = function() {
   Highcharts.setOptions({
     global: {
       useUTC: false,