X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=c7601008cc1bcb0f13c2cba2fcc2598999e22d81;hb=8c3a64633fe59a227723d29b6965a6a7b6dd2d73;hp=1038cf0375758d08c88deaa917887a432e222ac8;hpb=8b4dd6f242ee77016450d54c8272bd88dfd15c52;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 1038cf0..c760100 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -235,12 +235,11 @@ class eq
 	$this->t->set_var('district_number',$districts[$i]['district']);
 	$this->t->set_var('district_name',$districts[$i]['name']);	
 	$supervisor = $districts[$i]['supervisor'];
-	$unique_companionships='';
 		
 	// Select all the unique companionship numbers for this district
 	$sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
 	$this->db->query($sql,__LINE__,__FILE__);
-	$j=0;
+	$j=0; $unique_companionships = '';
 	while ($this->db->next_record())
 	  {
 	    $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -418,7 +417,7 @@ class eq
 	  // Get a list of all the companionships in this district
 	  $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
 	  $this->db->query($sql,__LINE__,__FILE__);
-	  $j=0;
+	  $j=0; $unique_companionships = '';
 	  while ($this->db->next_record())
 	    {
 	      $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -485,7 +484,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0; $unique_companionships='';
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
 	{
 	  $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -1921,7 +1920,7 @@ class eq
       // Select all the unique companionship numbers for this district
       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
       $this->db->query($sql,__LINE__,__FILE__);
-      $j=0;
+      $j=0; $unique_companionships = '';
       while ($this->db->next_record())
 	{
 	  $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2555,7 +2554,7 @@ class eq
       $notes = get_var('notes',array('GET','POST'));
       $eqpresppi = get_var('eqpresppi',array('GET','POST'));
      
-      $sql = "SELECT * FROM eq_presidency where valid=1 and eqpres=0";
+      $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
       $this->db2->query($sql,__LINE__,__FILE__);
       while ($this->db2->next_record())
       {
@@ -2735,13 +2734,11 @@ class eq
 	$this->t->set_var('district_number',$districts[$i]['district']);
 	$this->t->set_var('district_name',$districts[$i]['name']);	
 	$supervisor = $districts[$i]['supervisor'];
-	$unique_companionships='';
 		
 	// Select all the unique companionship numbers for this district
 	$sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
-
 	$this->db->query($sql,__LINE__,__FILE__);
-	$j=0;
+	$j=0; $unique_companionships = '';
 	while ($this->db->next_record())
 	  {
 	    $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2893,25 +2890,21 @@ class eq
       $date = get_var('date',array('GET','POST'));
       $notes = get_var('notes',array('GET','POST'));
       $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-      
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
-      $this->db->query($sql,__LINE__,__FILE__);
-      while ($this->db->next_record())
-	{
-	  $supervisor = $this->db->f('supervisor');
-	  $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
-	  $this->db2->query($sql,__LINE__,__FILE__);
-	  $this->db2->next_record();
-	  $interviewer_name = $this->db2->f('name');
-	  
-	  if($supervisor == $interviewer) { 
-	    $this->t->set_var('interviewer',$supervisor . ' selected');
-	  } else {
-	    $this->t->set_var('interviewer',$interviewer);
-	  }
-	  $this->t->set_var('interviewer_name',$interviewer_name);
-	  $this->t->fp('int_list','interviewer_list',True);
-	}
+
+      $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      while ($this->db2->next_record())
+      {
+        $elder = $this->db2->f('elder');
+        $interviewer_name = $this->db2->f('name');
+        if($elder == $interviewer) {
+          $this->t->set_var('interviewer',$interviewer . ' selected');
+        } else {
+          $this->t->set_var('interviewer',$interviewer);
+        }
+        $this->t->set_var('interviewer_name',$interviewer_name);
+        $this->t->fp('int_list','interviewer_list',True);
+      }
       
       if($action == 'save')
 	{