X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=26f8d7e67c06e291ecc35b690248faeb8a809edf;hb=3f241aa189dacd37134c49231058abf868da4c03;hp=2ba160b6e96ef975fee667f0e94478be0876ae0e;hpb=c72d1e908d58ff45e6f332093028899e9d89a656;p=eq%2F.git

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 2ba160b..26f8d7e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -1720,11 +1720,6 @@ class tc
 						$supervisor_last_name = $supervisor_array[0];
 						$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
 						$this->db2->query($sql,__LINE__,__FILE__);
-						if($this->db2->next_record()) {
-							$mls_id = $this->db2->f('mls_id');
-						}
-						$sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-						$this->db2->query($sql,__LINE__,__FILE__);
 						if($this->db2->next_record()) {
 							$supervisor_address = $this->db2->f('address');
 						}
@@ -1804,11 +1799,6 @@ class tc
 			$supervisor_last_name = $supervisor_array[0];
 			$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
 			$this->db2->query($sql,__LINE__,__FILE__);
-			if($this->db2->next_record()) {
-				$mls_id = $this->db2->f('mls_id');
-			}
-			$sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-			$this->db2->query($sql,__LINE__,__FILE__);
 			if($this->db2->next_record()) {
 				$supervisor_address = $this->db2->f('address');
 			}
@@ -2467,15 +2457,16 @@ class tc
 			$indiv = $this->db2->f('individual');
 			$interviewer_name = $this->db2->f('name');
 			if($indiv == $interviewer) {
-				$this->t->set_var('interviewer',$interviewer . ' selected');
+				$this->t->set_var('interviewer',$indiv . ' selected');
 			} else {
-				$this->t->set_var('interviewer',$interviewer);
+				$this->t->set_var('interviewer',$indiv);
 			}
+			#print "indiv: $indiv interviewer: $interviewer<br>";
 			$this->t->set_var('interviewer_name',$interviewer_name);
 			$this->t->set_var('eqpresppi_checked','checked');
 			$this->t->fp('int_list','interviewer_list',True);
 		}
-
+		#print "selected interviewer: $interviewer<br>";
 		if($action == 'save') {
 			$notes = get_var('notes',array('POST'));
 			$this->db->query("UPDATE tc_interview set " .
@@ -2792,9 +2783,9 @@ class tc
 			$indiv = $this->db2->f('individual');
 			$interviewer_name = $this->db2->f('name');
 			if($indiv == $interviewer) {
-				$this->t->set_var('interviewer',$interviewer . ' selected');
+				$this->t->set_var('interviewer',$indiv . ' selected');
 			} else {
-				$this->t->set_var('interviewer',$interviewer);
+				$this->t->set_var('interviewer',$indiv);
 			}
 			$this->t->set_var('interviewer_name',$interviewer_name);
 			$this->t->fp('int_list','interviewer_list',True);
@@ -3539,7 +3530,7 @@ class tc
 			$presidency_data[$i]['name'] = $this->db->f('name');
 			$presidency_data[$i]['indiv'] = $this->db->f('individual');
 			$presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
-			$presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual'];
+			$presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
 			$i++;
 		}
 
@@ -3587,13 +3578,9 @@ class tc
 						} else if($indiv > 0) {
 							$supervisor_name_array = explode(",",$presidency2name[$presidency]);
 							$supervisor_last_name = $supervisor_name_array[0];
+							print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
 							$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
 							$this->db2->query($sql,__LINE__,__FILE__);
-							if($this->db2->next_record()) {
-								$mls_id = $this->db2->f('mls_id');
-							}
-							$sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-							$this->db2->query($sql,__LINE__,__FILE__);
 							if($this->db2->next_record()) {
 								$supervisor_address = $this->db2->f('address');
 							}
@@ -3713,11 +3700,6 @@ class tc
 						$supervisor_last_name = $supervisor_name_array[0];
 						$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
 						$this->db2->query($sql,__LINE__,__FILE__);
-						if($this->db2->next_record()) {
-							$mls_id = $this->db2->f('mls_id');
-						}
-						$sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-						$this->db2->query($sql,__LINE__,__FILE__);
 						if($this->db2->next_record()) {
 							$supervisor_address = $this->db2->f('address');
 						}
@@ -3751,7 +3733,7 @@ class tc
 				$table_data.= "</td>";
 
 				// individual drop down list (for PPIs)
-				$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+				$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
 				$table_data.= '<option value=0></option>';  
 				for ($j=0; $j < count($individual); $j++) {
 					$id = $individual[$j];
@@ -3807,7 +3789,7 @@ class tc
 				$table_data.= "</td>";
 
 				// individual drop down list
-				$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+				$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
 				$table_data.= '<option value=0></option>';  
 				for ($j=0; $j < count($individual); $j++) {
 					$id = $individual[$j];
@@ -4276,10 +4258,14 @@ class tc
 			$dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
 			$dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
 
-			$sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
+			$sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
 			$this->db2->query($sql,__LINE__,__FILE__);
 			if($this->db2->next_record()) {
-				$email = $this->db2->f('email');
+				if ($this->db2->f('email1') != "") {
+					$email = $this->db2->f('email1');
+				} else { 
+					$email = $this->db2->f('email2');
+				}
 				$interviewer = $this->db2->f('name');
 			}