fix RhoInc#331

samussiah · Aug 22, 2021 · 15307ce · 15307ce
1 parent 11b8d56
commit 15307ce
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/build/webcodebook.js b/build/webcodebook.js
@@ -2324,6 +2324,8 @@
   }
 
   function onInit$2() {
+    var _this = this;
+
     var context = this;
     var config = this.initialSettings;
     var measure = config.measure;
@@ -2352,7 +2354,10 @@
     if (!this.group) {
       this.initialSettings.unfilteredData = this.raw_data;
       this.raw_data = this.initialSettings.unfilteredData.filter(function(d) {
-        return !isNaN(+d[measure]) && !/^\s*$/.test(d[measure]);
+        return (
+          _this.config.codebookConfig.missingValues.indexOf(d[measure]) ===
+            -1 && !/^\s*$/.test(d[measure])
+        );
       });
     }
 
@@ -2485,7 +2490,8 @@
       margin: this_.margin,
       nBins: d.bins,
       chartType: d.chartType,
-      commonScale: d.commonScale == undefined ? true : d.commonScale
+      commonScale: d.commonScale == undefined ? true : d.commonScale,
+      codebookConfig: d.codebookConfig
     };
     var chartData = [];
 
@@ -4232,6 +4238,9 @@
             else g.statistics = summarize.continuous(g.values, sub);
           });
         }
+
+        // Give charts access to codebook object.
+        varObj.codebookConfig = config;
         return varObj;
       });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/charts/createHistogramBoxPlot.js b/src/charts/createHistogramBoxPlot.js
@@ -10,7 +10,8 @@ export function createHistogramBoxPlot(this_, d) {
     margin: this_.margin,
     nBins: d.bins,
     chartType: d.chartType,
-    commonScale: d.commonScale == undefined ? true : d.commonScale
+    commonScale: d.commonScale == undefined ? true : d.commonScale,
+    codebookConfig: d.codebookConfig
   };
   let chartData = [];
 

diff --git a/src/charts/histogramBoxPlot/onInit.js b/src/charts/histogramBoxPlot/onInit.js
@@ -34,7 +34,9 @@ export default function onInit() {
   if (!this.group) {
     this.initialSettings.unfilteredData = this.raw_data;
     this.raw_data = this.initialSettings.unfilteredData.filter(
-      d => !isNaN(+d[measure]) && !/^\s*$/.test(d[measure])
+      d =>
+        this.config.codebookConfig.missingValues.indexOf(d[measure]) === -1 &&
+        !/^\s*$/.test(d[measure])
     );
   }
 

diff --git a/src/codebook/data/makeSummary.js b/src/codebook/data/makeSummary.js
@@ -159,6 +159,9 @@ export function makeSummary(codebook) {
           else g.statistics = summarize.continuous(g.values, sub);
         });
       }
+
+      // Give charts access to codebook object.
+      varObj.codebookConfig = config;
       return varObj;
     });
 

diff --git a/test-page/default/index.html b/test-page/default/index.html
@@ -15,7 +15,6 @@
 
     <body>
         <div id = 'title'>Web Codebook</div>
-        <div id = 'subtitle'>Test Page</div>
         <div id = 'container'></div>
     </body>
 

diff --git a/test-page/default/index.js b/test-page/default/index.js
@@ -21,15 +21,11 @@ fetch(
             .join(' ')
       ).replace(/\.csv/i, '');
     });
-    console.log('Data file metadata:');
-    console.log(json);
     //const fileObj = json[Math.floor(Math.random() * json.length)];
     const fileObj = json[8];
-    console.log('Select data file metadata:');
-    console.log(fileObj);
     d3.csv(
       fileObj.github_url,
-      function(d) {
+      function(d, i) {
         return d;
       },
       function(error, data) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
         <body>
             <div id = 'title'>Web Codebook</div>
-            <div id = 'subtitle'>Test Page</div>
             <div id = 'container'></div>
         </body>
@@ Expand Down @@