X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=409b87e6bf0cd05a0709f1f70a132d26aa42b206;hb=d752724b9143721b5175a0975d0c75254d779e18;hp=06a11e10bbca0918c68625279147f63f6ff01400;hpb=618c7a09c5e0b99ca1ef5381aa2349802d11098b;p=eq%2F.git

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 06a11e1..409b87e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -203,7 +203,7 @@ class tc
 		$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_view'));
 		$this->t->set_var('title','Hometeaching'); 
 
-		$sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+		$sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$i=0;
 		while ($this->db->next_record()) {
@@ -692,7 +692,7 @@ class tc
 
 		for ($i=0; $i < count($names); $i++) {
 			//$this->nextmatchs->template_alternate_row_color(&$this->t);
-			$this->t->set_var('indiv_name',$names[$i]);
+			$this->t->set_var('individual_name',$names[$i]);
 			if(($i+1) % 3 == 0) {
 				$this->t->set_var('table_sep',"</td></tr><tr>"); 
 			} else { 
@@ -734,7 +734,7 @@ class tc
 			// Re-add the individuals who are checked as having participated in this activity
 			$indivs = get_var('individual_name',array('POST'));
 			if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with
-				foreach ($indivs as $indiv) {
+				foreach ($indivs as $individual) {
 					$this->db->query("INSERT INTO tc_participation (individual,activity) " .
 					                 "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
 				}
@@ -761,7 +761,7 @@ class tc
 			}
 
 			$indivs = get_var('individual_name',array('POST'));
-			foreach ($indivs as $indiv)
+			foreach ($indivs as $individual)
 			{
 				$this->db->query("INSERT INTO tc_participation (individual,activity) " .
 				                 "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
@@ -1775,7 +1775,7 @@ class tc
 		}
 
 		// Get the Districts
-		$sql = "SELECT * FROM tc_district AS td JOIN tc_presidency AS tp WHERE td.district=tp.district AND td.valid=1 ORDER BY td.district ASC";
+		$sql = "SELECT * FROM tc_district AS td JOIN (tc_presidency AS tp, tc_individual AS ti) WHERE td.district=tp.district AND td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$i=0;
 		while ($this->db->next_record()) {
@@ -1889,7 +1889,7 @@ class tc
 			$i=0;
 			for ($j=0; $j < count($unique_companionships); $j++) {
 				// Select all the companions from each companionship
-				$sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
+				$sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
 				$this->db->query($sql,__LINE__,__FILE__);
 				$k=0; $int_completed=0;
 				$comp = $unique_companionships[$j]['companionship'];
@@ -2601,7 +2601,7 @@ class tc
 		else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
 		else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
-		$sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+		$sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$i=0;
 		while ($this->db->next_record()) {
@@ -4073,8 +4073,8 @@ class tc
 			$name = "High Priests";
 			$indiv = 0;
 			$valid = 0;
-			$this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " .
-			                  "VALUES ('" . $district . "','" . $name . "','" .
+			$this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+			                  "VALUES ('" . $district . "','" . 
 			                  $indiv . "','" . $valid . "'" .
 			                  ")",__LINE__,__FILE__);
 
@@ -4091,8 +4091,8 @@ class tc
 
 				// If we have a valid district, add it to the district table
 				if($district > 0) {
-					$this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " .
-					                  "VALUES ('" . $district . "','" . $name . "','" .
+					$this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+					                  "VALUES ('" . $district . "','" . 
 					                  $indiv . "','" . $valid . "'" .
 					                  ")",__LINE__,__FILE__);
 				}