X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=59aa4c0c4c516e34c72af18d42ff829f9a1c82d0;hb=b5c74cd3f678ed412df81cda7f8f77344d374d7a;hp=05b2a5232777e4f13924f4a8f0dd5f38bdf0cd07;hpb=40bab501e1ba7d982bead980469dcd975d141130;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 05b2a52..59aa4c0 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -34,7 +34,7 @@ class tc
var $upload_target_path;
var $script_path;
var $max_appointments;
- var $max_presidency_members;
+ var $max_leader_members;
var $ppi_frequency_label;
var $public_functions = array
@@ -83,7 +83,7 @@ class tc
$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_leader_members = 99;
$this->max_appointments = 32768;
$this->db = $GLOBALS['phpgw']->db;
@@ -228,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++;
}
@@ -260,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()) {
@@ -539,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');
@@ -758,7 +758,7 @@ class tc
$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 valid=1";
+ $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');
@@ -804,7 +804,7 @@ class tc
// 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.valid=1";
+ $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');
@@ -873,8 +873,8 @@ class tc
}
$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";
+ // email changes to leader
+ $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND (tl.type='P' OR tl.type='C' OR tl.type='S') AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$email = "";
@@ -889,7 +889,7 @@ class tc
$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";
+ $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record()) {
if ($this->db->f('email1') != "") {
@@ -933,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()) {
@@ -986,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()) {
@@ -999,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()) {
@@ -1901,8 +1900,8 @@ class tc
$indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
- $presidency_location = $entry['presidency_location'];
- if($location == "") { $location = $presidency_location; }
+ $leader_location = $entry['leader_location'];
+ if($location == "") { $location = $leader_location; }
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
@@ -1965,35 +1964,35 @@ class tc
$total_indivs=0; $indivs_with_yearly_ppi=0;
// 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)"; }
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti where tl.individual=ti.individual AND tl.valid=1 AND ";
+ if($this->yearly_ppi_interviewer == 1) { $sql .= " (tl.type='P')"; }
+ if($this->yearly_ppi_interviewer == 2) { $sql .= " (tl.type='P' OR tl.type='C')"; }
+ if($this->yearly_ppi_interviewer == 3) { $sql .= " (tl.type='P' OR tl.type='C' OR tl.type='S')"; }
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
- $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)";
+ $leader_name = $this->db->f('name');
+ $leader_name_array = explode(",",$leader_name);
+ $leader_last_name = $leader_name_array[0];
+ $leader_id = $this->db->f('leader');
+ $leader_address = $this->db->f('address');
+ $leader_location = "$leader_last_name"." home ($leader_address)";
$appt_table_data = "";
- // Display a scheduling table for this presidency member
+ // Display a scheduling table for this leader 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";
+ $appt_table_title = $leader_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";
+ $sql = "SELECT * FROM tc_appointment where leader=".$leader_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; }
+ if(($location == "") && ($indiv > 0)) { $location = $leader_location; }
$date = $this->db2->f('date');
$date_array = explode("-",$date);
@@ -2032,7 +2031,7 @@ class tc
}
$this->t->set_var('appt_table_data',$appt_table_data);
$this->t->set_var('appt_header_row',$appt_header_row);
- $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
+ $this->t->set_var('lang_save','Save Appts for ' . $leader_name);
$this->t->fp('apptlist','appt_list',True);
}
@@ -2214,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');
@@ -2238,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 = ""; }
@@ -2288,15 +2287,15 @@ 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_leader AS tl, tc_individual AS ti) WHERE td.district=tl.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]['presidency'] = $this->db->f('presidency');
+ $districts[$i]['leader'] = $this->db->f('leader');
+ $districts[$i]['leader'] = $this->db->f('leader');
$i++;
}
@@ -2315,29 +2314,29 @@ 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);
$this->t->set_var('appt_table_title',$appt_table_title);
// query the database for all the appointments
- $sql = "SELECT * FROM tc_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM tc_appointment where leader=".$districts[$d]['leader']." and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$appointment = $this->db->f('appointment');
$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);
@@ -2370,7 +2369,7 @@ class tc
$appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
$appt_table_data.= '';
- $appt_table_data.= '';
+ $appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
@@ -2382,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())
@@ -2444,7 +2443,7 @@ class tc
$link_data['interview'] = '';
$link_data['action'] = 'add';
$link_data['type'] = 'H';
- $link_data['interviewer'] = $districts[$d]['supervisor'];
+ $link_data['interviewer'] = $districts[$d]['leader'];
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$table_data.= "
";
@@ -2626,18 +2625,18 @@ class tc
$appt_table_data = "";
// Find out what the President ID is
- $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";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
- $presidency_name = $this->db->f('name');
- $presidency_id = $this->db->f('presidency');
+ $leader_name = $this->db->f('name');
+ $leader_id = $this->db->f('leader');
} else {
- print "
-E- Unable to locate Presidency in tc_presidency table
";
+ print "
-E- Unable to locate Presidency in tc_leader table
";
return;
}
// 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";
+ $sql = "SELECT * FROM tc_appointment where leader=$leader_id and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
@@ -2833,13 +2832,13 @@ class tc
$this->t->set_var('lang_num_months','Years of History');
}
- $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";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$interviewer = $this->db->f('individual');
} else {
- print "
-E- Unable to locate President in tc_presidency table
";
+ print "
-E- Unable to locate President in tc_leader table
";
return;
}
$this->t->set_var('district_number','*');
@@ -2955,10 +2954,10 @@ class tc
$notes = get_var('notes',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)"; }
- 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)"; }
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1 AND ";
+ if($this->yearly_ppi_interviewer == 1) { $sql .= " (tl.type='P')"; }
+ if($this->yearly_ppi_interviewer == 2) { $sql .= " (tl.type='P' OR tl.type='C')"; }
+ if($this->yearly_ppi_interviewer == 3) { $sql .= " (tl.type='P' OR tl.type='C' OR tl.type='S')"; }
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
@@ -3092,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++;
}
@@ -3122,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()) {
@@ -3153,7 +3152,7 @@ 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'] = '';
@@ -3284,7 +3283,7 @@ class tc
$notes = get_var('notes',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)";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1 AND (tl.type='P' OR tl.type='C' OR tl.type='D' OR tl.district!=0)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
@@ -3976,7 +3975,7 @@ class tc
function schedule()
{
$this->t->set_file(array('sched_t' => 'schedule.tpl'));
- $this->t->set_block('sched_t','presidency_list','list');
+ $this->t->set_block('sched_t','leader_list','list');
$action = get_var('action',array('GET','POST'));
@@ -4004,15 +4003,15 @@ class tc
$header_row.= "
Location
";
$table_data = "";
- $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 GROUP BY tp.individual ORDER BY ti.name ASC";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1 GROUP BY tl.individual ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $presidency_data[$i]['id'] = $this->db->f('presidency');
- $presidency_data[$i]['name'] = $this->db->f('name');
- $presidency_data[$i]['indiv'] = $this->db->f('individual');
- $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
- $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
+ $leader_data[$i]['id'] = $this->db->f('leader');
+ $leader_data[$i]['name'] = $this->db->f('name');
+ $leader_data[$i]['indiv'] = $this->db->f('individual');
+ $leader2name[$leader_data[$i]['id']] = $leader_data[$i]['name'];
+ $leader2indiv[$leader_data[$i]['id']] = $leader_data[$i]['indiv'];
$i++;
}
@@ -4030,9 +4029,9 @@ class tc
if($action == 'save') {
$new_data = get_var('sched',array('POST'));
- foreach ($new_data as $presidency_array) {
- foreach ($presidency_array as $entry) {
- $presidency = $entry['presidency'];
+ foreach ($new_data as $leader_array) {
+ foreach ($leader_array as $entry) {
+ $leader = $entry['leader'];
$appointment = $entry['appointment'];
$location = $entry['location'];
$date = $entry['date'];
@@ -4058,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];
- #print "presidency2indiv: $presidency $presidency2indiv[$presidency] ";
- $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
+ $leader_name_array = explode(",",$leader2name[$leader]);
+ $leader_last_name = $leader_name_array[0];
+ #print "leader2indiv: $leader $leader2indiv[$leader] ";
+ $sql = "SELECT * FROM tc_individual where individual='$leader2indiv[$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)";
}
}
@@ -4114,7 +4113,7 @@ class tc
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM tc_appointment where " .
"appointment='$appointment'" .
- " and presidency='$presidency'" .
+ " and leader='$leader'" .
" and individual='$indiv'" .
" and family='$family'" .
" and date='$date'" .
@@ -4130,7 +4129,7 @@ class tc
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
- " ,presidency='" . $presidency . "'" .
+ " ,leader='" . $leader . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -4142,8 +4141,8 @@ class tc
else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
//print "adding entry: appt=$appointment date: $date time: $time individual: $indiv family: $family ";
- $this->db2->query("INSERT INTO tc_appointment (appointment,presidency,family,individual,date,time,location,uid) " .
- "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $indiv . "','" .
+ $this->db2->query("INSERT INTO tc_appointment (appointment,leader,family,individual,date,time,location,uid) " .
+ "VALUES (NULL,'" . $leader . "','" . $family . "','" . $indiv . "','" .
$date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
// Now reselect this entry from the database to see if we need
@@ -4151,7 +4150,7 @@ class tc
$sql = "SELECT * FROM tc_appointment where " .
"individual='$indiv'" .
" and family='$family'" .
- " and presidency='$presidency'" .
+ " and leader='$leader'" .
" and date='$date'" .
" and time='$time'" .
" and uid='$uid'" .
@@ -4182,15 +4181,15 @@ class tc
}
array_multisort($indiv_name, $individual);
- for ($i=0; $i < count($presidency_data); $i++) {
- $presidency = $presidency_data[$i]['id'];
- $interviewer = $presidency_data[$i]['individual'];
- $name = $presidency_data[$i]['name'];
- $this->t->set_var('presidency_name',$name);
+ for ($i=0; $i < count($leader_data); $i++) {
+ $leader = $leader_data[$i]['id'];
+ $interviewer = $leader_data[$i]['individual'];
+ $name = $leader_data[$i]['name'];
+ $this->t->set_var('leader_name',$name);
$table_data="";
// query the database for all the appointments
- $sql = "SELECT * FROM tc_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM tc_appointment where leader=$leader and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
// Prefill any existing appointment slots
@@ -4207,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];
- $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
+ $leader_name_array = explode(",",$leader2name[$leader]);
+ $leader_last_name = $leader_name_array[0];
+ $sql = "SELECT * FROM tc_individual where individual='$leader2indiv[$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)";
}
}
@@ -4235,16 +4234,16 @@ class tc
// Date selection
$table_data.= '