X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=737306148f4acec3f3e593be403d2504171de504;hb=7a87ac31d4d7dcbcd415168d5adf7d18489adaf1;hp=b25ed33354f0969e58ab07237e620c40d56af9ea;hpb=816f52ad6f787625d4758484615624e438b63058;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index b25ed33..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'];
@@ -221,8 +223,10 @@ class eq
 		$month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
 		$month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
 		$month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+		// Add this to the query to filter on only visits made by this companionship:
+		// " AND companionship=" . $unique_companionships[$j]['companionship'].
 		$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
-		       " AND companionship=" . $unique_companionships[$j]['companionship'].
+		       " AND companionship!=0".
  		       " AND family=". $family_id;
 		$this->db2->query($sql,__LINE__,__FILE__);
 		$link_data['menuaction'] = 'eq.eq.ht_update';
@@ -324,6 +328,13 @@ class eq
 	    }
 	  for ($j=0; $j < count($unique_companionships); $j++)
 	    {
+	      // FIXME: We won't be able to go back and edit history on families that have been
+	      // reassigned to a different companionship. The following delete command will not delete
+	      // the history of visits under an older companionship, only the ones for the existing
+	      // companionship. This will lead to duplicate visits being entered for an older
+	      // month for the same family, making it impossible to change the past history once
+	      // a family is reassigned. However, you will be able to view the history just fine.
+	      
 	      // Delete all the visits that have taken place for all families for this month
 	      $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
 			       " AND " . "date='" . $date . "'",__LINE__,__FILE__);
@@ -358,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);
@@ -377,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())
@@ -386,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 = "";
@@ -398,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'];
@@ -421,7 +434,7 @@ class eq
 	    
 	    $header_row="<th width=$comp_width><font size=-2>Families</th>";
 	    $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
-	           " AND companionship=" . $unique_companionships[$j]['companionship'] .
+	           " AND companionship!=0".
 	           " AND family=". $family_id;
 	    $this->db2->query($sql,__LINE__,__FILE__);
 	    $value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
@@ -843,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);
@@ -909,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';
@@ -921,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>";
 	      }
@@ -952,7 +967,7 @@ class eq
 		  $ppis[$m]++; $total_ppis[$m]++;
 		  $link_data['menuaction'] = 'eq.eq.ppi_update';
 		  $link_data['companionship'] = $companionship;
-		  $link_data['interviewer'] = $supervisor;
+		  $link_data['interviewer'] = $this->db2->f('interviewer');
 		  $link_data['elder'] = $elder_id;
 		  $link_data['name'] = $name;
 		  $link_data['ppi'] = $this->db2->f('ppi');