LIMS-1589 - Remove Highcharts

api/src/Page.php

@@ -221,6 +221,7 @@ function auth($require_staff)
         if ($require_staff)
         {
             $auth = $this->staff;
+
         }
         // Barcode Scanners
         else if ($this->bcr() && !$this->user->loginId)

client/package.json

@@ -38,7 +38,7 @@
     "imports-loader": "^0.8.0",
     "jest-environment-jsdom": "^29.5.0",
     "mini-css-extract-plugin": "^2.6.1",
-    "postcss": "^8.1.14",
+    "postcss": "^8.4.31",
     "postcss-color-function": "^4.1.0",
     "postcss-extend-rule": "^3.0.0",
     "postcss-import": "^13.0.0",
@@ -60,7 +60,6 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "@highcharts/map-collection": "^1.1.2",
     "backbone": "1.1.2",
     "backbone-validation": "0.9.1",
     "backbone.marionette": "2.1.0",
@@ -79,7 +78,6 @@
     "flot-axislabels": "^1.0.0",
     "flot-pie": "^1.0.0",
     "font-awesome": "^4.2.0",
-    "highcharts": "^7.2.2",
     "jquery": "^1.12.4",
     "jquery-color": "^3.0.0-alpha.1",
     "jquery-flot-resize": "^1.0.0",

client/src/js/modules/shipment/views/dewarstats.js

@@ -4,17 +4,13 @@ define(['marionette',
     'views/table',
     'utils/table',
     'utils',
-    'highmaps',
-    'highmaps-world',
     'templates/shipment/dewarstats.html', 'jquery.flot', 'jquery.flot.tooltip'], 
     function(Marionette,
         DewarOverview,
         Runs,
         TableView,
         table,
         utils,
-        Highcharts,
-        HighchartsWorldMap, // Needs to be loaded to provide custom/world map
         template) {
 
 
@@ -80,7 +76,6 @@ define(['marionette',
 
 
         initialize: function() {
-            console.log(Highcharts)
             this.run = new DewarOverview(null, { queryParams: { group_by: 'year' } })
             this.countries = new SortedDewars(null, { queryParams: { group_by: 'country' } })
             this.countries.state.pageSize = 25
@@ -141,17 +136,11 @@ define(['marionette',
                 backgrid: { emptyText: 'No dewar stats found' } 
             }))
 
-            this.listenTo(this.countries, 'sync', this.plotMap)
-            this.plotMap()
         },
 
-
         onShow: function() {
             this.listenTo(this.run, 'sync', this.plotYears)
-            this.plotMap()
         },
-
-
         plotYears: function() {
             var ticks = []
             var cols = utils.getColors(3)
@@ -183,60 +172,6 @@ define(['marionette',
 
             $.plot(this.ui.years, data, options)  
         },
-
-
-        plotMap: function() {
-            var data = []
-            this.countries.fullCollection.each(function(c) {
-                if (c.get('CODE')) data.push({ code: c.get('CODE'), value: parseInt(c.get('DEWARS')) })
-            })
-
-            var num = 5
-            var cols = utils.getColors(num)
-            var stops = []
-            _.each(_.range(num), function(n) {
-                stops.push([(1/num)*n, cols[n]])
-            })
-
-            Highcharts.mapChart({
-                chart: {
-                    renderTo: this.ui.map[0],
-                    backgroundColor:'rgba(255, 255, 255, 0.0)',
-                    map: 'custom/world'
-                },
-
-                title: {
-                    text: 'Dewar breakdown by Country'
-                },
-
-                mapNavigation: {
-                    enabled: true,
-                    buttonOptions: {
-                        verticalAlign: 'bottom'
-                    }
-                },
-
-                colorAxis: {
-                    min: 1,
-                    type: 'logarithmic',
-                    stops: stops,
-                },
-
-                series: [{
-                    data: data,
-                    joinBy: ['iso-a2', 'code'],
-                    states: {
-                        hover: {
-                            color: '#a4edba'
-                        }
-                    },
-                    dataLabels: {
-                        enabled: true,
-                        format: '{point.properties.postal}'
-                    }
-                }]
-            });
-        },
 
     })
 

client/src/js/templates/shipment/dewarstats.html

@@ -19,8 +19,5 @@
 <h1>By Year</h1>
 <div class="runs"></div>
 
-<div class="plot_container">
-	<div id="avg_time" class="large map"></div>
-</div>
 <h1>By Country</h1>
 <div class="countries"></div>