Fixed bug in querying eqpres PPI history in scheduling tool.
[eq/.git] / inc / class.eq.inc.php
index b3730dde2037d5e54e53b94646cc4d95fa1aab7a..7f0d5a6e887671fb744d508cd3468d9b6aaf1508 100644 (file)
@@ -1,7 +1,8 @@
 <?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   *
@@ -57,6 +58,7 @@ class eq
      'org_view'   => True,
      'schedule'   => True,
      'admin'      => True,
+     'email'      => True,
      'email_appt' => True,
      'willing_view'   => True,
      'willing_update' => True,
@@ -68,11 +70,10 @@ class eq
  
   function eq()
     {
-      $base_path = $_SERVER['DOCUMENT_ROOT'];
-      if(file_exists("$base_path/eq/setup/eq_config.local")) {
-       include("$base_path/eq/setup/eq_config.local");
+      if(file_exists("setup/eq_config.local")) {
+       include("setup/eq_config.local");
       } else {
-       include("$base_path/eq/setup/eq_config");
+       include("setup/eq_config");
       }
       
       $this->script_path = "$this->application_path"."/bin";
@@ -167,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');
     }
@@ -224,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']);      
@@ -244,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
@@ -279,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);
@@ -327,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]++;           
+                   $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') {
+                   $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>";
                }
              }
@@ -349,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>";
 
@@ -364,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>";
       
@@ -513,7 +526,6 @@ 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);
@@ -540,13 +552,14 @@ class eq
            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';
@@ -573,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);
@@ -1397,7 +1410,34 @@ class eq
       $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
@@ -1407,16 +1447,18 @@ class eq
              {
                $elder = $entry['elder'];
                $appointment = $entry['appointment'];
-               
-               //print "elder: $elder appointment: $appointment <br>";
+               $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'";
+               $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);
@@ -1444,21 +1486,6 @@ class eq
          $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched');
          //Header('Location: ' . $take_me_to_url);
        }
-
-      // 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_id = $this->db->f('elder');
-       $presidency_id = $this->db->f('presidency');
-       $interviewer = $this->db->f('elder');
-       $district_number = '*';
-       $district_name = $president_name;
-      } else {
-       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
-       return;
-      }
       
       // create the elder id -> elder name mapping
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
@@ -1475,11 +1502,12 @@ class eq
       array_multisort($elder_name, $elder_id);
 
       // APPOINTMENT TABLE
-      $date_width=150; $time_width=100; $elder_width=200;
-      $appt_table_width=$date_width + $time_width + $elder_width;
+      $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;
@@ -1499,6 +1527,8 @@ class eq
        {
          $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);
@@ -1522,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);
@@ -1562,11 +1595,11 @@ 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';
@@ -1694,7 +1727,22 @@ class eq
       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
@@ -1704,15 +1752,34 @@ class eq
              {
                $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'";
+               $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
@@ -1763,27 +1830,14 @@ class eq
          $i++;
        }
       
-      // 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');
-         $i++;
-       }
-      array_multisort($elder_name_data, $elder_id_data);
-
       // APPOINTMENT TABLE
       $district = 1;
-      $date_width=150; $time_width=100; $elder_width=200;
-      $appt_table_width=$date_width + $time_width + $elder_width;
+      $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;
@@ -1794,6 +1848,19 @@ class eq
       $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);
@@ -1807,6 +1874,8 @@ class eq
        {
          $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);
@@ -1831,7 +1900,11 @@ 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.'">';
+         $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);
@@ -2048,7 +2121,26 @@ 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
@@ -2058,15 +2150,23 @@ class eq
              {
                $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'";
+               $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
@@ -2080,14 +2180,14 @@ class eq
          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__);
             
           }
 
@@ -2096,11 +2196,12 @@ class eq
        }
 
       // APPOINTMENT TABLE
-      $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 = ""; 
 
       // Find out what the EQ Presidency ID is
@@ -2113,20 +2214,7 @@ class eq
        print "<hr><font color=red><h3>-E- Unable to locate EQ Presidency in eq_presidency table</h3></font></hr>";
        return;
       }
-      
-      // create the family id -> family name mapping
-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
-      $this->db->query($sql,__LINE__,__FILE__);
-      $i=0;
-      $family_id = NULL;
-      while ($this->db->next_record())
-       {
-         $family_id[$i] = $this->db->f('family');
-         $family_name[$i] = $this->db->f('name');
-         $i++;
-       }
-      array_multisort($family_name, $family_id);
-      
+            
       // query the database for all the appointments
       $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -2135,7 +2223,12 @@ class eq
        {
          $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];
@@ -2159,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);
@@ -3133,7 +3229,7 @@ class eq
       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;
@@ -3149,10 +3245,10 @@ class eq
       $i=0; 
       $last_time = 0; 
       $found_sunday = 0;
-      $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, $current_month-$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);
@@ -3163,7 +3259,8 @@ class eq
          $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; }
@@ -3552,14 +3649,45 @@ class eq
       $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'));
@@ -3569,21 +3697,51 @@ class eq
               {
                 $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 < $this->max_appointments)
@@ -3595,7 +3753,8 @@ class eq
                        " and elder='$elder'" .
                        " and family='$family'" .
                        " and date='$date'" .
-                       " and time='$time'";
+                       " and time='$time'" .
+                       " and location='$location'";
                     $this->db->query($sql,__LINE__,__FILE__);
                     if(!$this->db->next_record()) {
                       $old_date = $this->db->f('date');
@@ -3605,6 +3764,7 @@ class eq
                                        " ,elder=" . $elder . 
                                        " ,date='" . $date . "'" .
                                        " ,time='" . $time . "'" .
+                                       " ,location='" . $location . "'" .
                                        " ,presidency='" . $presidency . "'" .
                                        " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                       
@@ -3617,9 +3777,9 @@ class eq
                 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
                     //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,uid) "
-                          . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
-                          . $elder . "','" . $date . "','" . $time  . "','" . $uid ."')",__LINE__,__FILE__);
+                    $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.
@@ -3629,7 +3789,8 @@ class eq
                        " and presidency='$presidency'" .
                        " and date='$date'" .
                        " and time='$time'" .
-                       " and uid='$uid'";
+                       " and uid='$uid'" .
+                       " and location='$location'";
                     $this->db3->query($sql,__LINE__,__FILE__);
                     if($this->db3->next_record()) {
                       // Email the appointment if warranted
@@ -3644,17 +3805,6 @@ class eq
          $take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule');
          //Header('Location: ' . $take_me_to_url);
        }
-
-      $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');
-         $i++;
-       }
       
       $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
       $this->db->query($sql,__LINE__,__FILE__);
@@ -3667,17 +3817,6 @@ 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($presidency_data); $i++) {
        $presidency = $presidency_data[$i]['id'];
@@ -3696,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);
@@ -3723,7 +3887,7 @@ class eq
            $table_data.= "</td>";
            
            // Elder drop down list (for PPIs)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$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];
@@ -3734,7 +3898,7 @@ class eq
            $table_data.='</select></td>';
 
            // Family drop down list (for Visits)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$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];
@@ -3743,6 +3907,10 @@ 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['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
            $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
@@ -3768,7 +3936,7 @@ class eq
          $table_data.= "</td>";
          
          // Elder drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$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];
@@ -3778,7 +3946,7 @@ class eq
          $table_data.='</select></td>';
          
          // Family drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$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];
@@ -3786,6 +3954,10 @@ class eq
            $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.'">';
@@ -3804,7 +3976,39 @@ class eq
       $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'));
@@ -4188,6 +4392,7 @@ class eq
        {
          $appointment = $this->db->f('appointment');
          $presidency = $this->db->f('presidency');
+         $location = $this->db->f('location');
          $interviewer = "";
          $email = "";
          $elder = $this->db->f('elder');
@@ -4196,7 +4401,6 @@ class eq
          $family_name = "";
          $appt_name = "";
          $phone = "";
-         $location = "";
          $uid = $this->db->f('uid');
                    
          // Extract the year, month, day, hours, minutes, seconds from the appointment time
@@ -4230,7 +4434,6 @@ class eq
              $elder_name = $this->db2->f('name');
              $phone = $this->db2->f('phone');
              $appt_name = $elder_name . " Interview";
-             $location = "$interviewer"."'s home";
              $duration = $this->default_ppi_appt_duration * 60;
            }
          }
@@ -4248,11 +4451,6 @@ class eq
              if($this->db3->next_record()) {
                $phone = $this->db3->f('phone');
              }
-             $sql = "SELECT * FROM eq_parent where family='$family'";
-             $this->db3->query($sql,__LINE__,__FILE__);
-             if($this->db3->next_record()) {
-               $location=$this->db3->f('address');
-             }
              $duration = $this->default_visit_appt_duration * 60;
            }
          }