Fixed issues with EQ Attendance tool not properly calculating the percent per month
[eq/.git] / inc / class.eq.inc.php
index a20f1561cd580d7dd35c28e72c180a3878655a6d..1fac1b24b5846d3cbe0c61bc8987d4d738744524 100644 (file)
@@ -22,7 +22,13 @@ class eq
   var $default_ht_num_months;
   var $default_ppi_num_months;
   var $default_ppi_num_years;
+  var $default_int_num_months;
+  var $default_int_num_years;
   var $default_att_num_months;
+  var $current_year;
+  var $current_month;
+  var $upload_target_path;
+  var $script_path;
   
   var $public_functions = array
     (
@@ -34,18 +40,30 @@ class eq
      'par_view'   => True,
      'ppi_view'   => True,
      'ppi_update' => True,
+     'ppi_sched'  => True,
+     'int_view'   => True,
+     'int_update' => True,
+     'vis_sched'  => True,
      'vis_view'   => True,
      'vis_update' => True,
      'att_view'   => True,
-     'att_update' => True
+     'att_update' => True,
+     'dir_view'   => True,
+     'org_view'   => True,
+     'schedule'   => True,
+     'admin'      => True
      );
  
   function eq()
     {
-      $this->default_ht_num_months = 1;
-      $this->default_ppi_num_months = 1;
+      $this->default_ht_num_months = 3;
+      $this->default_ppi_num_months = 3;
       $this->default_ppi_num_years = 0;
-      $this->default_att_num_months = 1;
+      $this->default_int_num_months = 3;
+      $this->default_int_num_years = 0;
+      $this->default_att_num_months = 3;
+      $this->upload_target_path = "/home/users/eqpres/eq_data/";
+      $this->script_path = "/usr/share/phpgroupware/eq/";
       
       $this->db                = $GLOBALS['phpgw']->db;
       $this->db2       = $this->db;
@@ -63,6 +81,14 @@ class eq
        
       $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
       $GLOBALS['phpgw']->common->phpgw_header();
+
+      $this->current_day = `date '+%d'`;
+      $this->current_day = $this->current_day-0; // Make it numeric
+      $this->current_month = `date '+%m'`;
+      $this->current_month = $this->current_month-0; // Make it numeric
+      $this->current_year = `date '+%Y'`;
+      $this->current_year = $this->current_year-0; // Make it numeric
+
       echo parse_navbar();
       $this->display_app_header();     
     }
@@ -99,12 +125,27 @@ class eq
       $link_data['menuaction'] = 'eq.eq.ppi_view';
       $this->t->set_var('link_ppi',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_ppi','PPIs');
+      $link_data['menuaction'] = 'eq.eq.int_view';
+      $this->t->set_var('link_int',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_int','Interviews');
       $link_data['menuaction'] = 'eq.eq.vis_view';
       $this->t->set_var('link_visit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_visit','Visits');
       $link_data['menuaction'] = 'eq.eq.att_view';     
       $this->t->set_var('link_attendance',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_attendance','Attendance');
+      $link_data['menuaction'] = 'eq.eq.dir_view';     
+      $this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_dir','Directory');
+      $link_data['menuaction'] = 'eq.eq.org_view';     
+      $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_org','Callings');
+      $link_data['menuaction'] = 'eq.eq.admin';        
+      $this->t->set_var('link_admin',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_admin','Admin');
+      $link_data['menuaction'] = 'eq.eq.schedule';     
+      $this->t->set_var('link_schedule',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_schedule','Scheduling');
                
       $this->t->pparse('out','eq_header');
     }
@@ -124,7 +165,7 @@ class eq
       
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
       $this->t->set_var('title','Hometeaching'); 
-
+      
       $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -143,6 +184,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);
@@ -159,6 +201,7 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       $total_families = 0;
@@ -192,18 +235,25 @@ 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');
-             if($elder_id) { $name = $elders[$elder_id]; }
-             else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-             $companion_table_entry .= "$name";
+             if($elder_id) {
+               $name = $elders[$elder_id];
+               $phone = $elder_phone[$elder_id];
+             }
+             else if($aaronic_id) {
+               $name = $aaronic[$aaronic_id]['name'];
+               $phone = $aaronic[$aaronic_id]['phone'];                
+             }
+             $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'];
+         $sql = $sql . " ORDER BY name ASC";
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
          while ($this->db->next_record())
@@ -217,12 +267,18 @@ class eq
              // in the past $num_months for this Family
              $header_row="<th width=$comp_width><font size=-2>Families</th>";
              for($m=$num_months; $m >= 0; $m--) {
-               if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
-               $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";
+               $month = $this->current_month - $m;
+               $year = $this->current_year;
+               if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+               if($month < 10) { $month = "0"."$month"; }
+               $month_start = "$year"."-"."$month"."-"."01";
+               $month_end = "$year"."-"."$month"."-"."31";
+               $month = "$month"."/"."$year";
+               //print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end<br>";
+               // 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';
@@ -244,9 +300,15 @@ class eq
                  else if($this->db2->f('visited') == 'n') {
                    $table_data .= '<td align=center><a href="'.$link.'"><img src="x.gif"></a></td>';
                  }
-                 else { $table_data .= "<td>&nbsp;</td>"; }
+                 else {
+                   $visits[$m]++; $total_visits[$m]++;
+                   $table_data .= "<td>&nbsp;</td>";
+                 }
+               }
+               else {
+                 $visits[$m]++; $total_visits[$m]++;
+                 $table_data .= "<td>&nbsp;</td>";
                }
-               else { $table_data .= "<td>&nbsp;</td>"; }
              }
              $table_data .= "</tr>"; 
              $k++;
@@ -308,7 +370,7 @@ class eq
       if($action == 'save')
        {
          // Get a list of all the companionships in 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;
          while ($this->db->next_record())
@@ -318,6 +380,15 @@ 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.
+
+             //$comp=$unique_companionships[$j]['companionship'];
+             //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district<br>";
              // 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__);
@@ -352,6 +423,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);
@@ -368,10 +440,11 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       // 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())
@@ -380,7 +453,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 = "";
@@ -392,18 +465,25 @@ 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');
-           if($elder_id) { $name = $elders[$elder_id]; }
-           else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-           $companion_table_entry .= "$name";
+           if($elder_id) {
+             $name = $elders[$elder_id];
+             $phone = $elder_phone[$elder_id];
+           }
+           else if($aaronic_id) {
+             $name = $aaronic[$aaronic_id]['name'];
+             $phone = $aaronic[$aaronic_id]['phone'];
+           }
+           $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'];
+       $sql = $sql . " ORDER BY name ASC";
        $this->db->query($sql,__LINE__,__FILE__);
        while ($this->db->next_record())
          {
@@ -415,7 +495,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;
@@ -786,7 +866,572 @@ class eq
       $this->t->pfp('out','par_view_t');
       $this->save_sessiondata(); 
     }
+  
+  function ppi_sched()
+    {
+      $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
+      $this->t->set_block('ppi_sched_t','elder_list','elderlist');
+      $this->t->set_block('ppi_sched_t','appt_list','apptlist');
+      $action = get_var('action',array('GET','POST'));
+
+      $this->t->set_var('lang_save','Save Appt / Pri / Notes');
+      $this->t->set_var('lang_reset','Clear Changes');
+      
+      $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
+      $this->t->set_var('ppi_link_title','Yearly PPIs');
+      
+      $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
+      $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched&action=save'));
+      $this->t->set_var('title','Yearly PPIs Scheduler');
+
+      $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=""; $completed_data=""; $totals_data="";
+
+      $year = date('Y');
+      
+      if($action == 'save')
+       {
+         // Save any changes made to the appointment table
+         $new_data = get_var('appt_notes',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $elder = $entry['elder'];
+            $appointment = $entry['appointment'];
+
+            //print "elder: $elder appointment: $appointment <br>";
+            
+            // Perform database save actions here
+            $this->db->query("UPDATE eq_appointment set " .
+                             " elder='" . $elder . "'" .
+                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+          }
+         
+         // Save any changes made to the ppi notes table
+         $new_data = get_var('ppi_notes',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $ppi_notes = $entry['notes'];
+            $elder_id = $entry['elder_id'];
+            $ppi_pri = $entry['pri'];
+            
+            // Perform database save actions here
+            $this->db->query("UPDATE eq_elder set " .
+                             " ppi_notes='" . $ppi_notes . "'" .
+                             ",ppi_pri='" . $ppi_pri . "'" .
+                             " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+            
+          }
+
+         $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched');
+         Header('Location: ' . $take_me_to_url);
+       }
+
+      // Get the Districts
+      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $districts[$i]['district'] = $this->db->f('district');
+         $districts[$i]['name'] = $this->db->f('name');
+         $districts[$i]['supervisor'] = $this->db->f('supervisor');
+         $i++;
+       }
+      $districts[$i]['district'] = $i + 1;
+      $districts[$i]['name'] = "Unassigned";
+      $districts[$i]['supervisor'] = "Unassigned";
+      
+      // create the elder id -> elder name mapping
+      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      $elder_id = NULL;
+      $elder_name = NULL;
+      while ($this->db->next_record())
+       {
+         $elder_name[$i] = $this->db->f('name');
+         $elder_id[$i] = $this->db->f('elder');
+         $i++;
+       }
+      array_multisort($elder_name, $elder_id);
+
+      // APPOINTMENT TABLE
+      $district = 1;
+      $date_width=150; $time_width=100; $elder_width=200;
+      $appt_table_width=$date_width + $time_width + $elder_width;
+      $appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
+      $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
+      $appt_header_row.= "<th width=$elder_width><font size=-2>Elder</th>";
+      $appt_table_data = ""; 
+
+      $total_elders=0; $elders_with_yearly_ppi=0;
+      
+      // Display a scheduling table for each district
+      for ($d=0; $d < count($districts); $d++) {
+      $table_data=""; $appt_table_data="";
+      $this->t->set_var('district_number',$districts[$d]['district']);
+      $this->t->set_var('district_name',$districts[$d]['name']);       
+      $supervisor = $districts[$d]['supervisor'];
+      $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Yearly PPI Not Completed";
+      $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Yearly PPI Appointment Slots";
+      $this->t->set_var('table_title',$table_title);
+      $this->t->set_var('appt_table_title',$appt_table_title);
+      
+      // query the database for all the appointments
+      $sql = "SELECT * FROM eq_appointment where district=".$districts[$d]['district']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+       
+      while ($this->db->next_record())
+       {
+         $appointment = $this->db->f('appointment');
+         $elder = $this->db->f('elder');
+         
+         $date = $this->db->f('date');
+         $date_array = explode("-",$date);
+         $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
+         $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year));
+         
+         $time = $this->db->f('time');
+         $time_array = explode(":",$time);
+         $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2]));
+         
+         $appt_table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+         $appt_table_data.= "<td align=center>$day_string</td>";
+         $appt_table_data.= "<td align=center>$time_string</td>";
+
+         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][elder]>';
+         $appt_table_data.= '<option value=0></option>';
+         for ($i=0; $i < count($elder_id); $i++) {
+           $id = $elder_id[$i];
+           $name = $elder_name[$i];
+           if($elder_id[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+           $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
+         }
+         $appt_table_data.='</select></td>';
+
+         $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
+         
+         $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+         $this->t->set_var('tr_color',$tr_color);
+       }
+
+      $this->t->set_var('appt_table_data',$appt_table_data);
+      $this->t->set_var('appt_header_row',$appt_header_row);
+      $this->t->set_var('appt_table_width',$appt_table_width);
+
+      // PPI SCHEDULING TABLE
+      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      
+      $i=0; 
+      $elder_id = NULL;
+      while ($this->db->next_record())
+       {
+         $sql2 = "SELECT * FROM eq_companionship where valid=1 and elder=".$this->db->f('elder');
+         $this->db2->query($sql2,__LINE__,__FILE__);
+         
+         if(((!$this->db2->next_record()) && ($d == count($districts) - 1)) ||
+            ($this->db2->f('district') == $districts[$d]['district'])) { 
+           $elder_id[$i] = $this->db->f('elder');
+           $elder_name[$i] = $this->db->f('name');
+           $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+           $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
+           $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+           $i++;
+           $total_elders++;
+         }
+       }
+
+      $max = count($elder_id);
+      
+      for($i=0; $i < $max; $i++) {
+          $id = $elder_id[$i];
+          $name = $elder_name[$i];
+         $phone = $elder_phone[$id];
+         $ppi_pri = $elder_ppi_pri[$id];
+         $ppi_notes = $elder_ppi_notes[$id];
+
+         // If this elder has had a yearly PPI this year, don't show him on the schedule list
+         $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
+         $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND elder=" . $id;
+         $this->db2->query($sql,__LINE__,__FILE__);
+         
+         if(!$this->db2->next_record()) {
+           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+           $this->db->query($sql,__LINE__,__FILE__);
+           if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
+           $link_data['menuaction'] = 'eq.eq.ppi_update';
+           $link_data['elder'] = $id;
+           $link_data['aaronic'] = 0;
+           $link_data['name'] = $name;
+           $link_data['ppi'] = '';
+           $link_data['eqpresppi'] = 1;
+           $link_data['action'] = 'add';
+           $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+           $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>";
+           $table_data.= "<td align=center>";
+           $table_data.= '<select name=ppi_notes['.$i.'][pri]>';
+           foreach(range(0,6) as $num) {
+             if($num == 0) { $num = 1; } else {$num = $num*5; }
+             if($ppi_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+             $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);
+         } else {
+           $link_data['menuaction'] = 'eq.eq.ppi_update';
+           $link_data['interviewer'] = $this->db2->f('interviewer');
+           $link_data['elder'] = $this->db2->f('elder');
+           $link_data['aaronic'] = $this->db2->f('aaronic');
+           $link_data['name'] = $name;
+           $link_data['ppi'] = $this->db2->f('ppi');
+           $link_data['eqpresppi'] = $this->db2->f('eqpresppi');
+           $link_data['action'] = 'view';
+           $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
+           $elders_with_yearly_ppi++;
+           $date = $this->db2->f('date');
+           $ppi_notes = $this->db2->f('notes');
+           if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
+           $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><a href=".$link.">$date</a></td>";
+           $completed_data.= "<td align=left>$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>PPI Notes</th>";
+            
+      $this->t->set_var('table_width',$table_width);
+      $this->t->set_var('header_row',$header_row);
+      $this->t->set_var('table_data',$table_data);
+      $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->fp('elderlist','elder_list',True);
+
+      } // End for each district loop
+
+      // Now display a table of those elders not assigned to any companionships
+      
+      
+      $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>";
+      $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+      $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+      $totals_data.= "<td align=left><font size=-2><b>Total Elders with yearly PPIs completed:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$elders_with_yearly_ppi / $total_elders</b></font></td>";
+      $percent = ceil(($elders_with_yearly_ppi / $total_elders)*100);
+      $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+      $this->t->set_var('tr_color',$tr_color);
+      $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+      $totals_data.= "<td align=left><font size=-2><b>Percentage:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>";
+      $totals_data.= "</tr>";
+
+      $this->t->set_var('totals',$totals_data);
+      $this->t->set_var('totals_header_row',$totals_header_row);
+      $this->t->set_var('totals_table_width',$totals_table_width);
+      
+      $this->t->pfp('out','ppi_sched_t');
+      $this->save_sessiondata(); 
+      
+    }
+  
+  function vis_sched()
+    {
+      $this->t->set_file(array('vis_sched_t' => 'vis_sched.tpl'));
+      $this->t->set_block('vis_sched_t','family_list','familylist');
+      $this->t->set_block('vis_sched_t','appt_list','apptlist');
+      $action = get_var('action',array('GET','POST'));
+
+      $this->t->set_var('lang_save','Save Appt / Pri / Notes');
+      $this->t->set_var('lang_reset','Clear Changes');
+      
+      $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view'));
+      $this->t->set_var('vis_link_title','View Yearly Visits');
+      
+      $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'));
+      $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits');
+
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched&action=save'));
+      $this->t->set_var('title','EQ Presidency Yearly Visit Scheduler');
+
+      $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20;
+      $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width;
+      $header_row = "<th width=$family_width><font size=-2>Family 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=$visit_date_width><font size=-2>Last Visit</th>";
+      $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+      $table_data=""; $completed_data=""; $totals_data="";
+
+      $year = date('Y');
+      
+      if($action == 'save')
+       {
+         // Save any changes made to the appointment table
+         $new_data = get_var('appt_notes',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $family = $entry['family'];
+            $appointment = $entry['appointment'];
+
+            // Perform database save actions here
+            $this->db->query("UPDATE eq_appointment set " .
+                             " family='" . $family . "'" .
+                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+          }
+         
+         // Save any changes made to the visit notes table
+         $new_data = get_var('vis_notes',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $visit_notes = $entry['notes'];
+            $family_id = $entry['family_id'];
+            $visit_pri = $entry['pri'];
+            
+            // Perform database save actions here
+            $this->db->query("UPDATE eq_family set " .
+                             " visit_notes='" . $visit_notes . "'" .
+                             ",visit_pri='" . $visit_pri . "'" .
+                             " WHERE family=" . $family_id,__LINE__,__FILE__);
+            
+          }
+
+         $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched');
+         Header('Location: ' . $take_me_to_url);
+       }
+
+      // APPOINTMENT TABLE
+      $district = 4;
+      $date_width=150; $time_width=100; $family_width=250;
+      $appt_table_width=$date_width + $time_width + $family_width;
+      $appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
+      $appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
+      $appt_header_row.= "<th width=$family_width><font size=-2>Family</th>";
+      $appt_table_data = ""; 
+
+      // create the family id -> family name mapping
+      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      $family_id = NULL;
+      while ($this->db->next_record())
+       {
+         $family_id[$i] = $this->db->f('family');
+         $family_name[$i] = $this->db->f('name');
+         $i++;
+       }
+      array_multisort($family_name, $family_id);
+      
+      // query the database for all the appointments
+      $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+
+      while ($this->db->next_record())
+       {
+         $appointment = $this->db->f('appointment');
+         $family = $this->db->f('family');
+
+         $date = $this->db->f('date');
+         $date_array = explode("-",$date);
+         $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
+         $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year));
+         
+         $time = $this->db->f('time');
+         $time_array = explode(":",$time);
+         $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2]));
+         
+         $appt_table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+         $appt_table_data.= "<td align=center>$day_string</td>";
+         $appt_table_data.= "<td align=center>$time_string</td>";
+
+         $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][family]>';
+         $appt_table_data.= '<option value=0></option>';
+         for ($i=0; $i < count($family_id); $i++) {
+           $id = $family_id[$i];
+           $name = $family_name[$i];
+           if($family_id[$i] == $family) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+           $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.' Family</option>';
+         }
+         $appt_table_data.='</select></td>';
+
+         $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
+         
+         $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+         $this->t->set_var('tr_color',$tr_color);
+       }
+
+      $this->t->set_var('appt_table_data',$appt_table_data);
+      $this->t->set_var('appt_header_row',$appt_header_row);
+      $this->t->set_var('appt_table_width',$appt_table_width);
+
+      
+      // VISIT SCHEDULING TABLE
+      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+
+      $total_families=0; $families_with_yearly_visit=0;
+      
+      $i=0; 
+      $family_id = NULL;
+      $family_name = NULL;
+      $family_phone = NULL;
+      $family_visit_pri = NULL;
+      $family_visit_notes = NULL;
+      while ($this->db->next_record())
+       {
+         $family_id[$i] = $this->db->f('family');
+         $family_name[$i] = $this->db->f('name');
+         $family_phone[$family_id[$i]] = $family_id[$i] . " ERROR";
+         $family_visit_pri[$family_id[$i]] = $this->db->f('visit_pri');
+         $family_visit_notes[$family_id[$i]] = $this->db->f('visit_notes');
+         $i++;
+         $total_families++;
+       }
+
+      $sql = "SELECT * FROM eq_parent where valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      while ($this->db->next_record())
+       {
+         $family = $this->db->f('family');
+         $phone = $this->db->f('phone');
+         $family_phone[$family] = $phone;
+       }
+      
+      $max = count($family_id);
+      
+      for($i=0; $i < $max; $i++) {
+          $id = $family_id[$i];
+          $name = $family_name[$i];
+         $phone = $family_phone[$id];
+         $vis_pri = $family_visit_pri[$id];
+         $vis_notes = $family_visit_notes[$id];
+
+         // If this family has had a yearly visit this year, don't show them on the schedule list
+         $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
+         $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND family=" . $id . " AND companionship=0";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         
+         if(!$this->db2->next_record()) {
+           $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
+           $this->db->query($sql,__LINE__,__FILE__);
+           if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
+           $link_data['menuaction'] = 'eq.eq.vis_update';
+           $link_data['visit'] = '';
+           $link_data['family'] = $id;
+           $link_data['name'] = $name;
+           $link_data['action'] = 'add';
+           $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+           $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name Family</a></td>";
+           $table_data.= "<td align=center>$phone</td>";
+           $table_data.= "<td align=center>";
+           $table_data.= '<select name=vis_notes['.$i.'][pri]>';
+           foreach(range(0,6) as $num) {
+             if($num == 0) { $num = 1; } else {$num = $num*5; }
+             if($vis_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+             $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="vis_notes['.$i.'][notes]" value="'.$vis_notes.'">';
+           $table_data.= '<input type=hidden name="vis_notes['.$i.'][family_id]" value="'.$id.'">';
+           $table_data.= '<input type=hidden name="vis_notes['.$i.'][family_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);
+         } else {
+           $link_data['menuaction'] = 'eq.eq.vis_update';
+           $link_data['visit'] = $this->db2->f('visit');
+           $link_data['family'] = $this->db2->f('family');
+           $link_data['name'] = $name;
+           $link_data['date'] = $this->db2->f('date');
+           $link_data['action'] = 'view';
+           $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
+           $families_with_yearly_visit++;
+           $date = $this->db2->f('date');
+           $vis_notes = $this->db2->f('notes');
+           if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+           $completed_data.= "<tr bgcolor=". $this->t->get_var('tr_color2') ."><td title=\"$phone\"><a href=$link>$name Family</a></td>";
+           $completed_data.= "<td align=center>$phone</td>";
+           $completed_data.= "<td align=center><a href=".$link.">$date</a></td>";
+           $completed_data.= "<td align=left>$vis_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>Family 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>Visit Notes</th>";
+      
+      $family_width=300; $totals_width=100;
+      $totals_table_width=$family_width + $totals_width;
+      $totals_header_row = "<th width=$family_width><font size=-2>Families</th>";
+      $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+      $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+      $totals_data.= "<td align=left><font size=-2><b>Total Families with yearly Visits completed:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$families_with_yearly_visit / $total_families</b></font></td>";
+      $percent = ceil(($families_with_yearly_visit / $total_families)*100);
+      $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+      $this->t->set_var('tr_color',$tr_color);
+      $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+      $totals_data.= "<td align=left><font size=-2><b>Percentage:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>";
+      $totals_data.= "</tr>";
+      
+      $this->t->set_var('table_width',$table_width);
+      $this->t->set_var('header_row',$header_row);
+      $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('familylist','family_list',True);
+      $this->t->fp('apptlist','appt_list',True);
+      
+      $this->t->pfp('out','vis_sched_t');
+      $this->save_sessiondata(); 
+      
+    }
+  
   function ppi_view()
     {
       $this->t->set_file(array('ppi_view_t' => 'ppi_view.tpl'));
@@ -799,25 +1444,21 @@ class eq
       if($num_months == 1) { $this->t->set_var('lang_num_months','Month of History'); }
       else {  $this->t->set_var('lang_num_months','Months of History'); }
       $this->t->set_var('lang_filter','Filter');
-      
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
-      $this->t->set_var('eqpres_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view&eqpresppi=1'));
-      $eqpresppi = get_var('eqpresppi',array('GET','POST'));
+            
+      $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
+      $this->t->set_var('ppi_link_title','Yearly PPIs'); 
+      $eqpresppi = 0;
+
+      $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
+      $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
       
-      if($eqpresppi == 1) {
-       $num_months = get_var('num_months',array('GET','POST'));
-       if($num_months == '') { $num_months = $this->default_ppi_num_years; }
-       $this->t->set_var('num_months',$num_months);
-        $this->t->set_var('ppi_link_title','PPIs');
-        $this->t->set_var('title','EQ President Yearly PPIs');
-       if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
-       else { $this->t->set_var('lang_num_months','Years of History'); }
-       $this->t->set_var('eqpres_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_view'));
-      }
-      else { 
-        $this->t->set_var('ppi_link_title','EQ President Yearly PPIs'); 
-        $this->t->set_var('title','PPIs'); 
-      }
+      $this->t->set_var('title','Yearly PPIs');
+      $num_months = get_var('num_months',array('GET','POST'));
+      if($num_months == '') { $num_months = $this->default_ppi_num_years; }
+      $this->t->set_var('num_months',$num_months);
+      if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
+      else { $this->t->set_var('lang_num_months','Years of History'); }        
 
       $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -827,7 +1468,7 @@ class eq
          $districts[$i]['district'] = $this->db->f('district');
          $districts[$i]['name'] = $this->db->f('name');
          $districts[$i]['supervisor'] = $this->db->f('supervisor');
-         if($eqpresppi == 0) { $i++; }
+         $i++;
        }
 
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
@@ -837,6 +1478,9 @@ 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');
+         $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
+         $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
          $i++;
        }
       array_multisort($elder_name, $elder_id);
@@ -851,28 +1495,21 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       $total_companionships = 0;
+      $total_elders = 0;
       $this->nextmatchs->template_alternate_row_color(&$this->t);
       for ($i=0; $i < count($districts); $i++) {
-       if($eqpresppi == 1) { 
-         $this->t->set_var('district_number','*');
-         $this->t->set_var('district_name','EQ President');
-       } else {
-         $this->t->set_var('district_number',$districts[$i]['district']);
-         $this->t->set_var('district_name',$districts[$i]['name']);    
-       }
+       $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
-       if($eqpresppi == 1) { 
-         $sql = "SELECT distinct companionship FROM eq_companionship";
-       } 
-       else {
-         $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
-       }
+       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+
        $this->db->query($sql,__LINE__,__FILE__);
        $j=0;
        while ($this->db->next_record())
@@ -881,21 +1518,17 @@ class eq
            $j++;
          }
        
-       $comp_width=400; $ppi_width=25; $table_width=$comp_width + $num_months*$ppi_width;
+       $comp_width=400; $ppi_width=75; $table_width=$comp_width + $num_months*$ppi_width;
        $table_data=""; $num_companionships = $j; $num_elders = 0;
        for($m=$num_months; $m >= 0; $m--) { $ppis[$m] = 0; }
        for ($j=0; $j < count($unique_companionships); $j++) {
          // Select all the companions in each companionship
-         if($eqpresppi) {
-           $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
-                  "companionship=". $unique_companionships[$j]['companionship'];  
-         }
-          else {
-           $sql = "SELECT * FROM eq_companionship where valid=1 and ".
-                  "companionship=". $unique_companionships[$j]['companionship'];
-          }
+         $sql = "SELECT * FROM eq_companionship where valid=1 and aaronic=0 and ".
+            "companionship=". $unique_companionships[$j]['companionship'];  
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
+         $comp = $unique_companionships[$j]['companionship'];
+         for($m=$num_months; $m >= 0; $m--) { $ppi_recorded[$comp][$m] = 0; }
          while ($this->db->next_record())
            {
              // Get this companions information
@@ -903,51 +1536,44 @@ class eq
              $companionship = $this->db->f('companionship');
              $elder_id = $this->db->f('elder');
              $aaronic_id = $this->db->f('aaronic');
-             if($elder_id) { $name = $elders[$elder_id]; }
-             else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
+             if($elder_id) {
+               $name = $elders[$elder_id];
+               $phone = $elder_phone[$elder_id];
+             }
+             else if($aaronic_id) {
+               $name = $aaronic[$aaronic_id]['name'];
+               $phone = $aaronic[$aaronic_id]['phone'];
+             }
              $link_data['menuaction'] = 'eq.eq.ppi_update';
              $link_data['companionship'] = $companionship;
              $link_data['interviewer'] = $supervisor;
              $link_data['elder'] = $elder_id;
+             $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;
              $link_data['ppi'] = '';
              $link_data['eqpresppi'] = $eqpresppi;
              $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>";
-             } else {
-               $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$name</td>";
-             }
-             
+             $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
+
              // Find out how many times PPIs were performed in the past $num_months for this Elder
              $header_row="<th width=$comp_width><font size=-2>Companionship</th>";
              for($m=$num_months; $m >= 0; $m--) {
-               if($eqpresppi == 1) {
-                 $year = date('Y') - $m;
-                 $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
-                 $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
-                        "AND elder=" . $elder_id . " AND eqpresppi=1";
-                 $this->db2->query($sql,__LINE__,__FILE__);
-                 $header_row .= "<th width=150><font size=-2>$year</th>"; 
-               }
-               else {
-                 if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
-                 $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";
-                 $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
-                        "AND elder=" . $elder_id . " AND eqpresppi=0";
-                 $this->db2->query($sql,__LINE__,__FILE__);
-                 $header_row .= "<th width=$ppi_width><font size=-2>$month</th>";
-               }
+               $year = date('Y') - $m;
+               $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
+               $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
+                  "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
+               $this->db2->query($sql,__LINE__,__FILE__);
+               $header_row .= "<th width=150><font size=-2>$year</th>"; 
+
                if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
                if($this->db2->next_record()) {
-                 $ppis[$m]++; $total_ppis[$m]++;
+                 $ppis[$m]++; $total_ppis[$m]++; $ppi_recorded[$companionship][$m]=1;
                  $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['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;
                  $link_data['ppi'] = $this->db2->f('ppi');
                  $link_data['eqpresppi'] = $eqpresppi;
@@ -957,12 +1583,7 @@ class eq
                  $month = $date_array[1];
                  $day   = $date_array[2];
                  $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
-
-                 if($aaronic_id == 0) {
-                   $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif"><br>'.$month.'-'.$day.'</a></td>';
-                 } else {
-                   $table_data .= '<td align=center><img src="checkmark.gif"></td>';
-                 }
+                 $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif">&nbsp;'.$month.'-'.$day.'</a></td>';
                }
                else { $table_data .= "<td>&nbsp;</td>"; }
              }
@@ -971,84 +1592,108 @@ class eq
            }
          $table_data .= "<tr><td colspan=20><hr></td></tr>";
        }
-       // Now add Elders not assigned to any companionship to the table if we are in eqpresppi mode
-       if($eqpresppi == 1) {
-         $table_data .= "<tr bgcolor=\"#c9c9c9\"><hr><td colspan=20><b>Unassigned Potential Home Teachers</b><hr></td></tr>";
-         foreach($elders as $elder_id => $value) {
-           $sql = "SELECT * FROM eq_companionship where valid=1 and elder=".$elder_id;
-           $this->db->query($sql,__LINE__,__FILE__);
-           if(!$this->db->next_record()) {
-             // We found an Elder not in a companionship, add them to the table
-             $num_elders++;
-             $companionship=0;
-             $name = $elders[$elder_id];
-             $link_data['menuaction'] = 'eq.eq.ppi_update';
-             $link_data['companionship'] = $companionship;
-             $link_data['interviewer'] = $supervisor;
-             $link_data['elder'] = $elder_id;
-             $link_data['name'] = $name;
-             $link_data['ppi'] = '';
-             $link_data['eqpresppi'] = $eqpresppi;
-             $link_data['action'] = 'add';
-             $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
-             $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><a href=$link>$name</a></td>";
-             for($m=$num_months; $m >= 0; $m--) {
-               $year = date('Y') - $m;
-               $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
-               $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
-                      "AND elder=" . $elder_id . " AND eqpresppi=1";
-               $this->db2->query($sql,__LINE__,__FILE__);
-               if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
-               if($this->db2->next_record()) {
-                 $ppis[$m]++; $total_ppis[$m]++;
-                 $link_data['menuaction'] = 'eq.eq.ppi_update';
-                 $link_data['companionship'] = $companionship;
-                 $link_data['interviewer'] = $supervisor;
-                 $link_data['elder'] = $elder_id;
-                 $link_data['name'] = $name;
-                 $link_data['ppi'] = $this->db2->f('ppi');
-                 $link_data['eqpresppi'] = $eqpresppi;
-                 $link_data['action'] = 'view';
-                 $date = $this->db2->f('date');
-                 $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
-                 $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif"><br>'.$date.'</a></td>';
-               }
-               else { $table_data .= "<td>&nbsp;</td>"; }
-             }
-             $table_data .= "</tr>"; 
-           }
-         }
-       }
+
        $total_companionships += $num_companionships;
-       if($eqpresppi == 1) {
-         $stat_data = "<tr><td><b><font size=-2>$num_elders Elders<br>PPI Totals:</font></b></td>";
-       } else {
-         $stat_data = "<tr><td><b><font size=-2>$num_companionships Companionships<br>PPI Totals:</font></b></td>";
-        }
+       $total_elders += $num_elders;
+       $stat_data = "<tr><td><b><font size=-2>$num_elders Elders<br>PPI Totals:</font></b></td>";
+      
        for($m=$num_months; $m >=0; $m--) {
-         if($eqpresppi == 1) { $percent = ceil(($ppis[$m] / $num_elders)*100); }
-         else { $percent = ceil(($ppis[$m] / $num_companionships)*100); }
+         $percent = ceil(($ppis[$m] / $num_elders)*100);
          $stat_data .= "<td align=center><font size=-2><b>$ppis[$m]<br>$percent%</font></b></td>";
        }
        $stat_data .= "</tr>";
-
        $this->t->set_var('table_width',$table_width);
        $this->t->set_var('header_row',$header_row);
        $this->t->set_var('table_data',$table_data);
        $this->t->set_var('stat_data',$stat_data);
        $this->t->fp('list','district_list',True);
       }
-
-      $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>PPI Totals:</font></b></td>";
-      for($m=$num_months; $m >=0; $m--) {
-       $percent = ceil(($total_ppis[$m] / $total_companionships)*100);
-       $totals .= "<td align=center><font size=-2><b>$total_ppis[$m]<br>$percent%</font></b></td>";
-      }
-      $totals .= "</tr>";
       
-      $this->t->set_var('totals',$totals);
-      $this->t->pfp('out','ppi_view_t');
-      $this->save_sessiondata(); 
+      // Now add Elders not assigned to any companionship to the table
+      $header_row = "";
+      $table_data = "";
+      $num_elders = 0;
+      $this->t->set_var('district_number','*');
+      $this->t->set_var('district_name','Unassigned Potential Home Teachers');
+      for($m=$num_months; $m >= 0; $m--) { $ppis[$m] = 0; }
+      foreach($elders as $elder_id => $value) {
+       $header_row="<th width=$comp_width><font size=-2>Elder</th>";
+       $sql = "SELECT * FROM eq_companionship where valid=1 and elder=".$elder_id;
+       $this->db->query($sql,__LINE__,__FILE__);
+       if(!$this->db->next_record()) {
+         // We found an Elder not in a companionship, add them to the table
+         $num_elders++;
+         $companionship=0;
+         $name = $elders[$elder_id];
+         $phone = $elder_phone[$elder_id];
+         $link_data['menuaction'] = 'eq.eq.ppi_update';
+         $link_data['companionship'] = $companionship;
+         $link_data['interviewer'] = $supervisor;
+         $link_data['elder'] = $elder_id;
+         $link_data['name'] = $name;
+         $link_data['ppi'] = '';
+         $link_data['eqpresppi'] = $eqpresppi;
+         $link_data['action'] = 'add';
+         $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+         $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
+         for($m=$num_months; $m >= 0; $m--) {
+           $year = date('Y') - $m;
+           $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
+           $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
+              "AND elder=" . $elder_id;
+           $this->db2->query($sql,__LINE__,__FILE__);
+           $header_row .= "<th width=150><font size=-2>$year</th>";
+           
+           if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
+           if($this->db2->next_record()) {
+             $ppis[$m]++; $total_ppis[$m]++;
+             $link_data['menuaction'] = 'eq.eq.ppi_update';
+             $link_data['companionship'] = $companionship;
+             $link_data['interviewer'] = $supervisor;
+             $link_data['elder'] = $elder_id;
+             $link_data['name'] = $name;
+             $link_data['ppi'] = $this->db2->f('ppi');
+             $link_data['eqpresppi'] = $eqpresppi;
+             $link_data['action'] = 'view';
+             $date = $this->db2->f('date');
+             $date_array = explode("-",$date);
+             $month = $date_array[1];
+             $day   = $date_array[2];
+             $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+             $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif">&nbsp;'.$month.'-'.$day.'</a></td>';
+           }
+           else { $table_data .= "<td>&nbsp;</td>"; }
+         }
+         $table_data .= "</tr>"; 
+       }
+      }
+
+      $total_companionships += $num_companionships;
+      $total_elders += $num_elders;
+      $stat_data = "<tr><td><b><font size=-2>$num_elders Elders<br>PPI Totals:</font></b></td>";
+      
+      for($m=$num_months; $m >=0; $m--) {
+       $percent = ceil(($ppis[$m] / $num_elders)*100);
+       $stat_data .= "<td align=center><font size=-2><b>$ppis[$m]<br>$percent%</font></b></td>";
+       }
+      $stat_data .= "</tr>";
+
+      $this->t->set_var('table_width',$table_width);
+      $this->t->set_var('header_row',$header_row);
+      $this->t->set_var('table_data',$table_data);
+      $this->t->set_var('stat_data',$stat_data);
+      $this->t->fp('list','district_list',True);
+
+      $totals = "<tr><td><b><font size=-2>$total_elders Total Elders<br>PPI Totals:</font></b></td>";
+      for($m=$num_months; $m >=0; $m--) {
+       $percent = ceil(($total_ppis[$m] / $total_elders)*100);
+       $totals .= "<td align=center><font size=-2><b>$total_ppis[$m]<br>$percent%</font></b></td>";
+      }
+      $totals .= "</tr>";
+      
+      $this->t->set_var('totals',$totals);
+      $this->t->pfp('out','ppi_view_t');
+      $this->save_sessiondata(); 
     }
 
   function ppi_update()
@@ -1068,10 +1713,11 @@ class eq
       $name = get_var('name',array('GET','POST'));
       $ppi = get_var('ppi',array('GET','POST'));
       $elder = get_var('elder',array('GET','POST'));
+      $aaronic = get_var('aaronic',array('GET','POST'));
       $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())
@@ -1098,6 +1744,7 @@ class eq
                           "   ppi='" . $ppi . "'" .
                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
+                       ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                      ", eqpresppi='" . $eqpresppi . "'" .
@@ -1109,8 +1756,8 @@ class eq
       if($action == 'insert')
        {
          $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
-                          . "VALUES ('" . $interviewer . "','" . $elder . "','"
+         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+                          . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
          $this->ppi_view();
          return false;
@@ -1123,6 +1770,7 @@ class eq
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
+         $this->t->set_var('aaronic',$aaronic);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
          $this->t->set_var('eqpresppi',$eqpresppi);
@@ -1141,6 +1789,7 @@ class eq
          $this->t->set_var('name',$name);
          $this->t->set_var('interviewer', $this->db->f('interviewer'));
          $this->t->set_var('elder',$this->db->f('elder'));
+         $this->t->set_var('aaronic',$this->db->f('aaronic'));
          $this->t->set_var('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));
          $this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
@@ -1182,6 +1831,323 @@ class eq
       $this->save_sessiondata(); 
     }
 
+    function int_view()
+    {
+      $this->t->set_file(array('int_view_t' => 'int_view.tpl'));
+      $this->t->set_block('int_view_t','district_list','list');
+
+      $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
+      $num_months = get_var('num_months',array('GET','POST'));
+      if($num_months == '') { $num_months = $this->default_int_num_months; }
+      $this->t->set_var('num_months',$num_months);
+      if($num_months == 1) { $this->t->set_var('lang_num_months','Month of History'); }
+      else {  $this->t->set_var('lang_num_months','Months of History'); }
+      $this->t->set_var('lang_filter','Filter');
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
+            
+      $this->t->set_var('title','Hometeaching Interviews'); 
+
+      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $districts[$i]['district'] = $this->db->f('district');
+         $districts[$i]['name'] = $this->db->f('name');
+         $districts[$i]['supervisor'] = $this->db->f('supervisor');
+         $i++;
+       }
+
+      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $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);
+      for($i=0; $i < count($elder_id); $i++) {
+          $id = $elder_id[$i];
+          $elders[$id] = $elder_name[$i];
+      }      
+
+      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      while ($this->db->next_record())
+       {
+         $aaronic_id = $this->db->f('aaronic');
+         $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
+       }
+      
+      $total_companionships = 0;
+      $this->nextmatchs->template_alternate_row_color(&$this->t);
+      for ($i=0; $i < count($districts); $i++) {
+       $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;
+       while ($this->db->next_record())
+         {
+           $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
+           $j++;
+         }
+       
+       $comp_width=250; $int_width=75; $table_width=$comp_width + $num_months*$int_width;
+       $table_data=""; $num_companionships = $j; $num_elders = 0;
+       for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
+       for ($j=0; $j < count($unique_companionships); $j++) {
+         // Select all the companions in each companionship
+         $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+            "companionship=". $unique_companionships[$j]['companionship'];
+         $this->db->query($sql,__LINE__,__FILE__);
+         $k=0;
+         $comp = $unique_companionships[$j]['companionship'];
+         for($m=$num_months; $m >= 0; $m--) { $int_recorded[$comp][$m] = 0; }
+         while ($this->db->next_record())
+           {
+             // Get this companions information
+             $num_elders++;
+             $companionship = $this->db->f('companionship');
+             $elder_id = $this->db->f('elder');
+             $aaronic_id = $this->db->f('aaronic');
+             if($elder_id) {
+               $name = $elders[$elder_id];
+               $phone = $elder_phone[$elder_id];
+             }
+             else if($aaronic_id) {
+               $name = $aaronic[$aaronic_id]['name'];
+               $phone = $aaronic[$aaronic_id]['phone'];
+             }
+             $link_data['menuaction'] = 'eq.eq.int_update';
+             $link_data['companionship'] = $companionship;
+             $link_data['interviewer'] = $supervisor;
+             $link_data['elder'] = $elder_id;
+             $link_data['aaronic'] = $aaronic_id;
+             $link_data['name'] = $name;
+             $link_data['interview'] = '';
+             $link_data['action'] = 'add';
+             $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+             $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
+
+             // Find out how many times Interviews were performed in the past $num_months for this Elder
+             $header_row="<th width=$comp_width><font size=-2>Companionship</th>";
+             for($m=$num_months; $m >= 0; $m--) {
+               $month = $this->current_month - $m;
+               $year = $this->current_year;
+               if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+               if($month < 10) { $month = "0"."$month"; }
+               $month_start = "$year"."-"."$month"."-"."01";
+               $month_end = "$year"."-"."$month"."-"."31";
+               $month = "$month"."/"."$year";
+               $sql = "SELECT * FROM eq_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
+                  "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
+               $this->db2->query($sql,__LINE__,__FILE__);
+               $header_row .= "<th width=$int_width><font size=-2>$month</th>";
+             
+               if(!$total_ints[$m]) { $total_ints[$m] = 0; }
+               if($this->db2->next_record()) {
+                 if(!$int_recorded[$companionship][$m]) {
+                   $ints[$m]++; $total_ints[$m]++; $int_recorded[$companionship][$m]=1;
+                 }
+                 $link_data['menuaction'] = 'eq.eq.int_update';
+                 $link_data['companionship'] = $companionship;
+                 $link_data['interviewer'] = $this->db2->f('interviewer');
+                 $link_data['elder'] = $elder_id;
+                 $link_data['aaronic'] = $aaronic_id;
+                 $link_data['name'] = $name;
+                 $link_data['interview'] = $this->db2->f('interview');
+                 $link_data['action'] = 'view';
+                 $date = $this->db2->f('date');
+                 $date_array = explode("-",$date);
+                 $month = $date_array[1];
+                 $day   = $date_array[2];
+                 $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+                 $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif">&nbsp;'.$month.'-'.$day.'</a></td>';
+               }
+               else { $table_data .= "<td>&nbsp;</td>"; }
+             }
+             $table_data .= "</tr>"; 
+             $k++;
+           }
+         $table_data .= "<tr><td colspan=20><hr></td></tr>";
+       }
+       $total_companionships += $num_companionships;
+       $stat_data = "<tr><td><b><font size=-2>$num_companionships Companionships<br>Interview Quarterly Totals:</font></b></td>";
+
+       for($m=$num_months; $m >=0; $m--) {
+         $month = $this->current_month - $m;
+         if(($month % 3) == 1) { $quarter_total = $ints[$m]; }
+         else { $quarter_total += $ints[$m]; }
+         $percent = ceil(($quarter_total / $num_companionships)*100);
+         $stat_data .= "<td align=center><font size=-2><b>$quarter_total<br>$percent%</font></b></td>";
+       }
+       $stat_data .= "</tr>";
+
+       $this->t->set_var('table_width',$table_width);
+       $this->t->set_var('header_row',$header_row);
+       $this->t->set_var('table_data',$table_data);
+       $this->t->set_var('stat_data',$stat_data);
+       $this->t->fp('list','district_list',True);
+      }
+
+      // Display the totals, cummulative per quarter
+      $quarter_total = 0;
+      $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>Interview Quarterly Totals:</font></b></td>";
+      for($m=$num_months; $m >=0; $m--) {
+       $month = $this->current_month - $m;
+       if(($month % 3) == 1) { $quarter_total = $total_ints[$m]; }
+       else { $quarter_total += $total_ints[$m]; }
+       $percent = ceil(($quarter_total / $total_companionships)*100);
+       $totals .= "<td align=center><font size=-2><b>$quarter_total<br>$percent%</font></b></td>";
+      }
+      $totals .= "</tr>";
+      
+      $this->t->set_var('totals',$totals);
+      $this->t->pfp('out','int_view_t');
+      $this->save_sessiondata(); 
+    }
+
+  function int_update()
+    {
+      $this->t->set_file(array('form' => 'int_update.tpl'));
+      $this->t->set_block('form','interviewer_list','int_list');
+      $this->t->set_block('form','add','addhandle');
+      $this->t->set_block('form','edit','edithandle');
+      
+      $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
+      $this->t->set_var('readonly','');
+      $this->t->set_var('disabled','');
+      
+      $action = get_var('action',array('GET','POST'));
+      $companionship = get_var('companionship',array('GET','POST'));
+      $interviewer = get_var('interviewer',array('GET','POST'));      
+      $name = get_var('name',array('GET','POST'));
+      $interview = get_var('interview',array('GET','POST'));
+      $elder = get_var('elder',array('GET','POST'));
+      $aaronic = get_var('aaronic',array('GET','POST'));
+      $date = get_var('date',array('GET','POST'));
+      $notes = get_var('notes',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);
+       }
+      
+      if($action == 'save')
+       {
+         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $this->db->query("UPDATE eq_interview set " .
+                    "   interview='" . $interview . "'" .
+                   ", interviewer='" . $interviewer . "'" .
+                         ", elder='" . $elder . "'" .
+                       ", aaronic='" . $aaronic . "'" .
+                          ", date='" . $date . "'" .
+                         ", notes='" . $notes . "'" .
+                          " WHERE interview=" . $interview,__LINE__,__FILE__);
+         $this->int_view();
+         return false;
+       }
+
+      if($action == 'insert')
+       {
+         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
+                          . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
+                          . $date . "','" . $notes ."')",__LINE__,__FILE__);
+         $this->int_view();
+         return false;
+       }
+      
+      if($action == 'add')
+       {
+         $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
+         $this->t->set_var('interview', '');
+         $this->t->set_var('interviewer', $interviewer);
+         $this->t->set_var('name',$name);
+         $this->t->set_var('elder',$elder);
+         $this->t->set_var('aaronic',$aaronic);
+         $this->t->set_var('date','');
+         $this->t->set_var('notes','');
+         $this->t->set_var('lang_done','Cancel');
+         $this->t->set_var('lang_action','Adding New Interview');
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'insert'));
+       }
+
+      if($action == 'edit' || $action == 'view')
+       {
+         $sql = "SELECT * FROM eq_interview WHERE interview=".$interview;
+         $this->db->query($sql,__LINE__,__FILE__);
+         $this->db->next_record();
+         $this->t->set_var('interview',$interview);
+         $this->t->set_var('name',$name);
+         $this->t->set_var('interviewer', $this->db->f('interviewer'));
+         $this->t->set_var('elder',$this->db->f('elder'));
+         $this->t->set_var('aaronic',$this->db->f('aaronic'));
+         $this->t->set_var('date',$this->db->f('date'));
+         $this->t->set_var('notes',$this->db->f('notes'));
+       }
+      
+      if($action == 'edit')
+       {
+         $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
+         $this->t->set_var('lang_done','Cancel');
+         $this->t->set_var('lang_action','Editing Interview');
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'save'));
+       }
+
+      if($action == 'view')
+       {
+         $date = $this->db->f('date');
+         $this->t->set_var('cal_date','<input type=text size="10" maxlength="10" name="date" value="'.$date.'" readonly>');
+         $this->t->set_var('readonly','READONLY');
+         $this->t->set_var('disabled','DISABLED');
+         $this->t->set_var('lang_done','Done');
+         $this->t->set_var('lang_action','Viewing Interview');
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'edit'));
+       }
+      
+      $this->t->set_var('lang_reset','Clear Form');
+      $this->t->set_var('lang_add','Add Interview');
+      $this->t->set_var('lang_save','Save Changes');
+      $this->t->set_var('edithandle','');
+      $this->t->set_var('addhandle','');
+
+      $this->t->pfp('out','form');
+      
+      if($action == 'view') { $this->t->set_var('lang_save','Edit Interview'); }
+      if($action == 'edit' || $action == 'view') { $this->t->pfp('addhandle','edit'); }
+      if($action == 'add') { $this->t->pfp('addhandle','add'); }
+     
+      $this->save_sessiondata(); 
+    }
+
   function vis_view()
     {
       $this->t->set_file(array('vis_view_t' => 'vis_view.tpl'));
@@ -1190,6 +2156,13 @@ class eq
 
       $this->t->set_var('lang_name','Family Name');
       $this->t->set_var('lang_date','Date');
+
+      $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view'));
+      $this->t->set_var('vis_link_title','View Yearly Visits');
+      
+      $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'));
+      $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits');
+      
       
       $sql = "SELECT * FROM eq_visit WHERE companionship=0 ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -1372,6 +2345,10 @@ class eq
 
   function att_view()
     {
+      $monthnum['Jan']=1; $monthnum['Feb']=2; $monthnum['Mar']=3; $monthnum['Apr']=4;
+      $monthnum['May']=5; $monthnum['Jun']=6; $monthnum['Jul']=7; $monthnum['Aug']=8;
+      $monthnum['Sep']=9; $monthnum['Oct']=10; $monthnum['Nov']=11; $monthnum['Dec']=12;
+
       $this->t->set_file(array('att_view_t' => 'att_view.tpl'));
       $this->t->set_block('att_view_t','act_list','list');
 
@@ -1422,7 +2399,8 @@ class eq
        $last_time += 90000;
        if($found_sunday) { $i++; $found_sunday=0; }
       }
-      
+
+      $total_elders = count($elder_id);
       $old_month=$sunday_list[0]['month']; $span=0;
       for ($i=0; $i < count($sunday_list); $i++) {
         $date = $sunday_list[$i]['date'];
@@ -1436,6 +2414,9 @@ class eq
          $link_data['month'] = $sunday_list[$i-1]['month'];
          $link_data['year'] = $sunday_list[$i-1]['year'];
          $link_data['action'] = 'update_month';
+         $cur_month = $sunday_list[$i-1]['month'];
+         $cur_year = $sunday_list[$i-1]['year'];
+         $header_row .= "<th><font size=-3>$cur_month&nbsp;$cur_year</font></th>";
          $this->t->set_var('update_month',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
          $this->t->set_var('month',$sunday_list[$i-1]['month']);
          $this->t->set_var('year',$sunday_list[$i-1]['year']);
@@ -1443,7 +2424,9 @@ class eq
          $this->t->fp('list1','month_list',True);
        } $span++;
       }
-
+      $this->t->set_var('total_elders',$total_elders);
+      $this->t->set_var('header_row',$header_row);
+      
       $elder_width=200; $att_width=25; $total_width=$elder_width; 
       for ($i=0; $i < count($sunday_list); $i++) {
        $link_data['menuaction'] = 'eq.eq.att_update';
@@ -1459,6 +2442,7 @@ class eq
        $this->t->set_var('year',$sunday_list[$i]['year']);
        $this->t->fp('list2','header_list',True);
        $total_width += $att_width;
+       $attendance[$monthnum[$sunday_list[$i]['month']]]=0;
       }
 
       for ($i=0; $i < count($elder_id); $i++) {
@@ -1474,6 +2458,11 @@ class eq
             . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
+           $cur_month = $sunday_list[$j]['month'];
+           if($attended[$i][$cur_month] != 1) { 
+             $attended[$i][$cur_month]=1;
+             $attendance[$monthnum[$cur_month]]++;
+           } 
            $att_table .= '<td align=center><img src="checkmark.gif"></td>';
          } else {
            $att_table .= '<td>&nbsp;</td>';
@@ -1486,6 +2475,36 @@ class eq
       $this->t->set_var('elder_width',$elder_width);
       $this->t->set_var('att_width',$att_width);
 
+      # Now calculate attendance for these months
+      $attendance_str = "";
+      $nonattendance_str = "";
+      $aveattendance_str = "";
+      $avenonattendance_str = "";
+      $num_months=0;
+      $ave_total_attended=0;
+      ksort($attendance);
+      foreach($attendance as $att => $value) {
+       $total_attended = $attendance[$att];
+       $ave_total_attended += $attendance[$att]; $num_months++;
+       $percent = ceil(($total_attended / $total_elders)*100);
+       $attendance_str.="<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
+       $total_nonattended = $total_elders - $total_attended;
+       $percent = ceil(($total_nonattended / $total_elders)*100);
+       $nonattendance_str.="<td align=center><font size=-2><b>$total_nonattended ($percent%)</b></font></td>";
+       
+       $total_attended = ceil(($ave_total_attended / $num_months));
+       $percent = ceil(($total_attended / $total_elders)*100);
+       $aveattendance_str .= "<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
+       $total_attended = $total_elders - ceil(($ave_total_attended / $num_months));
+       $percent = ceil(($total_attended / $total_elders)*100);
+       $avenonattendance_str .= "<td align=center><font size=-2><b>$total_attended ($percent%)</b></font></td>";
+      }
+      
+      $this->t->set_var('attendance',$attendance_str);
+      $this->t->set_var('aveattendance',$aveattendance_str);
+      $this->t->set_var('nonattendance',$nonattendance_str);
+      $this->t->set_var('avenonattendance',$avenonattendance_str);
+      
       $this->t->pfp('out','att_view_t');
       $this->save_sessiondata(); 
     }
@@ -1639,6 +2658,495 @@ class eq
       $this->save_sessiondata();       
     }
 
+  function dir_view()
+    {
+      $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
+      $this->t->set_block('dir_view_t','dir_list','list');
+      
+      $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $parent[$i]['id'] = $this->db->f('parent');
+         $parent[$i]['name'] = $this->db->f('name');
+         $parent[$i]['phone'] = $this->db->f('phone');
+         $parent[$i]['address'] = $this->db->f('address');
+         $i++;
+       }   
+      
+      for ($i=0; $i < count($parent); $i++) 
+      {
+        $name = $parent[$i]['name'];
+       $phone = $parent[$i]['phone'];
+       $address = $parent[$i]['address'];
+       $this->t->set_var('name', $name);
+       $this->t->set_var('address', $address);
+       $this->t->set_var('phone', $phone);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+       $this->t->fp('list','dir_list',True);
+       //print "$phone $name $address<br>";
+      }
+      $this->t->pfp('out','dir_view_t');
+      $this->save_sessiondata();   
+    }
+  
+  function org_view()
+    {
+      $this->t->set_file(array('org_view_t' => 'org_view.tpl'));
+      $this->t->set_block('org_view_t','calling_list','list1');
+      $this->t->set_block('org_view_t','org_list','list2');
+
+      # Display a list ordered alphabetically
+      $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $calling[$i]['id'] = $this->db->f('indiv_id');
+         $calling[$i]['name'] = $this->db->f('name');
+         $calling[$i]['position'] = $this->db->f('position');
+         $calling[$i]['sustained'] = $this->db->f('sustained');
+         $calling[$i]['organization'] = $this->db->f('organization');
+         $i++;
+       }   
+      for ($i=0; $i < count($calling); $i++) 
+      {
+        $name = $calling[$i]['name'];
+       $position = $calling[$i]['position'];
+       $sustained = $calling[$i]['sustained'];
+       $organization = $calling[$i]['organization'];
+       $this->t->set_var('name', $name);
+       $this->t->set_var('position', $position);
+       $this->t->set_var('sustained', $sustained);
+       $this->t->set_var('organization', $organization);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+       $this->t->fp('list1','calling_list',True);
+      }
+
+      # Display a list ordered by organization
+      $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $calling[$i]['id'] = $this->db->f('indiv_id');
+         $calling[$i]['name'] = $this->db->f('name');
+         $calling[$i]['position'] = $this->db->f('position');
+         $calling[$i]['sustained'] = $this->db->f('sustained');
+         $calling[$i]['organization'] = $this->db->f('organization');
+         $i++;
+       }   
+      for ($i=0; $i < count($calling); $i++) 
+      {
+        $name = $calling[$i]['name'];
+       $position = $calling[$i]['position'];
+       $sustained = $calling[$i]['sustained'];
+       $organization = $calling[$i]['organization'];
+       $this->t->set_var('name', $name);
+       $this->t->set_var('position', $position);
+       $this->t->set_var('sustained', $sustained);
+       $this->t->set_var('organization', $organization);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+       $this->t->fp('list2','org_list',True);
+      }
+      
+      $this->t->pfp('out','org_view_t');
+      $this->save_sessiondata();   
+    }
+  
+  function schedule()
+    {
+      $this->t->set_file(array('sched_t' => 'schedule.tpl'));
+      $this->t->set_block('sched_t','district_list','list');
+
+      $action = get_var('action',array('GET','POST'));
+      
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule&action=save'));
+      $this->t->set_var('title','EQ Scheduling Tool');
+
+      $this->t->set_var('lang_save','Save Schedule');
+      $this->t->set_var('lang_reset','Cancel');
+      
+      $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
+      $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+
+      $this->t->set_var('schedule_vis_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched'));
+      $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits');
+      
+      $date_width=150; $time_width=200; $elder_width=200; $family_width=200;
+      $table_width=$date_width + $time_width + $elder_width + $family_width;
+      $header_row = "<th width=$date_width><font size=-2>Date</th>";
+      $header_row.= "<th width=$time_width><font size=-2>Time</th>";      
+      $header_row.= "<th width=$elder_width><font size=-2>Elder</th>";
+      $header_row.= "<th width=$family_width><font size=-2>Family</th>";
+      $table_data = "";
+
+      if($action == 'save')
+       {
+         $new_data = get_var('sched',array('POST'));
+         foreach ($new_data as $district_array)
+          {
+            foreach ($district_array as $entry)
+              {
+                $district = $entry['district'];
+                $appointment = $entry['appointment'];
+                $date = $entry['date'];
+                $hour = $entry['hour'];
+                $minute = $entry['minute'];
+                $pm = $entry['pm'];
+                $elder = $entry['elder'];
+                $family = $entry['family'];
+                if($pm) { $hour = $hour + 12; }
+                $time = $hour.':'.$minute.':'.'00';
+
+                // Update an existing appointment
+                if($appointment != 0)
+                  {
+                    $this->db->query("UPDATE eq_appointment set" .
+                             " family=" . $family . 
+                             " ,elder=" . $elder . 
+                             " ,date='" . $date . "'" .
+                             " ,time='" . $time . "'" .
+                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+                    //print "updating entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";                  
+                  }
+                
+                // Add a new appointment
+                else if(($appointment == 0) && ($date != "") && ($time != ""))
+                  {
+                    $this->db->query("INSERT INTO eq_appointment (appointment,district,family,elder,date,time) "
+                          . "VALUES ('" . $appointment . "','" . $district . "','" . $family . "','"
+                          . $elder . "','" . $date . "','" . $time  ."')",__LINE__,__FILE__);
+                    
+                    //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";                    
+                  }
+              }
+          }
+         
+         $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule');
+         Header('Location: ' . $take_me_to_url);
+       }
+      
+      $sql = "SELECT * FROM eq_district where district != 0 ORDER BY district ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $districts[$i]['district'] = $this->db->f('district');
+         $districts[$i]['name'] = $this->db->f('name');
+         $districts[$i]['supervisor'] = $this->db->f('supervisor');
+         $i++;
+       }
+      
+      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $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);
+
+      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $family_id[$i] = $this->db->f('family');
+         $family_name[$i] = $this->db->f('name');
+         $i++;
+       }
+      array_multisort($family_name, $family_id);
+      
+      for ($i=0; $i < count($districts); $i++) {
+       $district = $districts[$i]['district'];
+       $this->t->set_var('district_number',$districts[$i]['district']);
+       $this->t->set_var('district_name',$districts[$i]['name']);      
+       $supervisor = $districts[$i]['supervisor'];
+       $table_data="";
+       
+       // query the database for all the appointments
+       $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC";
+       $this->db->query($sql,__LINE__,__FILE__);
+
+       // Prefill any existing appointment slots
+       while ($this->db->next_record())
+         {
+           $appointment = $this->db->f('appointment');
+           $elder = $this->db->f('elder');
+           $family = $this->db->f('family');
+           
+           $date = $this->db->f('date');
+           $date_array = explode("-",$date);
+           $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
+           $day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year));
+           
+           $time = $this->db->f('time');
+           $time_array = explode(":",$time);
+           $hour = $time_array[0];
+           $minute = $time_array[1];
+           $pm = 0;
+           if($hour > 12) { $pm=1; $hour = $hour - 12; }
+           $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2]));
+           
+           $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+
+           // Date selection
+           $table_data.= '<td align=left>';
+           $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options);
+           $table_data.= '</td>';
+           
+           // Hour & Minutes selection
+           $table_data.= "<td align=center>";
+           $table_data.= '<select name=sched['.$district.']['.$appointment.'][hour]>';
+           foreach(range(1,12) as $num) {
+             if($hour == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+             $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+           }
+           $table_data.= '</select>';
+           $table_data.= '&nbsp;:&nbsp;';
+           $table_data.= '<select name=sched['.$district.']['.$appointment.'][minute]>';
+           foreach(range(0,3) as $num) {
+             $num = $num * 15; if($num == 0) { $num = "00"; }
+             if($minute == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+             $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+           }
+           $table_data.= '</select>';
+           $table_data.= '<select name=sched['.$district.']['.$appointment.'][pm]>';
+           if($pm == 0) { $table_data.= '<option value=0 selected>am</option>'; $table_data.= '<option value=1>pm</option>'; }
+           else { $table_data.= '<option value=0>am</option>'; $table_data.= '<option value=1 selected>pm</option>'; }
+           $table_data.= '</select>';
+           $table_data.= "</td>";
+           
+           // Elder drop down list (for PPIs)
+           $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][elder]>';
+           $table_data.= '<option value=0></option>';  
+           for ($j=0; $j < count($elder_id); $j++) {
+             $id = $elder_id[$j];
+             $name = $elder_name[$j];
+             if($elder_id[$j] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+             $table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
+           }
+           $table_data.='</select></td>';
+
+           // Family drop down list (for Visits)
+           $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][family]>';
+           $table_data.= '<option value=0></option>';              
+           for ($j=0; $j < count($elder_id); $j++) {
+             $id = $family_id[$j];
+             $name = $family_name[$j];
+             if($family_id[$j] == $family) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+             $table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.' Family</option>';
+           }
+           $table_data.='</select></td>';
+           
+           $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+           $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][district]" value="'.$district.'">';
+       
+           $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+           $this->t->set_var('tr_color',$tr_color);
+           
+         }
+
+       // Create blank appointment slot
+       $appointment = 0;
+       $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+
+        // Date selection
+       $table_data.= '<td align=left>';
+       $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+       $table_data.= '</td>';
+       
+       // Time selection
+       $table_data.= "<td align=center>";
+       $table_data.= '<select name=sched['.$district.']['.$appointment.'][hour]>';
+       $table_data.= '<option value=""></option>';
+       foreach(range(1,12) as $num) {
+         $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+       }
+       $table_data.= '</select>';
+       $table_data.= '&nbsp;:&nbsp;';
+       $table_data.= '<select name=sched['.$district.']['.$appointment.'][minute]>';
+       $table_data.= '<option value=""></option>';
+       foreach(range(0,3) as $num) {
+         $num = $num * 15; if($num == 0) { $num = "00"; }
+         $table_data.= '<option value='.$num.'>'.$num.'</option>';
+       }
+       $table_data.= '</select>';
+       $table_data.= '<select name=sched['.$district.']['.$appointment.'][pm]>';
+       $table_data.= '<option value=""></option>';
+       $table_data.= '<option value=0>am</option>';
+       $table_data.= '<option value=1>pm</option>';
+       $table_data.= '</select>';
+       $table_data.= "</td>";
+       
+       // Elder drop down list
+       $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][elder]>';
+       $table_data.= '<option value=0></option>';  
+       for ($j=0; $j < count($elder_id); $j++) {
+         $id = $elder_id[$j];
+         $name = $elder_name[$j];
+         $table_data.= '<option value='.$id.'>'.$name.'</option>';
+       }
+       $table_data.='</select></td>';
+       
+       // Family drop down list
+       $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][family]>';
+       $table_data.= '<option value=0></option>';          
+       for ($j=0; $j < count($elder_id); $j++) {
+         $id = $family_id[$j];
+         $name = $family_name[$j];
+         $table_data.= '<option value='.$id.'>'.$name.' Family</option>';
+       }
+       $table_data.='</select></td>';
+
+       $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+       $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][district]" value="'.$district.'">';
+       
+       $this->t->set_var('table_data',$table_data);
+       $this->t->set_var('header_row',$header_row);
+       $this->t->set_var('table_width',$table_width);
+       $this->t->fp('list','district_list',True);
+       
+      }
+      
+      $this->t->pfp('out','sched_t');
+      $this->save_sessiondata();   
+    }
+  
+  function admin()
+    {
+      $this->t->set_file(array('admin_t' => 'admin.tpl'));
+      $this->t->set_block('admin_t','upload','uploadhandle');
+      $this->t->set_block('admin_t','admin','adminhandle');
+      $this->t->set_block('admin_t','cmd','cmdhandle');
+      
+      $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload'));
+      
+      $action = get_var('action',array('GET','POST'));
+
+      $this->t->pfp('out','admin_t');
+      
+      if($action == 'upload')
+       {        
+         $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
+         
+         if((($_FILES['uploadedfile']['type'] == "application/zip") ||
+             ($_FILES['uploadedfile']['type'] == "application/x-zip-compressed") ||
+             ($_FILES['uploadedfile']['type'] == "application/x-zip") ||
+             ($_FILES['uploadedfile']['type'] == "application/octet-stream")) &&
+            (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) {
+           $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
+           $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "<br>";
+           $uploadstatus.= "Type     : " . $_FILES['uploadedfile']['type'] . "<br>";
+           $uploadstatus.= "Size     : " . $_FILES['uploadedfile']['size'] . "<br>";    
+           $this->t->set_var('uploadstatus',$uploadstatus);
+           $this->t->pfp('uploadhandle','upload');
+           $this->t->set_var('uploadhandle','');
+           print "<table border=1 width=80%><tr><td>\n<pre>";
+           
+           # make a directory for this data to be stored in
+           $date="data_" . date("Y_m_d");
+           $data_dir = $this->upload_target_path . $date;
+           print "-> Making the data directory: $date<br>\n";
+           exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to create the data directory. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+
+           # move the file uploaded into this directory
+           print "-> Moving the uploaded file into the data dir<br>\n";
+           exec('mv ' . $target_path . ' ' . $data_dir . '/' . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to move the uploaded file into the data dir. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           
+           # unzip the data into this directory
+           print "-> Unzipping the data<br>\n";
+           $data_file = $data_dir . '';
+           exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           exec('mv ' . $data_dir . '/*/* '. $data_dir . ' 2>&1', $result, $return_code);
+
+           # update the data_latest link to point to this new directory
+           print "-> Updating the latest data dir link<br>\n";
+           $data_latest = $this->upload_target_path . 'data_latest';
+           exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to update the data latest link. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           
+           # run the import perl script to encorporate it into the DB
+           ob_start('ob_logstdout', 2);
+           print "-> Importing the data into the EQ database<br>\n";
+           ob_flush(); flush(); sleep(1);
+           $import_log = $this->upload_target_path . '/import.log';
+           $data_log = $this->upload_target_path . '/data.log';
+           $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log;
+           $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log;
+           #print "import_cmd: $import_cmd<br>";
+           #print "parse_cmd: $parse_cmd<br>";
+           ob_start('ob_logstdout', 2);
+           passthru($import_cmd);
+           passthru($parse_cmd);
+           ob_flush(); flush(); sleep(1);
+
+           # fix the permissions of the data dir
+           exec('chmod -R o-rwx ' . $data_dir, $result, $return_code);
+           
+           $this->t->pfp('cmdhandle','cmd');
+           print "</pre></td></tr></table>";
+           
+         } else if(($_FILES['uploadedfile']['type'] != "application/zip") &&
+                   ($_FILES['uploadedfile']['type'] != "application/x-zip-compressed") &&
+                   ($_FILES['uploadedfile']['type'] != "application/x-zip") &&
+                   ($_FILES['uploadedfile']['type'] != "application/octet-stream")) {
+           $uploadstatus = "<b><font color=red>The file format must be a .zip file, please try again! </font></b>";
+           $uploadstatus.= "<br><br><b>Detected file format: " . $_FILES['uploadedfile']['type'] . "</b>";
+           $this->t->set_var('uploadstatus',$uploadstatus);
+           $this->t->pfp('uploadhandle','upload',True);
+         } else {
+           $uploadstatus = "<b><font color=red> There was an error (" . $_FILES['uploadedfile']['error'];
+           $uploadstatus.= ") uploading the file, please try again! </font></b>";
+           $this->t->set_var('uploadstatus',$uploadstatus);
+           $this->t->pfp('uploadhandle','upload',True);
+         }
+       }
+      else
+       {
+         $this->t->set_var('adminhandle','');
+         $this->t->pfp('adminhandle','admin'); 
+       }
+      
+      $this->save_sessiondata();   
+    }
+  
 }
 
 ?>