From 33630a432b7dacbf49a87fabe68fcc0e5903dcbb Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Wed, 9 Sep 2015 04:09:09 +0300
Subject: [PATCH] changed titles as may mismatch with existing titles and
 translations added links to questionnairelist.php some clean-up

---
 admin/index.php             |  4 ++--
 admin/new.php               |  1 -
 admin/questionnairelist.php |  3 ++-
 admin/set_outcomes.php      | 21 ++++++++-------------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 75f41971..d3c4c1ab 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -98,7 +98,7 @@ include ("../lang.inc.php");
 				<li><a href="?g=1&amp;page=<?php echo LIME_URL ;?>admin/admin.php?action=newsurvey"><i class="fa fa-file-text-o lime fa-fw"></i><?php print T_("Create an instrument in Limesurvey") ;?></a></li>
                 <li><a href="?g=1&amp;page=new.php"><i class="fa fa-plus-circle fa-fw"></i><?php print T_("Create a new questionnaire") ;?></a></li>
                 <li><a href="?g=1&amp;page=questionnairelist.php"><i class="fa fa-list fa-fw"></i><?php print T_("Questionnaire management") ;?></a></li>
-			    <li><a href="?g=9&amp;page=set_outcomes.php?qid=0"><i class="fa fa-list-ol fa-fw"></i><?php print T_("Questionnaire outcomes") ;?></a></li>
+			    <li><a href="?g=9&amp;page=set_outcomes.php?qid=0"><i class="fa fa-list-ol fa-fw"></i><?php print T_("Set questionnaire outcomes") ;?></a></li>
                 <li><a href="?g=1&amp;page=<?php echo LIME_URL ;?>admin/admin.php"><i class="fa fa-lemon-o lime fa-fw"></i><?php print T_("Administer instruments with Limesurvey") ;?></a></li>
                 <li><a href="?g=1&amp;page=questionnaireprefill.php"><i class="fa fa-thumb-tack fa-fw"></i><?php print T_("Pre-fill questionnaire") ;?></a></li>
               </ul>
@@ -162,7 +162,7 @@ include ("../lang.inc.php");
           </li>
           <li class="has_sub"><a href="" class=""><i class="fa fa-lg fa-gear"></i><span><?php print T_("System settings") ;?></span></a>
               <ul style="<?php if ($g == 9) echo "display:block";?>">
-			    <li><a href="?g=9&amp;page=set_outcomes.php?default"><i class="fa fa-list-ol fa-fw"></i><?php print T_("Default outcomes") ;?></a></li>
+			    <li><a href="?g=9&amp;page=set_outcomes.php?default"><i class="fa fa-list-ol fa-fw"></i><?php print T_("Set default outcomes") ;?></a></li>
                 <li><a href="?g=9&amp;page=timezonetemplate.php"><i class="fa fa-globe fa-fw"></i><?php print T_("Set default timezone list") ;?></a></li>
 				<li><a href="?g=9&amp;page=availabilitygroup.php"><i class="fa fa-clock-o fa-fw"></i><?php print T_("Manage Time slots") ;?></a></li>
                 <li><a href="?g=9&amp;page=shifttemplate.php"><i class="fa fa-calendar fa-fw"></i><?php print T_("Set default shift times") ;?></a></li>
diff --git a/admin/new.php b/admin/new.php
index 61952567..1f8b82bc 100644
--- a/admin/new.php
+++ b/admin/new.php
@@ -89,7 +89,6 @@ if (isset($_POST['import_file']))
 	}
 
 	$do = implode($do,",");
-	//print $do . "</br>";
 	
 //** - end 
 	
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index 08db3ba8..e99658be 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -576,6 +576,7 @@ else
 			CONCAT('<a href=\'outcomes.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Outcomes for questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-bar-chart fa-2x\'></i></a>')
 		END as outcomes,
 		CONCAT('<a href=\'callhistory.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Call history"). "&ensp;\n" . TQ_("questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-phone fa-2x\'></i></a>') as calls,
+		CONCAT('<a href=\'set_outcomes.php?qid=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Set outcomes"). "&ensp;\n" . TQ_("questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-list-ol fa-2x\'></i></a>') as setoutcomes,
 		CASE WHEN enabled = 0 THEN
 			CONCAT('<i class=\'btn fa fa-download fa-2x\' style=\'color:lightgrey;\'></i>')
 		ELSE
@@ -594,7 +595,7 @@ else
 		FROM questionnaire";
 	$rs = $db->GetAll($sql);
 
-	$columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","dataout","modify","inlime","prefill","deletee");
+	$columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","dataout","modify","setoutcomes","inlime","prefill","deletee");
 	xhtml_table($rs,$columns,false,"table-hover table-condensed "); 
 	
 print "</div>";
diff --git a/admin/set_outcomes.php b/admin/set_outcomes.php
index 60884676..0de4a196 100644
--- a/admin/set_outcomes.php
+++ b/admin/set_outcomes.php
@@ -81,22 +81,19 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
 	$def = $db->GetAll($sql);
 			
 	for ($i=0; $i < count($def); $i++){
-			foreach($def[$i] as $key => $val){
-				$sel[] = $val;
-			}
+		foreach($def[$i] as $key => $val){
+			$sel[] = $val;
+		}
 	}
 	
 	if(!empty($_POST['select']) ){		
 		//add selected outcomes
-		foreach($_POST['select'] as $n => $val)
-			{
-				$sel[] = $val;
-			}
+		foreach($_POST['select'] as $n => $val){
+			$sel[] = $val;
+		}
 	}
 	
 	$sel=implode($sel,",");
-		
-	print $sel . "</br>";
 	
 	$qid = intval($_POST['qid']);
 	$sql = "UPDATE questionnaire
@@ -105,7 +102,6 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
 
 	$db->Execute($sql);	 
 	
-	
 	$_GET['qid'] = $_POST['qid'];
 	
 	unset($_POST['qid']);
@@ -116,8 +112,8 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
 
 /*select outcomes list*/
 
-if (isset($_GET['default'])) { $title = T_("Default outcomes"); } 
-else if (isset($_GET['qid'])){ $title = T_("Questionnaire outcomes"); $qid = intval($_GET['qid']); }
+if (isset($_GET['default'])) { $title = T_("Set default outcomes"); } 
+else if (isset($_GET['qid'])){ $title = T_("Set questionnaire outcomes"); $qid = intval($_GET['qid']); }
 else die();
 
 xhtml_head($title,true,$css,$js_head); 
@@ -212,7 +208,6 @@ if (isset($rs) && !empty($rs)){
 		}
 	}
 
-
 ?>
 
 	<form enctype="multipart/form-data" action="?" method="post" class="form-horizontal col-lg-12" >