X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclass.tc.inc.php;h=bcf18e26a79ba6cfb9ee1f9b721ed95a6b287e56;hb=be758016f3cd29cef9b854c3473df80c12668763;hp=c4337f1d5a8a05d0eeeeaec1ebec9e5ba29303e8;hpb=8abd1050612bcab4549875f12fdc1a036a9ce233;p=eq%2F.git

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index c4337f1..bcf18e2 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -426,7 +426,7 @@ class tc
 			$unassigned_family_list = get_var('unassignedFamilies',array('POST'));
 			
 			if ($assignedHT_list || $unassignedHT_list) {
-				$sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")";
+				$sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"NULL\",\"$district\")";
 				$this->db2->query($sql,__LINE__,__FILE__);
 				$companionship_sandbox = mysql_insert_id();
 				
@@ -540,11 +540,11 @@ class tc
 			while ($this->db->next_record()) {
 				$companionship = $this->db->f('companionship');
 				$district = $this->db->f('district');
-				$sql = "INSERT INTO tc_companionship_sandbox (district) VALUES (\"$district\")";
+				$sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"$companionship\",\"$district\")";
 				$this->db2->query($sql,__LINE__,__FILE__);
 				$companionship_sandbox = mysql_insert_id();
 				
-				$sql = "SELECT * FROM tc_companion WHERE companionship=$companionship AND valid=1";
+				$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship AND tc.valid=1 AND ti.valid=1";
 				$this->db2->query($sql,__LINE__,__FILE__);
 				while ($this->db2->next_record()) {
 					$individual = $this->db2->f('individual');
@@ -664,8 +664,10 @@ class tc
 						$companion_names .= " / " . $this->db2->f('name');
 					}
 				}
-				$sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
-				$sandbox_table_data .= "<tr><td><table>";
+				$this->nextmatchs->template_alternate_row_color(&$this->t);
+				$sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+				$sandbox_table_data .= "<th bgcolor=#d3dce3 align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
+				$sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><table>";
 				
 				# get families they visit
 				$sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
@@ -673,11 +675,13 @@ class tc
 				while ($this->db2->next_record()) {
 					$family_name = $this->db2->f('name') . " Family";
 					$family_id = $this->db2->f('tc_family');
-					$sandbox_table_data .= "<tr>";
+					$tc_companionship = $this->db2->f('tc_companionship');
+				    $this->nextmatchs->template_alternate_row_color(&$this->t);
+				    $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
 					$sandbox_table_data .= "<td align=\"Left\" width=\"1000\">$family_name</td>";
 					
 					# get 12 months visit data for given family
-					for($m=$this->sandbox_stats_num_months; $m >= 0; $m--) {
+					for($m=$this->sandbox_stats_num_months; $m > 0; $m--) {
 						$month = $this->current_month - $m;
 						$year = $this->current_year;
 						if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
@@ -686,7 +690,11 @@ class tc
 						$month_end = "$year"."-"."$month"."-"."31";
 						$month = "$month"."/"."$year";
 
-						$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id;
+						if ($this->sandbox_visits_comp_only == 0) {
+							$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id;
+						} else {
+							$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship=$tc_companionship AND family=". $family_id;
+						}
 						$query_id = $this->db3->query($sql,__LINE__,__FILE__);
 
 						if($this->db3->next_record()) {