Merge 5187012 into 5c82c66

pat310 · Jan 23, 2018 · 4955afb · 4955afb
2 parents 5c82c66 + 5187012
commit 4955afb
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ pivot.data.table
        'Baratheon',
        'Baratheon',
        'Lannister',
-       'aggregated' ],
+       'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -133,7 +133,7 @@ pivot.data.table
     type: 'data',
     depth: 0,
     row: 10 },
-  { value: [ '', 22, 22, 38, 18, 133, '' ], type: 'aggregated' } ]
+  { value: [ 'Totals', 22, 22, 38, 18, 133, '' ], type: 'aggregated' } ]
 ```
 
 ## API
@@ -218,7 +218,7 @@ const pivot = new Pivot(dataArray, ['gender'], ['house'], cbFunc, 0, 'average ag
 
 console.log(pivot.data.table);
 /*
-[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -227,15 +227,15 @@ console.log(pivot.data.table);
     type: 'data',
     depth: 0,
     row: 2 },
-  { value: [ '', 11, 28, 44.333333333333336, '' ],
+  { value: [ 'Totals', 11, 28, 44.333333333333336, '' ],
     type: 'aggregated' } ]
 */
 
 pivot.update(dataArray, ['gender', 'name'], ['house'], cbFunc, 0, 'average age')
 
 console.log(pivot.data.table);
 /*
-[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -283,15 +283,15 @@ console.log(pivot.data.table);
     type: 'data',
     depth: 1,
     row: 11 },
-  { value: [ '', 11, 28, 44.333333333333336, '' ],
+  { value: [ 'Totals', 11, 28, 44.333333333333336, '' ],
     type: 'aggregated' } ]
 */
 
 pivot.collapse(1);
 
 console.log(pivot.data.table);
 /*
-[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -327,7 +327,7 @@ console.log(pivot.data.table);
     type: 'data',
     depth: 1,
     row: 11 },
-  { value: [ '', 11, 28, 44.333333333333336, '' ],
+  { value: [ 'Totals', 11, 28, 44.333333333333336, '' ],
     type: 'aggregated' } ]
 */
 
@@ -350,7 +350,7 @@ pivot.collapse(2);
 
 console.log(pivot.data.table);
 /*
-[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -362,14 +362,14 @@ console.log(pivot.data.table);
     depth: 0,
     type: 'rowHeader',
     row: 5 },
-  { value: [ '', 11, 28, 44.333333333333336, '' ],
+  { value: [ 'Totals', 11, 28, 44.333333333333336, '' ],
     type: 'aggregated' } ]
 */
 
 pivot.expand(1);
 console.log(pivot.data.table);
 /*
-[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+[ { value: [ 'average age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
     depth: 0,
     type: 'colHeader',
     row: 0 },
@@ -393,7 +393,7 @@ console.log(pivot.data.table);
     depth: 0,
     type: 'rowHeader',
     row: 5 },
-  { value: [ '', 11, 28, 44.333333333333336, '' ],
+  { value: [ 'Totals', 11, 28, 44.333333333333336, '' ],
     type: 'aggregated' } ]
 ```
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quick-pivot",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "a utility for quickly pivoting data",
   "main": "lib/quick-pivot.min.js",
   "scripts": {

diff --git a/src/logic.js b/src/logic.js
@@ -395,7 +395,7 @@ export function tableCreator(data, rows = [], cols = [], accCatOrCB,
         return accumulator(accumulatedRawData, accCatOrCB, accTypeOrInitVal);
       }
 
-      return '';
+      return 'Totals';
     });
   }
 
@@ -451,7 +451,7 @@ export function tableCreator(data, rows = [], cols = [], accCatOrCB,
         tableRow.value = tableRow.value.concat(columnAggregations[counter]);
         counter += 1;
       } else {
-        tableRow.value = tableRow.value.concat(i === 0 ? 'aggregated' : '');
+        tableRow.value = tableRow.value.concat(i === 0 ? 'Totals' : '');
       }
 
       return tableRow;

diff --git a/test/index/collapse.js b/test/index/collapse.js
@@ -32,7 +32,7 @@ export default () => {
 
     const expectedTable = [
       {
-        value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'aggregated'],
+        value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'Totals'],
         depth: 0,
         type: 'colHeader',
         row: 0,
@@ -64,7 +64,7 @@ export default () => {
       },
       {
         type: 'aggregated',
-        value: ['', 44, 56, 133, ''],
+        value: ['Totals', 44, 56, 133, ''],
       },
     ];
 
@@ -138,7 +138,7 @@ export default () => {
     pivot.collapse(1).collapse(2);
     const expectedTable = [
       {
-        value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'aggregated'],
+        value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'Totals'],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -155,7 +155,7 @@ export default () => {
       },
       {
         type: 'aggregated',
-        value: ['', 44, 56, 133, ''],
+        value: ['Totals', 44, 56, 133, ''],
       },
     ];
 
@@ -175,7 +175,7 @@ export default () => {
       pivot.collapse(5).collapse(1);
       const expectedTable = [
         {
-          value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'aggregated'],
+          value: ['sum age', 'Stark', 'Baratheon', 'Lannister', 'Totals'],
           depth: 0,
           type: 'colHeader',
           row: 0 },
@@ -192,7 +192,7 @@ export default () => {
         },
         {
           type: 'aggregated',
-          value: ['', 44, 56, 133, ''],
+          value: ['Totals', 44, 56, 133, ''],
         },
       ];
 

diff --git a/test/index/expand.js b/test/index/expand.js
@@ -71,7 +71,7 @@ export default () => {
     );
 
     const expectedTable = [
-      { value: [ 'sum age', 'Stark', 'Baratheon', 'Lannister', 'aggregated' ],
+      { value: [ 'sum age', 'Stark', 'Baratheon', 'Lannister', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -91,7 +91,7 @@ export default () => {
         row: 5 },
       {
         type: 'aggregated',
-        value: ['', 44, 56, 133, ''],
+        value: ['Totals', 44, 56, 133, ''],
       },
     ];
 
@@ -183,7 +183,7 @@ export default () => {
           'Baratheon',
           'Baratheon',
           'Lannister',
-          'aggregated',
+          'Totals',
         ],
         depth: 0,
         type: 'colHeader',
@@ -251,7 +251,7 @@ export default () => {
       },
       {
         type: 'aggregated',
-        value: ['', 22, 22, 38, 18, 133, ''],
+        value: ['Totals', 22, 22, 38, 18, 133, ''],
       },
     ];
 

diff --git a/test/index/filter.js b/test/index/filter.js
@@ -44,7 +44,7 @@ export default () => {
 
     const expectedResult = [
       {
-        value: [ 'sum age', 'sum age', 'aggregated' ],
+        value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0,
@@ -65,7 +65,7 @@ export default () => {
       { value: [ 'Sansa', 12, 12 ], type: 'data', depth: 2, row: 14 },
       { value: [ 'm', 8, '' ], depth: 1, type: 'rowHeader', row: 15 },
       { value: [ 'Bran', 8, 8 ], type: 'data', depth: 2, row: 16 },
-      { type: 'aggregated', value: ['', 219, ''] },
+      { type: 'aggregated', value: ['Totals', 219, ''] },
     ];
 
     pivot.filter('name', ['Jon'], 'exclude');
@@ -83,7 +83,7 @@ export default () => {
     );
 
     const expectedResult = [
-      { value: [ 'sum age', 'sum age', 'aggregated' ],
+      { value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -109,7 +109,7 @@ export default () => {
       { value: [ 'Sansa', 12, 12 ], type: 'data', depth: 2, row: 14 },
       { value: [ 'm', 8, '' ], depth: 1, type: 'rowHeader', row: 15 },
       { value: [ 'Bran', 8, 8 ], type: 'data', depth: 2, row: 16 },
-      {type: 'aggregated', value: ['', 219, ''] },
+      {type: 'aggregated', value: ['Totals', 219, ''] },
     ];
 
     pivot.filter('name', ['Jon']);
@@ -128,7 +128,7 @@ export default () => {
 
     const expectedResult = [
       {
-        value: [ 'sum age', 'sum age', 'aggregated' ],
+        value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0,
@@ -140,7 +140,7 @@ export default () => {
       { value: [ 'm', 22, '' ], depth: 1, type: 'rowHeader', row: 5 },
       { value: [ 'Bran', 8, 8 ], type: 'data', depth: 2, row: 6 },
       { value: [ 'Jon', 14, 14 ], type: 'data', depth: 2, row: 7 },
-      { type: 'aggregated', value: ['', 44, ''] },
+      { type: 'aggregated', value: ['Totals', 44, ''] },
     ];
 
     function filterFunc(dataRow) {
@@ -162,7 +162,7 @@ export default () => {
     );
 
     const expectedResult = [
-      { value: [ 'sum age', 'sum age', 'aggregated'],
+      { value: [ 'sum age', 'sum age', 'Totals'],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -179,7 +179,7 @@ export default () => {
         row: 6 },
       { value: [ 'm', 133, '' ], depth: 1, type: 'rowHeader', row: 7 },
       { value: [ 'Stark', 30, '' ], depth: 0, type: 'rowHeader', row: 11 },
-      { type: 'aggregated', value: ['', 219, ''] },
+      { type: 'aggregated', value: ['Totals', 219, ''] },
     ];
 
     pivot.collapse(11).collapse(2).collapse(6);
@@ -200,13 +200,13 @@ export default () => {
 
     const expectedResult = [
       {
-        value: [ 'sum age', 'sum age', 'aggregated' ],
+        value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0,
       },
       { value: [ 'Stark', 44, '' ], depth: 0, type: 'rowHeader', row: 1 },
-      { type: 'aggregated', value: ['', 44, ''] },
+      { type: 'aggregated', value: ['Totals', 44, ''] },
     ];
 
     function filterFunc(dataRow) {
@@ -231,15 +231,15 @@ export default () => {
 
     const expectedResult = [
       {
-        value: [ 'sum age', 'sum age', 'aggregated' ],
+        value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0,
       },
       { value: [ 'Baratheon', 38, '' ], depth: 0, type: 'rowHeader', row: 1 },
       { value: [ 'f', 38, '' ], depth: 1, type: 'rowHeader', row: 2 },
       { value: [ 'Cersei', 38, 38 ], type: 'data', depth: 2, row: 3 },
-      { type: 'aggregated', value: ['', 38, ''] },
+      { type: 'aggregated', value: ['Totals', 38, ''] },
     ];
 
     pivot.filter('house', ['Stark'], 'exclude')
@@ -259,7 +259,7 @@ export default () => {
     );
 
     const expectedResult = [
-      { value: [ 'sum age', 'sum age', 'aggregated' ],
+      { value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -280,7 +280,7 @@ export default () => {
       { value: [ 'm', 22, '' ], depth: 1, type: 'rowHeader', row: 11 },
       { value: [ 'Bran', 8, 8 ], type: 'data', depth: 2, row: 12 },
       { value: [ 'Jon', 14, 14 ], type: 'data', depth: 2, row: 13 },
-      { type: 'aggregated', value: ['', 96, ''] },
+      { type: 'aggregated', value: ['Totals', 96, ''] },
     ];
 
     pivot.filter('name', ['Cersei'], 'exclude')
@@ -302,7 +302,7 @@ export default () => {
     );
 
     const expectedResult = [
-      { value: [ 'sum age', 'sum age', 'aggregated' ],
+      { value: [ 'sum age', 'sum age', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0 },
@@ -325,7 +325,7 @@ export default () => {
       { value: [ 'm', 22, '' ], depth: 1, type: 'rowHeader', row: 11 },
       { value: [ 'Bran', 8, 8 ], type: 'data', depth: 2, row: 12 },
       { value: [ 'Jon', 14, 14 ], type: 'data', depth: 2, row: 13 },
-      { type: 'aggregated', value: ['', 96, ''] },
+      { type: 'aggregated', value: ['Totals', 96, ''] },
     ];
 
     pivot.filter('name', ['Cersei'], 'exclude')

diff --git a/test/index/update.js b/test/index/update.js
@@ -25,7 +25,7 @@ const dataArray2 = [
 export default () => {
   it('should return a new pivoted table if not filtering', () => {
     const expected = [
-      { value: [ 'sum age', 'Stark', 'Lannister', 'Baratheon', 'aggregated' ],
+      { value: [ 'sum age', 'Stark', 'Lannister', 'Baratheon', 'Totals' ],
         depth: 0,
         type: 'colHeader',
         row: 0,
@@ -37,7 +37,7 @@ export default () => {
       { value: [ 'Jaime', '', 32, '', 32 ], type: 'data', depth: 1, row: 5 },
       { value: [ 'Joffrey', '', '', 18, 18 ], type: 'data', depth: 1, row: 6 },
       { value: [ 'Tyrion', '', 34, '', 34 ], type: 'data', depth: 1, row: 7 },
-      { type: 'aggregated', value: ['', 20, 66, 18, ''] },
+      { type: 'aggregated', value: ['Totals', 20, 66, 18, ''] },
     ];
 
     const pivot = new Pivot(