From 7e7fd39afe44f68794867ac6909a31743d64895b Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Tue, 18 Jun 2013 12:00:14 +1000
Subject: [PATCH] Don't display overall stats unless explicitly selected

---
 admin/samplecallattempts.php    | 50 ++++++++++++++++-----------------
 functions/functions.display.php | 11 +++++++-
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/admin/samplecallattempts.php b/admin/samplecallattempts.php
index 60b6e838..8a37abb5 100644
--- a/admin/samplecallattempts.php
+++ b/admin/samplecallattempts.php
@@ -69,7 +69,7 @@ function sample_call_attempt_report($questionnaire_id = false, $sample_id = fals
 	global $db;
 
 	$q = "";
-	if ($questionnaire_id !== false)
+	if ($questionnaire_id !== false && $questionnaire_id != -1)
 		$q = "AND c.questionnaire_id = $questionnaire_id";
 
 	$s = "";
@@ -169,41 +169,41 @@ function sample_call_attempt_report($questionnaire_id = false, $sample_id = fals
 
 xhtml_head(T_("Sample call attempt"),true,array("../css/table.css"),array("../js/window.js"));
 
-print "<h2>" . T_("Overall") . "</h2>";
-
-sample_call_attempt_report(false,false,false);
-
 print "<h2>" . T_("Please select a questionnaire") . "</h2>";
 $questionnaire_id = false;
-if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
-display_questionnaire_chooser($questionnaire_id);
+if (isset($_GET['questionnaire_id'])) $questionnaire_id = intval($_GET['questionnaire_id']);
+display_questionnaire_chooser($questionnaire_id,array(-1,T_("Overall")));
 
-if ($questionnaire_id)
+
+if ($questionnaire_id || $questionnaire_id == -1)
 {
 	if (sample_call_attempt_report($questionnaire_id,false,false))
 	{
-		print "<h2>" . T_("Please select a sample") . "</h2>";
-		$sample_import_id = false;
-		if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
-		display_sample_chooser($questionnaire_id,$sample_import_id);
-
-		if ($sample_import_id)
+		if ($questionnaire_id != -1)
 		{
-			if (sample_call_attempt_report($questionnaire_id,$sample_import_id,false))
+			print "<h2>" . T_("Please select a sample") . "</h2>";
+			$sample_import_id = false;
+			if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
+			display_sample_chooser($questionnaire_id,$sample_import_id);
+
+			if ($sample_import_id)
 			{
-				$questionnaire_sample_quota_row_id = false;
-				if (isset($_GET['questionnaire_sample_quota_row_id'])) $questionnaire_sample_quota_row_id = bigintval($_GET['questionnaire_sample_quota_row_id']);
-				print "<h2>" . T_("Please select a quota") . "</h2>";
-				display_quota_chooser($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id);
-	
-				if ($questionnaire_sample_quota_row_id)
+				if (sample_call_attempt_report($questionnaire_id,$sample_import_id,false))
 				{
-					if (!sample_call_attempt_report($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id))
-						print "<p>" . T_("No calls for this quota") . "</p>";
+					$questionnaire_sample_quota_row_id = false;
+					if (isset($_GET['questionnaire_sample_quota_row_id'])) $questionnaire_sample_quota_row_id = bigintval($_GET['questionnaire_sample_quota_row_id']);
+					print "<h2>" . T_("Please select a quota") . "</h2>";
+					display_quota_chooser($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id);
+		
+					if ($questionnaire_sample_quota_row_id)
+					{
+						if (!sample_call_attempt_report($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id))
+							print "<p>" . T_("No calls for this quota") . "</p>";
+					}
 				}
+				else
+					print "<p>" . T_("No calls for this sample") . "</p>";
 			}
-			else
-				print "<p>" . T_("No calls for this sample") . "</p>";
 		}
 	}
 	else
diff --git a/functions/functions.display.php b/functions/functions.display.php
index e78a338f..9a009141 100644
--- a/functions/functions.display.php
+++ b/functions/functions.display.php
@@ -55,7 +55,7 @@ include_once(dirname(__FILE__).'/../db.inc.php');
  * @param int|bool $questionnaire_id The questionnaire id or false if none selecetd
  *
  */
-function display_questionnaire_chooser($questionnaire_id = false)
+function display_questionnaire_chooser($questionnaire_id = false, $overall = false)
 {
 	global $db;
 
@@ -69,6 +69,15 @@ function display_questionnaire_chooser($questionnaire_id = false)
 	print "<div><select id='questionnaire' name='questionnaire' onchange=\"LinkUp('questionnaire')\"><option value='?'></option>";
 	if (!empty($rs))
 	{
+		if (is_array($overall))
+		{
+			$selected = "";
+			if ($questionnaire_id == $overall[0])
+				$selected = "selected='selected'";
+
+			print "<option value='?questionnaire_id=-1' $selected>{$overall[1]}</option>";
+		}
+
 		foreach($rs as $r)
 		{
 			print "<option value='?questionnaire_id={$r['questionnaire_id']}' {$r['selected']}>{$r['description']}</option>";