changeset 631:d63600ad574b Dev_main

Analysis.js sort uses Google's DataTable sort functions.
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Mon, 21 Mar 2016 16:22:49 +0000
parents 9dcfd654abad
children 9e4fb381944e
files analysis/analysis.js
diffstat 1 files changed, 2 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/analysis/analysis.js	Mon Mar 21 16:07:57 2016 +0000
+++ b/analysis/analysis.js	Mon Mar 21 16:22:49 2016 +0000
@@ -132,45 +132,10 @@
             this.chart.draw(this.data,this.options);
         }
         this.sortData = function() {
-            
-            var map = this.data.Jf.map(function(el,i){
-                return {index: i, value: el.c[1].v};
-            });
-            
-            map.sort(function(a,b){
-                if (a.value > b.value) {return -1;}
-                if (a.value < b.value) {return 1;}
-                return 0;
-            })
-            
-            var Jf = [];
-            var cc = [];
-            for (var i=0; i<map.length; i++) {
-                Jf.push(this.data.Jf[map[i].index]);
-                cc.push(this.data.cc[map[i].index]);
-            }
-            this.data.Jf = Jf;
-            this.data.cc = cc;
+            this.data.sort(1);
         }
         this.sortName = function() {
-            var map = this.data.Jf.map(function(el,i){
-                return {index: i, value: el.c[0].v};
-            });
-            
-            map.sort(function(a,b){
-                if (a.value < b.value) {return -1;}
-                if (a.value > b.value) {return 1;}
-                return 0;
-            })
-            
-            var Jf = [];
-            var cc = [];
-            for (var i=0; i<map.length; i++) {
-                Jf.push(this.data.Jf[map[i].index]);
-                cc.push(this.data.cc[map[i].index]);
-            }
-            this.data.Jf = Jf;
-            this.data.cc = cc;
+            this.data.sort(0);
         }
         this.handleEvent = function() {
             // Only used to handle the chart.event.addListener(this,'ready') callback