Fixed table titles and removed table widths for appt sched tables
[eq/.git] / inc / class.tc.inc.php
index 06a11e10bbca0918c68625279147f63f6ff01400..7191469bbb3dc4c707684d91b59733b683d681e1 100644 (file)
@@ -35,6 +35,7 @@ class tc
        var $script_path;
        var $max_appointments;
        var $max_presidency_members;
+       var $ppi_frequency_label;
 
        var $public_functions = array
        (
@@ -105,6 +106,18 @@ 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();    
@@ -203,7 +216,7 @@ 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";
+               $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()) {
@@ -255,7 +268,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__);
 
@@ -692,7 +705,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 { 
@@ -725,7 +738,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
@@ -734,7 +747,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__);
                                }
@@ -750,10 +763,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>";
@@ -761,7 +774,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__);
@@ -996,8 +1009,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()) {
@@ -1107,8 +1119,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()) {
@@ -1346,42 +1357,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');
+               $this->t->set_var('title',$this->ppi_frequency_label . ' 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>";
+               $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 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');
-                       $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;
-                       $president_address = $this->db->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
@@ -1391,7 +1386,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
@@ -1431,8 +1427,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;
@@ -1445,39 +1440,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]));
 
@@ -1488,14 +1496,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>';
 
@@ -1506,15 +1514,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; 
@@ -1530,7 +1539,7 @@ class tc
                }
 
                $max = count($individual);
-
+               
                for($i=0; $i < $max; $i++) {
                        $id = $individual[$i];
                        $name = $indiv_name[$i];
@@ -1538,10 +1547,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()) {
@@ -1606,27 +1616,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);
@@ -1638,7 +1645,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(); 
@@ -1666,7 +1673,7 @@ class tc
 
                $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=$indiv_width><font size=-2>Individual</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>";
@@ -1683,8 +1690,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;
@@ -1725,11 +1731,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');
                                                }
@@ -1762,7 +1763,7 @@ 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->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");
@@ -1775,7 +1776,7 @@ class tc
                }
 
                // Get the Districts
-               $sql = "SELECT * FROM tc_district AS td JOIN tc_presidency AS tp WHERE td.district=tp.district AND td.valid=1 ORDER BY td.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()) {
@@ -1809,11 +1810,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');
                        }
@@ -1889,7 +1885,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'];
@@ -1922,11 +1918,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'); 
@@ -1938,6 +1934,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>";
@@ -1967,6 +1964,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++;
@@ -1985,7 +1983,7 @@ 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=$name_width><font size=-2>Individual</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>";
@@ -2056,7 +2054,7 @@ class tc
                $year = date('Y');
 
                // create the family id -> family name mapping
-               $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 ORDER BY ti.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;
@@ -2107,12 +2105,10 @@ 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->logToFile("vis_sched", "UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'");
                                        $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
                                }
                        }
@@ -2196,7 +2192,7 @@ class tc
 
 
                // VISIT SCHEDULING TABLE
-               $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 ORDER BY tsp.priority ASC, ti.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;
@@ -2232,7 +2228,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) { 
@@ -2244,9 +2240,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);
@@ -2329,12 +2325,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);
@@ -2349,7 +2345,6 @@ class tc
                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;
@@ -2357,8 +2352,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()) {
@@ -2373,7 +2367,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="";
@@ -2390,10 +2384,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);
@@ -2404,7 +2398,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; }
@@ -2416,7 +2410,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);
@@ -2463,34 +2457,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 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)";
+           $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();
@@ -2500,8 +2498,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;
                }
@@ -2511,11 +2509,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=' .
@@ -2523,17 +2521,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') {
@@ -2601,7 +2599,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()) {
@@ -2647,7 +2645,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;
@@ -2663,9 +2661,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>";
@@ -2685,7 +2684,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>";
 
@@ -2699,10 +2698,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];
@@ -2779,14 +2779,14 @@ 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'));
@@ -2797,9 +2797,9 @@ class tc
                        $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);
@@ -2810,9 +2810,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();
@@ -2822,8 +2822,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;
                }
@@ -2833,9 +2833,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=' .
@@ -2843,16 +2844,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') {
@@ -2933,7 +2935,7 @@ class tc
                for ($i=0; $i < count($visit_list); $i++) {
                        $this->nextmatchs->template_alternate_row_color(&$this->t);
 
-                       $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.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();
 
@@ -2961,7 +2963,7 @@ class tc
                }
 
                // List the families that are available to record a visit against
-               $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";
+               $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();
 
@@ -3017,7 +3019,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;
@@ -3027,7 +3029,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;
                }
@@ -3121,8 +3123,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()) {
@@ -3311,8 +3312,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()) {
@@ -3452,7 +3452,7 @@ 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()) {
@@ -3477,7 +3477,7 @@ class tc
                }
 
                # Display a list ordered by organization
-               $sql = "SELECT * FROM tc_calling ORDER BY organization 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()) {
@@ -3525,13 +3525,13 @@ 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 = "";
@@ -3544,11 +3544,11 @@ 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 AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.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()) {
@@ -3578,6 +3578,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) {
@@ -3588,13 +3592,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');
                                                        }
@@ -3674,8 +3674,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()) {
@@ -3715,11 +3714,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');
                                                }
@@ -3753,7 +3747,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];
@@ -3809,7 +3803,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];
@@ -3896,8 +3890,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()) {
@@ -4073,8 +4066,8 @@ 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__);
 
@@ -4091,8 +4084,8 @@ class tc
 
                                // 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__);
                                }
@@ -4279,10 +4272,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 AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.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');
                        }