change supervisor field in tc_district and tc_district_sandbox to leader
[eq/.git] / inc / class.tc.inc.php
index fc699ea7f203c7a61639acd744339d9aac6ec174..57a3f3a8b42c4968b4ad419041bc25d6bc849a00 100644 (file)
@@ -79,6 +79,9 @@ class tc
                        include("setup/tc_config");
                }
 
+               $this->jquery_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.js');
+               $this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js');
+               
                $this->script_path = "$this->application_path"."/bin";
                $this->max_presidency_members = 99;
                $this->max_appointments = 32768;
@@ -92,6 +95,11 @@ class tc
                $this->grants     = $GLOBALS['phpgw']->acl->get_grants('tc');
                $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
 
+               $GLOBALS['phpgw_info']['flags']['css'] .= "-->\n</style>\n"
+                  . '<link rel="stylesheet" type="text/css" media="all" href="'
+                  . $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.css').'"/>'
+                  . "\n<style type=\"text/css\">\n<!--\n";
+
                $this->jscal = CreateObject('tc.jscalendar');   // before phpgw_header() !!!
                $this->cal_options = 'daFormat    : "%Y-%m-%d",
                                      ifFormat    : "%Y-%m-%d",
@@ -220,13 +228,13 @@ class tc
                $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";
+               $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.leader=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
                        $districts[$i]['district'] = $this->db->f('district');
                        $districts[$i]['name'] = $this->db->f('name');
-                       $districts[$i]['supervisor'] = $this->db->f('supervisor');
+                       $districts[$i]['leader'] = $this->db->f('leader');
                        $i++;
                }
 
@@ -252,10 +260,10 @@ class tc
                for ($i=0; $i < count($districts); $i++) {
                        $this->t->set_var('district_number',$districts[$i]['district']);
                        $this->t->set_var('district_name',$districts[$i]['name']);      
-                       $supervisor = $districts[$i]['supervisor'];
+                       $leader = $districts[$i]['leader'];
 
                        // Select all the unique companionship numbers for this district
-                       $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$i]['district'];
+                       $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$i]['district'];
                        $this->db->query($sql,__LINE__,__FILE__);
                        $j=0; $unique_companionships = '';
                        while ($this->db->next_record()) {
@@ -401,6 +409,7 @@ class tc
        function ht_sandbox()
        {
                $this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl'));
+           $this->t->set_block('ht_sandbox_t','switch_case_list','sc_list');
                $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');
@@ -411,7 +420,8 @@ class tc
                $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'));
-               
+           $this->t->set_var('jquery_url',$this->jquery_url);
+                
            $action = get_var('action',array('GET','POST'));
 
                $this->t->set_var('title','Hometeaching Sandbox'); 
@@ -529,13 +539,13 @@ class tc
                        $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\")";
+                               $leader = $this->db->f('leader');
+                               $sql = "INSERT INTO tc_district_sandbox (district,leader) VALUES (\"$district\",\"$leader\")";
                                $this->db2->query($sql,__LINE__,__FILE__);
                        }
                        
                        # populate family, companion, and companionship tables
-                       $sql = "SELECT * FROM tc_companionship WHERE valid=1";
+                       $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1";
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record()) {
                                $companionship = $this->db->f('companionship');
@@ -561,6 +571,8 @@ class tc
                                        $this->db3->query($sql,__LINE__,__FILE__);
                                }
                        }
+               } else if ($_POST['changes']) {
+                       $this->ht_sandbox_changes();
                }
                
                // get list of companionships
@@ -651,8 +663,16 @@ class tc
                        $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()) {
+                           $switch_case_list = "";
                                $sandbox_table_data .= "<tr><td><table>";
                                $companionship = $this->db->f('companionship');
+
+                           $switch_case_list .= "case '". $companionship ."':\n";
+                               $switch_case_list .= "  $(\"#district option:selected\").removeAttr(\"selected\");\n";
+                               $switch_case_list .= "  $(\"#assignedHT option:selected\").removeAttr(\"selected\");\n";
+                               $switch_case_list .= "  $(\"#assignedFamilies option:selected\").removeAttr(\"selected\");\n";
+                               $switch_case_list .= "  $(\"#district option[value='".$districts[$d]."']\").attr(\"selected\",true);\n";
+
                                # 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__);
@@ -663,9 +683,13 @@ class tc
                                        } else {
                                                $companion_names .= " / " . $this->db2->f('name');
                                        }
+                                       $individual = $this->db2->f('individual');
+                                       $switch_case_list .= "  $(\"#assignedHT option[value='".$individual."']\").attr(\"selected\",true);\n";
                                }
-                               $sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
-                               $sandbox_table_data .= "<tr><td><table>";
+                               $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\">$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";
@@ -673,12 +697,15 @@ class tc
                                while ($this->db2->next_record()) {
                                        $family_name = $this->db2->f('name') . " Family";
                                        $family_id = $this->db2->f('tc_family');
+                                   $family = $this->db2->f('family');
                                        $tc_companionship = $this->db2->f('tc_companionship');
-                                       $sandbox_table_data .= "<tr>";
+                                   $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>";
-                                       
+                                   $switch_case_list .= "  $(\"#assignedFamilies option[value='".$family."']\").attr(\"selected\",true);\n";
+                                 
                                        # get 12 months visit data for given family
-                                       for($m=$this->sandbox_stats_num_months; $m >= 0; $m--) {
+                                       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; }
@@ -710,8 +737,10 @@ class tc
                                }
                                $sandbox_table_data .= "</table></td></tr>";
                                $sandbox_table_data .= "</table></td></tr>";
+                               $switch_case_list .= "break;\n";
+                               $this->t->set_var('switch_case_list',$switch_case_list);
+                               $this->t->fp('sc_list','switch_case_list',True);
                        }
-                       
                        $sandbox_table_data .= "</table>";
                        $sandbox_table_data .= "</td>";
                }
@@ -723,7 +752,162 @@ class tc
                $this->t->pfp('out','ht_sandbox_t');
                $this->save_sessiondata();
        }
-      
+
+       function ht_sandbox_changes()
+       {
+               $email_contents = "Please review the following changes to home teaching.\r\n\r\n";
+               // list all companionships deleted
+               $email_contents .= "Removed Companionships\r\n\r\n";
+               $sql = "SELECT * FROM tc_companionship WHERE companionship NOT IN (SELECT tc_companionship FROM tc_companionship_sandbox) AND type='H' AND valid=1";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $companionship = $this->db->f('companionship');
+                       $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship";
+                       $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');
+                               }
+                       }
+                       $email_contents .= "\t$companion_names\r\n";
+               }
+               $email_contents .= "\r\n";
+               
+               // list all companionships added
+               $email_contents .= "New Companionships\r\n\r\n";
+               $sql = "SELECT * FROM tc_companionship_sandbox WHERE tc_companionship=0";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $companionship = $this->db->f('companionship');
+                       $sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.individual=ti.individual AND tcs.companionship=$companionship";
+                       $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');
+                               }
+                       }
+                       $email_contents .= "\t$companion_names\r\n";
+                       $sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND companionship=$companionship";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               $family_name = $this->db2->f('name') . " Family";
+                               $email_contents .= "\t\t$family_name\r\n";
+                       }
+               }
+               $email_contents .= "\r\n";
+               
+               // list all companionships with changes
+               $email_contents .= "Modified Companionships\r\n\r\n";
+               $sql = "SELECT tcps.* FROM tc_companionship AS tc JOIN tc_companionship_sandbox AS tcps WHERE tc.companionship=tcps.tc_companionship AND tc.type='H' AND tc.valid=1";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $companionship = $this->db->f('companionship');
+                       $tc_companionship = $this->db->f('tc_companionship');
+                       $companionship_changed = 0;
+                       
+                       // get current companion list
+                       $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.companionship=$companionship AND tc.individual=ti.individual";
+                       $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');
+                               }
+                       }
+                       
+                       // list removed companions
+                       $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.companionship=$tc_companionship AND tc.individual=ti.individual AND tc.individual NOT IN (SELECT individual FROM tc_companion_sandbox WHERE companionship=$companionship)";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               if ($companionship_changed == 0) {
+                                       $companionship_changed = 1;
+                                       $email_contents .= "\t$companion_names\r\n";
+                               }
+                               $name = $this->db2->f('name');
+                               $email_contents .= "\t\tremoved $name as a companion\r\n";
+                       }
+                       
+                       // list added companions
+                       $sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.companionship=$companionship AND tcs.individual=ti.individual AND tcs.individual NOT IN (SELECT individual FROM tc_companion WHERE companionship=$tc_companionship)";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               if ($companionship_changed == 0) {
+                                       $companionship_changed = 1;
+                                       $email_contents .= "\t$companion_names\r\n";
+                               }
+                               $name = $this->db2->f('name');
+                               $email_contents .= "\t\tadded $name as a companion\r\n";
+                       }
+                       
+                       // list removed families
+                       $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship=$tc_companionship AND tf.family NOT IN (SELECT tc_family FROM tc_family_sandbox WHERE companionship=$companionship)";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               if ($companionship_changed == 0) {
+                                       $companionship_changed = 1;
+                                       $email_contents .= "\t$companion_names\r\n";
+                               }
+                               $name = $this->db2->f('name');
+                               $email_contents .= "\t\tremoved $name Family\r\n";
+                       }
+                       
+                       // list added families
+                       $sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND tfs.companionship=$companionship AND tfs.individual NOT IN (SELECT individual FROM tc_family WHERE companionship=$tc_companionship)";
+                       $this->db2->query($sql,__LINE__,__FILE__);
+                       while ($this->db2->next_record()) {
+                               if ($companionship_changed == 0) {
+                                       $companionship_changed = 1;
+                                       $email_contents .= "\t$companion_names\r\n";
+                               }
+                               $name = $this->db2->f('name');
+                               $email_contents .= "\t\tadded $name Family\r\n";
+                       }
+               }
+               $email_contents .= "\r\n";
+               
+               // email changes to presidency
+               $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1) AND tp.valid=1";
+               $this->db->query($sql,__LINE__,__FILE__);
+               while ($this->db->next_record()) {
+                       $email = "";
+                       if ($this->db->f('email1') != "") {
+                               $email = $this->db->f('email1');
+                       } else { 
+                               $email = $this->db->f('email2');
+                       }
+                       if ($to == "") {
+                               $to .= $email;
+                       } else {
+                               $to .= ", $email";
+                       }
+               }
+               $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 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()) {
+                       if ($this->db->f('email1') != "") {
+                               $from = $this->db->f('email1');
+                       } else { 
+                               $from = $this->db->f('email2');
+                       }
+               } else {
+                       $from = "president@3rdcounselor";
+               }
+               $subject = "HomeTeaching Changes";
+               $message .= "$email_contents";
+               $headers = "From: $from\r\n" .
+                          "Reply-To: $from\r\n" .
+                          "X-Mailer: PHP/" . phpversion();
+
+               mail($to, $subject, $message, $headers);
+       }
 
        function ht_update()
        {
@@ -749,7 +933,7 @@ class tc
 
                if($action == 'save') {
                        // Get a list of all the companionships in this district
-                       $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $district;
+                       $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $district;
                        $this->db->query($sql,__LINE__,__FILE__);
                        $j=0; $unique_companionships = '';
                        while ($this->db->next_record()) {
@@ -802,7 +986,7 @@ class tc
                }      
 
                // Select all the unique companionship numbers for this district
-               $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $district;
+               $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $district;
                $this->db->query($sql,__LINE__,__FILE__);
                $j=0; $unique_companionships = '';
                while ($this->db->next_record()) {
@@ -815,8 +999,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 ".
-                       "companionship=". $unique_companionships[$j]['companionship'];
+                       $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1 AND companionship=". $unique_companionships[$j]['companionship'];
                        $this->db->query($sql,__LINE__,__FILE__);
 
                        while ($this->db->next_record()) {
@@ -1882,11 +2065,11 @@ class tc
                        $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";
+                              "AND individual=" . $id . " AND type='P' ORDER BY date DESC";
                        $this->db2->query($sql,__LINE__,__FILE__);
 
                        if(!$this->db2->next_record()) {
-                               $sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
+                               $sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND type='P' ORDER BY date DESC";
                                $this->db->query($sql,__LINE__,__FILE__);
                                if($this->db->next_record()) { 
                                        $date = $this->db->f('date'); 
@@ -1897,7 +2080,7 @@ class tc
                                $link_data['individual'] = $id;
                                $link_data['name'] = $name;
                                $link_data['interview'] = '';
-                               $link_data['interview_type'] = 1;
+                               $link_data['type'] = 1;
                                $link_data['action'] = 'add';
                                $link_data['interviewer'] = $interviewer;
                                $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
@@ -1930,7 +2113,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'] = $this->db2->f('interview_type');
+                               $link_data['type'] = $this->db2->f('type');
                                $link_data['action'] = 'view';
                                $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);    
                                $indivs_with_yearly_ppi++;
@@ -2030,7 +2213,7 @@ class tc
                        $i++;
                }
                // add any YM that are home teachers
-               $sql = "SELECT * FROM tc_companionship where valid=1";
+               $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1";
                $this->db->query($sql,__LINE__,__FILE__);
                while ($this->db->next_record()) {
                        $tmp_individual = $this->db->f('individual');
@@ -2054,15 +2237,15 @@ class tc
                                        $appointment = $entry['appointment'];
                                        $location = $entry['location'];
                                        if($location == "") {
-                                               $supervisor = $entry['supervisor'];
-                                               $supervisor_array = explode(",", $individ2name[$supervisor]);
-                                               $supervisor_last_name = $supervisor_array[0];
-                                               $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
+                                               $leader = $entry['leader'];
+                                               $leader_array = explode(",", $individ2name[$leader]);
+                                               $leader_last_name = $leader_array[0];
+                                               $sql = "SELECT * FROM tc_individual where individual='$leader'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
-                                                       $supervisor_address = $this->db2->f('address');
+                                                       $leader_address = $this->db2->f('address');
                                                }
-                                               $location = "$supervisor_last_name"." home ($supervisor_address)";
+                                               $location = "$leader_last_name"." home ($leader_address)";
                                        }
                                        if($indiv == 0) { $location = ""; }
 
@@ -2104,14 +2287,14 @@ class tc
                }
 
                // Get the Districts
-               $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";
+               $sql = "SELECT * FROM tc_district AS td JOIN (tc_presidency AS tp, tc_individual AS ti) WHERE td.district=tp.district AND td.leader=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
                        $district = $this->db->f('district');
                        $districts[$i]['district'] = $this->db->f('district');
                        $districts[$i]['name'] = $this->db->f('name');
-                       $districts[$i]['supervisor'] = $this->db->f('supervisor');
+                       $districts[$i]['leader'] = $this->db->f('leader');
                        $districts[$i]['presidency'] = $this->db->f('presidency');
                        $i++;
                }
@@ -2131,15 +2314,15 @@ class tc
                        $table_data=""; $appt_table_data="";
                        $this->t->set_var('district_number',$districts[$d]['district']);
                        $this->t->set_var('district_name',$districts[$d]['name']);      
-                       $supervisor = $districts[$d]['supervisor'];
-                       $supervisor_array = explode(",", $supervisor);
-                       $supervisor_last_name = $supervisor_array[0];
-                       $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
+                       $leader = $districts[$d]['leader'];
+                       $leader_array = explode(",", $leader);
+                       $leader_last_name = $leader_array[0];
+                       $sql = "SELECT * FROM tc_individual where individual='$leader'";
                        $this->db2->query($sql,__LINE__,__FILE__);
                        if($this->db2->next_record()) {
-                               $supervisor_address = $this->db2->f('address');
+                               $leader_address = $this->db2->f('address');
                        }
-                       $location = "$supervisor_last_name"." home ($supervisor_address)";
+                       $location = "$leader_last_name"." home ($leader_address)";
                        $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Individuals with Interviews Not Completed";
                        $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview Appointment Slots";
                        $this->t->set_var('table_title',$table_title);
@@ -2153,7 +2336,7 @@ class tc
                                $appointment = $this->db->f('appointment');
                                $indiv = $this->db->f('individual');
                                $location = $this->db->f('location');
-                               if(($location == "") && ($indiv > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
+                               if(($location == "") && ($indiv > 0)) { $location = "$leader_last_name"." home ($leader_address)"; }
 
                                $date = $this->db->f('date');
                                $date_array = explode("-",$date);
@@ -2186,7 +2369,7 @@ class tc
                                $appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
 
                                $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
-                               $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][supervisor]" value="'.$supervisor.'">';
+                               $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][leader]" value="'.$leader.'">';
 
                                $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
                                $this->t->set_var('tr_color',$tr_color);
@@ -2198,7 +2381,7 @@ class tc
                        // INTERVIEW SCHEDULING TABLE
 
                        // Select all the unique companionship numbers for this district
-                       $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$d]['district'];
+                       $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$d]['district'];
                        $this->db->query($sql,__LINE__,__FILE__);
                        $j=0; $unique_companionships = '';
                        while ($this->db->next_record())
@@ -2243,11 +2426,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' AND interview_type='hti'";
+                                       $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND type='H'";
                                        $this->db2->query($sql,__LINE__,__FILE__);
 
                                        if(!$this->db2->next_record()) {
-                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
+                                               $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND type='H' ORDER BY date DESC";
                                                $this->db3->query($sql,__LINE__,__FILE__);
                                                if($this->db3->next_record()) { 
                                                        $date = $this->db3->f('date'); 
@@ -2259,8 +2442,8 @@ 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_data['type'] = 'H';
+                                               $link_data['interviewer'] = $districts[$d]['leader'];
                                                $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>";
                                                $table_data.= "<td align=center>$phone</td>";
@@ -2289,7 +2472,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['type'] = 'H';
                                                $link_data['action'] = 'view';
                                                $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);    
                                                $comps_with_quarterly_int++;
@@ -2696,7 +2879,7 @@ class tc
                        $link_data['individual'] = $id;
                        $link_data['name'] = $name;
                        $link_data['interview'] = '';
-                       $link_data['interview_type'] = 'ppi'; 
+                       $link_data['type'] = 'P'; 
                        $link_data['action'] = 'add';
                        $link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
                        $this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -2707,7 +2890,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' ORDER BY date DESC";
+                                      "AND individual=" . $id . " AND type='P' ORDER BY date DESC";
                                $this->db2->query($sql,__LINE__,__FILE__);
 
                                if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2719,7 +2902,7 @@ class tc
                                        $link_data['indiv'] = $id;
                                        $link_data['name'] = $name;
                                        $link_data['interview'] = $this->db2->f('interview');
-                                       $link_data['interview_type'] = 'ppi';
+                                       $link_data['type'] = 'P';
                                        $link_data['action'] = 'view';
                                        $date = $this->db2->f('date');
                                        $date_array = explode("-",$date);
@@ -2769,7 +2952,7 @@ class tc
                $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'));
+               $type = get_var('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 ";
            if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; }
@@ -2798,7 +2981,7 @@ class tc
                                         ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
                                         ", notes=\"" . $notes . "\"" .
-                                        ", interview_type='" . $interview_type . "'" .
+                                        ", type='" . $type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->ppi_view();
                        return false;
@@ -2806,9 +2989,9 @@ class tc
 
                if($action == 'insert') {
                        $notes = get_var('notes',array('POST'));
-                       $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+                       $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
                                         "VALUES ('" . $interviewer . "','" . $individual . "','" .
-                                        $date . "',\"" . $notes . "\",'" . $interview_type  ."')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes . "\",'" . $type  ."')",__LINE__,__FILE__);
                        $this->ppi_view();
                        return false;
                }
@@ -2821,7 +3004,7 @@ class tc
                        $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('type',$type);
                        $this->t->set_var('eqpresppi_checked','checked');
                        $this->t->set_var('lang_done','Cancel');
                        $this->t->set_var('lang_action','Adding New PPI');
@@ -2830,7 +3013,7 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='P'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
@@ -2839,8 +3022,8 @@ class tc
                        $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') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+                       $this->t->set_var('type',$this->db->f('type'));
+                       if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
                }
 
                if($action == 'edit') {
@@ -2908,13 +3091,13 @@ 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 AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
+               $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.leader=ti.individual AND td.valid=1 ORDER BY td.district ASC";
                $this->db->query($sql,__LINE__,__FILE__);
                $i=0;
                while ($this->db->next_record()) {
                        $districts[$i]['district'] = $this->db->f('district');
                        $districts[$i]['name'] = $this->db->f('name');
-                       $districts[$i]['supervisor'] = $this->db->f('supervisor');
+                       $districts[$i]['leader'] = $this->db->f('leader');
                        $i++;
                }
 
@@ -2938,10 +3121,10 @@ class tc
                for ($i=0; $i < count($districts); $i++) {
                        $this->t->set_var('district_number',$districts[$i]['district']);
                        $this->t->set_var('district_name',$districts[$i]['name']);      
-                       $supervisor = $districts[$i]['supervisor'];
+                       $leader = $districts[$i]['leader'];
 
                        // Select all the unique companionship numbers for this district
-                       $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$i]['district'];
+                       $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$i]['district'];
                        $this->db->query($sql,__LINE__,__FILE__);
                        $j=0; $unique_companionships = '';
                        while ($this->db->next_record()) {
@@ -2969,11 +3152,11 @@ class tc
                                        $phone = $indiv_phone[$individual];
                                        $link_data['menuaction'] = 'tc.tc.int_update';
                                        $link_data['companionship'] = $companionship;
-                                       $link_data['interviewer'] = $supervisor;
+                                       $link_data['interviewer'] = $leader;
                                        $link_data['individual'] = $individual;
                                        $link_data['name'] = $name;
                                        $link_data['interview'] = '';
-                                       $link_data['interview_type'] = 'hti';
+                                       $link_data['type'] = 'H';
                                        $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>";
@@ -2993,7 +3176,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 interview_type='hti' ORDER BY date DESC";
+                                                      "AND individual=" . $individual . " AND type='H' ORDER BY date DESC";
                                                $this->db2->query($sql,__LINE__,__FILE__);
                                                $header_row .= "<th width=$int_width><font size=-2>$month</th>";
 
@@ -3011,7 +3194,7 @@ class tc
                                                        $link_data['name'] = $name;
                                                        $link_data['interview'] = $this->db2->f('interview');
                                                        $link_data['action'] = 'view';
-                                                       $link_data['interview_type'] = 'hti';
+                                                       $link_data['type'] = 'H';
                                                        $date = $this->db2->f('date');
                                                        $date_array = explode("-",$date);
                                                        $month = $date_array[1];
@@ -3098,7 +3281,7 @@ class tc
                $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'));
+               $type = get_var('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 OR tp.district!=0)";
                $this->db2->query($sql,__LINE__,__FILE__);
@@ -3122,7 +3305,7 @@ class tc
                                         ", individual='" . $individual . "'" .
                                         ", date='" . $date . "'" .
                                         ", notes=\"" . $notes . "\"" .
-                                        ", interview_type='" . $interview_type . "'" .
+                                        ", type='" . $type . "'" .
                                         " WHERE interview=" . $interview,__LINE__,__FILE__);
                        $this->int_view();
                        return false;
@@ -3130,9 +3313,9 @@ class tc
 
                if($action == 'insert') {
                        $notes = get_var('notes',array('POST'));
-                       $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+                       $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
                                         "VALUES ('" . $interviewer . "','" . $individual . "','" .
-                                        $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
+                                        $date . "',\"" . $notes ."\",'" . $type . "')",__LINE__,__FILE__);
                        $this->int_view();
                        return false;
                }
@@ -3145,7 +3328,7 @@ class tc
                        $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('type',$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=' .
@@ -3153,7 +3336,7 @@ class tc
                }
 
                if($action == 'edit' || $action == 'view') {
-                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='hti'";
+                       $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='H'";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
                        $this->t->set_var('interview',$interview);
@@ -3162,8 +3345,8 @@ class tc
                        $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') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+                       $this->t->set_var('type',$this->db->f('type'));
+                       if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
                }
 
                if($action == 'edit') {
@@ -3757,36 +3940,11 @@ class tc
        function org_view()
        {
                $this->t->set_file(array('org_view_t' => 'org_view.tpl'));
-               $this->t->set_block('org_view_t','calling_list','list1');
-               $this->t->set_block('org_view_t','org_list','list2');
-
-               # Display a list ordered alphabetically
-               $sql = "SELECT * FROM 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]['name'] = $this->db->f('name');
-                       $calling[$i]['position'] = $this->db->f('position');
-                       $calling[$i]['sustained'] = $this->db->f('sustained');
-                       $calling[$i]['organization'] = $this->db->f('organization');
-                       $i++;
-               }   
-               for ($i=0; $i < count($calling); $i++) {
-                       $name = $calling[$i]['name'];
-                       $position = $calling[$i]['position'];
-                       $sustained = $calling[$i]['sustained'];
-                       $organization = $calling[$i]['organization'];
-                       $this->t->set_var('name', $name);
-                       $this->t->set_var('position', $position);
-                       $this->t->set_var('sustained', $sustained);
-                       $this->t->set_var('organization', $organization);
-                       $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
-                       $this->t->set_var('tr_color',$tr_color);
-                       $this->t->fp('list1','calling_list',True);
-               }
+               $this->t->set_block('org_view_t','calling_list','list');
+           $this->t->set_var('jquery_url',$this->jquery_url);
+           $this->t->set_var('jquery_tablesorter_url',$this->jquery_tablesorter_url);
 
-               # Display a list ordered by organization
-               $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY organization 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()) {
@@ -3807,7 +3965,7 @@ class tc
                        $this->t->set_var('organization', $organization);
                        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
                        $this->t->set_var('tr_color',$tr_color);
-                       $this->t->fp('list2','org_list',True);
+                       $this->t->fp('list','calling_list',True);
                }
 
                $this->t->pfp('out','org_view_t');
@@ -3899,15 +4057,15 @@ class tc
                                                        $family_address = $familyid2address[$family];
                                                        $location = "$family_last_name"." home ($family_address)";
                                                } else if($indiv > 0) {
-                                                       $supervisor_name_array = explode(",",$presidency2name[$presidency]);
-                                                       $supervisor_last_name = $supervisor_name_array[0];
+                                                       $leader_name_array = explode(",",$presidency2name[$presidency]);
+                                                       $leader_last_name = $leader_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()) {
-                                                               $supervisor_address = $this->db2->f('address');
+                                                               $leader_address = $this->db2->f('address');
                                                        }
-                                                       $location = "$supervisor_last_name"." home ($supervisor_address)";
+                                                       $location = "$leader_last_name"." home ($leader_address)";
                                                }
                                        }
 
@@ -4048,14 +4206,14 @@ class tc
                                                $family_address = $familyid2address[$family];
                                                $location = "$family_last_name"." home ($family_address)";
                                        } else if($indiv > 0) {
-                                               $supervisor_name_array = explode(",",$presidency2name[$presidency]);
-                                               $supervisor_last_name = $supervisor_name_array[0];
+                                               $leader_name_array = explode(",",$presidency2name[$presidency]);
+                                               $leader_last_name = $leader_name_array[0];
                                                $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
                                                $this->db2->query($sql,__LINE__,__FILE__);
                                                if($this->db2->next_record()) {
-                                                       $supervisor_address = $this->db2->f('address');
+                                                       $leader_address = $this->db2->f('address');
                                                }
-                                               $location = "$supervisor_last_name"." home ($supervisor_address)";
+                                               $location = "$leader_last_name"." home ($leader_address)";
                                        }
                                }
 
@@ -4404,7 +4562,7 @@ class tc
                        $name = "High Priests";
                        $indiv = 0;
                        $valid = 0;
-                       $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+                       $this->db2->query("INSERT INTO tc_district (district,leader,valid) " .
                                          "VALUES ('" . $district . "','" . 
                                          $indiv . "','" . $valid . "'" .
                                          ")",__LINE__,__FILE__);
@@ -4422,7 +4580,7 @@ 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,supervisor,valid) " .
+                                       $this->db2->query("INSERT INTO tc_district (district,leader,valid) " .
                                                          "VALUES ('" . $district . "','" . 
                                                          $indiv . "','" . $valid . "'" .
                                                          ")",__LINE__,__FILE__);