fix for considering all rows in a column for percentage calculation

apxor · Sep 16, 2017 · 5951eeb · 5951eeb
1 parent 3cca838
commit 5951eeb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/lib/reactcohortgraph.js b/lib/reactcohortgraph.js
@@ -3095,7 +3095,7 @@ var _initialiseProps = function _initialiseProps() {
 
                     if (index < 2) return;
                     var value = _this._sumOfColumnWithIndex(_this.store[key], index);
-                    var percent = _this._getPercentage(_this._sumOfFirstColumnUpToIndex(_this.store[key], totalRows - index), value);
+                    var percent = _this._getPercentage(_this._sumOfFirstColumnUpToIndex(_this.store[key], totalRows), value);
                     _this.headers[key].push((_this$headers$key$pus = {
                         isHeader: true,
                         index: index,
@@ -3133,9 +3133,11 @@ var _initialiseProps = function _initialiseProps() {
         var sum = 0;
         for (var i = 0; i <= index; i++) {
             try {
+                //FIXME: need better understanding than this
                 sum += arr[i][1].value;
             } catch (e) {
-                sum += 0;
+                //if no further index break the loop
+                break;
             }
         }
         return sum;

diff --git a/lib/reactcohortgraph.min.js b/lib/reactcohortgraph.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-cohort-graph",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Cohort Analysis Graph with ReactJS",
   "main": "lib/reactcohortgraph.js",
   "scripts": {

diff --git a/src/DataStore.js b/src/DataStore.js
@@ -127,7 +127,7 @@ export default class DataStore {
                 largeRow.forEach((el, index) => {
                     if(index < 2) return;
                     const value = this._sumOfColumnWithIndex(this.store[key], index);
-                    const percent = this._getPercentage(this._sumOfFirstColumnUpToIndex(this.store[key], totalRows - index), value);
+                    const percent = this._getPercentage(this._sumOfFirstColumnUpToIndex(this.store[key], totalRows), value);
                     this.headers[key].push({
                         isHeader: true,
                         index: index,
@@ -180,10 +180,10 @@ export default class DataStore {
     _sumOfFirstColumnUpToIndex = (arr, index) => {
         let sum = 0;
         for(let i = 0; i <= index; i++){
-            try {
+            try { //FIXME: need better understanding than this
                 sum += arr[i][1].value;
-            }catch(e){
-                sum += 0;
+            }catch(e){ //if no further index break the loop
+                break;
             }
         }
         return sum;