From 562c16d6265e2b2373afabf7801771d943e8d8e6 Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Thu, 10 Sep 2015 02:44:16 +0300
Subject: [PATCH] added links to client panel and quotareport, cosmetic for
 questionnaireprefill.php

---
 admin/index.php                |  7 ++++++-
 admin/questionnairelist.php    | 13 +++++++++----
 admin/questionnaireprefill.php | 14 +++++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/admin/index.php b/admin/index.php
index 2dbf70f2..0d57fed6 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -88,7 +88,12 @@ include ("../functions/functions.operator.php");
             <a href="../index.php" class=" "  target="_blanc" style="padding-top: 20px; ">
               <i class="fa fa-sign-in fa-lg fa-fw "></i><?php print T_("Operator panel");?>           
             </a>
-          </li>			
+          </li>	
+          <li class=" ">
+            <a href="../client/index.php" class=" "  target="_blanc" style="padding-top: 20px; ">
+              <i class="fa fa-sign-in fa-lg fa-fw "></i><?php print T_("Client panel");?>           
+            </a>
+          </li>			  
 		  <li class="dropdown pull-right user-data">            
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"  style=" min-width: 160px;">
               <i class="fa fa-user fa-fw "></i><?php print T_("Logged as:") . "&ensp;" . $username ;?>           
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index 99ed8803..b0ecbdeb 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -563,7 +563,7 @@ else
 		CASE WHEN enabled = 0 THEN 
 			CONCAT('<i class=\'btn fa fa-calendar fa-2x\' style=\'color:lightgrey;\'></i>')
 		ELSE
-			CONCAT('<a href=\'addshift.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Shifts") . "&ensp;\n" . TQ_("questionnaire") . "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-calendar fa-2x\'></i></a>')
+			CONCAT('<a href=\'addshift.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Shifts") . " " . TQ_("questionnaire") . "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-calendar fa-2x\'></i></a>')
 		END as shifts,
 		CASE WHEN enabled = 0 THEN 
 			CONCAT('<i class=\'btn fa fa-square-o fa-2x\' style=\'color:lightgrey;\'></i>')
@@ -580,17 +580,22 @@ else
 		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=\'callhistory.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Call history"). " " . TQ_("questionnaire"). " ',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-phone fa-2x\'></i></a>') as calls,
 		CASE WHEN enabled = 0 THEN
 			CONCAT('<i class=\'btn fa fa-download fa-2x\' style=\'color:lightgrey;\'></i>')
 		ELSE
-			CONCAT('<a href=\'dataoutput.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Data output"). "&ensp;\n" . TQ_("questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-download fa-2x\'></i></a>')
+			CONCAT('<a href=\'dataoutput.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Data output"). " " . TQ_("questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-download fa-2x\'></i></a>')
 		END as  dataout,
 		CASE WHEN enabled = 0 THEN 
 			CONCAT('<i class=\'btn fa fa-book fa-2x\' style=\'color:lightgrey;\'></i>')
 		ELSE
 			CONCAT('<a href=\'assignsample.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . TQ_("Assigned samples"). "\' data-toggle=\'tooltip\'><i class=\'fa fa-book fa-2x\'></i></a>')
 		END as assample,
+		CASE WHEN enabled = 0 THEN 
+			CONCAT('<i class=\'btn fa fa-filter fa-2x\' style=\'color:lightgrey;\'></i>')
+		ELSE
+			CONCAT('<a href=\'quotareport.php?questionnaire_id=',questionnaire_id,'\' class=\'btn\' title=\'" . T_("Quota report"). " " . TQ_("questionnaire"). "&ensp;',questionnaire_id,'\' data-toggle=\'tooltip\'><i class=\'fa fa-filter fa-2x\'></i></a>')
+		END as quotareport,
 		CASE WHEN enabled = 0 THEN 
 			CONCAT('<i class=\'btn fa fa-question-circle fa-2x\' style=\'color:lightgrey;\'></i>')
 		ELSE
@@ -599,7 +604,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","quotareport","dataout","modify","inlime","prefill","deletee");
 	xhtml_table($rs,$columns,false,"table-hover table-condensed "); 
 	
 print "</div>";
diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php
index 8afea37c..32dfd5d0 100644
--- a/admin/questionnaireprefill.php
+++ b/admin/questionnaireprefill.php
@@ -101,7 +101,9 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['questionnaire_prefill_id'])
 $questionnaire_id = false;
 if (isset($_GET['questionnaire_id'])) 	$questionnaire_id = bigintval($_GET['questionnaire_id']);
 
-xhtml_head(T_("Pre fill questionnaire: Set values for questionnaire to prefill"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js"));
+$subtitle = T_("Set values for questionnaire to prefill");
+
+xhtml_head(T_("Prefill questionnaire:"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js"), false, false, false, $subtitle);
 print "<h3 class='form-inline pull-left'>" . T_("Select a questionnaire") . ":&emsp;</h3>";
 
 $sql = "SELECT questionnaire_id as value,description, 
@@ -182,14 +184,16 @@ if ($questionnaire_id != false)
 			AND sivr.sample_import_id = qs.sample_import_id";
 		?>
 		<form action="" method="get" class="form-inline form-group">
-		<label for="value"><?php  echo T_("The value to pre fill"); ?>:&emsp;</label><input type="text" name="value" id="value" size="50" class="form-control"/>
-		<label for="svar">&emsp;<?php  echo T_("or: Select pre fill from sample list"); ?>&emsp;</label>
+		<p><label for="value"><?php  echo T_("The value to pre fill"); ?>:&emsp;</label><input type="text" name="value" id="value" size="50" class="form-control"/></p>
+		<p><label for="svar"><?php  echo T_("or: Select pre fill from sample list"); ?>&emsp;</label>
 <?php 	//display a list of possible sample variables for this questionnaire
-		display_chooser($db->GetAll($sql),"svar","svar",true,false,false,true,false,true,"form-group");
+		display_chooser($db->GetAll($sql),"svar","svar",true,false,false,false,false,true,"form-group");
 ?>
+		</p>
 		<input type="hidden" name="questionnaire_id" value="<?php  print($questionnaire_id); ?>"/>
 		<input type="hidden" name="sgqa" value="<?php  print($sgqa); ?>"/>
-		<input type="submit" name="add_prefill" class="btn btn-primary fa" value="<?php  print(T_("Add pre fill")); ?>"/>
+		</br>
+		<p><input type="submit" name="add_prefill" class="btn btn-primary fa" value="<?php  print(T_("Add pre fill")); ?>"/></p>
 		</form>
 		<?php 
 	}