From 612f3aaea9e154c0acac886ae32d28ae77d59174 Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Mon, 5 Oct 2015 18:34:02 +0300
Subject: [PATCH] Added in-page Lime statistics block, Bootstrapted interface

---
 client/index.php | 41 ++++++++++++++++++++++++-----------------
 css/custom.css   |  4 ++++
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/client/index.php b/client/index.php
index c3b0728c..3e3ab9ca 100644
--- a/client/index.php
+++ b/client/index.php
@@ -41,7 +41,7 @@ include_once(dirname(__FILE__).'/../db.inc.php');
 /** 
  * Authentication
  */
-include ("auth-client.php");
+require ("auth-client.php");
 
 
 /**
@@ -62,11 +62,11 @@ include ("../functions/functions.client.php");
 
 $client_id = get_client_id();
 
-xhtml_head(T_("Questionnaire Outcomes"),true,array("css/table.css"));
+xhtml_head(T_("Questionnaire Outcomes"),true,array("../include/bootstrap/css/bootstrap.min.css", "../css/custom.css"));
 
 if ($client_id)
 {
-	$sql = "SELECT q.questionnaire_id,q.description
+	$sql = "SELECT q.questionnaire_id,q.description,q.lime_sid
 		FROM questionnaire as q, client_questionnaire as cq
 		WHERE cq.questionnaire_id = q.questionnaire_id
 		AND q.enabled = 1
@@ -75,14 +75,17 @@ if ($client_id)
 	$qs = $db->GetAll($sql);
 
 	if (empty($qs))
-		print "<p>" . T_("There are no questionnaires assigned to you") . "</p>";
+		print "<p class='alert alert-info'>" . T_("There are no questionnaires assigned to you") . "</p>";
 	else
 	{
+		print "<div class='col-lg-2'>";
+		
 		foreach($qs as $q)
 		{
-			print "<h2>{$q['description']}</h2>";
+			print "<div class=' '><h2>{$q['description']}</h2>";
 
 			$questionnaire_id = $q['questionnaire_id'];
+			$qsid=$q['lime_sid'];
 
 			$sql = "SELECT o.calc, count( c.case_id )
 				FROM `case` AS c, `outcome` AS o
@@ -91,15 +94,15 @@ if ($client_id)
 				GROUP BY o.calc";
 			
 			$a = $db->GetAssoc($sql);
+			
 			$a = aapor_clean($a);
 		
-			
-			print "<table><tr><th>" . T_("Outcome") . "</th><th>" . T_("Rate") . "</th></tr>"; 
+			print "<table class='table-hover table-condensed tclass'><thead class=\"highlight\"><tr><th>" . T_("Outcome") . "</th><th>" . T_("Rate") . "</th></tr></thead>"; 
 			print "<tr><td>" . T_("Response Rate 1") . "</td><td>" . round(aapor_rr1($a),2) . "</td></tr>";
 			print "<tr><td>" . T_("Refusal Rate 1") . "</td><td>" . round(aapor_ref1($a),2) . "</td></tr>";
 			print "<tr><td>" . T_("Cooperation Rate 1") . "</td><td>" . round(aapor_coop1($a),2) . "</td></tr>";
 			print "<tr><td>" . T_("Contact Rate 1") . "</td><td>" . round(aapor_con1($a),2) . "</td></tr>";
-			print "</table>";
+			print "</table></br>";
 			
 			
 			$sql = "SELECT o.description as des, o.outcome_id, count( c.case_id ) as count
@@ -115,20 +118,24 @@ if ($client_id)
 				translate_array($rs,array("des"));
 				xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"));
 			}
-			else
-				print "<p>" . T_("No outcomes recorded for this questionnaire") . "</p>";
-		
+			else print "<p class='alert alert-info'>" . T_("No outcomes recorded for this questionnaire") . "</p>";
+
+			print "</br><a href=\"?page=".LIME_URL."admin/admin.php\" class=\"btn btn-default btn-block btn-lime\">" . T_("Lime results") . "</a></div>";
 		}
+		
+		$page =''; if (isset($_GET['page'])) $page = $_GET['page'] . "?action=browse&amp;sid=$qsid"; 
+?>		
+		</div>
+		
+		<div class="col-lg-10" id=" " style="height:820px;">
+			<?php xhtml_object($page,' ',"full"); ?>
+		</div>	
+<?php
 
 	}
-
-
-
 }
 else
-	print "<p>" . T_("You are not a valid client") . "</p>";
-
-
+	print "<p class='alert alert-danger'>" . T_("You are not a valid client") . "</p>";
 
 xhtml_foot();
 
diff --git a/css/custom.css b/css/custom.css
index 8dc3463f..9e2441bd 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -74,4 +74,8 @@ text-shadow: 1px 2px 1px #ababab;
 .h1, .h2, .h3, h1, h2, h3 {
 margin-bottom: 0.4em;
 margin-top: 0.25em;
+}
+.full {
+  width:100%;
+  height:100%;
 }
\ No newline at end of file