Repository: incubator-senssoft-tap
Updated Branches:
  refs/heads/tapdocker 767bcf2de -> d603c6313


Removed demographics filtering entirely. Should add back if data includes 
in-take material


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/commit/40db1528
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/tree/40db1528
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/diff/40db1528

Branch: refs/heads/tapdocker
Commit: 40db152849cb6c59d7643b9a81dc6d8581f7cd7f
Parents: 767bcf2
Author: Arthi Vezhavendan <arthi...@gmail.com>
Authored: Fri Jul 21 16:23:23 2017 -0400
Committer: Arthi Vezhavendan <arthi...@gmail.com>
Committed: Fri Jul 21 16:23:23 2017 -0400

----------------------------------------------------------------------
 gulpfile.babel.js                           |   4 +-
 public/components/AppResults.jsx            | 143 ++++-------------------
 public/components/visualizations/Counts.jsx |   7 +-
 3 files changed, 26 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/40db1528/gulpfile.babel.js
----------------------------------------------------------------------
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 2cc122e..4921597 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -53,8 +53,8 @@ gulp.task('dev', () => {
       'styles:build'
     ],
     [
-      // 'django',
-      // 'test',
+      //'django',
+      //'test',
       'styles',
       'js'
     ]

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/40db1528/public/components/AppResults.jsx
----------------------------------------------------------------------
diff --git a/public/components/AppResults.jsx b/public/components/AppResults.jsx
index b4092e2..df5c592 100644
--- a/public/components/AppResults.jsx
+++ b/public/components/AppResults.jsx
@@ -25,17 +25,17 @@ class AppResults extends Component {
     this.state = {
       result : 'counts',
       metric : 'out_degree',
-      educationlevels: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-      gender : 0,
+      //educationlevels: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+      //gender : 0,
       ab : false,
       graphAb : false,
     };
   }
 
   componentDidMount() {
-    $('#education-accordion').accordion({
-      collapsible : true,
-    });
+    // $('#education-accordion').accordion({
+    //   collapsible : true,
+    // });
     $('#results-controls').accordion({
       collapsible : false,
     });
@@ -54,21 +54,21 @@ class AppResults extends Component {
       },
     });
 
-    $('.ui.education.checkbox').checkbox({
-      onChange : () => {
-        let educationlevels = [];
-        $('input[name=education]:checked').each((i, el) => {
-          educationlevels.push(+$(el).val());
-        });
-        this.setState({ educationlevels : educationlevels });
-      },
-    });
+    // $('.ui.education.checkbox').checkbox({
+    //   onChange : () => {
+    //     let educationlevels = [];
+    //     $('input[name=education]:checked').each((i, el) => {
+    //       educationlevels.push(+$(el).val());
+    //     });
+    //     this.setState({ educationlevels : educationlevels });
+    //   },
+    // });
 
-    $('#gender-select').dropdown({
-      onChange : (val) => {
-        this.setState({ gender : val });
-      },
-    });
+    // $('#gender-select').dropdown({
+    //   onChange : (val) => {
+    //     this.setState({ gender : val });
+    //   },
+    // });
 
     $('#ab-toggle').checkbox({
       onChange : () => {
@@ -102,108 +102,6 @@ class AppResults extends Component {
                   Activity Counts
                 </a>
                 <div className='active content'>
-                  <div className='ui form'>
-
-                    <div className='field'>
-                      <div id='gender-select' className='ui fluid selection 
dropdown'>
-                        <input type='hidden' name='gender'></input>
-                        <i className='dropdown icon'></i>
-                        <div className='default text'>Gender</div>
-                        <div className='menu'>
-                          <div className='item' data-value='0'>Both</div>
-                          <div className='item' data-value='2'>Male</div>
-                          <div className='item' data-value='1'>Female</div>
-                        </div>
-                      </div>
-                    </div>
-
-                    <div className='field'>
-                      <div id='education-accordion' className='accordion'>
-                        <div className='title'>
-                          <i className='dropdown icon'></i>
-                          Highest Education Level
-                        </div>
-                        <div className='content'>
-
-                          <div className='ui form'>
-                            <div className='grouped fields'>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='1' defaultChecked></input>
-                                  <label>No schooling completed</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='2' defaultChecked></input>
-                                  <label>Nursery school to 8th grade</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='3' defaultChecked></input>
-                                  <label>9th, 10th, or 11th grade</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='4' defaultChecked></input>
-                                  <label>12th grade, or no diploma</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='5' defaultChecked></input>
-                                  <label>High school graduate</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='6' defaultChecked></input>
-                                  <label>Some college credit</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='7' defaultChecked></input>
-                                  <label>1 or more years of college</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='8' defaultChecked></input>
-                                  <label>Associate degree</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='9' defaultChecked></input>
-                                  <label>Bachelors degree</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='10' defaultChecked></input>
-                                  <label>Masters degree</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='11' defaultChecked></input>
-                                  <label>Professional degree</label>
-                                </div>
-                              </div>
-                              <div className='field'>
-                                <div className='ui education checkbox'>
-                                  <input type='checkbox' name='education' 
value='12' defaultChecked></input>
-                                  <label>Doctorate degree</label>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
 
                     <div className='field'>
                       <div id='ab-toggle' className='ui toggle checkbox'>
@@ -211,8 +109,6 @@ class AppResults extends Component {
                         <label>A/B</label>
                       </div>
                     </div>
-
-                  </div>
                 </div>
               </div>
 
@@ -317,6 +213,7 @@ class AppResults extends Component {
               </div>
             </div>
           </div>
+          
 
           <div className='twelve wide column'>
             <div className='ui basic row segment'>

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/40db1528/public/components/visualizations/Counts.jsx
----------------------------------------------------------------------
diff --git a/public/components/visualizations/Counts.jsx 
b/public/components/visualizations/Counts.jsx
index f8d1cbc..02f30f1 100644
--- a/public/components/visualizations/Counts.jsx
+++ b/public/components/visualizations/Counts.jsx
@@ -115,9 +115,10 @@ class Counts extends Component {
 function subset(data, filters) {
   preprocessData(data);
 
-  var dataSubset = data.filter((p) => {
-    return (filters.gender === 0 || filters.gender == 
p.intake_data.demographics.Gender) && 
(filters.educationlevels.includes(+p.intake_data.education["Most school 
completed"]));
-  });
+  // var dataSubset = data.filter((p) => {
+  //   return (filters.gender === 0 || filters.gender == 
p.intake_data.demographics.Gender) && 
(filters.educationlevels.includes(+p.intake_data.education["Most school 
completed"]));
+  // });
+  var dataSubset = data;
 
   var logs = {};
 

Reply via email to