tabulation polish

mathbiol · Oct 13, 2014 · 2d58fe1 · 2d58fe1
1 parent 0910479
commit 2d58fe1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/jobs/sparcsSuffolk2012tabulate.js b/jobs/sparcsSuffolk2012tabulate.js
@@ -45,8 +45,8 @@ s.loadData(function(x){
 	document.getElementById('parm1').value='ccs_procedure_description'
 	document.getElementById('parm2').value='facility_name'
 	bt.onclick=function(){
-		$('#allPatients').html("<h3>All patients</h3>")
-		$('#medicaidPatients').html("<h3>Medicaid patients</h3>")
+		$('#allPatients').html("<h3>All patients ("+s.docs.length+")</h3>")
+		$('#medicaidPatients').html("<h3>Medicaid patients ("+s.medicaid.docs.length+")</h3>")
 		var selParm1 = document.getElementById('parm1').value;
 		var selParm2 = document.getElementById('parm2').value;
 		var Up1 = openHealth.unique(s.tab[selParm1])

diff --git a/jobs/sparcsSuffolk2012tabulateAsthma.js b/jobs/sparcsSuffolk2012tabulateAsthma.js
@@ -40,7 +40,7 @@ s.loadData(function(x){
 		$('#parm1').append('<option value="'+u+'">'+u+'</option>')
 		$('#parm2').append('<option value="'+u+'">'+u+'</option>')
 	})
-	$("#openHealthJob").append('<hr><div id="allPatients"><h3>All patients</h3></div></hr><hr><div id="medicaidPatients"><h3>Medicaid patients</h3></div></hr>');
+	$("#openHealthJob").append('<hr><div id="allPatients"><h3>All Asthma patients</h3></div></hr><hr><div id="medicaidPatients"><h3>Medicaid Asthma patients</h3></div></hr>');
 	var bt = document.getElementById('tabulate')
 	document.getElementById('parm1').value='ccs_procedure_description'
 	document.getElementById('parm2').value='facility_name'
@@ -53,11 +53,11 @@ s.loadData(function(x){
 		var Up2 = openHealth.unique(s.tab[selParm2])
 		$('#allPatients').append(openHealth.crossdoc2html(
 			openHealth.tabulateCount(s.tab,selParm1,selParm2,Up1,Up2),
-			'counts of '+selParm1+' vs '+selParm2+' for all patients.csv'
+			'counts of '+selParm1+' vs '+selParm2+' for all Asthma patients.csv'
 		));
 		$('#medicaidPatients').append(openHealth.crossdoc2html(
 			openHealth.tabulateCount(s.medicaid.tab,selParm1,selParm2,Up1,Up2),
-			'counts of '+selParm1+' vs '+selParm2+' for Medicaid patients.csv'
+			'counts of '+selParm1+' vs '+selParm2+' for Medicaid Asthma patients.csv'
 		));
 
 		//console.log(Date(),this)

diff --git a/openHealth.js b/openHealth.js
@@ -376,13 +376,13 @@ this.crossdoc2csv=function(d,title){
 	// header
 	var rr=Object.getOwnPropertyNames(d).sort(); //rows
 	var cc=Object.getOwnPropertyNames(d[rr[0]]).sort() //columns
-	cc.map(function(p1){
-		csv+=','+p1
+	cc.map(function(p2){
+		csv+=','+p2.replace(/[;,]/g,' ')
 	})
 	csv+='\n'
 	// body
 	rr.map(function(p1){
-		csv+=p1;
+		csv+=p1.replace(/[;,]/g,' ');
 		cc.map(function(p2){
 			csv+=','+d[p1][p2];
 		})