X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=737306148f4acec3f3e593be403d2504171de504;hb=7a87ac31d4d7dcbcd415168d5adf7d18489adaf1;hp=8c2984e511210cbe2e203254bdb40552d074112f;hpb=4d253dd156e29b53b2b2d0307d71eaef3379df8d;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 8c2984e..7373061 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -143,6 +143,7 @@ class eq
 	{
 	  $elder_id[$i] = $this->db->f('elder');
 	  $elder_name[$i] = $this->db->f('name');
+	  $elder_phone[$elder_id[$i]] = $this->db->f('phone');
 	  $i++;
 	}
       array_multisort($elder_name, $elder_id);
@@ -192,15 +193,16 @@ class eq
 	  while ($this->db->next_record())
 	    {
 	      // Get this companions information
-	      if($companion_table_entry != "") { $companion_table_entry .= " / "; }
+	      if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
 	      $companionship = $this->db->f('companionship');
 	      $elder_id = $this->db->f('elder');
 	      $aaronic_id = $this->db->f('aaronic');
+	      $phone = $elder_phone[$elder_id];
 	      if($elder_id) { $name = $elders[$elder_id]; }
 	      else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-	      $companion_table_entry .= "$name";
+	      $companion_table_entry .= "<td title=\"$phone\"><b>$name</b></td>";
 	    }
-	  $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><b>$companion_table_entry<hr></td></tr>";
+	  $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
 	  
 	  // Get the names of the families assigned this home teaching companionship
 	  $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
@@ -367,6 +369,7 @@ class eq
 	{
 	  $elder_id[$i] = $this->db->f('elder');
 	  $elder_name[$i] = $this->db->f('name');
+	  $elder_phone[$elder_id[$i]] = $this->db->f('phone');
 	  $i++;
 	}
       array_multisort($elder_name, $elder_id);
@@ -386,7 +389,7 @@ class eq
 	}
       
       // Select all the unique companionship numbers for this district
-      $sql = "SELECT distinct companionship FROM eq_companionship where district=". $district;
+      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships='';
       while ($this->db->next_record())
@@ -395,7 +398,7 @@ class eq
 	  $j++;
 	}
       
-      $comp_width=300; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width;
+      $comp_width=300; $visit_width=25; $table_width=$comp_width + $visit_width;
       $table_data=""; $num_companionships = 0; $num_families = 0; $visits=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
 	$companion_table_entry = "";
@@ -407,15 +410,16 @@ class eq
 	while ($this->db->next_record())
 	  {
 	    // Get this companions information
-	    if($companion_table_entry != "") { $companion_table_entry .= "&nbsp;/&nbsp;"; }
+	    if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
 	    $companionship = $this->db->f('companionship');
 	    $elder_id = $this->db->f('elder');
 	    $aaronic_id = $this->db->f('aaronic');
+	    $phone = $elder_phone[$elder_id];
 	    if($elder_id) { $name = $elders[$elder_id]; }
 	    else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-	    $companion_table_entry .= "$name";
+	    $companion_table_entry .= "<td title=\"$phone\"><b>$name</b></td>";
 	  }
-	$table_data.= "<tr bgcolor=#d3dce3><td colspan=20><b>$companion_table_entry</b><hr></td></tr>";
+	$table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
 	
 	// Get the names of the families assigned this home teaching companionship
 	$sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
@@ -852,6 +856,7 @@ class eq
 	{
 	  $elder_id[$i] = $this->db->f('elder');
 	  $elder_name[$i] = $this->db->f('name');
+	  $elder_phone[$elder_id[$i]] = $this->db->f('phone');
 	  $i++;
 	}
       array_multisort($elder_name, $elder_id);
@@ -918,6 +923,7 @@ class eq
 	      $companionship = $this->db->f('companionship');
 	      $elder_id = $this->db->f('elder');
 	      $aaronic_id = $this->db->f('aaronic');
+	      $phone = $elder_phone[$elder_id];
 	      if($elder_id) { $name = $elders[$elder_id]; }
 	      else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
 	      $link_data['menuaction'] = 'eq.eq.ppi_update';
@@ -930,7 +936,7 @@ class eq
 	      $link_data['action'] = 'add';
 	      $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
 	      if($aaronic_id == 0) {
-		$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><a href=$link>$name</a></td>";
+		$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
 	      } else {
 		$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$name</td>";
 	      }