X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=9132163d176037bf5987ac7613ed8894360b5902;hb=bac0e351544d3bb1b064109982928e3e7de5dd73;hp=7b40acb47df95d452f790b248b854f93e7b5b69b;hpb=91304044f2ea32e703e55e2d16b1cb3e7c113829;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 7b40acb..9132163 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -872,13 +872,14 @@ class eq
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched&action=save'));
       $this->t->set_var('title','EQ President Yearly PPIs Scheduler');
 
-      $elder_width=450; $phone_width=25; $pri_width=10; $notes_width=128;
-      $table_width=$elder_width + $phone_width + $pri_width + $notes_width;
+      $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
+      $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
       $header_row = "<th width=$elder_width><font size=-2>Elder Name</th>";
       $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
       $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
+      $header_row.= "<th width=$ppi_date_width><font size=-2>Last PPI</th>";
       $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
-      $table_data="";
+      $table_data=""; $completed_data=""; $totals_data="";
 
       $year = date('Y');
       
@@ -937,6 +938,9 @@ class eq
 	  $this->db2->query($sql,__LINE__,__FILE__);
 	  
 	  if(!$this->db2->next_record()) {
+	    $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
+	    $this->db->query($sql,__LINE__,__FILE__);
+	    if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
 	    $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
 	    $table_data.= "<td align=center>$phone</td>";
 	    //$table_data.= "<td align=center>$ppi_pri</td>";
@@ -948,18 +952,34 @@ class eq
 	      $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
 	    }
 	    $table_data.= '</select></td>';
+	    $table_data.= "<td align=center>$date</td>";
 	    $table_data.= '<td><input type=text size="50" maxlength="128" name="ppi_notes['.$i.'][notes]" value="'.$ppi_notes.'">';
 	    $table_data.= '<input type=hidden name="ppi_notes['.$i.'][elder_id]" value="'.$id.'">';
 	    $table_data.= '<input type=hidden name="ppi_notes['.$i.'][elder_name]" value="'.$name.'">';
 	    $table_data.= '</td>';
+	    $table_data.= '</tr>';
 	    $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 	    $this->t->set_var('tr_color',$tr_color);
-	    $table_data.= '</tr>';
 	  } else {
 	    $elders_with_yearly_ppi++;
+	    $date = $this->db2->f('date');
+	    $completed_data.= "<tr bgcolor=". $this->t->get_var('tr_color2') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
+	    $completed_data.= "<td align=center>$phone</td>";
+	    $completed_data.= "<td align=center>$date</td>";
+	    $completed_data.= "<td align=center>$ppi_notes</td>";
+	    $completed_data.= '</tr>';
+	    $tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
+	    $this->t->set_var('tr_color2',$tr_color2);
 	  }
       }
 
+      $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
+      $completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
+      $completed_header_row = "<th width=$name_width><font size=-2>Elder Name</th>";
+      $completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
+      $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
+      $completed_header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+      
       $elders_width=300; $totals_width=100;
       $totals_table_width=$elders_width + $totals_width;
       $totals_header_row = "<th width=$elders_width><font size=-2>Elders</th>";
@@ -980,6 +1000,9 @@ class eq
       $this->t->set_var('table_data',$table_data);
       $this->t->set_var('totals_header_row',$totals_header_row);
       $this->t->set_var('totals_table_width',$totals_table_width);
+      $this->t->set_var('completed_header_row',$completed_header_row);
+      $this->t->set_var('completed_table_width',$completed_table_width);
+      $this->t->set_var('completed',$completed_data);
       $this->t->set_var('totals',$totals_data);
       $this->t->fp('list','elder_list',True);