diff --git a/admin/outcomes.php b/admin/outcomes.php index 46ebe0b4..cc0bebeb 100644 --- a/admin/outcomes.php +++ b/admin/outcomes.php @@ -1,4 +1,5 @@ -" . T_("Select a questionnaire") . ""; @@ -143,7 +144,7 @@ group by s.import_id"; $a = $db->GetAssoc($sql); $a = aapor_clean($a); - print ""; // table-hover table table-condensed + print "
" . T_("Outcome") . "" . T_("Rate") . "
"; print ""; print ""; print ""; @@ -153,7 +154,7 @@ group by s.import_id"; $sql = "SELECT count(case_id) FROM `case` WHERE `case`.questionnaire_id = '$questionnaire_id'"; $cases = $db->GetOne($sql); - $sql = "SELECT CONCAT('', o.description, '') as des, o.outcome_id, count( c.case_id ) as count, ROUND((count( c.case_id ) / $cases) * 100,2) as perc + $sql = "SELECT CONCAT(' ', '=>' ,' ')as link, o.description as des, o.outcome_id, count( c.case_id ) as count, ROUND((count( c.case_id ) / $cases) * 100,2) as perc FROM `case` AS c, `outcome` AS o WHERE c.questionnaire_id = '$questionnaire_id' AND c.current_outcome_id = o.outcome_id @@ -165,7 +166,7 @@ group by s.import_id"; { print "
"; //print "

" . T_("Total cases for questionnaire") . " = $cases

"; translate_array($rs,array("des")); - xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count")," " . T_("%")),"tclass",false,array("count","perc"));//array("des" => "Complete") + xhtml_table($rs,array("link","des","count","perc"),array("",T_("Outcome"),T_("Count")," " . T_("%")),"tclass",false,array("count","perc"));//array("des" => "Complete") print "
"; $sample_import_id = false; @@ -202,7 +203,7 @@ group by s.import_id"; print "
"; //

" . T_("Outcomes") . "

"; - $sql = "SELECT CONCAT('', o.description, '') as des, o.outcome_id, count( c.case_id ) as count,ROUND(count(c.case_id) / (SELECT count(case_id) FROM `case` JOIN sample ON (`case`.sample_id = sample.sample_id AND sample.import_id = '$sample_import_id') WHERE questionnaire_id = '$questionnaire_id' ) * 100,2) as perc + $sql = "SELECT CONCAT(' ', '=>' ,' ')as link, o.description as des, o.outcome_id, count( c.case_id ) as count,ROUND(count(c.case_id) / (SELECT count(case_id) FROM `case` JOIN sample ON (`case`.sample_id = sample.sample_id AND sample.import_id = '$sample_import_id') WHERE questionnaire_id = '$questionnaire_id' ) * 100,2) as perc FROM `case` AS c, `outcome` AS o, sample as s WHERE c.questionnaire_id = '$questionnaire_id' @@ -216,7 +217,7 @@ group by s.import_id"; if (!empty($rs)) { translate_array($rs,array("des")); - xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); + xhtml_table($rs,array("link","des","count","perc"),array("",T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); } else print "

" . T_("No outcomes recorded for this sample") . "

";
" . T_("Outcome") . "" . T_("Rate") . "
" . T_("Response Rate 1") . "" . round(aapor_rr1($a),2) . "
" . T_("Refusal Rate 1") . "" . round(aapor_ref1($a),2) . "
" . T_("Cooperation Rate 1") . "" . round(aapor_coop1($a),2) . "