fixed sandbox so it doesn't show last month of visits since the current month is...
[eq/.git] / inc / class.tc.inc.php
index 07c0b0e06e97ea6d00a60d641be19ebe2df4867c..bcf18e26a79ba6cfb9ee1f9b721ed95a6b287e56 100644 (file)
@@ -15,6 +15,7 @@ class tc
 {
        var $db;
        var $db2;
+       var $db3;
        var $t;
        var $nextmatchs;
        var $grants;
@@ -34,6 +35,7 @@ class tc
        var $script_path;
        var $max_appointments;
        var $max_presidency_members;
+       var $ppi_frequency_label;
 
        var $public_functions = array
        (
@@ -66,6 +68,7 @@ class tc
                'assign_view'    => True,
                'assign_update'  => True,
                'get_time_selection_form' => True,
+               'ht_sandbox' => True,
        );
  
        function tc()
@@ -104,10 +107,34 @@ class tc
                $this->current_month = $this->current_month-0; // Make it numeric
                $this->current_year = `date '+%Y'`;
                $this->current_year = $this->current_year-0; // Make it numeric
+               
+               if ($this->ppi_frequency == 12) {
+                       $this->ppi_frequency_label = "Annual";
+               } else if ($this->ppi_frequency == 6) {
+                       $this->ppi_frequency_label = "Semi-Annual";
+               } else if ($this->ppi_frequency == 3) {
+                       $this->ppi_frequency_label = "Quarterly";
+               } else if ($this->ppi_frequency == 1) {
+                       $this->ppi_frequency_label = "Monthly";
+               } else {
+                       $this->ppi_frequency_label = "Periodic";
+               }
 
                echo parse_navbar();
                $this->display_app_header();    
        }
+       
+       function logToFile($func, $msg)
+       {
+               // open file
+               $fd = fopen($this->upload_target_path . "/tc_trace.log", "a");
+               // append date/time to message
+               $str = "[" . date("Y/m/d h:i:s", mktime()) . "] [" . $func . "] " . $msg;
+               // write string
+               fwrite($fd, $str . "\n");
+               // close file
+               fclose($fd);
+       }
   
        function save_sessiondata()
        {
@@ -190,7 +217,10 @@ class tc
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_view'));
                $this->t->set_var('title','Hometeaching'); 
 
-               $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+               $this->t->set_var('ht_sandbox_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox'));
+               $this->t->set_var('ht_sandbox_link_title','Hometeaching Sandbox'); 
+
+               $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -242,7 +272,7 @@ class tc
                        for ($j=0; $j < count($unique_companionships); $j++) {
                                $companion_table_entry = "";
                                // Select all the companions in each companionship
-                               $sql = "SELECT * FROM tc_companionship where valid=1 and ".
+                               $sql = "SELECT * FROM tc_companion where valid=1 and ".
                                "companionship=". $unique_companionships[$j]['companionship'];
                                $this->db->query($sql,__LINE__,__FILE__);
 
@@ -258,7 +288,7 @@ class tc
                                $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
 
                                // Get the names of the families assigned this home teaching companionship
-                               $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+                               $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.companionship=".$unique_companionships[$j]['companionship'];
                                $sql = $sql . " ORDER BY name ASC";
                                $this->db->query($sql,__LINE__,__FILE__);
                                $k=0;
@@ -368,6 +398,336 @@ class tc
        }
       
 
+       function ht_sandbox()
+       {
+               $this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl'));
+               $this->t->set_block('ht_sandbox_t','comp_list','c_list');
+               $this->t->set_block('ht_sandbox_t','district_list','d_list');
+               $this->t->set_block('ht_sandbox_t','unassigned_ht_list','uht_list');
+               $this->t->set_block('ht_sandbox_t','assigned_ht_list','aht_list');
+               $this->t->set_block('ht_sandbox_t','unassigned_family_list','uf_list');
+               $this->t->set_block('ht_sandbox_t','assigned_family_list','af_list');
+               $this->t->set_block('ht_sandbox_t','district_table_list','dt_list');
+               $this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list');
+
+               $this->t->set_var('submit_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox&action=add'));
+               
+           $action = get_var('action',array('GET','POST'));
+
+               $this->t->set_var('title','Hometeaching Sandbox'); 
+
+               if ($_POST['add']) {
+                       #$this->t->set_var('debug_list',$_POST['add']);
+                       $companionship = get_var('companionship',array('POST'));
+                       $district = get_var('district',array('POST'));
+                       $assignedHT_list = get_var('assignedHT',array('POST'));
+                       $unassignedHT_list = get_var('unassignedHT',array('POST'));
+                       $assigned_family_list = get_var('assignedFamiles',array('POST'));
+                       $unassigned_family_list = get_var('unassignedFamilies',array('POST'));
+                       
+                       if ($assignedHT_list || $unassignedHT_list) {
+                               $sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"NULL\",\"$district\")";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               $companionship_sandbox = mysql_insert_id();
+                               
+                               foreach ($assignedHT_list as $individual) {
+                                       $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                               }
+                               foreach ($unassignedHT_list as $individual) {
+                                       $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                               }
+                               foreach ($assigned_family_list as $family) {
+                                       $sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                               }
+                               foreach ($unassigned_family_list as $family) {
+                                       $sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                               }
+                       } else {
+                               $this->t->set_var('debug_list','You must select at least one companion!');
+                       }
+               } else if ($_POST['delete']) {
+                       #$this->t->set_var('debug_list',$_POST['delete']);
+                       $companionship = get_var('companionship',array('POST'));
+                       #$this->t->set_var('debug_list',$companionship);
+                       
+                       if ($companionship > 0) {
+                               # unassign families
+                               $sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
+                               $this->db->query($sql,__LINE__,__FILE__);
+                               
+                               # remove companions
+                               $sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
+                               $this->db->query($sql,__LINE__,__FILE__);
+                               
+                               # remove companionship
+                               $sql = "DELETE FROM tc_companionship_sandbox WHERE companionship=$companionship";
+                               $this->db->query($sql,__LINE__,__FILE__);
+                       } else {
+                               $this->t->set_var('debug_list','You must select a companionship to delete!');
+                       }
+               } else if ($_POST['update']) {
+                       #$this->t->set_var('debug_list',$_POST['update']);
+                       $companionship = get_var('companionship',array('POST'));
+                       $district = get_var('district',array('POST'));
+                       $assignedHT_list = get_var('assignedHT',array('POST'));
+                       $unassignedHT_list = get_var('unassignedHT',array('POST'));
+                       $assigned_family_list = get_var('assignedFamiles',array('POST'));
+                       $unassigned_family_list = get_var('unassignedFamilies',array('POST'));
+                       #$this->t->set_var('debug_list',$district);
+                       
+                       if ($companionship > 0) {
+                               if ($assignedHT_list || $unassignedHT_list) {
+                                       # clear out existing info about companionship
+                                       $sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                                       $sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                                       
+                                       # set new info about companionship
+                                       $sql = "UPDATE tc_companionship_sandbox SET district=$district WHERE companionship=$companionship";
+                                       $this->db->query($sql,__LINE__,__FILE__);
+                                       foreach ($assignedHT_list as $individual) {
+                                               $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
+                                               $this->db->query($sql,__LINE__,__FILE__);
+                                       }
+                                       foreach ($unassignedHT_list as $individual) {
+                                               $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
+                                               $this->db->query($sql,__LINE__,__FILE__);
+                                       }
+                                       foreach ($assigned_family_list as $family) {
+                                               $sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
+                                               $this->db->query($sql,__LINE__,__FILE__);
+                                       }
+                                       foreach ($unassigned_family_list as $family) {
+                                               $sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
+                                               $this->db->query($sql,__LINE__,__FILE__);
+                                       }
+                               } else {
+                                       $this->t->set_var('debug_list','You must select at least one companion!');
+                               }
+                       } else {
+                               $this->t->set_var('debug_list','You must select a companionship to update!');
+                       }
+               } else if ($_POST['reset']) {
+                       #$this->t->set_var('debug_list',$_POST['reset']);
+                       
+                       $sql = "TRUNCATE TABLE tc_district_sandbox";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       $sql = "TRUNCATE TABLE tc_family_sandbox";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       $sql = "TRUNCATE TABLE tc_companion_sandbox";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       $sql = "TRUNCATE TABLE tc_companionship_sandbox";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       
+                       # populate tc_district_sandbox
+                       $sql = "SELECT * FROM tc_district WHERE valid=1";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       while ($this->db->next_record()) {
+                               $district = $this->db->f('district');
+                               $supervisor = $this->db->f('supervisor');
+                               $sql = "INSERT INTO tc_district_sandbox (district,supervisor) VALUES (\"$district\",\"$supervisor\")";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                       }
+                       
+                       # populate family, companion, and companionship tables
+                       $sql = "SELECT * FROM tc_companionship WHERE valid=1";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       while ($this->db->next_record()) {
+                               $companionship = $this->db->f('companionship');
+                               $district = $this->db->f('district');
+                               $sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"$companionship\",\"$district\")";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               $companionship_sandbox = mysql_insert_id();
+                               
+                               $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship AND tc.valid=1 AND ti.valid=1";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               while ($this->db2->next_record()) {
+                                       $individual = $this->db2->f('individual');
+                                       $sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+                                       $this->db3->query($sql,__LINE__,__FILE__);
+                               }
+                               
+                               $sql = "SELECT * FROM tc_family WHERE companionship=$companionship AND valid=1";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               while ($this->db2->next_record()) {
+                                       $individual = $this->db2->f('individual');
+                                       $family = $this->db2->f('family');
+                                       $sql = "INSERT INTO tc_family_sandbox (tc_family,individual,companionship) VALUES (\"$family\",\"$individual\",\"$companionship_sandbox\")";
+                                       $this->db3->query($sql,__LINE__,__FILE__);
+                               }
+                       }
+               }
+               
+               // get list of companionships
+               $sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox ORDER BY companionship ASC";
+               $this->db->query($sql,__LINE__,__FILE__);
+               $unique_companionships = '';
+               $unique_companionships[0]['companionship'] = 0;
+               $this->t->set_var('companionship_list','<option value="0">New Companionship</option>');
+               $this->t->fp('c_list','comp_list',True);
+               $j=1;
+               while ($this->db->next_record()) {
+                       $companionship = $this->db->f('companionship');
+                       $unique_companionships[$j]['companionship'] = $companionship;
+                       $combined_companionship = "";
+                       $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship ORDER BY ti.name ASC";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               if ($combined_companionship == "") {
+                                       $combined_companionship .= $this->db2->f('name');
+                               } else {
+                                       $combined_companionship .= " / " . $this->db2->f('name');
+                               }
+                       }
+                       $this->t->set_var('companionship_list','<option value="'.$companionship.'">'.$combined_companionship.'</option>');
+                       $this->t->fp('c_list','comp_list',True);
+                       $j++;
+               }
+
+               # get list of districts
+               $sql = "SELECT DISTINCT district FROM tc_district_sandbox ORDER BY district ASC";
+               $this->db->query($sql,__LINE__,__FILE__);
+               $districts = '';
+               $num_districts=0;
+               while ($this->db->next_record()) {
+                       $districts[$num_districts] = $this->db->f('district');
+                       $this->t->set_var('district','<option value="'.$districts[$num_districts].'">'.$districts[$num_districts].'</option>');
+                       $this->t->fp('d_list','district_list',True);
+                       $num_districts++;
+               }
+
+               # get list of individuals who are and are not home teachers
+               $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship' AND valid=1 ORDER BY name ASC";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $individual = $this->db->f('individual');
+                       $name = $this->db->f('name');
+                       $sql = "SELECT DISTINCT * FROM tc_companion_sandbox WHERE individual=$individual";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       if ($this->db2->next_record()) {
+                               $this->t->set_var('assigned_ht','<option value="'.$individual.'">'.$name.'</option>');
+                               $this->t->fp('aht_list','assigned_ht_list',True);
+                       } else {
+                               $this->t->set_var('unassigned_ht','<option value="'.$individual.'">'.$name.'</option>');
+                               $this->t->fp('uht_list','unassigned_ht_list',True);
+                       }
+               }
+               
+               # get list of families who are and are not assigned home teachers
+               $sql = "SELECT * FROM tc_family_sandbox AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual ORDER BY ti.name ASC";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $individual = $this->db->f('individual');
+                       $family = $this->db->f('family');
+                       $name = $this->db->f('name');
+                       if ($this->db->f('companionship') != 0) {
+                               $this->t->set_var('assigned_family','<option value="'.$family.'">'.$name.' Family</option>');
+                               $this->t->fp('af_list','assigned_family_list',True);
+                       } else {
+                               $this->t->set_var('unassigned_family','<option value="'.$family.'">'.$name.' Family</option>');
+                               $this->t->fp('uf_list','unassigned_family_list',True);
+                       }
+               }
+               
+               # populate ht districts table
+               $sandbox_table_data = "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\">";
+               
+               # set up column headers
+               $sandbox_table_data .= "<tr>";
+               for ($d = 0; $d < $num_districts; $d++) {
+                       $sandbox_table_data .= "<th align=\"center\" bgcolor=\"#c9c9c9\">District " . $districts[$d] . "</th>";
+               }
+
+               # get each companionship in each district
+               $sandbox_table_data .= "<tr>";
+               for ($d = 0; $d < $num_districts; $d++) {
+                       $sandbox_table_data .= "<td valign=\"Top\">";
+                       $sandbox_table_data .= "<table>";
+                       $sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox WHERE district=$districts[$d] ORDER BY companionship ASC";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       while ($this->db->next_record()) {
+                               $sandbox_table_data .= "<tr><td><table>";
+                               $companionship = $this->db->f('companionship');
+                               # get names of companions in this companionship
+                               $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship ORDER BY ti.name ASC";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               $companion_names = "";
+                               while ($this->db2->next_record()) {
+                                       if ($companion_names == "") {
+                                               $companion_names .= $this->db2->f('name');
+                                       } else {
+                                               $companion_names .= " / " . $this->db2->f('name');
+                                       }
+                               }
+                               $this->nextmatchs->template_alternate_row_color(&$this->t);
+                               $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+                               $sandbox_table_data .= "<th bgcolor=#d3dce3 align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
+                               $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><table>";
+                               
+                               # get families they visit
+                               $sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
+                               $this->db2->query($sql,__LINE__,__FILE__);
+                               while ($this->db2->next_record()) {
+                                       $family_name = $this->db2->f('name') . " Family";
+                                       $family_id = $this->db2->f('tc_family');
+                                       $tc_companionship = $this->db2->f('tc_companionship');
+                                   $this->nextmatchs->template_alternate_row_color(&$this->t);
+                                   $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+                                       $sandbox_table_data .= "<td align=\"Left\" width=\"1000\">$family_name</td>";
+                                       
+                                       # get 12 months visit data for given family
+                                       for($m=$this->sandbox_stats_num_months; $m > 0; $m--) {
+                                               $month = $this->current_month - $m;
+                                               $year = $this->current_year;
+                                               if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
+                                               if($month < 10) { $month = "0"."$month"; }
+                                               $month_start = "$year"."-"."$month"."-"."01";
+                                               $month_end = "$year"."-"."$month"."-"."31";
+                                               $month = "$month"."/"."$year";
+
+                                               if ($this->sandbox_visits_comp_only == 0) {
+                                                       $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id;
+                                               } else {
+                                                       $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship=$tc_companionship AND family=". $family_id;
+                                               }
+                                               $query_id = $this->db3->query($sql,__LINE__,__FILE__);
+
+                                               if($this->db3->next_record()) {
+                                                       if($this->db3->f('visited') == 'y') {
+                                                               $sandbox_table_data .= "<td align=\"Right\"><img src=\"images/checkmark.gif\"></td>";
+                                                       } else if($this->db3->f('visited') == 'n') {
+                                                               $sandbox_table_data .= "<td align=\"Right\"><img src=\"images/x.gif\"></td>";
+                                                       } else {
+                                                               $sandbox_table_data .= "<td>&nbsp;</td>";
+                                                       }
+                                               } else {
+                                                       $sandbox_table_data .= "<td>&nbsp;</td>";
+                                               }
+                                       }
+                                       $sandbox_table_data .= "</tr>";
+                               }
+                               $sandbox_table_data .= "</table></td></tr>";
+                               $sandbox_table_data .= "</table></td></tr>";
+                       }
+                       
+                       $sandbox_table_data .= "</table>";
+                       $sandbox_table_data .= "</td>";
+               }
+               $sandbox_table_data .= "</tr>";
+               
+               $sandbox_table_data .= "</table>";
+               $this->t->set_var('district_table',$sandbox_table_data);
+
+               $this->t->pfp('out','ht_sandbox_t');
+               $this->save_sessiondata();
+       }
+      
+
        function ht_update()
        {
                $this->t->set_file(array('ht_update_t' => 'ht_update.tpl'));
@@ -474,8 +834,8 @@ class tc
                        $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
 
                        // Get the names of the families assigned this home teaching companionship
-                       $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
-                       $sql = $sql . " ORDER BY name ASC";
+                       $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.companionship=".$unique_companionships[$j]['companionship'];
+                       $sql = $sql . " ORDER BY ti.name ASC";
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record()) {
                                $family_name = $this->db->f('name');
@@ -679,7 +1039,7 @@ class tc
 
                for ($i=0; $i < count($names); $i++) {
                        //$this->nextmatchs->template_alternate_row_color(&$this->t);
-                       $this->t->set_var('indiv_name',$names[$i]);
+                       $this->t->set_var('individual_name',$names[$i]);
                        if(($i+1) % 3 == 0) {
                                $this->t->set_var('table_sep',"</td></tr><tr>"); 
                        } else { 
@@ -712,7 +1072,7 @@ class tc
                        $this->db->query("UPDATE tc_activity set " .
                                         "   assignment='" . $activity['assignment'] .
                                         "', date='" . $activity['date'] . "'" .
-                                        ", notes='" . $activity['notes'] . "'" .
+                                        ", notes=\"" . $activity['notes'] . "\"" .
                                         " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
 
                        // Delete all the individuals who have particiapted in this activity
@@ -721,7 +1081,7 @@ class tc
                        // Re-add the individuals who are checked as having participated in this activity
                        $indivs = get_var('individual_name',array('POST'));
                        if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with
-                               foreach ($indivs as $indiv) {
+                               foreach ($indivs as $individual) {
                                        $this->db->query("INSERT INTO tc_participation (individual,activity) " .
                                                         "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
                                }
@@ -737,10 +1097,10 @@ class tc
                        $activity['notes']= get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_activity (assignment,date,notes) " .
                                         "VALUES ('" . $activity['assignment'] . "','" .
-                                        $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+                                        $activity['date'] . "',\"" . $activity['notes'] . "\")",__LINE__,__FILE__);
 
                        $sql = "SELECT * FROM tc_activity WHERE assignment='".$activity['assignment']."' " .
-                              " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+                              " 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>";
@@ -748,7 +1108,7 @@ class tc
                        }
 
                        $indivs = get_var('individual_name',array('POST'));
-                       foreach ($indivs as $indiv)
+                       foreach ($indivs as $individual)
                        {
                                $this->db->query("INSERT INTO tc_participation (individual,activity) " .
                                                 "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
@@ -983,8 +1343,7 @@ class tc
                $this->t->set_block('par_view_t','header_list','list1');
                $this->t->set_block('par_view_t','individual_list','list2');
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -1094,8 +1453,7 @@ class tc
                }
                $this->t->set_var('filter_input',$filter_input);
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -1333,51 +1691,26 @@ class tc
                $this->t->set_var('lang_reset','Clear Changes');
 
                $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
-               $this->t->set_var('ppi_link_title','Yearly PPIs');
+               $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs');
 
                $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
-               $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+               $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
 
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched&action=save'));
-               $this->t->set_var('title','Yearly PPI Scheduler');
-
-               $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
-               $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
-               $header_row = "<th width=$indiv_width><font size=-2>individual 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>";
+               $this->t->set_var('title',$this->ppi_frequency_label . ' PPI Scheduler');
+
+               $header_row = "<th ><font size=-2>Individual Name</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last PPI</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
 
                $year = date('Y');
-
-               // Get the President
-               $sql = "SELECT * FROM tc_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('individual');
-                       $presidency_id = $this->db->f('presidency');
-                       $interviewer = $this->db->f('individual');
-                       $district_number = '*';
-                       $district_name = $president_name;
-                       $sql = "SELECT * FROM tc_individual where individual='$president_id'";
-                       $this->db2->query($sql,__LINE__,__FILE__);
-                       if($this->db2->next_record()) {
-                               $mls_id = $this->db2->f('mls_id');
-                       }
-                       $sql = "SELECT * FROM tc_individual where mls_id='$mls_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 President in tc_presidency table</h3></font></hr>";
-                       return;
-               }
+               $month = date('m');
+               $period = intval(($month-1)/$this->ppi_frequency) + 1;
+               $start_of_period = ($period-1)*$this->ppi_frequency + 1;
+               $end_of_period = $period * $this->ppi_frequency;
 
                if($action == 'save') {
                        // Save any changes made to the appointment table
@@ -1387,7 +1720,8 @@ class tc
                                        $indiv = $entry['individual'];
                                        $appointment = $entry['appointment'];
                                        $location = $entry['location'];
-                                       if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+                                   $presidency_location = $entry['presidency_location'];
+                                   if($location == "") { $location = $presidency_location; }
                                        if($indiv == 0) { $location = ""; }
 
                                        //Only perform a database update if we have made a change to this appointment
@@ -1417,17 +1751,9 @@ class tc
                                $this->db->query($sql,__LINE__,__FILE__);
                                if ($this->db->next_record()) {
                                        $scheduling_priority = $this->db->f('scheduling_priority');
-                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$priority' AND notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
+                                       //$this->logToFile("ppi_sched", "UPDATE tc_scheduling_priority SET priority='$priority', notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'");
+                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$priority', notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
                                }
-
-/*
-                               $this->db->query("UPDATE tc_individual set " .
-                                                " notes='" . $notes . "'" .
-                                                ",priority='" . $priority . "'" .
-                                                " WHERE individual=" . $individual,__LINE__,__FILE__);
-*/
-
-
                        }
 
                        $take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched');
@@ -1435,8 +1761,7 @@ class tc
                }
 
                // create the individual id -> individual name mapping
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_individual where valid=1 and steward='$this->default_stewardship' ORDER BY name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                $individual = NULL;
@@ -1449,39 +1774,52 @@ class tc
                array_multisort($indiv_name, $individual);
 
                // APPOINTMENT TABLE
-               $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
-               $appt_table_width=$date_width + $time_width + $indiv_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=$indiv_width><font size=-2>indiv</th>";
-               $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
-               $appt_table_data = ""; 
+               $appt_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Individual</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
+               $appt_table_data = "";
+               $table_data="";
 
                $total_indivs=0; $indivs_with_yearly_ppi=0;
 
-               // Display a scheduling table for the President
-               $table_data=""; $appt_table_data="";
-               $table_title = "District ".$district_number.": ".$district_name.": All indivs 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 tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+               // Get the President
+               $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.valid=1 AND ";
+               if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; }
+               if($this->yearly_ppi_interviewer == 2) { $sql .= " (tp.president=1 OR tp.counselor=1)"; }
+               if($this->yearly_ppi_interviewer == 3) { $sql .= " (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; }
                $this->db->query($sql,__LINE__,__FILE__);
-
                while ($this->db->next_record()) {
-                       $appointment = $this->db->f('appointment');
-                       $indiv = $this->db->f('individual');
-                       $location = $this->db->f('location');
-                       if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; }
+                 $presidency_name = $this->db->f('name');
+                 $presidency_name_array = explode(",",$presidency_name);
+                 $presidency_last_name = $presidency_name_array[0];
+                 $presidency_id = $this->db->f('presidency');
+                 $presidency_address = $this->db->f('address');
+                 $presidency_location = "$presidency_last_name"." home ($presidency_address)";
+                 $appt_table_data = "";
+
+                 // Display a scheduling table for this presidency member
+                 $not_completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Not Completed";
+                 $appt_table_title = $presidency_name . ": " . $this->ppi_frequency_label." PPI Appointment Slots";
+                 $this->t->set_var('not_completed_table_title',$not_completed_table_title);
+                 $this->t->set_var('appt_table_title',$appt_table_title);
+
+                 // query the database for all the appointments
+                 $sql = "SELECT * FROM tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+                 $this->db2->query($sql,__LINE__,__FILE__);
+
+                 while ($this->db2->next_record()) {
+                       $appointment = $this->db2->f('appointment');
+                       $indiv = $this->db2->f('individual');
+                       $location = $this->db2->f('location');
+                       if(($location == "") && ($indiv > 0)) { $location = $presidency_location; }
 
-                       $date = $this->db->f('date');
+                       $date = $this->db2->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 = $this->db2->f('time');
                        $time_array = explode(":",$time);
                        $time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2]));
 
@@ -1492,14 +1830,14 @@ class tc
                        $appt_table_data.= '<td align=center><select name=appt_notes['.$appointment.'][individual]>';
                        $appt_table_data.= '<option value=0></option>';
                        for ($i=0; $i < count($individual); $i++) {
-                               $id = $individual[$i];
-                               $name = $indiv_name[$i];
-                               if($individual[$i] == $indiv) { 
-                                       $selected[$id] = 'selected="selected"'; 
-                               } else { 
-                                       $selected[$id] = ''; 
-                               }
-                               $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
+                         $id = $individual[$i];
+                         $name = $indiv_name[$i];
+                         if($individual[$i] == $indiv) { 
+                               $selected[$id] = 'selected="selected"'; 
+                         } else { 
+                               $selected[$id] = ''; 
+                         }
+                         $appt_table_data.= '<option value='.$id.' '.$selected[$id].'>'.$name.'</option>';
                        }
                        $appt_table_data.='</select></td>';
 
@@ -1510,15 +1848,16 @@ class tc
 
                        $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);
+                 }
+                 $this->t->set_var('appt_table_data',$appt_table_data);
+                 $this->t->set_var('appt_header_row',$appt_header_row);
+                         $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
 
+                 $this->t->fp('apptlist','appt_list',True);
+               }
+               
                // PPI SCHEDULING TABLE
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual as ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and steward='Elder' and valid=1 ORDER by tsp.priority ASC, ti.name ASC";
+               $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='$this->default_stewardship' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
 
                $i=0; 
@@ -1534,7 +1873,7 @@ class tc
                }
 
                $max = count($individual);
-
+               
                for($i=0; $i < $max; $i++) {
                        $id = $individual[$i];
                        $name = $indiv_name[$i];
@@ -1542,10 +1881,11 @@ class tc
                        $priority = $indiv_priority[$id];
                        $notes = $indiv_notes[$id];
 
-                       // If this individual 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 tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
-                              "AND individual=" . $id . " AND interview_type='ppi'";
+                       // If this individual has had a PPI this period, don't show him on the schedule list
+                       $year_start = $year . "-" . $start_of_period . "-01";
+                       $year_end = $year . "-" . $end_of_period . "-31";
+                       $sql = "SELECT * FROM tc_interview WHERE date >= '$year_start' AND date <= '$year_end' ".
+                              "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
                        $this->db2->query($sql,__LINE__,__FILE__);
 
                        if(!$this->db2->next_record()) {
@@ -1610,27 +1950,24 @@ class tc
                        }
                } // End for individuals 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>Individual 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_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Completed";
+               $completed_header_row = "<th><font size=-2>Individual</th>";
+               $completed_header_row.= "<th><font size=-2>Phone</th>";      
+               $completed_header_row.= "<th><font size=-2>Date</th>";
+               $completed_header_row.= "<th><font size=-2>PPI Notes</th>";
 
-               $this->t->set_var('table_width',$table_width);
+               $this->t->set_var('completed_table_title',$completed_table_title);
                $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->set_var('lang_save','Save Pri / Notes'); 
                $this->t->fp('indivlist','individual_list',True); 
 
-               $indivs_width=300; $totals_width=100;
-               $totals_table_width=$indivs_width + $totals_width;
-               $totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Individuals</th>";
+               $totals_header_row.= "<th><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 Individuals with yearly PPIs completed:</b></font></td>";
+               $totals_data.= "<td align=left><font size=-2><b>Total Individuals with " . $this->ppi_frequency_label . " PPIs completed:</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$indivs_with_yearly_ppi / $total_indivs</b></font></td>";
                $percent = ceil(($indivs_with_yearly_ppi / $total_indivs)*100);
                $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1642,7 +1979,7 @@ class tc
 
                $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->set_var('ppi_frequency_label',$this->ppi_frequency_label);
 
                $this->t->pfp('out','ppi_sched_t');
                $this->save_sessiondata(); 
@@ -1656,7 +1993,6 @@ class tc
                $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('/tc/index.php','menuaction=tc.tc.int_view'));
@@ -1668,13 +2004,11 @@ class tc
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched&action=save'));
                $this->t->set_var('title','Hometeaching Interviews Scheduler');
 
-               $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
-               $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width;
-               $header_row = "<th width=$indiv_width><font size=-2>individual 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>";
+               $header_row = "<th><font size=-2>Individual</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last Interview</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
 
                $year = date('Y');
@@ -1687,8 +2021,7 @@ class tc
                //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
 
                // create the individual id -> individual name mapping
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                $individual_data = NULL;
@@ -1729,11 +2062,6 @@ class tc
                                                $supervisor_last_name = $supervisor_array[0];
                                                $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
-                                               if($this->db2->next_record()) {
-                                                       $mls_id = $this->db2->f('mls_id');
-                                               }
-                                               $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                               $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
                                                        $supervisor_address = $this->db2->f('address');
                                                }
@@ -1766,17 +2094,12 @@ class tc
                                $hti_pri = $entry['pri'];
                                //print "hti_notes: $hti_notes indiv_name: $indiv_name <Br>";
                                // Perform database save actions here
-                               $this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+                               $this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__);
                                if ($this->db->next_record()) {
                                        $scheduling_priority = $this->db->f('scheduling_priority');
-                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$hti_pri' and notes=\"hti_notes\" where scheduling_priority=$scheduling_priority",__LINE__,__FILE__);
+                                       //$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");
+                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'",__LINE__,__FILE__);
                                }
-/*
-                               $this->db->query("UPDATE tc_individual set " .
-                                                " hti_notes='" . $hti_notes . "'" .
-                                                ",hti_pri='" . $hti_pri . "'" .
-                                                " WHERE individual=" . $individual,__LINE__,__FILE__);
-*/
                        }
 
                        $take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched');
@@ -1784,7 +2107,7 @@ class tc
                }
 
                // Get the Districts
-               $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+               $sql = "SELECT * FROM tc_district AS td JOIN (tc_presidency AS tp, tc_individual AS ti) WHERE td.district=tp.district AND td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -1792,22 +2115,16 @@ class tc
                        $districts[$i]['district'] = $this->db->f('district');
                        $districts[$i]['name'] = $this->db->f('name');
                        $districts[$i]['supervisor'] = $this->db->f('supervisor');
-                       $sql = "SELECT * FROM tc_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');
-                       }
+                       $districts[$i]['presidency'] = $this->db->f('presidency');
                        $i++;
                }
 
                // APPOINTMENT TABLE
                $district = 1;
-               $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
-               $appt_table_width=$date_width + $time_width + $indiv_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=$indiv_width><font size=-2>Individual</th>";
-               $appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+               $appt_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Individual</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
                $appt_table_data = ""; 
 
                $total_comps=0; $comps_with_quarterly_int=0;
@@ -1822,11 +2139,6 @@ class tc
                        $supervisor_last_name = $supervisor_array[0];
                        $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
                        $this->db2->query($sql,__LINE__,__FILE__);
-                       if($this->db2->next_record()) {
-                               $mls_id = $this->db2->f('mls_id');
-                       }
-                       $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                       $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
                                $supervisor_address = $this->db2->f('address');
                        }
@@ -1885,7 +2197,6 @@ class tc
 
                        $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
 
@@ -1902,7 +2213,7 @@ class tc
                        $i=0;
                        for ($j=0; $j < count($unique_companionships); $j++) {
                                // Select all the companions from each companionship
-                               $sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
+                               $sql = "SELECT * FROM tc_companion AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
                                $this->db->query($sql,__LINE__,__FILE__);
                                $k=0; $int_completed=0;
                                $comp = $unique_companionships[$j]['companionship'];
@@ -1935,11 +2246,11 @@ class tc
                                        }
 
                                        // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
-                                       $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id'";
+                                       $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND interview_type='hti'";
                                        $this->db2->query($sql,__LINE__,__FILE__);
 
                                        if(!$this->db2->next_record()) {
-                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' ORDER BY date DESC";
+                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
                                                $this->db3->query($sql,__LINE__,__FILE__);
                                                if($this->db3->next_record()) { 
                                                        $date = $this->db3->f('date'); 
@@ -1951,6 +2262,7 @@ class tc
                                                $link_data['name'] = $name;
                                                $link_data['interview'] = '';
                                                $link_data['action'] = 'add';
+                                               $link_data['interview_type'] = 'hti';
                                                $link_data['interviewer'] = $districts[$d]['supervisor'];
                                                $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
                                                $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
@@ -1980,6 +2292,7 @@ class tc
                                                $link_data['individual'] = $this->db2->f('individual');
                                                $link_data['name'] = $name;
                                                $link_data['interview'] = $this->db2->f('interview');
+                                               $link_data['interview_type'] = 'hti';
                                                $link_data['action'] = 'view';
                                                $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);    
                                                $comps_with_quarterly_int++;
@@ -1996,28 +2309,24 @@ class tc
                                }
                        }
 
-                       $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>Individual 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>Interview Notes</th>";
+                       $completed_header_row = "<th><font size=-2>Individual</th>";
+                       $completed_header_row.= "<th><font size=-2>Phone</th>";      
+                       $completed_header_row.= "<th><font size=-2>Date</th>";
+                       $completed_header_row.= "<th><font size=-2>Interview 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->set_var('lang_save_appt','Save Appts for ' . $districts[$d]['name']);
+                       $this->t->set_var('lang_save_pri_notes','Save Pri / Notes for '. $districts[$d]['name']);
                        $this->t->fp('indivlist','individual_list',True);
 
                } // End for each district loop
 
 
-               $indivs_width=300; $totals_width=100;
-               $totals_table_width=$indivs_width + $totals_width;
-               $totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Individuals</th>";
+               $totals_header_row.= "<th><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 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>";
@@ -2031,7 +2340,6 @@ class tc
 
                $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','int_sched_t');
                $this->save_sessiondata(); 
@@ -2045,7 +2353,6 @@ class tc
                $this->t->set_block('vis_sched_t','appt_list','apptlist');
                $action = get_var('action',array('GET','POST'));
 
-               $this->t->set_var('lang_save','Save Appt / Pri / Notes');
                $this->t->set_var('lang_reset','Clear Changes');
 
                $this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_view'));
@@ -2057,19 +2364,17 @@ class tc
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched&action=save'));
                $this->t->set_var('title','Presidency Yearly Visit Scheduler');
 
-               $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20;
-               $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width;
-               $header_row = "<th width=$family_width><font size=-2>Family Name</th>";
-               $header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-               $header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-               $header_row.= "<th width=$visit_date_width><font size=-2>Last Visit</th>";
-               $header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+               $header_row = "<th><font size=-2>Family Name</th>";
+               $header_row.= "<th><font size=-2>Phone</th>";
+               $header_row.= "<th><font size=-2>Priority</th>";
+               $header_row.= "<th><font size=-2>Last Visit</th>";
+               $header_row.= "<th><font size=-2>Scheduling Notes</th>";
                $table_data=""; $completed_data=""; $totals_data="";
 
                $year = date('Y');
 
                // create the family id -> family name mapping
-               $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY ti.name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                $family_id = NULL;
@@ -2077,11 +2382,7 @@ class tc
                        $family_id[$i] = $this->db->f('family');
                        $family_name[$i] = $this->db->f('name');
                        $familyid2name[$family_id[$i]] = $family_name[$i];
-                       $sql = "SELECT * FROM tc_individual where family='$family_id[$i]'";
-                       $this->db2->query($sql,__LINE__,__FILE__);
-                       if($this->db2->next_record()) {
-                               $familyid2address[$family_id[$i]] = $this->db2->f('address');
-                       }
+                       $familyid2address[$family_id[$i]] = $this->db->f('address');
                        $i++;
                }
                array_multisort($family_name, $family_id);
@@ -2124,19 +2425,12 @@ class tc
                                $visit_notes = $entry['notes'];
                                $family = $entry['family_id'];
                                $visit_pri = $entry['pri'];
-
                                // Perform database save actions here
                                $this->db->query("SELECT * FROM tc_family WHERE family='$family'",__LINE__,__FILE__);
                                if ($this->db->next_record()) {
                                        $scheduling_priority = $this->db->f('scheduling_priority');
-                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri' AND notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'",__LINE__,__FILE__);
+                                       $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
                                }
-/*
-                               $this->db->query("UPDATE tc_family set " .
-                                                " visit_notes='" . $visit_notes . "'" .
-                                                ",visit_pri='" . $visit_pri . "'" .
-                                                " WHERE family=" . $family,__LINE__,__FILE__);
-*/
                        }
 
                        $take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched');
@@ -2144,16 +2438,14 @@ class tc
                }
 
                // APPOINTMENT TABLE
-               $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_header_row = "<th><font size=-2>Date</th>";
+               $appt_header_row.= "<th><font size=-2>Time</th>";      
+               $appt_header_row.= "<th><font size=-2>Family</th>";
+               $appt_header_row.= "<th><font size=-2>Location</th>";
                $appt_table_data = ""; 
 
                // Find out what the President ID is
-               $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
+               $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                if($this->db->next_record()) {
                        $presidency_name = $this->db->f('name');
@@ -2214,47 +2506,21 @@ class tc
 
                $this->t->set_var('appt_table_data',$appt_table_data);
                $this->t->set_var('appt_header_row',$appt_header_row);
-               $this->t->set_var('appt_table_width',$appt_table_width);
 
 
                // VISIT SCHEDULING TABLE
-               $sql = "SELECT * FROM tc_family AS tf JOIN tc_scheduling_priority AS tsp WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.valid=1 AND tf.individual != 0  AND tf.companionship != 0 ORDER BY tsp.priority ASC, tf.name ASC";
+               $sql = "SELECT * FROM tc_family AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0  AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY tsp.priority ASC, ti.name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
 
                $total_families=0; $families_with_yearly_visit=0;
 
-               $i=0; 
-               $family_id = NULL;
-               $family_name = NULL;
-               $family_phone = NULL;
-               $family_visit_pri = NULL;
-               $family_visit_notes = NULL;
-               while ($this->db->next_record()) {
-                       $family_id[$i] = $this->db->f('family');
-                       $family_name[$i] = $this->db->f('name');
-                       $family_phone[$family_id[$i]] = $family_id[$i] . " ERROR";
-                       $family_visit_pri[$family_id[$i]] = $this->db->f('visit_pri');
-                       $family_visit_notes[$family_id[$i]] = $this->db->f('visit_notes');
-                       $i++;
+               while ( $this->db->next_record()) {
                        $total_families++;
-               }
-
-               $sql = "SELECT * FROM tc_individual where valid=1";
-               $this->db->query($sql,__LINE__,__FILE__);
-               while ($this->db->next_record()) {
-                       $family = $this->db->f('family');
+                       $id = $this->db->f('family');
+                       $name = $this->db->f('name');
                        $phone = $this->db->f('phone');
-                       $family_phone[$family] = $phone;
-               }
-
-               $max = count($family_id);
-
-               for($i=0; $i < $max; $i++) {
-                       $id = $family_id[$i];
-                       $name = $family_name[$i];
-                       $phone = $family_phone[$id];
-                       $vis_pri = $family_visit_pri[$id];
-                       $vis_notes = $family_visit_notes[$id];
+                       $vis_pri = $this->db->f('priority');
+                       $vis_notes = $this->db->f('notes');
 
                        // If this family has had a yearly visit this year, don't show them on the schedule list
                        $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
@@ -2264,9 +2530,9 @@ class tc
 
                        if(!$this->db2->next_record()) {
                                $sql = "SELECT * FROM tc_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
-                               $this->db->query($sql,__LINE__,__FILE__);
-                               if($this->db->next_record()) { 
-                                       $date = $this->db->f('date'); 
+                               $this->db3->query($sql,__LINE__,__FILE__);
+                               if($this->db3->next_record()) { 
+                                       $date = $this->db3->f('date'); 
                                } else { 
                                        $date = ""; 
                                }
@@ -2279,7 +2545,7 @@ class tc
                                $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name Family</a></td>";
                                $table_data.= "<td align=center>$phone</td>";
                                $table_data.= "<td align=center>";
-                               $table_data.= '<select name=vis_notes['.$i.'][pri]>';
+                               $table_data.= '<select name=vis_notes['.$id.'][pri]>';
                                foreach(range(0,6) as $num) {
                                        if($num == 0) { $num = 1; } else {$num = $num*5; }
                                        if($vis_pri == $num) { 
@@ -2291,9 +2557,9 @@ class tc
                                }
                                $table_data.= '</select></td>';
                                $table_data.= "<td align=center>$date</td>";
-                               $table_data.= '<td><input type=text size="50" maxlength="128" name="vis_notes['.$i.'][notes]" value="'.$vis_notes.'">';
-                               $table_data.= '<input type=hidden name="vis_notes['.$i.'][family_id]" value="'.$id.'">';
-                               $table_data.= '<input type=hidden name="vis_notes['.$i.'][family_name]" value="'.$name.'">';
+                               $table_data.= '<td><input type=text size="50" maxlength="128" name="vis_notes['.$id.'][notes]" value="'.$vis_notes.'">';
+                               $table_data.= '<input type=hidden name="vis_notes['.$id.'][family_id]" value="'.$id.'">';
+                               $table_data.= '<input type=hidden name="vis_notes['.$id.'][family_name]" value="'.$name.'">';
                                $table_data.= '</td>';
                                $table_data.= '</tr>';
                                $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -2320,17 +2586,13 @@ class tc
                        }
                }
 
-               $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>";      
-               $completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-               $completed_header_row.= "<th width=$notes_width><font size=-2>Visit Notes</th>";
+               $completed_header_row = "<th><font size=-2>Family Name</th>";
+               $completed_header_row.= "<th><font size=-2>Phone</th>";      
+               $completed_header_row.= "<th><font size=-2>Date</th>";
+               $completed_header_row.= "<th><font size=-2>Visit Notes</th>";
 
-               $family_width=300; $totals_width=100;
-               $totals_table_width=$family_width + $totals_width;
-               $totals_header_row = "<th width=$family_width><font size=-2>Families</th>";
-               $totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+               $totals_header_row = "<th><font size=-2>Families</th>";
+               $totals_header_row.= "<th><font size=-2>$year</th>";
                $totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
                $totals_data.= "<td align=left><font size=-2><b>Total Families with yearly Visits completed:</b></font></td>";
                $totals_data.= "<td align=center><font size=-2><b>$families_with_yearly_visit / $total_families</b></font></td>";
@@ -2342,16 +2604,15 @@ class tc
                $totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>";
                $totals_data.= "</tr>";
 
-               $this->t->set_var('table_width',$table_width);
                $this->t->set_var('header_row',$header_row);
                $this->t->set_var('table_data',$table_data);
                $this->t->set_var('totals_header_row',$totals_header_row);
-               $this->t->set_var('totals_table_width',$totals_table_width);
                $this->t->set_var('completed_header_row',$completed_header_row);
-               $this->t->set_var('completed_table_width',$completed_table_width);
                $this->t->set_var('completed',$completed_data);
                $this->t->set_var('totals',$totals_data);
                $this->t->fp('familylist','family_list',True);
+               $this->t->set_var('lang_save_appt','Save Appts');
+               $this->t->set_var('lang_save_pri_notes','Save Pri / Notes');
                $this->t->fp('apptlist','appt_list',True);
 
                $this->t->pfp('out','vis_sched_t');
@@ -2376,12 +2637,12 @@ class tc
                $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
 
                $this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
-               $this->t->set_var('ppi_link_title','Yearly PPIs'); 
+               $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs'); 
 
                $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
-               $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+               $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
 
-               $this->t->set_var('title','Yearly PPIs');
+               $this->t->set_var('title',$this->ppi_frequency_label . ' PPIs');
                $num_months = get_var('num_months',array('GET','POST'));
                if($num_months == '') { $num_months = $this->default_ppi_num_years; }
                $this->t->set_var('num_months',$num_months);
@@ -2391,12 +2652,11 @@ class tc
                        $this->t->set_var('lang_num_months','Years of History');
                }
 
-               $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
+               $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                if($this->db->next_record()) {
                        $president_name = $this->db->f('name');
                        $interviewer = $this->db->f('individual');
-                       $interview_type = 'ppi';
                } else {
                        print "<hr><font color=red><h3>-E- Unable to locate President in tc_presidency table</h3></font></hr>";
                        return;
@@ -2404,8 +2664,7 @@ class tc
                $this->t->set_var('district_number','*');
                $this->t->set_var('district_name',$president_name);
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='Elder' and ti.valid=1 ORDER BY ti.individual ASC";
+               $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='$this->default_stewardship' and ti.valid=1 ORDER BY ti.individual ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -2420,7 +2679,7 @@ class tc
                array_multisort($indiv_name, $individual);
                //var_dump($indiv_name); print "<br><br>"; var_dump($individual);
 
-               $header_row="<th width=$comp_width><font size=-2>Individual Name</th>";
+               $header_row="<th width=$comp_width><font size=-2>Individual</th>";
 
                $indiv_width=400; $ppi_width=75; $table_width=$indiv_width + $num_months*$ppi_width;
                $table_data="";
@@ -2437,10 +2696,10 @@ class tc
 
                        $link_data['menuaction'] = 'tc.tc.ppi_update';
                        $link_data['interviewer'] = $interviewer;
-                       $link_data['indiv'] = $id;
+                       $link_data['individual'] = $id;
                        $link_data['name'] = $name;
                        $link_data['interview'] = '';
-                       $link_data['interview_type'] = $interview_type;
+                       $link_data['interview_type'] = 'ppi'; 
                        $link_data['action'] = 'add';
                        $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
                        $this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -2451,7 +2710,7 @@ class tc
                                $year = date('Y') - $m;
                                $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
                                $sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
-                                      "AND individual=" . $id . " AND interview_type='ppi'";
+                                      "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
                                $this->db2->query($sql,__LINE__,__FILE__);
 
                                if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2463,7 +2722,7 @@ class tc
                                        $link_data['indiv'] = $id;
                                        $link_data['name'] = $name;
                                        $link_data['interview'] = $this->db2->f('interview');
-                                       $link_data['interview_type'] = $interview_type;
+                                       $link_data['interview_type'] = 'ppi';
                                        $link_data['action'] = 'view';
                                        $date = $this->db2->f('date');
                                        $date_array = explode("-",$date);
@@ -2510,34 +2769,38 @@ class tc
                $interviewer = get_var('interviewer',array('GET','POST'));      
                $name = get_var('name',array('GET','POST'));
                $interview = get_var('interview',array('GET','POST'));
-               $indiv = get_var('indiv',array('GET','POST'));
+               $individual = get_var('individual',array('GET','POST'));
                $date = get_var('date',array('GET','POST'));
                $notes = get_var('notes',array('GET','POST'));
                $interview_type = get_var('interview_type',array('GET','POST'));
 
-               $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
+           $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND ";
+           if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; }
+               if($this->yearly_ppi_interviewer == 2) { $sql .= " (tp.president=1 OR tp.counselor=1)"; }
+               if($this->yearly_ppi_interviewer == 3) { $sql .= " (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; }
                $this->db2->query($sql,__LINE__,__FILE__);
                while ($this->db2->next_record()) {
                        $indiv = $this->db2->f('individual');
                        $interviewer_name = $this->db2->f('name');
                        if($indiv == $interviewer) {
-                               $this->t->set_var('interviewer',$interviewer . ' selected');
+                               $this->t->set_var('interviewer',$indiv . ' selected');
                        } else {
-                               $this->t->set_var('interviewer',$interviewer);
+                               $this->t->set_var('interviewer',$indiv);
                        }
+                       #print "indiv: $indiv interviewer: $interviewer<br>";
                        $this->t->set_var('interviewer_name',$interviewer_name);
-                       $this->t->set_var('interview_type_checked','');
+                       $this->t->set_var('eqpresppi_checked','checked');
                        $this->t->fp('int_list','interviewer_list',True);
                }
-
+               #print "selected interviewer: $interviewer<br>";
                if($action == 'save') {
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("UPDATE tc_interview set " .
                                         "   interview='" . $interview . "'" .
                                         ", interviewer='" . $interviewer . "'" .
-                                        ", individual='" . $indiv . "'" .
+                                        ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         ", interview_type='" . $interview_type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->ppi_view();
@@ -2547,8 +2810,8 @@ class tc
                if($action == 'insert') {
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
-                                        "VALUES ('" . $interviewer . "','" . $indiv . "','" .
-                                        $date . "','" . $notes . "','" . $interview_type  ."')",__LINE__,__FILE__);
+                                        "VALUES ('" . $interviewer . "','" . $individual . "','" .
+                                        $date . "',\"" . $notes . "\",'" . $interview_type  ."')",__LINE__,__FILE__);
                        $this->ppi_view();
                        return false;
                }
@@ -2558,11 +2821,11 @@ class tc
                        $this->t->set_var('interview', '');
                        $this->t->set_var('interviewer', $interviewer);
                        $this->t->set_var('name',$name);
-                       $this->t->set_var('indiv',$indiv);
+                       $this->t->set_var('individual',$individual);
                        $this->t->set_var('date','');
                        $this->t->set_var('notes','');
                        $this->t->set_var('interview_type',$interview_type);
-                       $this->t->set_var('interview_type_checked','checked');
+                       $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('/tc/index.php','menuaction=tc.tc.ppi_update&interview=' .
@@ -2570,17 +2833,17 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
                        $this->t->set_var('name',$name);
                        $this->t->set_var('interviewer', $this->db->f('interviewer'));
-                       $this->t->set_var('indiv',$this->db->f('indiv'));
+                       $this->t->set_var('individual',$this->db->f('individual'));
                        $this->t->set_var('date',$this->db->f('date'));
                        $this->t->set_var('notes',$this->db->f('notes'));
                        $this->t->set_var('interview_type',$this->db->f('interview_type'));
-                       if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
+                       if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
                }
 
                if($action == 'edit') {
@@ -2648,7 +2911,7 @@ class tc
                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 tc_district where valid=1 ORDER BY district ASC";
+               $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -2694,7 +2957,7 @@ class tc
                        for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
                        for ($j=0; $j < count($unique_companionships); $j++) {
                                // Select all the companions in each companionship
-                               $sql = "SELECT * FROM tc_companionship where valid=1 and ".
+                               $sql = "SELECT * FROM tc_companion where valid=1 and ".
                                       "companionship=". $unique_companionships[$j]['companionship'];
                                $this->db->query($sql,__LINE__,__FILE__);
                                $k=0;
@@ -2710,9 +2973,10 @@ class tc
                                        $link_data['menuaction'] = 'tc.tc.int_update';
                                        $link_data['companionship'] = $companionship;
                                        $link_data['interviewer'] = $supervisor;
-                                       $link_data['indiv'] = $individual;
+                                       $link_data['individual'] = $individual;
                                        $link_data['name'] = $name;
                                        $link_data['interview'] = '';
+                                       $link_data['interview_type'] = 'hti';
                                        $link_data['action'] = 'add';
                                        $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
                                        $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
@@ -2732,7 +2996,7 @@ class tc
                                                $month_end = "$year"."-"."$month"."-"."31";
                                                $month = "$month"."/"."$year";
                                                $sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
-                                                      "AND individual=" . $individual;
+                                                      "AND individual=" . $individual . " AND interview_type='hti' ORDER BY date DESC";
                                                $this->db2->query($sql,__LINE__,__FILE__);
                                                $header_row .= "<th width=$int_width><font size=-2>$month</th>";
 
@@ -2746,10 +3010,11 @@ class tc
                                                        $link_data['menuaction'] = 'tc.tc.int_update';
                                                        $link_data['companionship'] = $companionship;
                                                        $link_data['interviewer'] = $this->db2->f('interviewer');
-                                                       $link_data['indiv'] = $individual;
+                                                       $link_data['individual'] = $individual;
                                                        $link_data['name'] = $name;
                                                        $link_data['interview'] = $this->db2->f('interview');
                                                        $link_data['action'] = 'view';
+                                                       $link_data['interview_type'] = 'hti';
                                                        $date = $this->db2->f('date');
                                                        $date_array = explode("-",$date);
                                                        $month = $date_array[1];
@@ -2826,27 +3091,27 @@ class tc
                $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view'));
                $this->t->set_var('readonly','');
                $this->t->set_var('disabled','');
-               $this->t->set_var('interview_type_checked','');
+               $this->t->set_var('eqpresppi','');
 
                $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'));
-               $indiv = get_var('indiv',array('GET','POST'));
+               $individual = get_var('individual',array('GET','POST'));
                $date = get_var('date',array('GET','POST'));
                $notes = get_var('notes',array('GET','POST'));
                $interview_type = get_var('interview_type',array('GET','POST'));
 
-               $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+               $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1 OR tp.district!=0)";
                $this->db2->query($sql,__LINE__,__FILE__);
                while ($this->db2->next_record()) {
                        $indiv = $this->db2->f('individual');
                        $interviewer_name = $this->db2->f('name');
                        if($indiv == $interviewer) {
-                               $this->t->set_var('interviewer',$interviewer . ' selected');
+                               $this->t->set_var('interviewer',$indiv . ' selected');
                        } else {
-                               $this->t->set_var('interviewer',$interviewer);
+                               $this->t->set_var('interviewer',$indiv);
                        }
                        $this->t->set_var('interviewer_name',$interviewer_name);
                        $this->t->fp('int_list','interviewer_list',True);
@@ -2857,9 +3122,9 @@ class tc
                        $this->db->query("UPDATE tc_interview set " .
                                         "   interview='" . $interview . "'" .
                                         ", interviewer='" . $interviewer . "'" .
-                                        ", individual='" . $indiv . "'" .
+                                        ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         ", interview_type='" . $interview_type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->int_view();
@@ -2869,8 +3134,8 @@ class tc
                if($action == 'insert') {
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
-                                        "VALUES ('" . $interviewer . "','" . $indiv . "','" .
-                                        $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
+                                        "VALUES ('" . $interviewer . "','" . $individual . "','" .
+                                        $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
                        $this->int_view();
                        return false;
                }
@@ -2880,9 +3145,10 @@ class tc
                        $this->t->set_var('interview', '');
                        $this->t->set_var('interviewer', $interviewer);
                        $this->t->set_var('name',$name);
-                       $this->t->set_var('indiv',$indiv);
+                       $this->t->set_var('individual',$individual);
                        $this->t->set_var('date','');
                        $this->t->set_var('notes','');
+                       $this->t->set_var('interview_type',$interview_type);
                        $this->t->set_var('lang_done','Cancel');
                        $this->t->set_var('lang_action','Adding New Interview');
                        $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_update&interview=' .
@@ -2890,16 +3156,17 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='hti'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
                        $this->t->set_var('name',$name);
                        $this->t->set_var('interviewer', $this->db->f('interviewer'));
-                       $this->t->set_var('indiv',$this->db->f('individual'));
+                       $this->t->set_var('individual',$this->db->f('individual'));
                        $this->t->set_var('date',$this->db->f('date'));
                        $this->t->set_var('notes',$this->db->f('notes'));
-                       if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
+                       $this->t->set_var('interview_type',$this->db->f('interview_type'));
+                       if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
                }
 
                if($action == 'edit') {
@@ -2980,7 +3247,7 @@ class tc
                for ($i=0; $i < count($visit_list); $i++) {
                        $this->nextmatchs->template_alternate_row_color(&$this->t);
 
-                       $sql = "SELECT * FROM tc_family WHERE family=".$visit_list[$i]['family'];
+                       $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.family=".$visit_list[$i]['family']." AND ti.steward='$this->default_stewardship'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
 
@@ -3008,7 +3275,7 @@ class tc
                }
 
                // List the families that are available to record a visit against
-               $sql = "SELECT * FROM tc_family WHERE companionship != 0 and valid=1";
+               $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship != 0 AND tf.valid=1 AND ti.steward='$this->default_stewardship'";
                $this->db->query($sql,__LINE__,__FILE__);
                $total_records = $this->db->num_rows();
 
@@ -3064,7 +3331,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("UPDATE tc_visit set " .
                                         "  date='" . $date . "'" .
-                                        ", notes='" . $notes . "'" .
+                                        ", notes=\"" . $notes . "\"" .
                                         " WHERE visit=" . $visit,__LINE__,__FILE__);
                        $this->vis_view();
                        return false;
@@ -3074,7 +3341,7 @@ class tc
                        $notes = get_var('notes',array('POST'));
                        $this->db->query("INSERT INTO tc_visit (family,companionship,date,notes) " .
                                         "VALUES ('" . $family . "','" . $companionship . "','" .
-                                        $date . "','" . $notes . "')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes . "\")",__LINE__,__FILE__);
                        $this->vis_view();
                        return false;
                }
@@ -3168,8 +3435,7 @@ class tc
                else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
                else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -3358,8 +3624,7 @@ class tc
                        return false;
                }
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -3499,11 +3764,10 @@ class tc
                $this->t->set_block('org_view_t','org_list','list2');
 
                # Display a list ordered alphabetically
-               $sql = "SELECT * FROM tc_calling ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual ORDER BY name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
-                       $calling[$i]['id'] = $this->db->f('individual');
                        $calling[$i]['name'] = $this->db->f('name');
                        $calling[$i]['position'] = $this->db->f('position');
                        $calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3525,11 +3789,10 @@ class tc
                }
 
                # Display a list ordered by organization
-               $sql = "SELECT * FROM tc_calling ORDER BY sequence ASC";
+               $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY organization ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
-                       $calling[$i]['id'] = $this->db->f('individual');
                        $calling[$i]['name'] = $this->db->f('name');
                        $calling[$i]['position'] = $this->db->f('position');
                        $calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3574,18 +3837,18 @@ class tc
                $this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews');
 
                $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
-               $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+               $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
 
-               $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
+               $date_width=160; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
                $table_width=$date_width + $time_width + $indiv_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=$indiv_width><font size=-2>individual</th>";
+               $header_row.= "<th width=$indiv_width><font size=-2>Individual</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 tc_presidency where valid=1 GROUP BY individual ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 GROUP BY tp.individual ORDER BY ti.name ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -3593,22 +3856,18 @@ class tc
                        $presidency_data[$i]['name'] = $this->db->f('name');
                        $presidency_data[$i]['indiv'] = $this->db->f('individual');
                        $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
-                       $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual'];
+                       $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
                        $i++;
                }
 
-               $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 ORDER BY name ASC";
+               $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND ti.steward='$this->default_stewardship' AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.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 tc_individual where family='$family_id[$i]' and hh_position='Head of Household'";
-                       $this->db2->query($sql,__LINE__,__FILE__);
-                       if($this->db2->next_record()) {
-                               $familyid2address[$family_id[$i]] = $this->db2->f('address');
-                       }
+                       $familyid2address[$family_id[$i]] = $this->db->f('address');
                        $i++;
                }
                array_multisort($family_name, $family_id);
@@ -3631,6 +3890,10 @@ class tc
                                        $time = $hour.':'.$minute.':'.'00';
                                        $uid = 0;
 
+                                       // Zero out family or individual if they are invalid
+                                       if($indiv == "") { $indiv=0; }
+                                       if($family == "") { $family=0; }
+
                                        // Update our location
                                        if($location == "") {
                                                if($family > 0) {
@@ -3641,13 +3904,9 @@ class tc
                                                } else if($indiv > 0) {
                                                        $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                                                        $supervisor_last_name = $supervisor_name_array[0];
+                                                       #print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
                                                        $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
                                                        $this->db2->query($sql,__LINE__,__FILE__);
-                                                       if($this->db2->next_record()) {
-                                                               $mls_id = $this->db2->f('mls_id');
-                                                       }
-                                                       $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                                       $this->db2->query($sql,__LINE__,__FILE__);
                                                        if($this->db2->next_record()) {
                                                                $supervisor_address = $this->db2->f('address');
                                                        }
@@ -3727,8 +3986,7 @@ class tc
                        //Header('Location: ' . $take_me_to_url);
                }
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY individual ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -3768,11 +4026,6 @@ class tc
                                                $supervisor_last_name = $supervisor_name_array[0];
                                                $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
-                                               if($this->db2->next_record()) {
-                                                       $mls_id = $this->db2->f('mls_id');
-                                               }
-                                               $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
-                                               $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
                                                        $supervisor_address = $this->db2->f('address');
                                                }
@@ -3806,7 +4059,7 @@ class tc
                                $table_data.= "</td>";
 
                                // individual drop down list (for PPIs)
-                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
                                $table_data.= '<option value=0></option>';  
                                for ($j=0; $j < count($individual); $j++) {
                                        $id = $individual[$j];
@@ -3862,7 +4115,7 @@ class tc
                                $table_data.= "</td>";
 
                                // individual drop down list
-                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+                               $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
                                $table_data.= '<option value=0></option>';  
                                for ($j=0; $j < count($individual); $j++) {
                                        $id = $individual[$j];
@@ -3949,8 +4202,7 @@ class tc
 
                $this->t->pfp('out','admin_t');
 
-               // TODO:  changed this so it picks the quorum dynamically
-               $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
+               $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY individual ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
@@ -4096,7 +4348,6 @@ class tc
                                                $this->db2->query("UPDATE tc_presidency set" .
                                                                  " individual=" . $indiv . 
                                                                  " ,district=" . $district . 
-                                                                 " ,name='" . $name . "'" .
                                                                  " ,email='" . $email . "'" .
                                                                  " ,president='" . $president . "'" .
                                                                  " ,counselor='" . $counselor . "'" .
@@ -4104,10 +4355,10 @@ class tc
                                                                  " WHERE presidency=" . $id,__LINE__,__FILE__);
                                        } else {
                                                //print "Adding New Entry<br>";
-                                               $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district,name," .
+                                               $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district," .
                                                                  "email,president,counselor,secretary,valid) " .
                                                                  "VALUES (NULL,'" . $indiv . "','" . $district . "','" .
-                                                                 $name . "','" . $email . "','" . $president  . "','" .
+                                                                 $email . "','" . $president  . "','" .
                                                                  $counselor . "','" . $secretary . "','1'" .
                                                                  ")",__LINE__,__FILE__);
                                        }
@@ -4127,13 +4378,13 @@ class tc
                        $name = "High Priests";
                        $indiv = 0;
                        $valid = 0;
-                       $this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " .
-                                         "VALUES ('" . $district . "','" . $name . "','" .
+                       $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+                                         "VALUES ('" . $district . "','" . 
                                          $indiv . "','" . $valid . "'" .
                                          ")",__LINE__,__FILE__);
 
                        // Requery the tc_presidency table
-                       $sql = "SELECT * FROM tc_presidency where valid=1";
+                       $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record()) {
                                // Extract the data for each presidency record
@@ -4141,13 +4392,12 @@ class tc
                                $indiv = $this->db->f('individual');
                                $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 tc_district (district,name,supervisor,valid) " .
-                                                         "VALUES ('" . $district . "','" . $name . "','" .
+                                       $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+                                                         "VALUES ('" . $district . "','" . 
                                                          $indiv . "','" . $valid . "'" .
                                                          ")",__LINE__,__FILE__);
                                }
@@ -4164,7 +4414,7 @@ class tc
 
                // Now save off the data needed for a Presidency Table Update
 
-               $sql = "SELECT * FROM tc_presidency where valid=1";
+               $sql = "SELECT tp.*, ti.name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                $table_data = "";
                $header_row = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th>";
@@ -4334,10 +4584,14 @@ class tc
                        $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));
 
-                       $sql = "SELECT * FROM tc_presidency where presidency='$presidency'";
+                       $sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
                        $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
-                               $email = $this->db2->f('email');
+                               if ($this->db2->f('email1') != "") {
+                                       $email = $this->db2->f('email1');
+                               } else { 
+                                       $email = $this->db2->f('email2');
+                               }
                                $interviewer = $this->db2->f('name');
                        }
 
@@ -4356,18 +4610,18 @@ class tc
                        }
 
                        if($family > 0) {
-                               $sql = "SELECT * FROM tc_family where family='$family'";
+                               $sql = "SELECT * FROM tc_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');
                                        $individual = $this->db2->f('individual');
-                                       $appt_name = $family_name . " Family Visit";
                                        $sql = "SELECT * FROM tc_individual where individual='$individual'";
                                        $this->db3->query($sql,__LINE__,__FILE__);
                                        if($this->db3->next_record()) {
                                                $phone = $this->db3->f('phone');
+                                               $family_name = $this->db3->f('name');
+                                               $phone = $this->db3->f('phone');
                                        }
+                                       $appt_name = $family_name . " Family Visit";
                                        $duration = $this->default_visit_appt_duration * 60;
                                }
                        }