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=49d9a49e615b8f2e5aea3f42dc423b54efe7f188;hb=428f6a4f9c29acce79cd2a94081185bd3fd262d9;hp=1e9104d61714887f574f1feeb1767b25ba8c65b8;hpb=b569f0e85df791ecd13ed18a9378424bbd570558;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 1e9104d..49d9a49 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -200,20 +200,20 @@ class tc
$i++;
}
- $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
- // Make an array mapping indiv_ids to indiv_names
- for($i=0; $i < count($indiv_id); $i++) {
- $id = $indiv_id[$i];
+ // Make an array mapping individuals to indiv_names
+ for($i=0; $i < count($individual); $i++) {
+ $id = $individual[$i];
$indivs[$id] = $indiv_name[$i];
}
@@ -250,9 +250,9 @@ class tc
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= "
/ "; }
$companionship = $this->db->f('companionship');
- $indiv_id = $this->db->f('indiv');
- $name = $indivs[$indiv_id];
- $phone = $indiv_phone[$indiv_id];
+ $individual = $this->db->f('individual');
+ $name = $indivs[$individual];
+ $phone = $indiv_phone[$individual];
$companion_table_entry .= "$name ";
}
$table_data.= " ";
@@ -290,7 +290,7 @@ class tc
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
- // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ // look for visits made by any other companionship other than 0. (0 == Presidency Visit)
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
@@ -427,20 +427,20 @@ class tc
return false;
}
- $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
- // Make an array mapping indiv_ids to indiv_names
- for($i=0; $i < count($indiv_id); $i++) {
- $id = $indiv_id[$i];
+ // Make an array mapping individuals to indiv_names
+ for($i=0; $i < count($individual); $i++) {
+ $id = $individual[$i];
$indivs[$id] = $indiv_name[$i];
}
@@ -466,9 +466,9 @@ class tc
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= " / "; }
$companionship = $this->db->f('companionship');
- $indiv_id = $this->db->f('indiv');
- $name = $indivs[$indiv_id];
- $phone = $indiv_phone[$indiv_id];
+ $individual = $this->db->f('individual');
+ $name = $indivs[$individual];
+ $phone = $indiv_phone[$individual];
$companion_table_entry .= "$name ";
}
$table_data.= " ";
@@ -492,7 +492,7 @@ class tc
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
- // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ // look for visits made by any other companionship other than 0. (0 == Presidency Visit)
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
@@ -665,12 +665,12 @@ class tc
$i = 0;
while ($this->db->next_record()) {
- $part_list[$i]['indiv'] = $this->db->f('indiv');
+ $part_list[$i]['individual'] = $this->db->f('individual');
$i++;
}
for ($i=0; $i < count($part_list); $i++) {
- $sql = "SELECT * FROM tc_indiv WHERE indiv=" . $part_list[$i]['indiv'];
+ $sql = "SELECT * FROM tc_individual WHERE individual=" . $part_list[$i]['individual'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$names[$i] = $this->db->f('name');
@@ -696,7 +696,7 @@ class tc
function act_update()
{
$this->t->set_file(array('form' => 'act_update.tpl'));
- $this->t->set_block('form','indiv_list','list');
+ $this->t->set_block('form','individual_list','list');
$this->t->set_block('form','add','addhandle');
$this->t->set_block('form','edit','edithandle');
$this->t->set_var('lang_done','Done');
@@ -719,11 +719,11 @@ class tc
$this->db->query("DELETE from tc_participation where activity=".$activity['activity'],__LINE__,__FILE__);
// Re-add the individuals who are checked as having participated in this activity
- $indivs = get_var('indiv_name',array('POST'));
+ $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) {
- $this->db->query("INSERT INTO tc_participation (indiv,activity) " .
- "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO tc_participation (individual,activity) " .
+ "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
}
}
@@ -747,11 +747,11 @@ class tc
$activity['activity'] = $this->db->f('activity');
}
- $indivs = get_var('indiv_name',array('POST'));
+ $indivs = get_var('individual_name',array('POST'));
foreach ($indivs as $indiv)
{
- $this->db->query("INSERT INTO tc_participation (indiv,activity) " .
- "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO tc_participation (individual,activity) " .
+ "VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
}
$this->act_list();
@@ -812,23 +812,23 @@ class tc
$this->t->set_var('assignment_data',$assignment_data);
// Create individual selection boxes
- $sql = "SELECT * FROM tc_indiv";
+ $sql = "SELECT * FROM tc_individual";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
if($this->db->f('valid') == 1 || $action != 'add') {
$indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_valid[$i] = $this->db->f('valid');
$i++;
}
}
- array_multisort($indiv_name, $indiv_id, $indiv_valid);
+ array_multisort($indiv_name, $individual, $indiv_valid);
$j=0;
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
//$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM tc_participation where activity=". $activity['activity'] . " AND indiv=" . $indiv_id[$i];
+ $sql = "SELECT * FROM tc_participation where activity=". $activity['activity'] . " AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$this->t->set_var('checked','checked');
@@ -838,15 +838,15 @@ class tc
$checked=0;
}
if($checked || $indiv_valid[$i] == 1) {
- $this->t->set_var('indiv_name',$indiv_name[$i]);
- $this->t->set_var('indiv',$indiv_id[$i]);
+ $this->t->set_var('individual_name',$indiv_name[$i]);
+ $this->t->set_var('individual',$individual[$i]);
if(($j+1) % 3 == 0) {
$this->t->set_var('table_sep',"");
} else {
$this->t->set_var('table_sep',"");
}
if(($j) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); }
- $this->t->fp('list','indiv_list',True);
+ $this->t->fp('list','individual_list',True);
$j++;
}
}
@@ -981,18 +981,18 @@ class tc
{
$this->t->set_file(array('par_view_t' => 'par_view.tpl'));
$this->t->set_block('par_view_t','header_list','list1');
- $this->t->set_block('par_view_t','indiv_list','list2');
+ $this->t->set_block('par_view_t','individual_list','list2');
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual_name[$i] = $this->db->f('name');
+ $individual[$i] = $this->db->f('individual');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($individual_name, $individual);
$sql = "SELECT * FROM tc_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -1016,8 +1016,8 @@ class tc
$i++;
}
- $indiv_width=300; $part_width=25; $assignment_width=50;
- $total_width=$indiv_width+$part_width;
+ $individual_width=300; $part_width=25; $assignment_width=50;
+ $total_width=$individual_width+$part_width;
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
$this->t->set_var('assignment_code',$assignment_list[$i]['code']);
@@ -1025,17 +1025,17 @@ class tc
$total_width += $assignment_width;
}
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
$participated=0; $part_table = '';
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('indiv_name',$indiv_name[$i]);
+ $this->t->set_var('individual_name',$individual_name[$i]);
for ($j=0; $j < count($assignment_list); $j++) {
$date = "0000-00-00"; $checkmark=0; $num_matches=0;
for ($k=0; $k < count($activity_list); $k++) {
if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) {
$sql = "SELECT * FROM tc_participation where " .
" activity=" . $activity_list[$k]['activity'] .
- " AND indiv=" . $indiv_id[$i];
+ " AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
if($activity_list[$k]['date'] > $date) {
@@ -1061,10 +1061,10 @@ class tc
$part_table .= ' ';
}
$this->t->set_var('part_table',$part_table);
- $this->t->fp('list2','indiv_list',True);
+ $this->t->fp('list2','individual_list',True);
}
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('indiv_width',$indiv_width);
+ $this->t->set_var('individual_width',$individual_width);
$this->t->set_var('part_width',$part_width);
$this->t->set_var('act_width',$act_width);
$this->t->pfp('out','par_view_t');
@@ -1075,7 +1075,7 @@ class tc
{
$this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
$this->t->set_block('willing_view_t','header_list','list1');
- $this->t->set_block('willing_view_t','indiv_list','list2');
+ $this->t->set_block('willing_view_t','individual_list','list2');
$this->t->set_var('lang_filter','Filter');
$this->t->set_var('lang_filter_unwilling','Filter out unwilling individuals:');
@@ -1095,16 +1095,16 @@ class tc
$this->t->set_var('filter_input',$filter_input);
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $individual[$i] = $this->db->f('individual');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
$sql = "SELECT * FROM tc_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -1139,17 +1139,17 @@ class tc
$total_willing[$i] = 0;
}
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
$willing_table = ''; $indiv_willing=0;
- $this->t->set_var('indiv_name',$indiv_name[$i]);
- $this->t->set_var('indiv_phone',$indiv_phone[$indiv_id[$i]]);
- $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_update&indiv_id=' .
- $indiv_id[$i] . '&action=' . 'edit'));
+ $this->t->set_var('individual_name',$indiv_name[$i]);
+ $this->t->set_var('individual_phone',$indiv_phone[$individual[$i]]);
+ $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_update&individual=' .
+ $individual[$i] . '&action=' . 'edit'));
for ($j=0; $j < count($assignment_list); $j++) {
$found_willingness=0;
$sql = "SELECT * FROM tc_willingness where " .
" assignment=" . $assignment_list[$j]['assignment'] .
- " AND indiv=" . $indiv_id[$i];
+ " AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
$found_willingness=1;
@@ -1163,7 +1163,7 @@ class tc
$date = $this->db2->f('date');
$sql = "SELECT * FROM tc_participation where " .
" activity=" . $activity .
- " AND indiv=". $indiv_id[$i];
+ " AND individual=". $individual[$i];
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date_part = $date;
@@ -1188,7 +1188,7 @@ class tc
}
if(($indiv_willing == 1) || ($filter_unwilling == 'n')) {
$this->t->set_var('willing_table',$willing_table);
- $this->t->fp('list2','indiv_list',True);
+ $this->t->fp('list2','individual_list',True);
$this->nextmatchs->template_alternate_row_color(&$this->t);
}
}
@@ -1200,7 +1200,7 @@ class tc
$this->t->set_var('stat_table',$stat_table);
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('indiv_width',$indiv_width);
+ $this->t->set_var('individual_width',$indiv_width);
$this->t->set_var('willing_width',$willing_width);
$this->t->pfp('out','willing_view_t');
$this->save_sessiondata();
@@ -1216,8 +1216,8 @@ class tc
$this->t->set_block('willing_update_t','assignment_list','list');
$this->t->set_block('willing_update_t','save','savehandle');
- $indiv_id = get_var('indiv_id',array('GET','POST'));
- $this->t->set_var('indiv_id',$indiv_id);
+ $individual = get_var('individual',array('GET','POST'));
+ $this->t->set_var('individual',$individual);
$action = get_var('action',array('GET','POST'));
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_view'));
@@ -1227,7 +1227,7 @@ class tc
if($action == 'save') {
// Delete all the previous willingness entries for this individual
- $this->db->query("DELETE from tc_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__);
+ $this->db->query("DELETE from tc_willingness where individual=" . $individual ,__LINE__,__FILE__);
// Now, add the assignment willingness that is checked for this individual
$new_data = get_var('willingness',array('POST'));
@@ -1235,9 +1235,9 @@ class tc
$data_array = explode("/",$data);
$assignment = $data_array[0];
$willing = $data_array[1];
- //print "indiv_id: $indiv_id assignment: $assignment willing: $willing ";
- $this->db->query("INSERT INTO tc_willingness (indiv,assignment,willing) " .
- "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+ //print "individual: $individual assignment: $assignment willing: $willing ";
+ $this->db->query("INSERT INTO tc_willingness (individual,assignment,willing) " .
+ "VALUES (" . $individual .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
}
$this->willing_view();
return false;
@@ -1247,11 +1247,11 @@ class tc
$table_data="";
// Find out the individual's name
- $sql = "SELECT * FROM tc_indiv WHERE indiv=".$indiv_id." AND valid=1";
+ $sql = "SELECT * FROM tc_individual WHERE individual=".$individual." AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$indiv_name = $this->db->f('name');
- $this->t->set_var('indiv_name',$indiv_name);
+ $this->t->set_var('individual_name',$indiv_name);
}
// Select all the assignments
@@ -1267,7 +1267,7 @@ class tc
$table_data.=" $assignment_name ";
$header_row="Assignments Willingness ";
- $sql = "SELECT * FROM tc_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment;
+ $sql = "SELECT * FROM tc_willingness WHERE individual=".$individual." AND assignment=".$assignment;
$this->db2->query($sql,__LINE__,__FILE__);
$value = $assignment;
@@ -1325,7 +1325,7 @@ class tc
function ppi_sched()
{
$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
- $this->t->set_block('ppi_sched_t','indiv_list','indivlist');
+ $this->t->set_block('ppi_sched_t','individual_list','indivlist');
$this->t->set_block('ppi_sched_t','appt_list','apptlist');
$action = get_var('action',array('GET','POST'));
@@ -1352,24 +1352,24 @@ class tc
$year = date('Y');
- // Get the EQ President
+ // Get the President
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$president_name_array = explode(",",$president_name);
$president_last_name = $president_name_array[0];
- $president_id = $this->db->f('indiv');
+ $president_id = $this->db->f('individual');
$presidency_id = $this->db->f('presidency');
- $interviewer = $this->db->f('indiv');
+ $interviewer = $this->db->f('individual');
$district_number = '*';
$district_name = $president_name;
- $sql = "SELECT * FROM tc_indiv where indiv='$president_id'";
+ $sql = "SELECT * FROM tc_individual where individual='$president_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_indiv_id = $this->db2->f('mls_indiv_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$president_address = $this->db2->f('address');
@@ -1384,19 +1384,19 @@ class tc
$new_data = get_var('appt_notes',array('POST'));
if($new_data != "") {
foreach ($new_data as $entry) {
- $indiv = $entry['indiv'];
+ $indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
+ $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and individual='$indiv' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
// Perform database save actions here
$this->db->query("UPDATE tc_appointment set " .
- " indiv='" . $indiv . "'" .
+ " individual='" . $indiv . "'" .
",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -1409,14 +1409,14 @@ class tc
$new_data = get_var('ppi_notes',array('POST'));
foreach ($new_data as $entry) {
$ppi_notes = $entry['notes'];
- $indiv_id = $entry['indiv_id'];
+ $individual = $entry['individual'];
$ppi_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE tc_indiv set " .
+ $this->db->query("UPDATE tc_individual set " .
" ppi_notes='" . $ppi_notes . "'" .
",ppi_pri='" . $ppi_pri . "'" .
- " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
+ " WHERE individual=" . $individual,__LINE__,__FILE__);
}
@@ -1426,17 +1426,17 @@ class tc
// create the individual id -> individual name mapping
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
- $indiv_id = NULL;
+ $individual = NULL;
$indiv_name = NULL;
while ($this->db->next_record()) {
$indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
// APPOINTMENT TABLE
$date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
@@ -1449,7 +1449,7 @@ class tc
$total_indivs=0; $indivs_with_yearly_ppi=0;
- // Display a scheduling table for the EQ President
+ // 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";
@@ -1462,7 +1462,7 @@ class tc
while ($this->db->next_record()) {
$appointment = $this->db->f('appointment');
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$location = $this->db->f('location');
if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; }
@@ -1479,12 +1479,12 @@ class tc
$appt_table_data.= "$day_string ";
$appt_table_data.= "$time_string ";
- $appt_table_data.= '';
+ $appt_table_data.= '';
$appt_table_data.= ' ';
- for ($i=0; $i < count($indiv_id); $i++) {
- $id = $indiv_id[$i];
+ for ($i=0; $i < count($individual); $i++) {
+ $id = $individual[$i];
$name = $indiv_name[$i];
- if($indiv_id[$i] == $indiv) {
+ if($individual[$i] == $indiv) {
$selected[$id] = 'selected="selected"';
} else {
$selected[$id] = '';
@@ -1508,25 +1508,25 @@ class tc
// PPI SCHEDULING TABLE
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY ppi_pri ASC, name ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY ppi_pri ASC, name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
- $indiv_id = NULL;
+ $individual = NULL;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
- $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
- $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
+ $indiv_ppi_pri[$individual[$i]] = $this->db->f('ppi_pri');
+ $indiv_ppi_notes[$individual[$i]] = $this->db->f('ppi_notes');
$i++;
$total_indivs++;
}
- $max = count($indiv_id);
+ $max = count($individual);
for($i=0; $i < $max; $i++) {
- $id = $indiv_id[$i];
+ $id = $individual[$i];
$name = $indiv_name[$i];
$phone = $indiv_phone[$id];
$ppi_pri = $indiv_ppi_pri[$id];
@@ -1535,11 +1535,11 @@ class tc
// 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 indiv=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE indiv=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$date = $this->db->f('date');
@@ -1547,7 +1547,7 @@ class tc
$date = "";
}
$link_data['menuaction'] = 'tc.tc.ppi_update';
- $link_data['indiv'] = $id;
+ $link_data['individual'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['interview_type'] = 1;
@@ -1573,14 +1573,14 @@ class tc
$table_data.= ' ';
$table_data.= "$date ";
$table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
} else {
$link_data['menuaction'] = 'tc.tc.ppi_update';
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['indiv'] = $this->db2->f('indiv');
+ $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');
@@ -1613,7 +1613,7 @@ class tc
$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->fp('indivlist','indiv_list',True);
+ $this->t->fp('indivlist','individual_list',True);
$indivs_width=300; $totals_width=100;
$totals_table_width=$indivs_width + $totals_width;
@@ -1642,7 +1642,7 @@ class tc
function int_sched()
{
$this->t->set_file(array('int_sched_t' => 'int_sched.tpl'));
- $this->t->set_block('int_sched_t','indiv_list','indivlist');
+ $this->t->set_block('int_sched_t','individual_list','indivlist');
$this->t->set_block('int_sched_t','appt_list','apptlist');
$action = get_var('action',array('GET','POST'));
@@ -1678,51 +1678,51 @@ class tc
// create the individual id -> individual name mapping
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
- $indiv_id_data = NULL;
+ $individual_data = NULL;
$indiv_name_data = NULL;
while ($this->db->next_record()) {
$indiv_name_data[$i] = $this->db->f('name');
- $indiv_id_data[$i] = $this->db->f('indiv');
- $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
+ $individual_data[$i] = $this->db->f('individual');
+ $individ2name[$individual_data[$i]] = $indiv_name_data[$i];
$i++;
}
// add any YM that are home teachers
$sql = "SELECT * FROM tc_companionship where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
- $tmp_indiv_id = $this->db->f('indiv');
- $sql = "Select * FROM tc_indiv where indiv='$tmp_indiv_id' and steward='' and valid=1";
+ $tmp_individual = $this->db->f('individual');
+ $sql = "Select * FROM tc_individual where individual='$tmp_individual' and steward='' and valid=1";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv_name_data[$i] = $this->db2->f('name');
- $indiv_id_data[$i] = $this->db2->f('indiv');
- $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
+ $individual_data[$i] = $this->db2->f('individual');
+ $individ2name[$individual_data[$i]] = $indiv_name_data[$i];
$i++;
}
}
- array_multisort($indiv_name_data, $indiv_id_data);
+ array_multisort($indiv_name_data, $individual_data);
if($action == 'save') {
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
if($new_data != "") {
foreach ($new_data as $entry) {
- $indiv = $entry['indiv'];
+ $indiv = $entry['individual'];
$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_indiv where indiv='$supervisor'";
+ $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_indiv_id = $this->db2->f('mls_indiv_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1733,12 +1733,12 @@ class tc
//print "indiv: $indiv appointment: $appointment ";
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
+ $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and individual='$indiv' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
// Perform database save actions here
$this->db->query("UPDATE tc_appointment set " .
- " indiv='" . $indiv . "'" .
+ " individual='" . $indiv . "'" .
",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -1748,18 +1748,18 @@ class tc
}
// Save any changes made to the int notes table
- $new_data = get_var('int_notes',array('POST'));
+ $new_data = get_var('hti_notes',array('POST'));
foreach ($new_data as $entry) {
- $int_notes = $entry['notes'];
- $indiv_id = $entry['indiv_id'];
+ $hti_notes = $entry['notes'];
+ $individual = $entry['individual'];
$indiv_name = $entry['indiv_name'];
- $int_pri = $entry['pri'];
- //print "int_notes: $int_notes indiv_name: $indiv_name ";
+ $hti_pri = $entry['pri'];
+ //print "hti_notes: $hti_notes indiv_name: $indiv_name ";
// Perform database save actions here
- $this->db->query("UPDATE tc_indiv set " .
- " int_notes='" . $int_notes . "'" .
- ",int_pri='" . $int_pri . "'" .
- " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
+ $this->db->query("UPDATE tc_individual set " .
+ " hti_notes='" . $hti_notes . "'" .
+ ",hti_pri='" . $hti_pri . "'" .
+ " WHERE individual=" . $individual,__LINE__,__FILE__);
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched');
@@ -1803,12 +1803,12 @@ class tc
$supervisor = $districts[$d]['supervisor'];
$supervisor_array = explode(",", $supervisor);
$supervisor_last_name = $supervisor_array[0];
- $sql = "SELECT * FROM tc_indiv where indiv='$supervisor'";
+ $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_indiv_id = $this->db2->f('mls_indiv_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1825,7 +1825,7 @@ class tc
while ($this->db->next_record()) {
$appointment = $this->db->f('appointment');
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$location = $this->db->f('location');
if(($location == "") && ($indiv > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
@@ -1842,12 +1842,12 @@ class tc
$appt_table_data.= "$day_string ";
$appt_table_data.= "$time_string ";
- $appt_table_data.= '';
+ $appt_table_data.= '';
$appt_table_data.= ' ';
- for ($i=0; $i < count($indiv_id_data); $i++) {
- $id = $indiv_id_data[$i];
+ for ($i=0; $i < count($individual_data); $i++) {
+ $id = $individual_data[$i];
$name = $indiv_name_data[$i];
- if($indiv_id_data[$i] == $indiv) {
+ if($individual_data[$i] == $indiv) {
$selected[$id] = 'selected="selected"';
} else {
$selected[$id] = '';
@@ -1894,22 +1894,22 @@ class tc
$total_comps++;
while ($this->db->next_record()) {
// Get this companions information
- $indiv_id = $this->db->f('indiv');
+ $individual = $this->db->f('individual');
- $sql = "SELECT * FROM tc_indiv where indiv='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where individual='$individual'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv');
+ $individual = $this->db2->f('individual');
$indiv_name = $this->db2->f('name');
- $indiv_phone[$indiv_id] = $this->db2->f('phone');
- $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri');
- $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes');
+ $indiv_phone[$individual] = $this->db2->f('phone');
+ $indiv_hti_pri[$individual] = $this->db2->f('hti_pri');
+ $indiv_hti_notes[$individual] = $this->db2->f('hti_notes');
}
- $id = $indiv_id;
+ $id = $individual;
$name = $indiv_name;
$phone = $indiv_phone[$id];
- $int_pri = $indiv_int_pri[$id];
- $int_notes = $indiv_int_notes[$id];
+ $hti_pri = $indiv_hti_pri[$id];
+ $hti_notes = $indiv_hti_notes[$id];
// If the companionship has already had its quarterly interview,
// Skip the other companion in the companionship.
@@ -1917,7 +1917,7 @@ class tc
$completed_data.= "$name ";
$completed_data.= "$phone ";
$completed_data.= "$date ";
- $completed_data.= "$int_notes ";
+ $completed_data.= "$hti_notes ";
$completed_data.= ' ';
$tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
$this->t->set_var('tr_color2',$tr_color2);
@@ -1927,11 +1927,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 indiv='$id'";
+ $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE indiv='$id' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual='$id' ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date = $this->db3->f('date');
@@ -1939,7 +1939,7 @@ class tc
$date = "";
}
$link_data['menuaction'] = 'tc.tc.int_update';
- $link_data['indiv'] = $id;
+ $link_data['individual'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
@@ -1948,10 +1948,10 @@ class tc
$table_data.= "$name ";
$table_data.= "$phone ";
$table_data.= "";
- $table_data.= '';
+ $table_data.= '';
foreach(range(0,6) as $num) {
if($num == 0) { $num = 1; } else {$num = $num*5; }
- if($int_pri == $num) {
+ if($hti_pri == $num) {
$selected[$num] = 'selected="selected"';
} else {
$selected[$num] = '';
@@ -1960,16 +1960,16 @@ class tc
}
$table_data.= ' ';
$table_data.= "$date ";
- $table_data.= ' ';
- $table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' '."\n";
$i++;
} else {
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['indiv'] = $this->db2->f('indiv');
+ $link_data['individual'] = $this->db2->f('individual');
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
@@ -1977,12 +1977,12 @@ class tc
$comps_with_quarterly_int++;
$int_completed=1;
$date = $this->db2->f('date');
- $int_notes = $this->db2->f('notes');
- if(strlen($int_notes) > 40) { $int_notes = substr($int_notes,0,40) . "..."; }
+ $hti_notes = $this->db2->f('notes');
+ if(strlen($hti_notes) > 40) { $hti_notes = substr($hti_notes,0,40) . "..."; }
$completed_data.= "$name ";
$completed_data.= "$phone ";
$completed_data.= "$date ";
- $completed_data.= "$int_notes ";
+ $completed_data.= "$hti_notes ";
$completed_data.= ' ';
}
}
@@ -2001,7 +2001,7 @@ class tc
$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->fp('indivlist','indiv_list',True);
+ $this->t->fp('indivlist','individual_list',True);
} // End for each district loop
@@ -2061,7 +2061,7 @@ class tc
$year = date('Y');
// create the family id -> family name mapping
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@ -2069,7 +2069,7 @@ class tc
$family_id[$i] = $this->db->f('family');
$family_name[$i] = $this->db->f('name');
$familyid2name[$family_id[$i]] = $family_name[$i];
- $sql = "SELECT * FROM tc_indiv where family='$family_id[$i]'";
+ $sql = "SELECT * FROM tc_individual where family='$family_id[$i]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$familyid2address[$family_id[$i]] = $this->db2->f('address');
@@ -2137,8 +2137,8 @@ class tc
$appt_header_row.= "Location ";
$appt_table_data = "";
- // Find out what the EQ Presidency ID is
- $sql = "SELECT * FROM tc_presidency where eqpres=1 and valid=1";
+ // Find out what the President ID is
+ $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$presidency_name = $this->db->f('name');
@@ -2203,7 +2203,7 @@ class tc
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2224,7 +2224,7 @@ class tc
$total_families++;
}
- $sql = "SELECT * FROM tc_indiv where valid=1";
+ $sql = "SELECT * FROM tc_individual where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$family = $this->db->f('family');
@@ -2380,7 +2380,7 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
- $interviewer = $this->db->f('indiv');
+ $interviewer = $this->db->f('individual');
$interview_type = 'ppi';
} else {
print "-E- Unable to locate President in tc_presidency table ";
@@ -2390,20 +2390,20 @@ class tc
$this->t->set_var('district_name',$president_name);
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
- $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
- $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
+ $indiv_ppi_pri[$individual[$i]] = $this->db->f('ppi_pri');
+ $indiv_ppi_notes[$individual[$i]] = $this->db->f('ppi_notes');
$i++;
}
$total_indivs=$i;
- array_multisort($indiv_name, $indiv_id);
- //var_dump($indiv_name); print " "; var_dump($indiv_id);
+ array_multisort($indiv_name, $individual);
+ //var_dump($indiv_name); print " "; var_dump($individual);
$header_row="Individual Name ";
@@ -2415,8 +2415,8 @@ class tc
$ppis[$m] = 0;
}
- for ($j=0; $j < count($indiv_id); $j++) {
- $id = $indiv_id[$j];
+ for ($j=0; $j < count($individual); $j++) {
+ $id = $individual[$j];
$name = $indiv_name[$j];
$phone = $indiv_phone[$id];
@@ -2436,7 +2436,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 indiv=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2503,7 +2503,7 @@ class tc
$sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
- $indiv = $this->db2->f('indiv');
+ $indiv = $this->db2->f('individual');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
$this->t->set_var('interviewer',$interviewer . ' selected');
@@ -2520,7 +2520,7 @@ class tc
$this->db->query("UPDATE tc_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", indiv='" . $indiv . "'" .
+ ", individual='" . $indiv . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
", interview_type='" . $interview_type . "'" .
@@ -2531,7 +2531,7 @@ class tc
if($action == 'insert') {
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO tc_interview (interviewer,indiv,date,notes,interview_type) " .
+ $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
"VALUES ('" . $interviewer . "','" . $indiv . "','" .
$date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__);
$this->ppi_view();
@@ -2643,18 +2643,18 @@ class tc
$i++;
}
- $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
- for($i=0; $i < count($indiv_id); $i++) {
- $id = $indiv_id[$i];
+ array_multisort($indiv_name, $individual);
+ for($i=0; $i < count($individual); $i++) {
+ $id = $individual[$i];
$indivs[$id] = $indiv_name[$i];
}
@@ -2689,13 +2689,13 @@ class tc
// Get this companions information
$num_indivs++;
$companionship = $this->db->f('companionship');
- $indiv_id = $this->db->f('indiv');
- $name = $indivs[$indiv_id];
- $phone = $indiv_phone[$indiv_id];
+ $individual = $this->db->f('individual');
+ $name = $indivs[$individual];
+ $phone = $indiv_phone[$individual];
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $supervisor;
- $link_data['indiv'] = $indiv_id;
+ $link_data['indiv'] = $individual;
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
@@ -2717,7 +2717,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 indiv=" . $indiv_id;
+ "AND individual=" . $individual;
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "$month ";
@@ -2731,7 +2731,7 @@ class tc
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['indiv'] = $indiv_id;
+ $link_data['indiv'] = $individual;
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
@@ -2826,7 +2826,7 @@ class tc
$sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
- $indiv = $this->db2->f('indiv');
+ $indiv = $this->db2->f('individual');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
$this->t->set_var('interviewer',$interviewer . ' selected');
@@ -2842,7 +2842,7 @@ class tc
$this->db->query("UPDATE tc_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", indiv='" . $indiv . "'" .
+ ", individual='" . $indiv . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
", interview_type='" . $interview_type . "'" .
@@ -2853,7 +2853,7 @@ class tc
if($action == 'insert') {
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO tc_interview (interviewer,indiv,date,notes,interview_type) " .
+ $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
"VALUES ('" . $interviewer . "','" . $indiv . "','" .
$date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
$this->int_view();
@@ -2881,7 +2881,7 @@ class tc
$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('indiv',$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'); }
@@ -2993,7 +2993,7 @@ class tc
}
// List the families that are available to record a visit against
- $sql = "SELECT * FROM tc_family WHERE valid=1";
+ $sql = "SELECT * FROM tc_family WHERE companionship != 0 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -3133,7 +3133,7 @@ class tc
$this->t->set_block('att_view_t','month_list','list1');
$this->t->set_block('att_view_t','header_list','list2');
- $this->t->set_block('att_view_t','indiv_list','list3');
+ $this->t->set_block('att_view_t','individual_list','list3');
$this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.att_view'));
$num_quarters = get_var('num_quarters',array('GET','POST'));
@@ -3154,15 +3154,15 @@ class tc
else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual_name[$i] = $this->db->f('name');
+ $individual[$i] = $this->db->f('individual');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($individual_name, $individual);
// Create a list of sunday dates for a window of 3 months back and current month
$i=0;
@@ -3188,7 +3188,7 @@ class tc
if($found_sunday) { $i++; $found_sunday=0; }
}
- $total_indivs = count($indiv_id);
+ $total_individuals = count($individual);
$old_month=$sunday_list[0]['month']; $span=0;
for ($i=0; $i < count($sunday_list); $i++) {
$date = $sunday_list[$i]['date'];
@@ -3213,10 +3213,10 @@ class tc
}
$span++;
}
- $this->t->set_var('total_indivs',$total_indivs);
+ $this->t->set_var('total_individuals',$total_individuals);
$this->t->set_var('header_row',$header_row);
- $indiv_width=200; $att_width=25; $total_width=$indiv_width;
+ $individual_width=200; $att_width=25; $total_width=$individual_width;
for ($i=0; $i < count($sunday_list); $i++) {
$link_data['menuaction'] = 'tc.tc.att_update';
$link_data['month'] = $sunday_list[$i]['month'];
@@ -3234,17 +3234,17 @@ class tc
$attendance[$monthnum[$sunday_list[$i]['month']]]=0;
}
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
$att_table = "";
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('indiv_name',$indiv_name[$i]);
- #print "checking for indiv: " . $indiv_id[$i] . " ";
+ $this->t->set_var('individual_name',$individual_name[$i]);
+ #print "checking for individual: " . $individual[$i] . " ";
for ($j=0; $j < count($sunday_list); $j++) {
#print "checking for date: " . $sunday_list[$j]['date'] . " ";
#print "SELECT * FROM tc_attendance WHERE date='"
- # . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . " ";
+ # . $sunday_list[$j]['date'] . "' AND individual=" . $individual[$i] . " ";
$sql = "SELECT * FROM tc_attendance WHERE date='" .
- $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
+ $sunday_list[$j]['date'] . "' AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$cur_month = $sunday_list[$j]['month'];
@@ -3258,10 +3258,10 @@ class tc
}
}
$this->t->set_var('att_table',$att_table);
- $this->t->fp('list3','indiv_list',True);
+ $this->t->fp('list3','individual_list',True);
}
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('indiv_width',$indiv_width);
+ $this->t->set_var('individual_width',$individual_width);
$this->t->set_var('att_width',$att_width);
# Now calculate attendance for these months
@@ -3275,17 +3275,17 @@ class tc
foreach($attendance as $att => $value) {
$total_attended = $attendance[$att];
$ave_total_attended += $attendance[$att]; $num_months++;
- $percent = ceil(($total_attended / $total_indivs)*100);
+ $percent = ceil(($total_attended / $total_individuals)*100);
$attendance_str.="$total_attended ($percent%) ";
- $total_nonattended = $total_indivs - $total_attended;
- $percent = ceil(($total_nonattended / $total_indivs)*100);
+ $total_nonattended = $total_individuals - $total_attended;
+ $percent = ceil(($total_nonattended / $total_individuals)*100);
$nonattendance_str.="$total_nonattended ($percent%) ";
$total_attended = ceil(($ave_total_attended / $num_months));
- $percent = ceil(($total_attended / $total_indivs)*100);
+ $percent = ceil(($total_attended / $total_individuals)*100);
$aveattendance_str .= "$total_attended ($percent%) ";
- $total_attended = $total_indivs - ceil(($ave_total_attended / $num_months));
- $percent = ceil(($total_attended / $total_indivs)*100);
+ $total_attended = $total_individuals - ceil(($ave_total_attended / $num_months));
+ $percent = ceil(($total_attended / $total_individuals)*100);
$avenonattendance_str .= "$total_attended ($percent%) ";
}
@@ -3309,7 +3309,7 @@ class tc
$this->t->set_block('form','month_list','list1');
$this->t->set_block('form','header_list','list2');
- $this->t->set_block('form','indiv_list','list3');
+ $this->t->set_block('form','individual_list','list3');
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.att_view'));
@@ -3320,7 +3320,7 @@ class tc
$date = get_var('date',array('GET','POST'));
if($action == 'save_month' || $action == 'save_day') {
- $new_data = get_var('indivs_attended',array('POST'));
+ $new_data = get_var('individuals_attended',array('POST'));
$month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
if($action == 'save_month') {
@@ -3335,7 +3335,7 @@ class tc
$data_array = explode("-",$data);
$indiv = $data_array[0];
$date = "$data_array[1]-$data_array[2]-$data_array[3]";
- $this->db->query("INSERT INTO tc_attendance (indiv,date) " .
+ $this->db->query("INSERT INTO tc_attendance (individual,date) " .
"VALUES (" . $indiv . ",'". $date . "')",__LINE__,__FILE__);
}
@@ -3344,16 +3344,16 @@ class tc
}
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
- $indiv_attending[$indiv_id[$i]] = $this->db->f('attending');
+ $individual[$i] = $this->db->f('individual');
+ $indiv_attending[$individual[$i]] = $this->db->f('attending');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
if($action == 'update_month') {
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.att_update&action=save_month'));
@@ -3414,25 +3414,25 @@ class tc
$this->t->fp('list2','header_list',True);
}
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
$att_table = "";
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('indiv_name',$indiv_name[$i]);
+ $this->t->set_var('individual_name',$indiv_name[$i]);
for ($j=0; $j < count($sunday_list); $j++) {
$sql = "SELECT * FROM tc_attendance WHERE date='" .
- $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
+ $sunday_list[$j]['date'] . "' AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
- $value = $indiv_id[$i] . "-" . $sunday_list[$j]['date'];
+ $value = $individual[$i] . "-" . $sunday_list[$j]['date'];
if($this->db->next_record()) {
- $att_table .= ' ';
- } else if($indiv_attending[$indiv_id[$i]] == 1) {
- $att_table .= ' ';
+ $att_table .= ' ';
+ } else if($indiv_attending[$individual[$i]] == 1) {
+ $att_table .= ' ';
} else {
- $att_table .= ' ';
+ $att_table .= ' ';
}
}
$this->t->set_var('att_table',$att_table);
- $this->t->fp('list3','indiv_list',True);
+ $this->t->fp('list3','individual_list',True);
}
$this->t->set_var('lang_done', 'Cancel');
@@ -3450,11 +3450,11 @@ class tc
$this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
$this->t->set_block('dir_view_t','dir_list','list');
- $sql = "SELECT * FROM tc_indiv where valid=1 and hh_position='Head of Household' ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 and hh_position='Head of Household' ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $parent[$i]['id'] = $this->db->f('indiv');
+ $parent[$i]['id'] = $this->db->f('individual');
$parent[$i]['name'] = $this->db->f('name');
$parent[$i]['phone'] = $this->db->f('phone');
$parent[$i]['address'] = $this->db->f('address');
@@ -3488,7 +3488,7 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $calling[$i]['id'] = $this->db->f('indiv_id');
+ $calling[$i]['id'] = $this->db->f('individual');
$calling[$i]['name'] = $this->db->f('name');
$calling[$i]['position'] = $this->db->f('position');
$calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3514,7 +3514,7 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $calling[$i]['id'] = $this->db->f('indiv_id');
+ $calling[$i]['id'] = $this->db->f('individual');
$calling[$i]['name'] = $this->db->f('name');
$calling[$i]['position'] = $this->db->f('position');
$calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3570,26 +3570,26 @@ class tc
$header_row.= "Location ";
$table_data = "";
- $sql = "SELECT * FROM tc_presidency where valid=1";
+ $sql = "SELECT * FROM tc_presidency where valid=1 GROUP BY individual ORDER BY 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('indiv');
+ $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'];
+ $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual'];
$i++;
}
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$family_id[$i] = $this->db->f('family');
$family_name[$i] = $this->db->f('name');
$familyid2name[$family_id[$i]] = $family_name[$i];
- $sql = "SELECT * FROM tc_indiv where family='$family_id[$i]' and hh_position='Head of Household'";
+ $sql = "SELECT * FROM tc_individual where family='$family_id[$i]' and hh_position='Head of Household'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$familyid2address[$family_id[$i]] = $this->db2->f('address');
@@ -3609,7 +3609,7 @@ class tc
$hour = $entry['hour'];
$minute = $entry['minute'];
$pm = $entry['pm'];
- $indiv = $entry['indiv'];
+ $indiv = $entry['individual'];
$family = $entry['family'];
$location = $entry['location'];
if($pm) { $hour = $hour + 12; }
@@ -3626,12 +3626,12 @@ class tc
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
- $sql = "SELECT * FROM tc_indiv where indiv='$presidency2indiv[$presidency]'";
+ $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_indiv_id = $this->db2->f('mls_indiv_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -3656,7 +3656,7 @@ class tc
$sql = "SELECT * FROM tc_appointment where " .
"appointment='$appointment'" .
" and presidency='$presidency'" .
- " and indiv='$indiv'" .
+ " and individual='$indiv'" .
" and family='$family'" .
" and date='$date'" .
" and time='$time'" .
@@ -3667,7 +3667,7 @@ class tc
$old_time = $this->db->f('time');
$this->db2->query("UPDATE tc_appointment set" .
" family=" . $family .
- " ,indiv=" . $indiv .
+ " ,individual=" . $indiv .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
@@ -3682,15 +3682,15 @@ class tc
// Add a new appointment
else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
- //print "adding entry: appt=$appointment date: $date time: $time indiv: $indiv family: $family ";
- $this->db2->query("INSERT INTO tc_appointment (appointment,presidency,family,indiv,date,time,location,uid) " .
+ //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 . "','" .
$date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
// Now reselect this entry from the database to see if we need
// to send an appointment out for it.
$sql = "SELECT * FROM tc_appointment where " .
- "indiv='$indiv'" .
+ "individual='$indiv'" .
" and family='$family'" .
" and presidency='$presidency'" .
" and date='$date'" .
@@ -3713,20 +3713,20 @@ class tc
}
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
for ($i=0; $i < count($presidency_data); $i++) {
$presidency = $presidency_data[$i]['id'];
- $interviewer = $presidency_data[$i]['indiv'];
+ $interviewer = $presidency_data[$i]['individual'];
$name = $presidency_data[$i]['name'];
$this->t->set_var('presidency_name',$name);
$table_data="";
@@ -3738,7 +3738,7 @@ class tc
// Prefill any existing appointment slots
while ($this->db->next_record()) {
$appointment = $this->db->f('appointment');
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$family = $this->db->f('family');
$location = $this->db->f('location');
@@ -3751,12 +3751,12 @@ class tc
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
- $sql = "SELECT * FROM tc_indiv where indiv='$presidency2indiv[$presidency]'";
+ $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_indiv_id = $this->db2->f('mls_indiv_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -3793,10 +3793,10 @@ class tc
// individual drop down list (for PPIs)
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
- $id = $indiv_id[$j];
+ for ($j=0; $j < count($individual); $j++) {
+ $id = $individual[$j];
$name = $indiv_name[$j];
- if($indiv_id[$j] == $indiv) {
+ if($individual[$j] == $indiv) {
$selected[$id] = 'selected="selected"';
} else {
$selected[$id] = '';
@@ -3808,7 +3808,7 @@ class tc
// Family drop down list (for Visits)
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
+ for ($j=0; $j < count($individual); $j++) {
$id = $family_id[$j];
$name = $family_name[$j];
if($family_id[$j] == $family) {
@@ -3849,8 +3849,8 @@ class tc
// individual drop down list
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
- $id = $indiv_id[$j];
+ for ($j=0; $j < count($individual); $j++) {
+ $id = $individual[$j];
$name = $indiv_name[$j];
$table_data.= ''.$name.' ';
}
@@ -3859,7 +3859,7 @@ class tc
// Family drop down list
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
+ for ($j=0; $j < count($individual); $j++) {
$id = $family_id[$j];
$name = $family_name[$j];
$table_data.= ''.$name.' Family ';
@@ -3890,7 +3890,7 @@ class tc
function email()
{
$this->t->set_file(array('email_t' => 'email.tpl'));
- $this->t->set_block('email_t','indiv_list','list');
+ $this->t->set_block('email_t','individual_list','list');
$action = get_var('action',array('GET','POST'));
@@ -3935,16 +3935,16 @@ class tc
$this->t->pfp('out','admin_t');
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv2name[$indiv_id[$i]] = $indiv_name[$i];
+ $indiv2name[$individual[$i]] = $indiv_name[$i];
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
if($action == 'upload') {
$target_path = $this->upload_target_path . '/' . basename( $_FILES['uploadedfile']['name']);
@@ -4070,34 +4070,30 @@ class tc
$president = $entry['president'];
$counselor = $entry['counselor'];
$secretary = $entry['secretary'];
- $eqpresidency = $entry['eqpresidency'];
- // Set the individual id to 0 for EQ Presidency tagged entry
- if($eqpresidency == 1) { $indiv="0"; }
- // Re-look up the individual name for the ID if we aren't an EQ Presidency tagged entry
- else { $name = $indiv2name[$indiv]; }
+ // look up the individual name for the ID
+ $name = $indiv2name[$indiv];
//print "id=$id indiv=$indiv name=$name email=$email district=$district president=$president ";
- //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency ";
+ //print "counselor=$counselor secretary=$secretary ";
if(($indiv > 0) || ($name != "")) {
if($id < $this->max_presidency_members) {
//print "Updating Existing Entry ";
$this->db2->query("UPDATE tc_presidency set" .
- " indiv=" . $indiv .
+ " individual=" . $indiv .
" ,district=" . $district .
" ,name='" . $name . "'" .
" ,email='" . $email . "'" .
" ,president='" . $president . "'" .
" ,counselor='" . $counselor . "'" .
" ,secretary='" . $secretary . "'" .
- " ,eqpres='" . $eqpresidency . "'" .
" WHERE presidency=" . $id,__LINE__,__FILE__);
} else {
//print "Adding New Entry ";
- $this->db2->query("INSERT INTO tc_presidency (presidency,indiv,district,name," .
- "email,president,counselor,secretary,eqpres,valid) " .
+ $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district,name," .
+ "email,president,counselor,secretary,valid) " .
"VALUES (NULL,'" . $indiv . "','" . $district . "','" .
$name . "','" . $email . "','" . $president . "','" .
- $counselor . "','" . $secretary . "','" . $eqpres . "','1'" .
+ $counselor . "','" . $secretary . "','1'" .
")",__LINE__,__FILE__);
}
} else {
@@ -4127,7 +4123,7 @@ class tc
while ($this->db->next_record()) {
// Extract the data for each presidency record
$id = $this->db->f('presidency');
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$name = $this->db->f('name');
$district = $this->db->f('district');
$name = $this->db->f('name');
@@ -4151,23 +4147,22 @@ class tc
$this->t->pfp('adminhandle','admin');
}
- // Now save off the data needed for an EQ Presidency Table Update
+ // Now save off the data needed for a Presidency Table Update
$sql = "SELECT * FROM tc_presidency where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
- $header_row = "Individual Email District President Counselor Secretary Presidency ";
+ $header_row = "Individual Email District President Counselor Secretary ";
while ($this->db->next_record()) {
// Extract the data for each presidency record
$id = $this->db->f('presidency');
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$district = $this->db->f('district');
$name = $this->db->f('name');
$email = $this->db->f('email');
$president = $this->db->f('president');
$counselor = $this->db->f('counselor');
$secretary = $this->db->f('secretary');
- $eqpresidency = $this->db->f('eqpres');
// Create the forms needed in the table
$table_data .= "";
@@ -4179,10 +4174,10 @@ class tc
if($eqpresidency == 0) {
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
- $tmp_id = $indiv_id[$j];
+ for ($j=0; $j < count($individual); $j++) {
+ $tmp_id = $individual[$j];
$name = $indiv_name[$j];
- if($indiv_id[$j] == $indiv) {
+ if($individual[$j] == $indiv) {
$indivname = $name;
$selected = 'selected="selected"';
} else {
@@ -4231,12 +4226,6 @@ class tc
else { $table_data .= '0 1 '; }
$table_data.=' ';
- // Presidency
- $table_data.= '';
- if($eqpresidency == 1) { $table_data .= '0 1 '; }
- else { $table_data .= '0 1 '; }
- $table_data.=' ';
-
// End of ROW
$table_data .= " \n";
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -4251,8 +4240,8 @@ class tc
// individual
$table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($indiv_id); $j++) {
- $tmp_id = $indiv_id[$j];
+ for ($j=0; $j < count($individual); $j++) {
+ $tmp_id = $individual[$j];
$name = $indiv_name[$j];
$table_data.= ''.$name.' ';
}
@@ -4284,10 +4273,6 @@ class tc
$table_data.= '';
$table_data.= '0 1 ';
$table_data.=' ';
- // Presidency
- $table_data.= '';
- $table_data.= '0 1 ';
- $table_data.=' ';
// End of ROW
$table_data .= "\n";
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -4313,7 +4298,7 @@ class tc
$location = $this->db->f('location');
$interviewer = "";
$email = "";
- $indiv = $this->db->f('indiv');
+ $indiv = $this->db->f('individual');
$indiv_name = "";
$family = $this->db->f('family');
$family_name = "";
@@ -4345,7 +4330,7 @@ class tc
$from = $email;
if($indiv > 0) {
- $sql = "SELECT * FROM tc_indiv where indiv='$indiv'";
+ $sql = "SELECT * FROM tc_individual where individual='$indiv'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$indiv_name = $this->db2->f('name');
@@ -4361,9 +4346,9 @@ class tc
if($this->db2->next_record()) {
$family_name = $this->db2->f('name');
$phone = $this->db2->f('phone');
- $indiv_id = $this->db2->f('indiv_id');
+ $individual = $this->db2->f('individual');
$appt_name = $family_name . " Family Visit";
- $sql = "SELECT * FROM tc_indiv where indiv='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where individual='$individual'";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$phone = $this->db3->f('phone');