Moved around in the project and fix a minor sortingbug for multiDims.…

… Also fixed so linechart dont need 2 measures

.gitignore

@@ -2,4 +2,3 @@
 /node_modules/
 Chart.min.js
 Chart.js
-**/external/*

README.md

@@ -3,11 +3,10 @@ Render Chart.JS charts in Qlik Sense
 
 ## Install
 * bower install
-* copy Chart.js from bower_component into externals folder for the chart.
-* copy all files from common into externals folder for the chart.
+* copy Chart.js from bower_component into charts-folder/externals.
 
 ## TODO
-Automate the installation steps.
+Automate the installation step above.
 
 ## Preview
 ![All Charts](/images/all.png?raw=true "All Charts")

bar/bar.js → charts-folder/bar.js

@@ -1,6 +1,6 @@
 define( [
   'jquery',
-  './props',
+  './props-bar',
   './external/load-externals'
 ], function ( $, props, externals ) {
   'use strict';

common/chart-util.js → charts-folder/external/chart-util.js

@@ -47,11 +47,15 @@ define( [
     },
     sortSimple: function ( list, name, revers, multiMeasure ) {
       list = list.sort( function ( a, b ) {
-        var sortA = a[ name ],
-          sortB = b[ name ];
+        var sortA = a[ name[ 0 ] ],
+          sortB = b[ name[ 0 ] ];
         if ( multiMeasure ) {
-          sortA = a[ 0 ][ name ];
-          sortB = b[ 0 ][ name ];
+          sortA = a[ 0 ][ name[ 0 ] ];
+          sortB = b[ 0 ][ name[ 0 ] ];
+          if ( isNaN( sortA ) ) {
+            sortA = a[ 0 ][ name[ 1 ] ];
+            sortB = b[ 0 ][ name[ 1 ] ];
+          }
         }
         return sortA - sortB;
       } );
@@ -88,7 +92,7 @@ define( [
         }
       }
 
-      return self.sortSimple( data, 'value', true );
+      return self.sortSimple( data, [ 'value' ], true );
     },
     prepMultiMeasureCharts: function prepData( layout, round ) {
       var data = [];
@@ -104,7 +108,7 @@ define( [
           qMatrix = layout.qHyperCube.qDataPages[ 0 ].qMatrix,
           len = qMatrix.length,
           dataSetLen = qMatrix[ 0 ].length - 1,
-          list = self.sortSimple( qMatrix, 'qNum', true, true );
+          list = self.sortSimple( qMatrix, [ 'qNum', 'qElemNumber' ], true, true );
 
         data.labels = [];
         data.datasets = [];

line/line.js → charts-folder/line.js

@@ -1,6 +1,6 @@
 define( [
   'jquery',
-  './props',
+  './props-line',
   './external/load-externals'
 ], function ( $, props, externals ) {
   'use strict';

pie/pie.js → charts-folder/pie.js

@@ -1,6 +1,6 @@
 define( [
   'jquery',
-  './props',
+  './props-pie',
   './external/load-externals'
 ], function ( $, props, externals ) {
   'use strict';

polar/polar.js → charts-folder/polar.js

@@ -1,6 +1,6 @@
 define( [
   'jquery',
-  './props',
+  './props-polar',
   './external/load-externals'
 ], function ( $, props, externals ) {
   'use strict';

line/props.js → charts-folder/props-radar.js

@@ -8,7 +8,7 @@ define( [], function () {
     },
     measures = {
       uses: "measures",
-      min: 2,
+      min: 1,
       max: 2
     },
     sorting = {

radar/radar.js → charts-folder/radar.js

@@ -1,6 +1,6 @@
 define( [
   'jquery',
-  './props',
+  './props-radar',
   './external/load-externals'
 ], function ( $, props, externals ) {
   'use strict';

charts-folder/wbfolder.wbl

@@ -0,0 +1,10 @@
+bar.js;
+bar.qext
+line.js;
+line.qext
+pie.js;
+pie.qext
+polar.js;
+polar.qext
+radar.js;
+radar.qext