Fixed bug in querying eqpres PPI history in scheduling tool.
[eq/.git] / inc / class.eq.inc.php
index 61a5c8a302800be3e35136018a4597dc16a4df50..7f0d5a6e887671fb744d508cd3468d9b6aaf1508 100644 (file)
@@ -1,14 +1,15 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - eq                                                        *
-  * http://www.phpgroupware.org                                              *
+  * Application: phpGroupWare - eq                                           *
+  * Framework: http://www.phpgroupware.org                                   *
+  * Author: Alan J. Pippin (apippin@pippins.net)                             *
   * -----------------------------------------------                          *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
   *  Free Software Foundation; either version 2 of the License, or (at your  *
   *  option) any later version.                                              *
   \**************************************************************************/
-       /* $Id: class.eq.inc.php,v 1.1.1.1 2001/05/20 07:40:32 seek3r Exp $ */
+      /* $Id: class.eq.inc.php,v 1.1.1.1 2005/07/20 07:40:32 ajp Exp $ */
 
 class eq
 {
@@ -22,13 +23,17 @@ 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_quarters;
   var $default_int_num_years;
-  var $default_att_num_months;
+  var $default_vis_num_years;
+  var $default_att_num_quarters;
+  var $max_num_districts;
   var $current_year;
   var $current_month;
   var $upload_target_path;
   var $script_path;
+  var $max_appointments;
+  var $max_presidency_members;
   
   var $public_functions = array
     (
@@ -43,6 +48,7 @@ class eq
      'ppi_sched'  => True,
      'int_view'   => True,
      'int_update' => True,
+     'int_sched'  => True,
      'vis_sched'  => True,
      'vis_view'   => True,
      'vis_update' => True,
@@ -51,35 +57,45 @@ class eq
      'dir_view'   => True,
      'org_view'   => True,
      'schedule'   => True,
-     'admin'      => True
+     'admin'      => True,
+     'email'      => True,
+     'email_appt' => True,
+     'willing_view'   => True,
+     'willing_update' => True,
+     'send_ical_appt' => True,
+     'assign_view'    => True,
+     'assign_update'  => True,
+     'get_time_selection_form' => True,
      );
  
   function eq()
     {
-      $this->default_ht_num_months = 3;
-      $this->default_ppi_num_months = 3;
-      $this->default_ppi_num_years = 0;
-      $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/";
+      if(file_exists("setup/eq_config.local")) {
+       include("setup/eq_config.local");
+      } else {
+       include("setup/eq_config");
+      }
+      
+      $this->script_path = "$this->application_path"."/bin";
+      $this->max_presidency_members = 99;
+      $this->max_appointments = 32768;
       
       $this->db                = $GLOBALS['phpgw']->db;
       $this->db2       = $this->db;
+      $this->db3       = $this->db;
       $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
       $this->t          = $GLOBALS['phpgw']->template;
       $this->account    = $GLOBALS['phpgw_info']['user']['account_id'];
       $this->grants     = $GLOBALS['phpgw']->acl->get_grants('eq');
       $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
        
-      $this->jscal = CreateObject('phpgwapi.jscalendar');   // before phpgw_header() !!!
+      $this->jscal = CreateObject('eq.jscalendar');   // before phpgw_header() !!!
       $this->cal_options = 'daFormat    : "%Y-%m-%d",
                                 ifFormat    : "%Y-%m-%d",
                                 mondayFirst : false,
                                 weekNumbers : false';
        
-      $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools';
+      $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor';
       $GLOBALS['phpgw']->common->phpgw_header();
 
       $this->current_day = `date '+%d'`;
@@ -119,6 +135,12 @@ class eq
       $link_data['menuaction'] = 'eq.eq.act_list';
       $this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_activity','Activities');
+      $link_data['menuaction'] = 'eq.eq.willing_view';
+      $this->t->set_var('link_willing',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_willing','Willingness');
+      $link_data['menuaction'] = 'eq.eq.assign_view';
+      $this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_assignment','Assignments');
       $link_data['menuaction'] = 'eq.eq.par_view';
       $this->t->set_var('link_participation',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_participation','Participation');
@@ -146,6 +168,9 @@ class eq
       $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');
+      $link_data['menuaction'] = 'eq.eq.email';        
+      $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_email','Email');
                
       $this->t->pparse('out','eq_header');
     }
@@ -203,9 +228,9 @@ class eq
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
          $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
-      
-      $total_families = 0;
+
       $this->nextmatchs->template_alternate_row_color(&$this->t);
+      for($m=$num_months; $m >= 0; $m--) { $total_families[$m]=0; }
       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']);      
@@ -223,8 +248,8 @@ class eq
          }
 
        $comp_width=450; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width;
-       $table_data=""; $num_companionships = 0; $num_families = 0;
-       for($m=$num_months; $m >= 0; $m--) { $visits[$m] = 0; }
+       $table_data=""; $num_companionships = 0;
+       for($m=$num_months; $m >= 0; $m--) { $visits[$m]=0; $num_families[$m]=0; }
        for ($j=0; $j < count($unique_companionships); $j++) {
          $companion_table_entry = "";
          // Select all the companions in each companionship
@@ -258,7 +283,6 @@ class eq
          $k=0;
          while ($this->db->next_record())
            {
-             $num_families++; $total_families++;
              $family_name = $this->db->f('name');
              $family_id = $this->db->f('family');
              $this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -274,12 +298,24 @@ class eq
                $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'].
+
+               // First check to see if the currently assigned companionship has visited them
                $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
-                      " AND companionship!=0".
-                      " AND family=". $family_id;
+                  " AND companionship=".$unique_companionships[$j]['companionship'].
+                  " AND family=". $family_id;
+               $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->num_rows($query_id) == 0) {
+                 // We did not find any visits made by the currently assigned companionship,
+                 // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+                 $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                    " AND companionship!=0".
+                    " AND family=". $family_id;
+                 $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+               }
                $this->db2->query($sql,__LINE__,__FILE__);
                $link_data['menuaction'] = 'eq.eq.ht_update';
                $link_data['date'] = $month_start;
@@ -294,19 +330,21 @@ class eq
                if(!$total_visits[$m]) { $total_visits[$m] = 0; }
                if($this->db2->next_record()) {
                  if($this->db2->f('visited') == 'y') {
-                   $visits[$m]++; $total_visits[$m]++;           
-                   $table_data .= '<td align=center><a href="'.$link.'"><img src="checkmark.gif"></a></td>';
+                   $visits[$m]++; $total_visits[$m]++;
+                   $num_families[$m]++; $total_families[$m]++;
+                   $table_data .= '<td align=center><a href="'.$link.'"><img src="images/checkmark.gif"></a></td>';
                  }
                  else if($this->db2->f('visited') == 'n') {
-                   $table_data .= '<td align=center><a href="'.$link.'"><img src="x.gif"></a></td>';
+                   $num_families[$m]++; $total_families[$m]++;
+                   $table_data .= '<td align=center><a href="'.$link.'"><img src="images/x.gif"></a></td>';
                  }
                  else {
-                   $visits[$m]++; $total_visits[$m]++;
+                   //$visits[$m]++; $total_visits[$m]++;
                    $table_data .= "<td>&nbsp;</td>";
                  }
                }
                else {
-                 $visits[$m]++; $total_visits[$m]++;
+                 //$visits[$m]++; $total_visits[$m]++;
                  $table_data .= "<td>&nbsp;</td>";
                }
              }
@@ -316,11 +354,15 @@ class eq
          $table_data .= "<tr><td colspan=20></td></tr>";
        }
        $table_data .= "<tr><td colspan=20><hr></td></tr>";
-       $stat_data = "<tr><td><b><font size=-2>$num_families Families<br>Visit Totals:</font></b></td>";
+       $stat_data = "<tr><td><b><font size=-2>Families Hometaught:<br>Hometeaching Percentage:</font></b></td>";
 
        for($m=$num_months; $m >=0; $m--) {
-         $percent = ceil(($visits[$m] / $num_families)*100);
-         $stat_data .= "<td align=center><font size=-2><b>$visits[$m]<br>$percent%</font></b></td>";
+         if($num_families[$m] > 0) { 
+           $percent = ceil(($visits[$m] / $num_families[$m])*100);
+         } else {
+           $percent = 0;
+         }
+         $stat_data .= "<td align=center><font size=-2><b>$visits[$m] / $num_families[$m]<br>$percent%</font></b></td>";
        }
        $stat_data .= "</tr>";
 
@@ -331,10 +373,14 @@ class eq
        $this->t->fp('list','district_list',True);
       }
 
-      $totals = "<tr><td><b><font size=-2>$total_families Total Families<br>Visit Totals:</font></b></td>";
+      $totals = "<tr><td><b><font size=-2>Total Families Hometaught:<br>Total Hometeaching Percentage:</font></b></td>";
       for($m=$num_months; $m >=0; $m--) {
-       $percent = ceil(($total_visits[$m] / $total_families)*100);
-       $totals .= "<td align=center><font size=-2><b>$total_visits[$m]<br>$percent%</font></b></td>";
+       if($total_families[$m] > 0) { 
+         $percent = ceil(($total_visits[$m] / $total_families[$m])*100);
+       } else {
+         $percent = 0;
+       }
+       $totals .= "<td align=center><font size=-2><b>$total_visits[$m] / $total_families[$m]<br>$percent%</font></b></td>";
       }
       $totals .= "</tr>";
       
@@ -380,16 +426,9 @@ 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
+             // Delete all the visits that have taken place for all families for this companionsthip for this month
              $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
                               " AND " . "date='" . $date . "'",__LINE__,__FILE__);
            }
@@ -487,29 +526,40 @@ class eq
        $this->db->query($sql,__LINE__,__FILE__);
        while ($this->db->next_record())
          {
-           $num_families++; $total_families++;
            $family_name = $this->db->f('name');
            $family_id = $this->db->f('family');
            $this->nextmatchs->template_alternate_row_color(&$this->t);
            $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$family_name Family</td>";
            
            $header_row="<th width=$comp_width><font size=-2>Families</th>";
+
+           // First check to see if the currently assigned companionship has visited them
            $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                  " AND companionship=".$unique_companionships[$j]['companionship'].
+                  " AND family=". $family_id;
+           $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+           if($this->db2->num_rows($query_id) == 0) {
+             // We did not find any visits made by the currently assigned companionship,
+             // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+             $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
                   " AND companionship!=0".
                   " AND family=". $family_id;
-           $this->db2->query($sql,__LINE__,__FILE__);
+             $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+           }
+           
            $value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
            $header_row .= "<th width=$visit_width><font size=-2><a href=$link>$month</a></th>";
            if(!$total_visits) { $total_visits = 0; }
            if($this->db2->next_record()) {
              if($this->db2->f('visited') == 'y') {
-               $visits++; $total_visits++;
+               $visits++; $total_visits++; $num_families++;
                $table_data .= '<td width=100 align=center>';
                $table_data .= '<input type="radio" name="family_visited['.$family_id.'][]" value="'.$value.'/y" checked>Y';
                $table_data .= '<input type="radio" name="family_visited['.$family_id.'][]" value="'.$value.'/n">N';
                $table_data .= '<input type="radio" name="family_visited['.$family_id.'][]" value="'.$value.'/"> ';
                $table_data .= '</td>';
              } else if($this->db2->f('visited') == 'n') {
+               $num_families++;
                $table_data .= '<td width=100 align=center>';
                $table_data .= '<input type="radio" name="family_visited['.$family_id.'][]" value="'.$value.'/y">Y';
                $table_data .= '<input type="radio" name="family_visited['.$family_id.'][]" value="'.$value.'/n" checked>N';
@@ -536,10 +586,10 @@ class eq
        $table_data .= "<tr><td colspan=20></td></tr>";
       }
       $table_data .= "<tr><td colspan=20><hr></td></tr>";
-      $stat_data = "<tr><td><b><font size=-2>$num_families Families<br>Visit Totals:</font></b></td>";
+      $stat_data = "<tr><td><b><font size=-2>Families Hometaught:<br>Hometeaching Percentage:</font></b></td>";
       
       $percent = ceil(($visits / $num_families)*100);
-      $stat_data .= "<td align=center><font size=-2><b>$visits<br>$percent%</font></b></td>";
+      $stat_data .= "<td align=center><font size=-2><b>$visits / $num_families<br>$percent%</font></b></td>";
       $stat_data .= "</tr>";
       
       $this->t->set_var('table_width',$table_width);
@@ -563,8 +613,9 @@ class eq
       $this->t->set_file(array('act_list_t' => 'act_list.tpl'));
       $this->t->set_block('act_list_t','act_list','list');
       
-      $this->t->set_var('lang_name','Activity Name');
+      $this->t->set_var('lang_name','Assignment');
       $this->t->set_var('lang_date','Date');
+      $this->t->set_var('lang_notes','Description');
       
       $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -573,9 +624,18 @@ class eq
       $i = 0;
       while ($this->db->next_record())
        {
-         $activity_list[$i]['name'] = $this->db->f('name');
-         $activity_list[$i]['date']  = $this->db->f('date');
          $activity_list[$i]['activity']  = $this->db->f('activity');
+         $activity_list[$i]['assignment'] = $this->db->f('assignment');
+         $activity_list[$i]['date']  = $this->db->f('date');
+         $activity_list[$i]['notes']  = $this->db->f('notes');
+
+         $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         if($this->db2->next_record())
+           {
+             $activity_list[$i]['name'] = $this->db2->f('name');
+             $activity_list[$i]['code'] = $this->db2->f('code');
+           }
          $i++;
        }
             
@@ -584,6 +644,9 @@ class eq
          $this->nextmatchs->template_alternate_row_color(&$this->t);
          $this->t->set_var('name',$activity_list[$i]['name']);
          $this->t->set_var('date',$activity_list[$i]['date']);
+         $activity_notes = $activity_list[$i]['notes'];
+         if(strlen($activity_notes) > 40) { $activity_notes = substr($activity_notes,0,40) . "..."; }
+         $this->t->set_var('notes',$activity_notes);
          
          $link_data['menuaction'] = 'eq.eq.act_view';
          $link_data['activity'] = $activity_list[$i]['activity'];
@@ -618,13 +681,20 @@ class eq
       $sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
       $this->db->query($sql,__LINE__,__FILE__);
       $this->db->next_record();
-      $this->t->set_var('name', $this->db->f('name'));
+      $this->t->set_var('assignment', $this->db->f('assignment'));
       $this->t->set_var('date', $this->db->f('date'));
       $this->t->set_var('notes', $this->db->f('notes'));
-            
-      $this->t->set_var('lang_name','Activity Name');
+      
+      $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      if($this->db2->next_record())
+       {
+         $this->t->set_var('name', $this->db2->f('name'));
+         $this->t->set_var('code', $this->db2->f('code'));
+       }
+      $this->t->set_var('lang_name','Assignment');
       $this->t->set_var('lang_date','Date');
-      $this->t->set_var('lang_notes','Notes');
+      $this->t->set_var('lang_notes','Description');
       $this->t->set_var('lang_done','Done');
       $this->t->set_var('lang_action','View');
 
@@ -639,7 +709,7 @@ class eq
       $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_edit','Edit');
       $this->t->set_var('cal_date',$this->db->f('date'));
-
+      
       // Now find out which elders participated in this activity
       $sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
       $this->db->query($sql,__LINE__,__FILE__);
@@ -685,14 +755,14 @@ class eq
       $action = get_var('action',array('GET','POST'));
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.act_list'));
       $activity['activity'] = intval(get_var('activity',array('GET','POST')));
-
+      
       if($action == 'save')
        {
-         $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-         $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-         $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+         $activity['assignment'] = get_var('assignment',array('POST'));
+         $activity['date'] = get_var('date',array('POST'));
+         $activity['notes']= get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_activity set " .
-                          "   name='" . $activity['name'] .
+                          "   assignment='" . $activity['assignment'] .
                           "', date='" . $activity['date'] . "'" .
                           ", notes='" . $activity['notes'] . "'" .
                           " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
@@ -714,12 +784,28 @@ class eq
 
       if($action == 'insert')
        {
-         $activity['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-         $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-         $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
-         $this->db->query("INSERT INTO eq_activity (name,date,notes) "
-                          . "VALUES ('" . $activity['name'] . "','"
+         $activity['assignment'] = get_var('assignment',array('POST'));
+         $activity['date'] = get_var('date',array('POST'));
+         $activity['notes']= get_var('notes',array('POST'));
+         $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+                          . "VALUES ('" . $activity['assignment'] . "','"
                           . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+
+         $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+            . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+         $this->db->query($sql,__LINE__,__FILE__);
+         if($this->db->next_record()) {
+           //print "activity: " . $this->db->f('activity') . "<br>";
+           $activity['activity'] = $this->db->f('activity');
+         }
+         
+         $elders = get_var('elder_name',array('POST'));
+         foreach ($elders as $elder)
+           {
+             $this->db->query("INSERT INTO eq_participation (elder,activity) "
+                              . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+           }
+         
          $this->act_list();
          return false;
        }
@@ -728,7 +814,7 @@ class eq
        {
          $activity['activity'] = 0;
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
-         $this->t->set_var('name','');
+         $this->t->set_var('assignment','');
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
          $this->t->set_var('lang_done','Cancel');
@@ -743,7 +829,8 @@ class eq
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));
-         $this->t->set_var('name', $this->db->f('name'));
+         $this->t->set_var('assignment', $this->db->f('assignment'));
+         $assignment = $this->db->f('assignment');
          $this->t->set_var('date', $this->db->f('date'));
          $this->t->set_var('notes', $this->db->f('notes'));
          $this->t->set_var('lang_done','Cancel');
@@ -753,6 +840,30 @@ class eq
 
        }
 
+      // Create the assignments drop-down list
+      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i = 0;
+      while ($this->db->next_record())
+       {
+         $assignments[$i]['assignment']  = $this->db->f('assignment');
+         $assignments[$i]['name'] = $this->db->f('name');
+         $assignments[$i]['code'] = $this->db->f('code');
+         $i++;
+       }
+      
+      $assignment_data.= '<select name=assignment>';
+      $assignment_data.= '<option value=0></option>';  
+      for ($j=0; $j < count($assignments); $j++) {
+       $id = $assignments[$j]['assignment'];
+       $name = $assignments[$j]['name'];
+       if($assignments[$j]['assignment'] == $assignment) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+       $assignment_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
+      }
+      $assignment_data.='</select>';
+      $this->t->set_var('assignment_data',$assignment_data);
+      
+      // Create elder selection boxes
       $sql = "SELECT * FROM eq_elder";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -799,6 +910,125 @@ class eq
       $this->save_sessiondata();
     }
 
+    function assign_view()
+    {
+      $this->t->set_file(array('assign_view_t' => 'assign_view.tpl'));
+      $this->t->set_block('assign_view_t','assign_view','list');
+      
+      $this->t->set_var('lang_name','Assignment Name');
+      $this->t->set_var('lang_code','Code');
+      
+      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $total_records = $this->db->num_rows();
+
+      $i = 0;
+      while ($this->db->next_record())
+       {
+         $assignment_list[$i]['assignment']  = $this->db->f('assignment');
+         $assignment_list[$i]['name'] = $this->db->f('name');
+         $assignment_list[$i]['code'] = $this->db->f('code');
+         $i++;
+       }
+            
+      for ($i=0; $i < count($assignment_list); $i++)
+       {         
+         $this->nextmatchs->template_alternate_row_color(&$this->t);
+         $this->t->set_var('name',$assignment_list[$i]['name']);
+         $this->t->set_var('code',$assignment_list[$i]['code']);
+         
+         $link_data['menuaction'] = 'eq.eq.assign_update';
+         $link_data['assignment'] = $assignment_list[$i]['assignment'];
+         $link_data['action'] = 'edit';
+         $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+         $this->t->set_var('lang_edit','Edit');
+
+         $link_data['menuaction'] = 'eq.eq.assign_update';
+         $link_data['assignment'] = '0';
+         $link_data['action'] = 'add';
+         $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
+                           . '"><input type="submit" name="Add" value="' . 'Add Assignment' .'"></font></form>');
+
+         $this->t->fp('list','assign_view',True);
+       }
+
+      $this->t->pfp('out','assign_view_t');
+      $this->save_sessiondata();
+    }
+
+    function assign_update()
+    {
+      $this->t->set_file(array('form' => 'assign_update.tpl'));
+      $this->t->set_block('form','add','addhandle');
+      $this->t->set_block('form','edit','edithandle');
+      $this->t->set_var('lang_done','Done');
+
+      $action = get_var('action',array('GET','POST'));
+      $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_view'));
+      $assignment['assignment'] = intval(get_var('assignment',array('GET','POST')));
+
+      if($action == 'save')
+       {
+         $assignment['name'] = get_var('name',array('POST'));
+         $assignment['code'] = get_var('code',array('POST'));
+         $this->db->query("UPDATE eq_assignment set " .
+                          "  name='" . $assignment['name'] . "'" .
+                          ", code='" . $assignment['code'] . "'" .
+                          " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
+         
+         $this->assign_view();
+         return false;
+       }
+
+      if($action == 'insert')
+       {
+         $assignment['name'] = get_var('name',array('POST'));
+         $assignment['code'] = get_var('code',array('POST'));
+         $this->db->query("INSERT INTO eq_assignment (name,code) "
+                          . "VALUES ('" . $assignment['name'] . "','"
+                          . $assignment['code'] . "')",__LINE__,__FILE__);
+         $this->assign_view();
+         return false;
+       }
+      
+      if($action == 'add')
+       {
+         $assignment['assignment'] = 0;
+         $this->t->set_var('name','');
+         $this->t->set_var('code','');
+         $this->t->set_var('lang_done','Cancel');
+         $this->t->set_var('lang_action','Adding New Assignment');
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_update&assignment='
+                                                               . $assignment['assignment'] . '&action=' . 'insert'));
+       }
+
+      if($action == 'edit')
+       {
+         $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment'];
+         $this->db->query($sql,__LINE__,__FILE__);
+         $this->db->next_record();
+         $this->t->set_var('name', $this->db->f('name'));
+         $this->t->set_var('code', $this->db->f('code'));
+         $this->t->set_var('lang_done','Cancel');
+         $this->t->set_var('lang_action','Editing Assignment');
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.assign_update&assignment='
+                                                               . $assignment['assignment'] . '&action=' . 'save'));
+
+       }
+      
+      $this->t->set_var('lang_reset','Clear Form');
+      $this->t->set_var('lang_add','Add Assignment');
+      $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 == 'edit') { $this->t->pfp('addhandle','edit'); }
+      if($action == 'add') { $this->t->pfp('addhandle','add'); }
+      
+      $this->save_sessiondata();
+    }
+
   function par_view()
     {
       $this->t->set_file(array('par_view_t' => 'par_view.tpl'));
@@ -823,38 +1053,63 @@ class eq
       $i = 0;
       while ($this->db->next_record())
        {
-         $activity_list[$i]['name'] = $this->db->f('name');
+         $activity_list[$i]['assignment'] = $this->db->f('assignment');
          $activity_list[$i]['date'] = $this->db->f('date');
          $activity_list[$i]['activity']  = $this->db->f('activity');
-         if($activity_list[$i]['date'] == '0000-00-00') { $activity_list[$i]['date']=""; }
          $i++;
        }
 
-      $elder_width=250; $part_width=25; $act_width=50;
+      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while($this->db->next_record())
+       {
+         $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+         $assignment_list[$i]['name'] = $this->db->f('name');
+         $assignment_list[$i]['code'] = $this->db->f('code');
+         $i++;
+       }
+      
+      $elder_width=300; $part_width=25; $assignment_width=50;
       $total_width=$elder_width+$part_width;
-      for ($i=0; $i < count($activity_list); $i++) {
-       $this->t->set_var('activity_name',$activity_list[$i]['name']);
-       $this->t->set_var('activity_date',$activity_list[$i]['date']);
+      for ($i=0; $i < count($assignment_list); $i++) {
+       $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
+       $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
        $this->t->fp('list1','header_list',True);
-       $total_width += $act_width;
+       $total_width += $assignment_width;
       }
 
       for ($i=0; $i < count($elder_id); $i++) {
        $participated=0; $part_table = ''; 
        $this->nextmatchs->template_alternate_row_color(&$this->t);
        $this->t->set_var('elder_name',$elder_name[$i]);
-       for ($j=0; $j < count($activity_list); $j++) {
-         $sql = "SELECT * FROM eq_participation where activity="
-            . $activity_list[$j]['activity'] . " AND elder=" . $elder_id[$i];
-         $this->db->query($sql,__LINE__,__FILE__);
-         if($this->db->next_record()) {
-           $part_table .= '<td align=center><img src="checkmark.gif"></td>';
-           $participated++;
+       for ($j=0; $j < count($assignment_list); $j++) {
+         $date = "0000-00-00"; $checkmark=0; $num_matches=0;
+         for ($k=0; $k < count($activity_list); $k++) {
+           if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { 
+             $sql = "SELECT * FROM eq_participation where "
+                . " activity=" . $activity_list[$k]['activity']
+                . " AND elder=" . $elder_id[$i];
+             $this->db->query($sql,__LINE__,__FILE__);
+             while($this->db->next_record()) {
+               if($activity_list[$k]['date'] > $date) { 
+                 $date = $activity_list[$k]['date'];
+               }
+               $checkmark=1;
+               $num_matches++;
+               $participated++;
+             }
+           }
+         }
+         if($checkmark) {
+           $part_table .= '<td align=center><img src="images/checkmark.gif">';
+           $part_table .= '<font size=-2>'.$num_matches.'</font><br>';
+           $part_table .= '<font size=-2>'.$date.'</font></td>';
          } else {
            $part_table .= '<td>&nbsp;</td>';
          }
        }
-       if($participated) { $part_table .= '<td align=center><img src="checkmark.gif">'.$participated.'</td>'; }
+       if($participated) { $part_table .= '<td align=center><img src="images/checkmark.gif">'.$participated.'</td>'; }
        else { $part_table .= '<td>&nbsp;</td>'; }
        $this->t->set_var('part_table',$part_table);
        $this->t->fp('list2','elder_list',True);
@@ -866,143 +1121,423 @@ 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','EQ President Yearly PPIs Scheduler');
+    function willing_view()
+    {
+      $this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
+      $this->t->set_block('willing_view_t','header_list','list1');
+      $this->t->set_block('willing_view_t','elder_list','list2');
 
-      $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="";
+      $this->t->set_var('lang_filter','Filter');
+      $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
 
-      $year = date('Y');
+      $filter_unwilling = get_var('filter_unwilling',array('POST'));
+      $this->t->set_var('filter_unwilling',$filter_unwilling);
       
-      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";
+      if($filter_unwilling == 'y' || $filter_unwilling == '') { 
+       $filter_input = "<input type=\"radio\" name=\"filter_unwilling\" value=\"y\" checked>Y";
+       $filter_input.= "<input type=\"radio\" name=\"filter_unwilling\" value=\"n\">N";
+       $filter_input.= "&nbsp;&nbsp;";
+      } else {
+       $filter_input = "<input type=\"radio\" name=\"filter_unwilling\" value=\"y\">Y";
+       $filter_input.= "<input type=\"radio\" name=\"filter_unwilling\" value=\"n\" checked>N";
+       $filter_input.= "&nbsp;&nbsp;";
+      }
+      $this->t->set_var('filter_input',$filter_input);
       
-      // create the elder id -> elder name mapping
-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM eq_elder where valid=1";
       $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');
+         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
          $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 = ""; 
+      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while($this->db->next_record())
+       {
+         $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+         $assignment_list[$i]['name'] = $this->db->f('name');
+         $assignment_list[$i]['code'] = $this->db->f('code');
+         $i++;
+       }
 
-      $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";
+      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
-       
+      $total_records = $this->db->num_rows();
+
+      $i = 0;
       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]));
+         $activity_list[$i]['assignment'] = $this->db->f('assignment');
+         $activity_list[$i]['date'] = $this->db->f('date');
+         $activity_list[$i]['activity']  = $this->db->f('activity');
+         $i++;
+       }
+      
+      $elder_width=275; $willing_width=40; $assignment_width=50;
+      $total_width=$elder_width+$willing_width;
+      
+      for ($i=0; $i < count($assignment_list); $i++) {
+       $this->t->set_var('assignment_name',$assignment_list[$i]['name']);
+       $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
+       $this->t->fp('list1','header_list',True);
+       $total_width += $assignment_width;
+       $total_willing[$i] = 0;
+      }
+
+      for ($i=0; $i < count($elder_id); $i++) {
+       $willing_table = ''; $elder_willing=0;
+       $this->t->set_var('elder_name',$elder_name[$i]);
+       $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
+       $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
+                                                           . $elder_id[$i] . '&action=' . 'edit'));
+       for ($j=0; $j < count($assignment_list); $j++) {
+         $found_willingness=0; 
+         $sql = "SELECT * FROM eq_willingness where "
+            . " assignment=" . $assignment_list[$j]['assignment']
+            . " AND elder=" . $elder_id[$i];
+         $this->db->query($sql,__LINE__,__FILE__);
+         while($this->db->next_record()) {
+           $found_willingness=1;
+           $date_part="";
+           $sql = "SELECT * FROM eq_activity where "
+              . " assignment=". $assignment_list[$j]['assignment']
+              . " ORDER by date DESC";
+           $this->db2->query($sql,__LINE__,__FILE__);
+           if($this->db2->next_record()) {
+             $activity = $this->db2->f('activity');
+             $date = $this->db2->f('date');
+             $sql = "SELECT * FROM eq_participation where "
+                . " activity=" . $activity
+                . " AND elder=". $elder_id[$i];
+             $this->db3->query($sql,__LINE__,__FILE__);
+             if($this->db3->next_record()) {
+               $date_part = $date;
+             } 
+           }
+             
+           if($this->db->f('willing') == 'y') {
+             $total_willing[$j]++;
+             $elder_willing=1;
+             $willing_table .= '<td align=center><img src="images/checkmark.gif"><br><font size=-2>'.$date_part.'</font></td></td>';
+           }
+           else if($this->db->f('willing') == 'n') {
+             $willing_table .= '<td align=center><img src="images/x.gif"></td>';
+           }
+           else {
+             $elder_willing=1;
+             $willing_table .= "<td>&nbsp;</td>";
+           }
+         }
+         if(!$found_willingness) {
+           $elder_willing=1;
+           $willing_table .= "<td>&nbsp;</td>";
+         }
+       }
+       if(($elder_willing == 1) || ($filter_unwilling == 'n')) { 
+         $this->t->set_var('willing_table',$willing_table);
+         $this->t->fp('list2','elder_list',True);
+         $this->nextmatchs->template_alternate_row_color(&$this->t);
+       } 
+      }
+
+      $stat_table = '<td><b>Total Willing to Serve</b></td>';
+      for ($j=0; $j < count($assignment_list); $j++) {
+       $stat_table .= "<td align=center><b>".$total_willing[$j]."</b></td>";
+      }
+      $this->t->set_var('stat_table',$stat_table);
+      
+      $this->t->set_var('total_width',$total_width);
+      $this->t->set_var('elder_width',$elder_width);
+      $this->t->set_var('willing_width',$willing_width);
+      $this->t->pfp('out','willing_view_t');
+      $this->save_sessiondata(); 
+    }
+    
+  function willing_update()
+    {
+      //print "<font color=red>Willingness Update Under Constrcution</font>";
+      //$this->willing_view();
+      //return false;
+      
+      $this->t->set_file(array('willing_update_t' => 'willing_update.tpl'));
+      $this->t->set_block('willing_update_t','assignment_list','list');
+      $this->t->set_block('willing_update_t','save','savehandle');
+      
+      $elder_id = get_var('elder_id',array('GET','POST'));
+      $this->t->set_var('elder_id',$elder_id);
+      $action = get_var('action',array('GET','POST'));
+      
+      $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view'));
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&action=save'));
+      $this->t->set_var('lang_done','Cancel');
+      $this->t->set_var('title','Willingness Update ');
+      
+      if($action == 'save')
+       {
+         // Delete all the previous willingness entries for this elder
+         $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
+             
+         // Now, add the assignment willingness that is checked for this elder
+         $new_data = get_var('willingness',array('POST'));
+         foreach ($new_data as $data)
+           {
+             $data_array = explode("/",$data);
+             $assignment = $data_array[0];
+             $willing = $data_array[1];
+             //print "elder_id: $elder_id assignment: $assignment willing: $willing<br>";
+             $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) "
+                              . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+           }      
+         $this->willing_view();
+         return false;
+       }
+      
+      $assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width;
+      $table_data=""; 
+
+      // Find out the elder's name
+      $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      if($this->db->next_record()) {
+       $elder_name = $this->db->f('name');
+       $this->t->set_var('elder_name',$elder_name);
+      }
+      
+      // Select all the assignments
+      $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      
+      while ($this->db->next_record())
+       {
+         $assignment = $this->db->f('assignment');
+         $assignment_name = $this->db->f('name');
+         $assignment_code = $this->db->f('code');
+
+         $this->nextmatchs->template_alternate_row_color(&$this->t);
+         $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$assignment_name</td>";
+         
+         $header_row="<th width=$comp_width><font size=-2>Assignments</th><th>Willingness</th>";
+         $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+         $this->db2->query($sql,__LINE__,__FILE__);
+         $value = $assignment;
+            
+         if($this->db2->next_record()) {
+             if($this->db2->f('willing') == 'y') {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y" checked>Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/"> ';
+               $table_data .= '</td>';
+             } else if($this->db2->f('willing') == 'n') {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n" checked>N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/">';
+               $table_data .= '</td>';
+             } else {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/" checked> ';
+               $table_data .= '</td>';
+             }
+           }
+         else {
+           $table_data .= '<td width=100 align=center>';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/" checked> ';
+           $table_data .= '</td>';
+         }
+         
+         $table_data .= "\n";
+         $table_data .= "</tr>"; 
+         $table_data .= "<tr><td colspan=20></td></tr>";
+       }
+      
+      $table_data .= "<tr><td colspan=20><hr></td></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->fp('list','assignment_list',True);
+
+      $this->t->set_var('lang_reset','Clear Form');
+      $this->t->set_var('lang_save','Save Changes');
+      $this->t->set_var('savehandle','');
+      
+      $this->t->pfp('out','willing_update_t');
+      $this->t->pfp('addhandle','save');
+      
+      $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 PPI 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');
+
+      // Get the EQ President
+      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      if($this->db->next_record()) {
+       $president_name = $this->db->f('name');
+       $president_name_array = explode(",",$president_name);
+       $president_last_name = $president_name_array[0];
+       $president_id = $this->db->f('elder');
+       $presidency_id = $this->db->f('presidency');
+       $interviewer = $this->db->f('elder');
+       $district_number = '*';
+       $district_name = $president_name;
+       $sql = "SELECT * FROM eq_elder where elder='$president_id'";
+       $this->db2->query($sql,__LINE__,__FILE__);
+       if($this->db2->next_record()) {
+         $indiv_id = $this->db2->f('indiv_id');
+       }
+       $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+       $this->db2->query($sql,__LINE__,__FILE__);
+       if($this->db2->next_record()) {
+         $president_address = $this->db2->f('address');
+       }
+      } else {
+       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       return;
+      }
+
+      if($action == 'save')
+       {
+         // Save any changes made to the appointment table
+         $new_data = get_var('appt_notes',array('POST'));
+         if($new_data != "") { 
+           foreach ($new_data as $entry)
+             {
+               $elder = $entry['elder'];
+               $appointment = $entry['appointment'];
+               $location = $entry['location'];
+               if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+               if($elder == 0) { $location = ""; }
+               
+               //Only perform a database update if we have made a change to this appointment
+               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $this->db->query($sql,__LINE__,__FILE__);
+               if(!$this->db->next_record()) {
+                 // Perform database save actions here
+                 $this->db->query("UPDATE eq_appointment set " .
+                                  " elder='" . $elder . "'" .
+                                  ",location='" . $location . "'" .
+                                  " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+                 // Email the appointment
+                 $this->email_appt($appointment);
+               }
+               
+             }
+         }
+         
+         // 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);
+       }
+      
+      // 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
+      $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
+      $appt_table_width=$date_width + $time_width + $elder_width + $location_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_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+      $appt_table_data = ""; 
+
+      $total_elders=0; $elders_with_yearly_ppi=0;
+      
+      // Display a scheduling table for the EQ President
+      $table_data=""; $appt_table_data="";
+      $table_title = "District ".$district_number.": ".$district_name.": All Elders with Yearly PPI Not Completed";
+      $appt_table_title = "District ".$district_number.": ".$district_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 presidency=".$presidency_id." 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');
+         $location = $this->db->f('location');
+         if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home ($president_address)"; }
+         
+         $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>";
@@ -1017,7 +1552,10 @@ class eq
            $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
          }
          $appt_table_data.='</select></td>';
-
+         
+         $appt_table_data.= '<td align=center><input type=text size="35" maxlength="120" ';
+         $appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
+         
          $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
          
          $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1036,19 +1574,13 @@ class eq
       $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++;
-         }
+         $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);
@@ -1063,21 +1595,23 @@ class eq
          // 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;
+            "AND elder=" . $id . " AND eqpresppi=1";
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
-           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $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_data['interviewer'] = $interviewer;
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
+           $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+           $this->t->set_var('tr_color',$tr_color);
            $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>";
@@ -1095,13 +1629,10 @@ class eq
            $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');
@@ -1111,22 +1642,420 @@ class eq
            $date = $this->db2->f('date');
            $ppi_notes = $this->db2->f('notes');
            if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
+           $tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
+           $this->t->set_var('tr_color2',$tr_color2);
            $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);
          }
+      } // End for Elders Loop
+
+      $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); 
+      
+      $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 int_sched()
+    {
+      $this->t->set_file(array('int_sched_t' => 'int_sched.tpl'));
+      $this->t->set_block('int_sched_t','elder_list','elderlist');
+      $this->t->set_block('int_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('int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
+      $this->t->set_var('int_link_title','Hometeaching Interviews');
+      
+      $this->t->set_var('schedule_int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched'));
+      $this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews');
+
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched&action=save'));
+      $this->t->set_var('title','Hometeaching Interviews Scheduler');
+
+      $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
+      $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $int_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=$int_date_width><font size=-2>Last Interview</th>";
+      $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+      $table_data=""; $completed_data=""; $totals_data="";
+
+      $year = date('Y');
+      $month = date('m');
+      $nextyear = $year + 1;
+      if($month >= 1 && $month <= 3) { $quarter_start=$year."-01-01"; $quarter_end=$year."-04-01"; }
+      if($month >= 4 && $month <= 6) { $quarter_start=$year."-04-01"; $quarter_end=$year."-07-01"; }
+      if($month >= 7 && $month <= 9) { $quarter_start=$year."-07-01"; $quarter_end=$year."-10-01"; }
+      if($month >= 10 && $month <= 12) { $quarter_start=$year."-10-01"; $quarter_end=$nextyear."-01-01"; }
+      //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
+
+      // 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_data = NULL;
+      $elder_name_data = NULL;
+      while ($this->db->next_record())
+       {
+         $elder_name_data[$i] = $this->db->f('name');
+         $elder_id_data[$i] = $this->db->f('elder');
+         $elderid2name[$elder_id_data[$i]] = $elder_name_data[$i];
+         $i++;
+       }
+      array_multisort($elder_name_data, $elder_id_data);
+
+      if($action == 'save')
+       {
+         // Save any changes made to the appointment table
+         $new_data = get_var('appt_notes',array('POST'));
+         if($new_data != "") { 
+           foreach ($new_data as $entry)
+             {
+               $elder = $entry['elder'];
+               $appointment = $entry['appointment'];
+               $location = $entry['location'];
+               if($location == "") {
+                 $supervisor = $entry['supervisor'];
+                 $supervisor_array = explode(",", $elderid2name[$supervisor]);
+                 $supervisor_last_name = $supervisor_array[0];
+                 $sql = "SELECT * FROM eq_elder where elder='$supervisor'";
+                 $this->db2->query($sql,__LINE__,__FILE__);
+                 if($this->db2->next_record()) {
+                   $indiv_id = $this->db2->f('indiv_id');
+                 }
+                 $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+                 $this->db2->query($sql,__LINE__,__FILE__);
+                 if($this->db2->next_record()) {
+                   $supervisor_address = $this->db2->f('address');
+                 }
+                 $location = "$supervisor_last_name"." home ($supervisor_address)";
+               }
+               if($elder == 0) { $location = ""; }
+               
+               //print "elder: $elder appointment: $appointment <br>";
+               //Only perform a database update if we have made a change to this appointment
+               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $this->db->query($sql,__LINE__,__FILE__);
+               if(!$this->db->next_record()) {
+                 // Perform database save actions here
+                 $this->db->query("UPDATE eq_appointment set " .
+                                  " elder='" . $elder . "'" .
+                                  ",location='" . $location . "'" .
+                                  " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+                 
+                 // Email the appointment
+                 $this->email_appt($appointment);
+               }
+             }
+         }
+         
+         // Save any changes made to the int notes table
+         $new_data = get_var('int_notes',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $int_notes = $entry['notes'];
+            $elder_id = $entry['elder_id'];
+            $elder_name = $entry['elder_name'];
+            $int_pri = $entry['pri'];
+            $aaronic = $entry['aaronic'];
+            //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
+            if($aaronic == 0) { 
+              // Perform database save actions here
+              $this->db->query("UPDATE eq_elder set " .
+                               " int_notes='" . $int_notes . "'" .
+                               ",int_pri='" . $int_pri . "'" .
+                               " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+            } 
+            
+          }
+
+         $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_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())
+       {
+         $district = $this->db->f('district');
+         $districts[$i]['district'] = $this->db->f('district');
+         $districts[$i]['name'] = $this->db->f('name');
+         $districts[$i]['supervisor'] = $this->db->f('supervisor');
+         $sql = "SELECT * FROM eq_presidency where district=$district and valid=1";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         if($this->db2->next_record()) {
+           $districts[$i]['presidency'] = $this->db2->f('presidency');
+         }
+         $i++;
+       }
+      
+      // APPOINTMENT TABLE
+      $district = 1;
+      $date_width=250; $time_width=100; $elder_width=200; $location_width=100;
+      $appt_table_width=$date_width + $time_width + $elder_width + $location_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_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+      $appt_table_data = ""; 
+
+      $total_comps=0; $comps_with_quarterly_int=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'];
+      $supervisor_array = explode(",", $supervisor);
+      $supervisor_last_name = $supervisor_array[0];
+      $sql = "SELECT * FROM eq_elder where elder='$supervisor'";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      if($this->db2->next_record()) {
+       $indiv_id = $this->db2->f('indiv_id');
       }
+      $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+      $this->db2->query($sql,__LINE__,__FILE__);
+      if($this->db2->next_record()) {
+       $supervisor_address = $this->db2->f('address');
+      }
+      $location = "$supervisor_last_name"." home ($supervisor_address)";
+      $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Interviews Not Completed";
+      $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview 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 presidency=".$districts[$d]['presidency']." 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');
+         $location = $this->db->f('location');
+         if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
+         
+         $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_data); $i++) {
+           $id = $elder_id_data[$i];
+           $name = $elder_name_data[$i];
+           if($elder_id_data[$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.= '<td align=center><input type=text size="35" maxlength="120" ';
+         $appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
+         
+         $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
+         $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][supervisor]" value="'.$supervisor.'">';
+         
+         $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);
+
+      // INTERVIEW SCHEDULING TABLE
+      
+      // Select all the unique companionship numbers for this district
+      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
+      $this->db->query($sql,__LINE__,__FILE__);
+      $j=0;
+      while ($this->db->next_record())
+       {
+         $unique_companionships[$j]['companionship'] = $this->db->f('companionship');
+         $j++;
+       }
+
+      $i=0;
+      for ($j=0; $j < count($unique_companionships); $j++) {
+       // Select all the companions from each companionship
+       $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+          "companionship=". $unique_companionships[$j]['companionship'];
+       $this->db->query($sql,__LINE__,__FILE__);
+       $k=0; $int_completed=0;
+       $comp = $unique_companionships[$j]['companionship'];
+       $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+       $this->t->set_var('tr_color',$tr_color);
+       $total_comps++;
+       while ($this->db->next_record())
+           {         
+             // Get this companions information
+             $elder_id = $this->db->f('elder');
+             $aaronic_id = $this->db->f('aaronic');
+            
+             $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+             $this->db2->query($sql,__LINE__,__FILE__);        
+             if($this->db2->next_record())
+               {
+                 $elder_id = $this->db2->f('elder');
+                 $elder_name = $this->db2->f('name');
+                 $elder_phone[$elder_id] = $this->db2->f('phone');
+                 $elder_int_pri[$elder_id] = $this->db2->f('int_pri');
+                 $elder_int_notes[$elder_id] = $this->db2->f('int_notes');
+                 $elder_aaronic = 0;
+               }
+             else {
+               $sql = "SELECT * FROM eq_aaronic where aaronic=$aaronic_id";
+               $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->next_record())
+                 {
+                   $elder_id = $this->db2->f('aaronic');
+                   $elder_name = $this->db2->f('name');
+                   $elder_phone[$elder_id] = $this->db2->f('phone');
+                   $elder_aaronic = 1;
+                 }
+             }
 
+             $id = $elder_id;
+             $name = $elder_name;
+             $phone = $elder_phone[$id];
+             $int_pri = $elder_int_pri[$id];
+             $int_notes = $elder_int_notes[$id];
+             $aaronic = $elder_aaronic;
+             
+             // If the companionship has already had its quarterly interview,
+             // Skip the other companion in the companionship.
+             if($int_completed == 1) {
+               $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>$int_notes</td>";
+               $completed_data.= '</tr>';
+               $tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
+               $this->t->set_var('tr_color2',$tr_color2);
+               $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+               $this->t->set_var('tr_color',$tr_color);
+               continue;
+             }
+             
+             // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
+             $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_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->db3->query($sql,__LINE__,__FILE__);
+               if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
+               $link_data['menuaction'] = 'eq.eq.int_update';
+               $link_data['elder'] = $id;
+               $link_data['aaronic'] = 0;
+               $link_data['name'] = $name;
+               $link_data['ppi'] = '';
+               $link_data['action'] = 'add';
+               $link_data['interviewer'] = $districts[$d]['supervisor'];
+               $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>";
+               if($aaronic == 0) { 
+                 $table_data.= '<select name=int_notes['.$i.'][pri]>';
+                 foreach(range(0,6) as $num) {
+                   if($num == 0) { $num = 1; } else {$num = $num*5; }
+                   if($int_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>";
+               if($aaronic == 0) { 
+                 $table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
+               }
+               $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_id]" value="'.$id.'">';
+               $table_data.= '<input type=hidden name="int_notes['.$i.'][elder_name]" value="'.$name.'">';
+               $table_data.= '<input type=hidden name="int_notes['.$i.'][aaronic]" value="'.$aaronic.'">';
+               $table_data.= '</td>';
+               $table_data.= '</tr>'."\n";
+               $i++;
+             } else {
+               $link_data['menuaction'] = 'eq.eq.int_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['action'] = 'view';
+               $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
+               $comps_with_quarterly_int++;
+               $int_completed=1;
+               $date = $this->db2->f('date');
+               $int_notes = $this->db2->f('notes');
+               if(strlen($int_notes) > 40) { $int_notes = substr($int_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>$int_notes</td>";
+               $completed_data.= '</tr>';
+             }
+           }
+      }
+       
       $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>";
+      $completed_header_row.= "<th width=$notes_width><font size=-2>Interview Notes</th>";
             
       $this->t->set_var('table_width',$table_width);
       $this->t->set_var('header_row',$header_row);
@@ -1138,17 +2067,15 @@ class eq
 
       } // 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);
+      $totals_data.= "<td align=left><font size=-2><b>Total Companionships with interviews completed:</b></font></td>";
+      $totals_data.= "<td align=center><font size=-2><b>$comps_with_quarterly_int / $total_comps</b></font></td>";
+      $percent = ceil(($comps_with_quarterly_int / $total_comps)*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') .">";
@@ -1160,7 +2087,7 @@ class eq
       $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->t->pfp('out','int_sched_t');
       $this->save_sessiondata(); 
       
     }
@@ -1194,74 +2121,114 @@ class eq
       $table_data=""; $completed_data=""; $totals_data="";
 
       $year = date('Y');
-      
+
+      // 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');
+         $familyid2name[$family_id[$i]] = $family_name[$i];
+         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         if($this->db2->next_record()) {
+           $familyid2address[$family_id[$i]] = $this->db2->f('address');
+         }
+         $i++;
+       }
+      array_multisort($family_name, $family_id);
+
       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__);
-
-          }
+         if($new_data != "") { 
+           foreach ($new_data as $entry)
+             {
+               $family = $entry['family'];
+               $appointment = $entry['appointment'];
+               $location = $entry['location'];
+               if($location == "") {
+                 $family_name_array = explode(",", $familyid2name[$family]);
+                 $family_last_name = $family_name_array[0];
+                 $family_address = $familyid2address[$family];
+                 $location = "$family_last_name"." home ($family_address)";
+               }
+               if($family == 0) { $location = ""; }
+               
+               //Only perform a database update if we have made a change to this appointment
+               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family' and location='$location'";
+               $this->db->query($sql,__LINE__,__FILE__);
+               if(!$this->db->next_record()) {
+                 // Perform database save actions here
+                 $this->db->query("UPDATE eq_appointment set " .
+                                  " family='" . $family . "'" .
+                                  ",location='" . $location . "'" .
+                                  " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+                 
+                 // Email the appointment
+                 $this->email_appt($appointment);
+               }
+             }
+         }
          
          // 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'];
+            $family = $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__);
+                             " WHERE family=" . $family,__LINE__,__FILE__);
             
           }
 
          $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched');
-         Header('Location: ' . $take_me_to_url);
+         //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;
+      $date_width=250; $time_width=100; $family_width=250; $location_width=100;
+      $appt_table_width=$date_width + $time_width + $family_width + $location_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_header_row.= "<th width=$location_width><font size=-2>Location</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";
+      // Find out what the EQ Presidency ID is
+      $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1";
       $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);
-      
+      if($this->db->next_record()) {
+       $presidency_name = $this->db->f('name');
+       $presidency_id = $this->db->f('presidency');
+      } else {
+       print "<hr><font color=red><h3>-E- Unable to locate EQ Presidency in eq_presidency table</h3></font></hr>";
+       return;
+      }
+            
       // query the database for all the appointments
-      $sql = "SELECT * FROM eq_appointment where district=$district and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id 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');
-
+         $location = $this->db->f('location');
+         $family_name_array = explode(",", $familyid2name[$family]);
+         $family_last_name = $family_name_array[0];
+         $family_address = $familyid2address[$family];
+         if(($location == "") && ($family > 0)) { $location = "$family_last_name"." home ($family_address)"; }
+                       
          $date = $this->db->f('date');
          $date_array = explode("-",$date);
          $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
@@ -1285,6 +2252,9 @@ class eq
          }
          $appt_table_data.='</select></td>';
 
+         $appt_table_data.= '<td align=center><input type=text size="35" maxlength="120" ';
+         $appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
+
          $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
          
          $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1382,7 +2352,7 @@ class eq
            $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) . "..."; }
+           if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(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>";
@@ -1393,7 +2363,7 @@ class eq
          }
       }
 
-      $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
+      $name_width=190; $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>";      
@@ -1448,7 +2418,6 @@ class eq
             
       $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');
@@ -1460,16 +2429,18 @@ class eq
       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";
+      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
       $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++;
-       }
+      if($this->db->next_record()) {
+       $president_name = $this->db->f('name');
+       $interviewer = $this->db->f('elder');
+       $eqpresppi = 1;
+      } else {
+       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       return;
+      }
+      $this->t->set_var('district_number','*');
+      $this->t->set_var('district_name',$president_name);
 
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -1483,215 +2454,79 @@ class eq
          $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
          $i++;
        }
+      $total_elders=$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');
-       }
+      //var_dump($elder_name); print "<br><br>"; var_dump($elder_id);
       
-      $total_companionships = 0;
-      $total_elders = 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++;
-         }
+      $header_row="<th width=$comp_width><font size=-2>Elder Name</th>";
        
-       $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
-         $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
-             $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.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);
-             $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--) {
-               $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]++; $ppi_recorded[$companionship][$m]=1;
-                 $link_data['menuaction'] = 'eq.eq.ppi_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['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>"; 
-             $k++;
-           }
-         $table_data .= "<tr><td colspan=20><hr></td></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);
+      $elder_width=400; $ppi_width=75; $table_width=$elder_width + $num_months*$ppi_width;
+      $table_data="";
+      for($m=$num_months; $m >= 0; $m--) {
+       $year = date('Y') - $m;
+       $header_row .= "<th width=150><font size=-2>$year</th>"; 
+       $ppis[$m] = 0;
       }
       
-      // 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>"; }
+      for ($j=0; $j < count($elder_id); $j++) {
+       $id = $elder_id[$j];
+       $name = $elder_name[$j];
+       $phone = $elder_phone[$id];
+       
+       $link_data['menuaction'] = 'eq.eq.ppi_update';
+       $link_data['interviewer'] = $interviewer;
+       $link_data['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);
+       $this->nextmatchs->template_alternate_row_color(&$this->t);
+       $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
+       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=" . $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]++; $ppi_recorded[$companionship][$m]=1;
+           $link_data['menuaction'] = 'eq.eq.ppi_update';
+           $link_data['companionship'] = $companionship;
+           $link_data['interviewer'] = $this->db2->f('interviewer');
+           $link_data['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="images/checkmark.gif">&nbsp;'.$month.'-'.$day.'</a></td>';
          }
-         $table_data .= "</tr>"; 
+         else { $table_data .= "<td>&nbsp;</td>"; }
        }
+       $table_data .= "</tr>\n"; 
       }
-
-      $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>";
+      $table_data .= "<tr><td colspan=20><hr></td></tr>";
       
+      $stat_data = "<tr><td><b><font size=-2>$total_elders Elders<br>PPI Totals:</font></b></td>";
       for($m=$num_months; $m >=0; $m--) {
-       $percent = ceil(($ppis[$m] / $num_elders)*100);
+       $percent = ceil(($ppis[$m] / $total_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(); 
     }
@@ -1718,28 +2553,18 @@ class eq
       $notes = get_var('notes',array('GET','POST'));
       $eqpresppi = get_var('eqpresppi',array('GET','POST'));
       
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
-      $this->db->query($sql,__LINE__,__FILE__);
-      while ($this->db->next_record())
-       {
-         $supervisor = $this->db->f('supervisor');
-         $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
-         $this->db2->query($sql,__LINE__,__FILE__);
-         $this->db2->next_record();
-         $interviewer_name = $this->db2->f('name');
-         
-         if($supervisor == $interviewer) { 
-           $this->t->set_var('interviewer',$supervisor . ' selected');
-         } else {
-           $this->t->set_var('interviewer',$interviewer);
-         }
-         $this->t->set_var('interviewer_name',$interviewer_name);
-         $this->t->fp('int_list','interviewer_list',True);
-       }
-      
+      $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+      $this->db2->query($sql,__LINE__,__FILE__);
+      $this->db2->next_record();
+      $interviewer_name = $this->db2->f('name');
+      $this->t->set_var('interviewer',$interviewer . ' selected');
+      $this->t->set_var('interviewer_name',$interviewer_name);
+      $this->t->set_var('eqpresppi_checked','');
+      $this->t->fp('int_list','interviewer_list',True);
+    
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_ppi set " .
                           "   ppi='" . $ppi . "'" .
                    ", interviewer='" . $interviewer . "'" .
@@ -1755,7 +2580,7 @@ class eq
 
       if($action == 'insert')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
@@ -1770,10 +2595,10 @@ 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);
+         $this->t->set_var('eqpresppi_checked','checked');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New PPI');
          $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
@@ -1789,10 +2614,10 @@ 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'));
+         if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
        }
       
       if($action == 'edit')
@@ -1837,16 +2662,28 @@ class eq
       $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'); }
+      $num_quarters = get_var('num_quarters',array('GET','POST'));
+      if($num_quarters == '') { $num_quarters = $this->default_int_num_quarters; }
+      $this->t->set_var('num_quarters',$num_quarters);
+      if($num_quarters == 1) { $this->t->set_var('lang_num_quarters','Quarter of History'); }
+      else {  $this->t->set_var('lang_num_quarters','Quarters 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('int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
+      $this->t->set_var('int_link_title','Hometeaching Interviews'); 
+      
+      $this->t->set_var('schedule_int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched'));
+      $this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews');
+      
       $this->t->set_var('title','Hometeaching Interviews'); 
 
+      $num_months = $num_quarters * 3 - 1;
+      $current_month = $this->current_month;
+      if($current_month >= 1 && $current_month <= 3) { $current_month=3; }
+      else if($current_month >= 4 && $current_month <= 6) { $current_month=6; }
+      else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
+      else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
+
       $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -1934,7 +2771,7 @@ class eq
              $link_data['elder'] = $elder_id;
              $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;
-             $link_data['interview'] = '';
+             $link_data['ppi'] = '';
              $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>";
@@ -1942,14 +2779,14 @@ class eq
              // 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;
+               $month = $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' ".
+               $sql = "SELECT * FROM eq_ppi 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>";
@@ -1965,14 +2802,14 @@ class eq
                  $link_data['elder'] = $elder_id;
                  $link_data['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;
-                 $link_data['interview'] = $this->db2->f('interview');
+                 $link_data['ppi'] = $this->db2->f('ppi');
                  $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>';
+                 $table_data .= '<td align=center><a href='.$link.'><img src="images/checkmark.gif">&nbsp;'.$month.'-'.$day.'</a></td>';
                }
                else { $table_data .= "<td>&nbsp;</td>"; }
              }
@@ -1982,17 +2819,22 @@ class eq
          $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>";
+       $stat_data = "<tr><td><b><font size=-2>$num_companionships Companionships<br>Interview Totals:</font></b></td>";
 
+       // Print the hometeaching interview stats
        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>";
+         $month = $current_month - $m;
+         if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+         $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+         //print "$month % $this->monthly_hometeaching_interview_stats = $month_begins <br>";
+         if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+         if(($month_begins) == 1) { $total = $ints[$m]; }
+         else { $total += $ints[$m]; }
+         $percent = ceil(($total / $num_companionships)*100);
+         $stat_data .= "<td align=center><font size=-2><b>$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);
@@ -2000,18 +2842,21 @@ class eq
        $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>";
+      // Display the totals
+      $total = 0;
+      $totals = "<tr><td><b><font size=-2>$total_companionships Total Comps<br>Interview 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>";
+       $month = $current_month - $m;
+       if($month < 0) { $month = 12 + $month; } // Handle going backwards over a year boundary
+       $month_begins = $month % $this->monthly_hometeaching_interview_stats;
+       if($this->monthly_hometeaching_interview_stats == 1) { $month_begins = 1; }
+       if(($month_begins) == 1) { $total = $total_ints[$m]; }
+       else { $total += $total_ints[$m]; }
+       $percent = ceil(($total / $total_companionships)*100);
+       $totals .= "<td align=center><font size=-2><b>$total<br>$percent%</font></b></td>";
       }
       $totals .= "</tr>";
-      
+          
       $this->t->set_var('totals',$totals);
       $this->t->pfp('out','int_view_t');
       $this->save_sessiondata(); 
@@ -2027,16 +2872,18 @@ class eq
       $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','');
+      $this->t->set_var('eqpresppi_checked','');
       
       $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'));
+      $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__);
@@ -2059,25 +2906,26 @@ class eq
       
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
-         $this->db->query("UPDATE eq_interview set " .
-                    "   interview='" . $interview . "'" .
+         $notes = get_var('notes',array('POST'));
+         $this->db->query("UPDATE eq_ppi set " .
+                          "   ppi='" . $ppi . "'" .
                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
-                          " WHERE interview=" . $interview,__LINE__,__FILE__);
+                     ", eqpresppi='" . $eqpresppi . "'" .
+                          " WHERE ppi=" . $ppi,__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) "
+         $notes = get_var('notes',array('POST'));
+         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
-                          . $date . "','" . $notes ."')",__LINE__,__FILE__);
+                          . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__);
          $this->int_view();
          return false;
        }
@@ -2085,7 +2933,7 @@ class eq
       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('ppi', '');
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
@@ -2094,22 +2942,23 @@ class eq
          $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'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+                                                               . $ppi . '&action=' . 'insert'));
        }
 
       if($action == 'edit' || $action == 'view')
        {
-         $sql = "SELECT * FROM eq_interview WHERE interview=".$interview;
+         $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
-         $this->t->set_var('interview',$interview);
+         $this->t->set_var('ppi',$ppi);
          $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($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
        }
       
       if($action == 'edit')
@@ -2117,8 +2966,8 @@ class eq
          $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'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+                                                               . $ppi . '&action=' . 'save'));
        }
 
       if($action == 'view')
@@ -2129,8 +2978,8 @@ class eq
          $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('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
+                                                               . $ppi . '&action=' . 'edit'));
        }
       
       $this->t->set_var('lang_reset','Clear Form');
@@ -2162,9 +3011,19 @@ class eq
       
       $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('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_view'));
+      $num_years = get_var('num_years',array('GET','POST'));
+      if($num_years == '') { $num_years = $this->default_vis_num_years; }
+      $this->t->set_var('num_years',$num_years);
+      if($num_years == 1) { $this->t->set_var('lang_num_years','Year of History'); }
+      else {  $this->t->set_var('lang_num_years','Years of History'); }
+      $this->t->set_var('lang_filter','Filter');
       
+      $year = date('Y') - $num_years + 1;
+      $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
       
-      $sql = "SELECT * FROM eq_visit WHERE companionship=0 ORDER BY date DESC";
+      $sql = "SELECT * FROM eq_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
@@ -2262,7 +3121,7 @@ class eq
       
       if($action == 'save')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("UPDATE eq_visit set " .
                           "  date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
@@ -2273,7 +3132,7 @@ class eq
 
       if($action == 'insert')
        {
-         $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+         $notes = get_var('notes',array('POST'));
          $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
                           . "VALUES ('" . $family . "','" . $companionship . "','"
                           . $date . "','" . $notes . "')",__LINE__,__FILE__);
@@ -2345,6 +3204,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');
 
@@ -2353,13 +3216,20 @@ class eq
       $this->t->set_block('att_view_t','elder_list','list3');
       
       $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view'));
-      $num_months = get_var('num_months',array('GET','POST'));
-      if($num_months == '') { $num_months = $this->default_att_num_months; }
-      $this->t->set_var('num_months',$num_months);
+      $num_quarters = get_var('num_quarters',array('GET','POST'));
+      if($num_quarters == '') { $num_quarters = $this->default_att_num_quarters; }
+      $this->t->set_var('num_quarters',$num_quarters);
       $this->t->set_var('lang_filter','Filter');
-      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'); }
-         
+      if($num_quarters == 1) { $this->t->set_var('lang_num_quarters','Quarter of History'); }
+      else { $this->t->set_var('lang_num_quarters','Quarters of History'); }
+
+      $num_months = $num_quarters * 3;
+      $current_month = $this->current_month;
+      if($current_month >= 1 && $current_month <= 3) { $current_month=3; }
+      else if($current_month >= 4 && $current_month <= 6) { $current_month=6; }
+      else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
+      else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
+
       $sql = "SELECT * FROM eq_elder where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -2370,27 +3240,27 @@ class eq
          $i++;
        }
       array_multisort($elder_name, $elder_id);
-
       
       // Create a list of sunday dates for a window of 3 months back and current month
       $i=0; 
       $last_time = 0; 
       $found_sunday = 0;
-      $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, date("m")-$num_months, 1, date("y")));
+      $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, ($current_month-$num_months)+1, 1, date("y")));
       $last_date = explode("-",$sunday_list[0]['date']);
       $last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]);
-      $time_limit = mktime(0, 0, 0, date("m"), date("t"), date("y"));
+      $time_limit = mktime(0, 0, 0, $current_month, 31, date("y"));
       while($last_time < $time_limit)
       {
         $day = date("w",$last_time);
         if(date("w",$last_time) == 0) {
-         $sunday_list[$i]['date'] = date("Y-m-d", $last_time); 
+         $sunday_list[$i]['date'] = date("Y-m-d", $last_time);
          $last_date = explode("-",$sunday_list[$i]['date']);
          $last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]);
          $sunday_list[$i]['day'] = $last_date[2];
          $sunday_list[$i]['month'] = date("M",$last_time);
          $sunday_list[$i]['year'] = $last_date[0];
-         $found_sunday = 1; 
+         $found_sunday = 1;
+         $last_date = $sunday_list[$i]['date'];
        }
        $last_time += 90000;
        if($found_sunday) { $i++; $found_sunday=0; }
@@ -2438,6 +3308,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++) {
@@ -2456,9 +3327,9 @@ class eq
            $cur_month = $sunday_list[$j]['month'];
            if($attended[$i][$cur_month] != 1) { 
              $attended[$i][$cur_month]=1;
-             $attendance[$cur_month]++;
-           }
-           $att_table .= '<td align=center><img src="checkmark.gif"></td>';
+             $attendance[$monthnum[$cur_month]]++;
+           } 
+           $att_table .= '<td align=center><img src="images/checkmark.gif"></td>';
          } else {
            $att_table .= '<td>&nbsp;</td>';
          }
@@ -2477,6 +3348,7 @@ class eq
       $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++;
@@ -2557,6 +3429,7 @@ class eq
        {
          $elder_name[$i] = $this->db->f('name');
          $elder_id[$i] = $this->db->f('elder');
+         $elder_attending[$elder_id[$i]] = $this->db->f('attending');
          $i++;
        }
       array_multisort($elder_name, $elder_id);
@@ -2634,6 +3507,8 @@ class eq
          $value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];
          if($this->db->next_record()) {
            $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'" checked></td>';
+         } else if($elder_attending[$elder_id[$i]] == 1) {
+           $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'" checked></td>';
          } else {
            $att_table .= '<td align=center><input type="checkbox" name="elders_attended[]" value="'.$value.'"></td>';
          }
@@ -2755,7 +3630,7 @@ class eq
   function schedule()
     {
       $this->t->set_file(array('sched_t' => 'schedule.tpl'));
-      $this->t->set_block('sched_t','district_list','list');
+      $this->t->set_block('sched_t','presidency_list','list');
 
       $action = get_var('action',array('GET','POST'));
       
@@ -2765,76 +3640,170 @@ class eq
       $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');
+
+      $this->t->set_var('schedule_int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched'));
+      $this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews');
+      
+      $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');
       
-      $date_width=150; $time_width=200; $elder_width=200; $family_width=200;
-      $table_width=$date_width + $time_width + $elder_width + $family_width;
+      $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100;
+      $table_width=$date_width + $time_width + $elder_width + $family_width + $location_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>";
+      $header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $table_data = "";
 
+      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $presidency_data[$i]['id'] = $this->db->f('presidency');
+         $presidency_data[$i]['name'] = $this->db->f('name');
+         $presidency_data[$i]['elder'] = $this->db->f('elder');
+         $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
+         $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder'];
+         $i++;
+       }
+      
+      $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');
+         $familyid2name[$family_id[$i]] = $family_name[$i];
+         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         if($this->db2->next_record()) {
+           $familyid2address[$family_id[$i]] = $this->db2->f('address');
+         }
+         $i++;
+       }
+      array_multisort($family_name, $family_id);
+
       if($action == 'save')
        {
          $new_data = get_var('sched',array('POST'));
-         foreach ($new_data as $district_array)
+         foreach ($new_data as $presidency_array)
           {
-            foreach ($district_array as $entry)
+            foreach ($presidency_array as $entry)
               {
-                $district = $entry['district'];
+                $presidency = $entry['presidency'];
                 $appointment = $entry['appointment'];
+                $location = $entry['location'];
                 $date = $entry['date'];
                 $hour = $entry['hour'];
                 $minute = $entry['minute'];
                 $pm = $entry['pm'];
                 $elder = $entry['elder'];
                 $family = $entry['family'];
+                $location = $entry['location'];
                 if($pm) { $hour = $hour + 12; }
                 $time = $hour.':'.$minute.':'.'00';
-
+                $uid = 0;
+
+                // Update our location
+                if($location == "") {
+                  if($family > 0) {
+                    $family_name_array = explode(",", $familyid2name[$family]);
+                    $family_last_name = $family_name_array[0];
+                    $family_address = $familyid2address[$family];
+                    $location = "$family_last_name"." home ($family_address)";
+                  }
+                  else if($elder > 0) {
+                    $supervisor_name_array = explode(",",$presidency2name[$presidency]);
+                    $supervisor_last_name = $supervisor_name_array[0];
+                    $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+                    $this->db2->query($sql,__LINE__,__FILE__);
+                    if($this->db2->next_record()) {
+                      $indiv_id = $this->db2->f('indiv_id');
+                    }
+                    $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+                    $this->db2->query($sql,__LINE__,__FILE__);
+                    if($this->db2->next_record()) {
+                      $supervisor_address = $this->db2->f('address');
+                    }
+                    $location = "$supervisor_last_name"." home ($supervisor_address)";
+                  }
+                }
+                
+                // Zero out the family or elder if date = NULL
+                if($date == "") {
+                  $elder = 0;
+                  $family = 0;
+                  $location = "";
+                }
+
+                if(($elder == 0) && ($family == 0)) { $location = ""; }
+                
                 // Update an existing appointment
-                if($appointment != 0)
+                if($appointment < $this->max_appointments)
                   {
-                    $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>";                  
+                    //Only perform a database update if we have made a change to this appointment
+                    $sql = "SELECT * FROM eq_appointment where " .
+                       "appointment='$appointment'" .
+                       " and presidency='$presidency'" .
+                       " and elder='$elder'" .
+                       " and family='$family'" .
+                       " and date='$date'" .
+                       " and time='$time'" .
+                       " and location='$location'";
+                    $this->db->query($sql,__LINE__,__FILE__);
+                    if(!$this->db->next_record()) {
+                      $old_date = $this->db->f('date');
+                      $old_time = $this->db->f('time');
+                      $this->db2->query("UPDATE eq_appointment set" .
+                                       " family=" . $family . 
+                                       " ,elder=" . $elder . 
+                                       " ,date='" . $date . "'" .
+                                       " ,time='" . $time . "'" .
+                                       " ,location='" . $location . "'" .
+                                       " ,presidency='" . $presidency . "'" .
+                                       " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+                      
+                      // Email the appointment
+                      $this->email_appt($appointment);
+                    }
                   }
                 
                 // Add a new appointment
-                else if(($appointment == 0) && ($date != "") && ($time != ""))
+                else if(($appointment >= $this->max_appointments) && ($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>";                    
+                    //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";
+                    $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,location,uid) "
+                          . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','"
+                          . $date . "','" . $time  . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
+
+                    // Now reselect this entry from the database to see if we need
+                    // to send an appointment out for it.
+                    $sql = "SELECT * FROM eq_appointment where " .
+                       "elder='$elder'" .
+                       " and family='$family'" .
+                       " and presidency='$presidency'" .
+                       " and date='$date'" .
+                       " and time='$time'" .
+                       " and uid='$uid'" .
+                       " and location='$location'";
+                    $this->db3->query($sql,__LINE__,__FILE__);
+                    if($this->db3->next_record()) {
+                      // Email the appointment if warranted
+                      if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) { 
+                        $this->email_appt($this->db3->f('appointment'));
+                      }
+                    }
                   }
               }
           }
          
          $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++;
+         //Header('Location: ' . $take_me_to_url);
        }
       
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
@@ -2848,27 +3817,16 @@ class eq
          $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'];
+      for ($i=0; $i < count($presidency_data); $i++) {
+       $presidency = $presidency_data[$i]['id'];
+       $interviewer = $presidency_data[$i]['elder'];
+       $name = $presidency_data[$i]['name'];
+       $this->t->set_var('presidency_name',$name);
        $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";
+       $sql = "SELECT * FROM eq_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
        $this->db->query($sql,__LINE__,__FILE__);
 
        // Prefill any existing appointment slots
@@ -2877,6 +3835,31 @@ class eq
            $appointment = $this->db->f('appointment');
            $elder = $this->db->f('elder');
            $family = $this->db->f('family');
+           $location = $this->db->f('location');
+
+           if($location == "") {
+             if($family > 0) {
+               $family_name_array = explode(",", $familyid2name[$family]);
+               $family_last_name = $family_name_array[0];
+               $family_address = $familyid2address[$family];
+               $location = "$family_last_name"." home ($family_address)";
+             }
+             else if($elder > 0) {
+               $supervisor_name_array = explode(",",$presidency2name[$presidency]);
+               $supervisor_last_name = $supervisor_name_array[0];
+               $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+               $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->next_record()) {
+                 $indiv_id = $this->db2->f('indiv_id');
+               }
+               $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+               $this->db2->query($sql,__LINE__,__FILE__);
+               if($this->db2->next_record()) {
+                 $supervisor_address = $this->db2->f('address');
+               }
+               $location = "$supervisor_last_name"." home ($supervisor_address)";
+             }
+           }
            
            $date = $this->db->f('date');
            $date_array = explode("-",$date);
@@ -2895,33 +3878,16 @@ class eq
 
            // Date selection
            $table_data.= '<td align=left>';
-           $table_data.= $this->jscal->input('sched['.$district.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options);
+           $table_data.= $this->jscal->input('sched['.$presidency.']['.$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 .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
            $table_data.= "</td>";
            
            // Elder drop down list (for PPIs)
-           $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][elder]>';
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';  
            for ($j=0; $j < count($elder_id); $j++) {
              $id = $elder_id[$j];
@@ -2932,7 +3898,7 @@ class eq
            $table_data.='</select></td>';
 
            // Family drop down list (for Visits)
-           $table_data.= '<td align=center><select name=sched['.$district.']['.$appointment.'][family]>';
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';              
            for ($j=0; $j < count($elder_id); $j++) {
              $id = $family_id[$j];
@@ -2941,9 +3907,13 @@ class eq
              $table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.' Family</option>';
            }
            $table_data.='</select></td>';
+
+           // Location text box
+           $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
+           $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'" STYLE="font-size : 8pt">';
            
-           $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][appointment]" value="'.$appointment.'">';
-           $table_data.= '<input type=hidden name="sched['.$district.']['.$appointment.'][district]" value="'.$district.'">';
+           $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+           $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
        
            $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
            $this->t->set_var('tr_color',$tr_color);
@@ -2951,93 +3921,138 @@ class eq
          }
 
        // 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>';
+       for ($b=0; $b < 4; $b++) {
+         $appointment = $this->max_appointments + $b;
+         $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+
+         // Date selection
+         $table_data.= '<td align=left>';
+         $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+         $table_data.= '</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.'">';
+         // Time selection
+         $table_data.= "<td align=center>";
+         $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
+         $table_data.= "</td>";
+         
+         // Elder drop down list
+         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder] STYLE="font-size : 8pt">';
+         $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['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
+         $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>';
+
+         // Location text box
+         $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
+         $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="" STYLE="font-size : 8pt">';
+         
+         $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+         $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
+
+         $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+         $this->t->set_var('tr_color',$tr_color);
+       }
        
        $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->fp('list','presidency_list',True);
        
       }
       
       $this->t->pfp('out','sched_t');
       $this->save_sessiondata();   
     }
-  
+
+  function email()
+    {
+      $this->t->set_file(array('email_t' => 'email.tpl'));
+      $this->t->set_block('email_t','elder_list','list');
+
+      $action = get_var('action',array('GET','POST'));
+      
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email'));
+      $this->t->set_var('title','EQ Email Tool');
+
+      $this->t->set_var('lang_email','Send Email');
+      $this->t->set_var('lang_reset','Cancel');
+      
+      $this->t->set_var('email_member_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=member'));
+      $this->t->set_var('email_member_link_title','Email Quorum Member');
+
+      $this->t->set_var('email_quorum_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=quorum'));
+      $this->t->set_var('email_quorum_link_title','Email Quorum');
+      
+      $this->t->set_var('email_reminder_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=reminder'));
+      $this->t->set_var('email_reminder_link_title','Email Reminders');
+
+      $this->t->set_var('email_edit_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=edit'));
+      $this->t->set_var('email_edit_link_title','Edit Email Addresses');
+
+      $table_width=600;
+      $this->t->set_var('table_width',$table_width);
+      
+      $this->t->pfp('out','email_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_block('admin_t','presidency','presidencyhandle');
       
       $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload'));
+      $this->t->set_var('presidency_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=presidency'));
       
       $action = get_var('action',array('GET','POST'));
 
       $this->t->pfp('out','admin_t');
-      
+
+      $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');
+         $elder2name[$elder_id[$i]] = $elder_name[$i];
+         $i++;
+       }
+      array_multisort($elder_name, $elder_id);
+
       if($action == 'upload')
        {        
-         $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
+         $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))) {
+         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")) {
+
+           if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
+             $uploadstatus = "<b><font color=red> -E- Unable to move the uploaded file to ";
+             $uploadstatus.= "the target path (check the path and permissions) of: $target_path</font></b>";
+             $this->t->set_var('uploadstatus',$uploadstatus);
+             $this->t->pfp('uploadhandle','upload',True);
+             return 0;
+           }
+           
            $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
            $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "<br>";
            $uploadstatus.= "Type     : " . $_FILES['uploadedfile']['type'] . "<br>";
@@ -3049,9 +4064,9 @@ class eq
            
            # make a directory for this data to be stored in
            $date="data_" . date("Y_m_d");
-           $data_dir = $this->upload_target_path . $date;
+           $data_dir = $this->upload_target_path . '/' . $date;
            print "-> Making the data directory: $date<br>\n";
-           exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code);
+           exec('mkdir -p ' . $data_dir . ' 2>&1', $result, $return_code);
            if($return_code != 0) {
              print implode('\n',$result) . "<br>";
              print "<b><font color=red>";
@@ -3073,12 +4088,11 @@ class eq
            
            # 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);
+           exec($this->unzip_path .' -u '. $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 "-E- Unable to unzip the uploaded file into the data dir: $data_dir. Aborting import.";
              print "</font></b>";
              return 0;
            }
@@ -3086,7 +4100,7 @@ class eq
 
            # 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';
+           $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>";
@@ -3102,8 +4116,8 @@ class eq
            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;
+           $import_cmd = $this->script_path . '/import_ward_data ' . $data_latest . ' 2>&1 | tee ' . $import_log;
+           $parse_cmd = $this->script_path . '/parse_ward_data -v ' . $data_latest . ' > ' . $data_log . '2>&1';
            #print "import_cmd: $import_cmd<br>";
            #print "parse_cmd: $parse_cmd<br>";
            ob_start('ob_logstdout', 2);
@@ -3132,15 +4146,481 @@ class eq
            $this->t->pfp('uploadhandle','upload',True);
          }
        }
+      else if($action == "presidency")
+       {
+         $new_data = get_var('eqpres',array('POST'));
+         foreach ($new_data as $entry)
+          {
+            $id = $entry['id'];
+            $email = $entry['email'];
+            $elder = $entry['elder'];
+            $name = $entry['name'];
+            $district = $entry['district'];
+            $president = $entry['president'];
+            $counselor = $entry['counselor'];
+            $secretary = $entry['secretary'];
+            $eqpresidency = $entry['eqpresidency'];
+            // Set the elder id to 0 for EQ Presidency tagged entry
+            if($eqpresidency == 1) { $elder="0"; }
+            // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry
+            else { $name = $elder2name[$elder]; }
+            //print "id=$id elder=$elder name=$name email=$email district=$district president=$president ";
+            //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency<br>";
+
+            if(($elder > 0) || ($name != "")) {
+              if($id < $this->max_presidency_members) {
+                //print "Updating Existing Entry<br>";
+                $this->db2->query("UPDATE eq_presidency set" .
+                                  " elder=" . $elder . 
+                                  " ,district=" . $district . 
+                                  " ,name='" . $name . "'" .
+                                  " ,email='" . $email . "'" .
+                                  " ,president='" . $president . "'" .
+                                  " ,counselor='" . $counselor . "'" .
+                                  " ,secretary='" . $secretary . "'" .
+                                  " ,eqpres='" . $eqpresidency . "'" .
+                                  " WHERE presidency=" . $id,__LINE__,__FILE__);
+                
+              } else {
+                //print "Adding New Entry<br>";
+                $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name,"
+                                  . "email,president,counselor,secretary,eqpres,valid) "
+                                  . "VALUES (NULL,'" . $elder . "','" . $district . "','"
+                                  . $name . "','" . $email . "','" . $president  . "','"
+                                  . $counselor . "','" . $secretary . "','" . $eqpres  . "','1'"
+                                  .")",__LINE__,__FILE__);
+              }
+            } else {
+              //print "Ignoring Blank Entry<br>";
+            }
+          }
+
+         // Now update the eq_district table appropriately
+         
+         // Delete all the previous district entries from the table
+         $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__);
+         $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__);
+
+         // Always add a "District 0" assigned to the High Priests Group
+         $district = 0;
+         $name = "High Priests";
+         $elder = 0;
+         $valid = 0;
+         $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+                           . "VALUES ('" . $district . "','" . $name . "','"
+                           . $elder . "','" . $valid . "'"
+                           .")",__LINE__,__FILE__);
+         
+         
+         // Requery the eq_presidency table
+         $sql = "SELECT * FROM eq_presidency where valid=1";
+         $this->db->query($sql,__LINE__,__FILE__);
+         while ($this->db->next_record())
+           {
+             // Extract the data for each presidency record
+             $id = $this->db->f('presidency');
+             $elder = $this->db->f('elder');
+             $name = $this->db->f('name');
+             $district = $this->db->f('district');
+             $name = $this->db->f('name');
+             $valid = 1;
+
+             // If we have a valid district, add it to the district table
+             if($district > 0) {
+               $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+                                 . "VALUES ('" . $district . "','" . $name . "','"
+                                 . $elder . "','" . $valid . "'"
+                                 .")",__LINE__,__FILE__);
+             }
+             
+           }
+         
+         $this->t->set_var('adminhandle','');
+         $this->t->pfp('adminhandle','admin'); 
+       }
       else
        {
          $this->t->set_var('adminhandle','');
          $this->t->pfp('adminhandle','admin'); 
        }
+
+      // Now save off the data needed for an EQ Presidency Table Update
+      
+      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $table_data = "";
+      $header_row = "<th>Elder</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>EQ Presidency</th>";
+      while ($this->db->next_record())
+       {
+         // Extract the data for each presidency record
+         $id = $this->db->f('presidency');
+         $elder = $this->db->f('elder');
+         $district = $this->db->f('district');
+         $name = $this->db->f('name');
+         $email = $this->db->f('email');
+         $president = $this->db->f('president');
+         $counselor = $this->db->f('counselor');
+         $secretary = $this->db->f('secretary');
+         $eqpresidency = $this->db->f('eqpres');
+
+         // Create the forms needed in the table
+         $table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+         
+         // Presidency ID
+         $table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
+         
+         // Elder
+         if($eqpresidency == 0) { 
+           $table_data.= '<td align=center><select name="eqpres['.$id.'][elder]">';
+           $table_data.= '<option value=0></option>';  
+           for ($j=0; $j < count($elder_id); $j++) {
+             $tmp_id = $elder_id[$j];
+             $name = $elder_name[$j];
+             if($elder_id[$j] == $elder) { $eldername = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
+             $table_data.= '<option value='.$tmp_id.' '.$selected.'>'.$name.'</option>';
+           }
+           $table_data.='</select></td>';
+           $table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="'.$eldername.'">';
+         } else {
+           $table_data.= '<td align=left><input type=text size="20" name="eqpresname" value="EQ Presidency"></td>';
+           $table_data.= '<input type=hidden name="eqpres['.$id.'][name]" value="EQ Presidency">';
+         }
+           
+         // Email Address
+         $table_data .= '<td><input type="text" size="50" name="eqpres['.$id.'][email]" value="'.$email.'"></td>';
+         
+         // District
+         $table_data.= '<td align=center><select name="eqpres['.$id.'][district]">';
+         $table_data.= '<option value=0></option>';
+         for ($j=0; $j <= $this->max_num_districts; $j++) {
+           if($district == $j) { $selected = 'selected="selected"'; } else { $selected = ''; }
+           $table_data.= '<option value='.$j.' '.$selected.'>'.$j.'</option>';
+         }
+         $table_data.='</select></td>';
+         
+         // President
+         $table_data.= '<td align=center><select name="eqpres['.$id.'][president]">';
+         if($president == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
+         else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
+         $table_data.='</select></td>';
+         
+         // Counselor
+         $table_data.= '<td align=center><select name="eqpres['.$id.'][counselor]">';
+         if($counselor == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
+         else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
+         $table_data.='</select></td>';
+
+         // Secretary
+         $table_data.= '<td align=center><select name="eqpres['.$id.'][secretary]">';
+         if($secretary == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
+         else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
+         $table_data.='</select></td>';
+
+         // EQ Presidency
+         $table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
+         if($eqpresidency == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
+         else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
+         $table_data.='</select></td>';
+
+         // End of ROW
+         $table_data .= "</tr>\n";
+         $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+         $this->t->set_var('tr_color',$tr_color);
+       }
+
+      // Now create 1 blank row to always have a line available to add a new elder with
+      $id = $this->max_presidency_members;
+      $table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+      // Presidency ID
+      $table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
+      // Elder
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][elder]">';
+      $table_data.= '<option value=0></option>';  
+      for ($j=0; $j < count($elder_id); $j++) {
+       $tmp_id = $elder_id[$j];
+       $name = $elder_name[$j];
+       $table_data.= '<option value='.$tmp_id.'>'.$name.'</option>';
+      }
+      $table_data.='</select></td>';
+      $table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="">';
+      // Email Address
+      $table_data.='<td><input type="text" size="50" name="eqpres['.$id.'][email]" value=""></td>';
+      // District
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][district]">';
+      $table_data.= '<option value=0></option>';
+      for ($j=0; $j <= $this->max_num_districts; $j++) {
+       if($j == 0) { $selected = 'selected="selected"'; } else { $selected = ''; }
+       $table_data.= '<option value='.$j.' '.$selected.'>'.$j.'</option>';
+      }
+      $table_data.='</select></td>';
+      // President
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][president]">';
+      $table_data.= '<option value=0>0</option><option value=1>1</option>';
+      $table_data.='</select></td>';
+      // Counselor
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][counselor]">';
+      $table_data.= '<option value=0>0</option><option value=1>1</option>';
+      $table_data.='</select></td>';
+      // Secretary
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][secretary]">';
+      $table_data.= '<option value=0>0</option><option value=1>1</option>';
+      $table_data.='</select></td>';
+      // EQ Presidency
+      $table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
+      $table_data.= '<option value=0>0</option><option value=1>1</option>';
+      $table_data.='</select></td>';
+      // End of ROW
+      $table_data .= "</tr>\n";
+      $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+      $this->t->set_var('tr_color',$tr_color);
       
+      $this->t->set_var('header_row',$header_row);
+      $this->t->set_var('table_data',$table_data);
+      $this->t->pfp('presidencyhandle','presidency',True);
+
       $this->save_sessiondata();   
     }
-  
+
+  function email_appt($appointment)
+    {
+      //print "Emailing notification of appointment: $appointment <br>";
+
+      $sql = "SELECT * FROM eq_appointment where appointment='$appointment'";
+      $this->db->query($sql,__LINE__,__FILE__);
+       
+      while ($this->db->next_record())
+       {
+         $appointment = $this->db->f('appointment');
+         $presidency = $this->db->f('presidency');
+         $location = $this->db->f('location');
+         $interviewer = "";
+         $email = "";
+         $elder = $this->db->f('elder');
+         $elder_name = "";
+         $family = $this->db->f('family');
+         $family_name = "";
+         $appt_name = "";
+         $phone = "";
+         $uid = $this->db->f('uid');
+                   
+         // Extract the year, month, day, hours, minutes, seconds from the appointment time
+         $appt_date = $this->db->f('date');
+         $date_array = explode("-",$appt_date);
+         $year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
+         $appt_time = $this->db->f('time');
+         $time_array = explode(":",$appt_time);
+         $hour = $time_array[0]; $minute = $time_array[1]; $seconds = $time_array[2];
+
+         // Format the appointment time into an iCal UTC equivalent
+         $dtstamp = gmdate("Ymd"."\T"."His"."\Z");
+         $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
+         $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
+         
+         // Set the email address of the person making the appointment
+         $from = $GLOBALS['phpgw_info']['user']['fullname'] . "<" .
+                 $GLOBALS['phpgw_info']['user']['preferences']['email']['address'] . ">";
+         
+         $sql = "SELECT * FROM eq_presidency where presidency='$presidency'";
+         $this->db2->query($sql,__LINE__,__FILE__);
+         if($this->db2->next_record()) {
+           $email = $this->db2->f('email');
+           $interviewer = $this->db2->f('name');
+         }
+
+         if($elder > 0) { 
+           $sql = "SELECT * FROM eq_elder where elder='$elder'";
+           $this->db2->query($sql,__LINE__,__FILE__);
+           if($this->db2->next_record()) {
+             $elder_name = $this->db2->f('name');
+             $phone = $this->db2->f('phone');
+             $appt_name = $elder_name . " Interview";
+             $duration = $this->default_ppi_appt_duration * 60;
+           }
+         }
+
+         if($family > 0) { 
+           $sql = "SELECT * FROM eq_family where family='$family'";
+           $this->db2->query($sql,__LINE__,__FILE__);
+           if($this->db2->next_record()) {
+             $family_name = $this->db2->f('name');
+             $phone = $this->db2->f('phone');
+             $elder_id = $this->db2->f('elder_id');
+             $appt_name = $family_name . " Family Visit";
+             $sql = "SELECT * FROM eq_elder where elder='$elder_id'";
+             $this->db3->query($sql,__LINE__,__FILE__);
+             if($this->db3->next_record()) {
+               $phone = $this->db3->f('phone');
+             }
+             $duration = $this->default_visit_appt_duration * 60;
+           }
+         }
+
+         $dtend = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds+$duration,$month,$day,$year));
+         $dtendstr = date("g:i A", mktime($hour,$minute,$seconds+$duration,$month,$day,$year));
+         $date = $dtstartstr . "-" . $dtendstr;
+         $description = "$appt_name : $phone";
+         
+         if(($uid == 0) && ($appt_name != "")) { 
+           // Create a new calendar item for this appointment, since this must be the first time we
+           // are sending it out.
+           print "Sent new appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+           $uid = rand() . rand(); // Generate a random identifier for this appointment
+           $subject = "Created: $appt_name";
+           
+           $this->db->query("UPDATE eq_appointment set" .
+                            " uid=" . $uid . 
+                            " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+
+           $action = "PUBLISH";
+           $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart,
+                                 $dtend, $date, $location, $appt_name, $description, $uid);
+           
+         } else if(($uid != 0) && ($appt_name == "")) {
+           // Remove the calendar item for this appointment since it has already been sent
+           // and there is no name we have changed it to.
+           print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
+           $subject = "Canceled: $appt_date $appt_time";
+           
+           $this->db->query("UPDATE eq_appointment set" .
+                            " uid=0" . 
+                            " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+           
+           $action = "CANCEL";
+           $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart,
+                                 $dtend, $date, $location, $subject, $subject, $uid);
+           
+         } else if($uid != 0) {
+           // Update the existing appointment since we have changed it
+           print "Sent updated appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+
+           $subject = "Canceled: $appt_date $appt_time";
+           $action = "CANCEL";
+           $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart,
+                                 $dtend, $date, $location, $subject, $subject, $uid);
+           
+           $uid = rand() . rand(); // Generate a random identifier for this appointment
+           $this->db->query("UPDATE eq_appointment set" .
+                            " uid=" . $uid .
+                            " WHERE appointment=" . $appointment,__LINE__,__FILE__);
+           
+           $subject = "Updated: $appt_name";       
+           $action = "PUBLISH";
+           $this->send_ical_appt($action, $email, $from, $subject, $dtstamp, $dtstart,
+                                 $dtend, $date, $location, $appt_name, $description, $uid);
+         }
+         
+       }
+         
+      return true;
+    }
+
+  function send_ical_appt($action, $to, $from, $subject, $dtstamp, $dtstart, $dtend, $date, $location, $summary, $description, $uid)
+    {
+      // Initialize our local variables
+      $boundary = "=MIME_APPOINTMENT_BOUNDARY";
+      $message = "";
+      $headers = "";
+
+      // Form the headers for the email message
+      $headers.="X-Mailer: PHP/" . phpversion() . "\n";
+      $headers.="Mime-Version: 1.0\n";
+      $headers.="Content-Type: multipart/mixed; boundary=\"$boundary\"\n";
+      $headers.="Content-Disposition: inline\n";
+      $headers.="Reply-To: $from\n";
+      $headers.="From: $from\n";
+
+      // Print the plaintext version of the appointment
+      $message.="--$boundary\n";
+      $message.="Content-Type: text/plain; charset=us-ascii\n";
+      $message.="Content-Disposition: inline\n";
+      $message.="\n";
+      $message.="What: $description\n";
+      $message.="When: $date\n";
+      $message.="Where: $location\n";
+      $message.="\n";
+      
+      // Print the .ics attachment version of the appointment
+      $message.="--$boundary\n";
+      $message.="Content-Type: text/calendar; charset=us-ascii\n";
+      $message.="Content-Disposition: attachment; filename=\"appointment.ics\"\n";
+      $message.="\n";
+      $message.="BEGIN:VCALENDAR" . "\n";
+      $message.="VERSION:2.0" . "\n";
+      $message.="PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN" . "\n";
+      $message.="METHOD:$action" . "\n";
+      $message.="BEGIN:VEVENT" . "\n";
+      $message.="ORGANIZER:MAILTO:$from". "\n";
+      $message.="DTSTAMP:$dtstamp" . "\n";
+      $message.="DTSTART:$dtstart" . "\n";
+      $message.="DTEND:$dtend" . "\n";
+      $message.="SUMMARY:$summary" . "\n";
+      $message.="DESCRIPTION:$description" . "\n";
+      $message.="LOCATION:$location" . "\n";
+      $message.="UID:$uid" ."\n";
+      $message.="TRANSP:OPAQUE" . "\n";
+      $message.="SEQUENCE:0" . "\n";
+      $message.="CLASS:PUBLIC" . "\n";
+      $message.="END:VEVENT" . "\n";
+      $message.="END:VCALENDAR" . "\n";
+
+      // Complete the message
+      $message.="--$boundary\n";
+
+      // Send the message
+      mail($to, $subject, $message, $headers);
+      
+    }
+
+  function get_time_selection_form($hour, $minute, $pm, $presidency, $appointment)
+    {
+      $form_data = "";
+      $blank = 0;
+      
+      if($hour == 0) { $blank = 1; }
+
+      if($this->time_drop_down_lists == 1) {
+       // Create drop down lists to get the time
+       $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
+       if($blank == 1) { $form_data.= '<option value=""></option>'; }
+       foreach(range(1,12) as $num) {
+         if($hour == $num) { $selected = 'selected="selected"'; } else { $selected = ''; }
+         $form_data.= '<option value='.$num.' '.$selected.'>'.$num.'</option>';
+       }
+       $form_data.= '</select>';
+       $form_data.= '&nbsp;:&nbsp;';
+       $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
+       if($blank == 1) { $form_data.= '<option value=""></option>'; }
+       $num = 0;
+       while($num < 60) {
+         if($num < 10) { $num = "0" . "$num"; }
+         if($minute == $num) { $selected = 'selected="selected"'; } else { $selected = ''; }
+         if($blank == 1) { $selected = ""; }
+         $form_data.= '<option value='.$num.' '.$selected.'>'.$num.'</option>';
+         $num = $num + $this->time_drop_down_list_inc;
+       }
+       $form_data.= '</select>';
+      } else {
+       // Use free form text fields to get the time
+       if($blank == 1) { $hour = ""; $minute = ""; $ampm = ""; }
+       $form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][hour] value='.$hour.'>';
+       $form_data.= ':';
+       $form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][minute] value='.$minute.'>';
+       $form_data.= '&nbsp;';
+      }
+      // Always use a drop-down select form for am/pm
+      $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
+      if($blank == 0) { 
+       if($pm == 0) { $form_data.= '<option value=0 selected>am</option>'; $form_data.= '<option value=1>pm</option>'; }
+       if($pm == 1) { $form_data.= '<option value=0>am</option>'; $form_data.= '<option value=1 selected>pm</option>'; }
+      } else {
+       $form_data.= '<option value=""></option>';
+       $form_data.= '<option value=0>am</option>';
+       $form_data.= '<option value=1>pm</option>';
+      }
+      $form_data.= '</select>';
+      
+      return $form_data;
+    }
 }
 
 ?>