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=06a11e10bbca0918c68625279147f63f6ff01400;hb=618c7a09c5e0b99ca1ef5381aa2349802d11098b;hp=ac8fd709c687d16791243295e81cac7212ba62bd;hpb=c2126b4823045fd8915a51c9f0f38ca103a15731;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index ac8fd70..06a11e1 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -15,6 +15,7 @@ class tc
{
var $db;
var $db2;
+ var $db3;
var $t;
var $nextmatchs;
var $grants;
@@ -108,6 +109,18 @@ class tc
echo parse_navbar();
$this->display_app_header();
}
+
+ function logToFile($func, $msg)
+ {
+ // open file
+ $fd = fopen($this->upload_target_path . "/tc_trace.log", "a");
+ // append date/time to message
+ $str = "[" . date("Y/m/d h:i:s", mktime()) . "] [" . $func . "] " . $msg;
+ // write string
+ fwrite($fd, $str . "\n");
+ // close file
+ fclose($fd);
+ }
function save_sessiondata()
{
@@ -200,20 +213,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,15 +263,15 @@ class tc
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= "
$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 +1338,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,28 +1365,19 @@ class tc
$year = date('Y');
- // Get the EQ President
- $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
+ // Get the President
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$president_name_array = explode(",",$president_name);
$president_last_name = $president_name_array[0];
- $president_id = $this->db->f('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'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
- }
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $president_address = $this->db2->f('address');
- }
+ $president_address = $this->db->f('address');
} else {
print "-E- Unable to locate President in tc_presidency table ";
return;
@@ -1384,19 +1388,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
@@ -1406,18 +1410,20 @@ class tc
}
// Save any changes made to the ppi notes table
- $new_data = get_var('ppi_notes',array('POST'));
+ $new_data = get_var('notes',array('POST'));
foreach ($new_data as $entry) {
- $ppi_notes = $entry['notes'];
- $indiv_id = $entry['indiv_id'];
- $ppi_pri = $entry['pri'];
+ $notes = $entry['notes'];
+ $individual = $entry['individual'];
+ $priority = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE tc_indiv set " .
- " ppi_notes='" . $ppi_notes . "'" .
- ",ppi_pri='" . $ppi_pri . "'" .
- " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
-
+ $sql = "SELECT * FROM tc_individual WHERE individual='$individual'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ //$this->logToFile("ppi_sched", "UPDATE tc_scheduling_priority SET priority='$priority', notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'");
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$priority', notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
+ }
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched');
@@ -1426,17 +1432,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 +1455,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 +1468,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 +1485,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,38 +1514,38 @@ 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 AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='Elder' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC";
$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_priority[$individual[$i]] = $this->db->f('priority');
+ $indiv_notes[$individual[$i]] = $this->db->f('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];
- $ppi_notes = $indiv_ppi_notes[$id];
+ $priority = $indiv_priority[$id];
+ $notes = $indiv_notes[$id];
// If this individual has had a yearly PPI this year, don't show him on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
$sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
- "AND 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 +1553,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;
@@ -1558,12 +1564,12 @@ class tc
$this->t->set_var('tr_color',$tr_color);
$table_data.= "$name ";
$table_data.= "$phone ";
- //$table_data.= "$ppi_pri ";
+ //$table_data.= "$priority ";
$table_data.= "";
- $table_data.= '';
+ $table_data.= '';
foreach(range(0,6) as $num) {
if($num == 0) { $num = 1; } else {$num = $num*5; }
- if($ppi_pri == $num) {
+ if($priority == $num) {
$selected[$num] = 'selected="selected"';
} else {
$selected[$num] = '';
@@ -1572,15 +1578,15 @@ class tc
}
$table_data.= ' ';
$table_data.= "$date ";
- $table_data.= ' ';
- $table_data.= ' ';
- $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');
@@ -1588,14 +1594,14 @@ class tc
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$indivs_with_yearly_ppi++;
$date = $this->db2->f('date');
- $ppi_notes = $this->db2->f('notes');
- if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
+ $notes = $this->db2->f('notes');
+ if(strlen($notes) > 40) { $notes = substr($notes,0,40) . "..."; }
$tr_color2 = $this->nextmatchs->alternate_row_color($tr_color2);
$this->t->set_var('tr_color2',$tr_color2);
$completed_data.= "$name ";
$completed_data.= "$phone ";
$completed_data.= "$date ";
- $completed_data.= "$ppi_notes ";
+ $completed_data.= "$notes ";
$completed_data.= ' ';
}
} // End for individuals Loop
@@ -1613,7 +1619,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 +1648,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 +1684,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_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1733,12 +1739,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 +1754,20 @@ 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("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ //$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'",__LINE__,__FILE__);
+ }
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched');
@@ -1767,7 +1775,7 @@ class tc
}
// Get the Districts
- $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM tc_district AS td JOIN tc_presidency AS tp WHERE td.district=tp.district AND td.valid=1 ORDER BY td.district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -1775,11 +1783,7 @@ class tc
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['supervisor'] = $this->db->f('supervisor');
- $sql = "SELECT * FROM tc_presidency where district=$district and valid=1";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $districts[$i]['presidency'] = $this->db2->f('presidency');
- }
+ $districts[$i]['presidency'] = $this->db->f('presidency');
$i++;
}
@@ -1803,12 +1807,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_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -1825,7 +1829,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 +1846,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] = '';
@@ -1885,7 +1889,7 @@ class tc
$i=0;
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions from each companionship
- $sql = "SELECT * FROM tc_companionship where valid=1 and companionship=". $unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0; $int_completed=0;
$comp = $unique_companionships[$j]['companionship'];
@@ -1894,22 +1898,13 @@ 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'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv');
- $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');
- }
- $id = $indiv_id;
- $name = $indiv_name;
- $phone = $indiv_phone[$id];
- $int_pri = $indiv_int_pri[$id];
- $int_notes = $indiv_int_notes[$id];
+ $id = $this->db->f('individual');
+ $name = $this->db->f('name');
+ $phone = $this->db->f('phone');
+ $hti_pri = $this->db->f('priority');
+ $hti_notes = $this->db->f('notes');
// If the companionship has already had its quarterly interview,
// Skip the other companion in the companionship.
@@ -1917,7 +1912,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 +1922,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 +1934,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 +1943,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 +1955,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 +1972,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 +1996,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 +2056,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 AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@ -2069,11 +2064,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]'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $familyid2address[$family_id[$i]] = $this->db2->f('address');
- }
+ $familyid2address[$family_id[$i]] = $this->db->f('address');
$i++;
}
array_multisort($family_name, $family_id);
@@ -2118,10 +2109,12 @@ class tc
$visit_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE tc_family set " .
- " visit_notes='" . $visit_notes . "'" .
- ",visit_pri='" . $visit_pri . "'" .
- " WHERE family=" . $family,__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM tc_family WHERE family='$family'",__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ $scheduling_priority = $this->db->f('scheduling_priority');
+ //$this->logToFile("vis_sched", "UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'");
+ $this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
+ }
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched');
@@ -2137,8 +2130,8 @@ class tc
$appt_header_row.= "Location ";
$appt_table_data = "";
- // Find out what the EQ Presidency ID is
- $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
+ // 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";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$presidency_name = $this->db->f('name');
@@ -2203,43 +2196,18 @@ 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 AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
- $i=0;
- $family_id = NULL;
- $family_name = NULL;
- $family_phone = NULL;
- $family_visit_pri = NULL;
- $family_visit_notes = NULL;
- while ($this->db->next_record()) {
- $family_id[$i] = $this->db->f('family');
- $family_name[$i] = $this->db->f('name');
- $family_phone[$family_id[$i]] = $family_id[$i] . " ERROR";
- $family_visit_pri[$family_id[$i]] = $this->db->f('visit_pri');
- $family_visit_notes[$family_id[$i]] = $this->db->f('visit_notes');
- $i++;
+ while ( $this->db->next_record()) {
$total_families++;
- }
-
- $sql = "SELECT * FROM tc_indiv where valid=1";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record()) {
- $family = $this->db->f('family');
+ $id = $this->db->f('family');
+ $name = $this->db->f('name');
$phone = $this->db->f('phone');
- $family_phone[$family] = $phone;
- }
-
- $max = count($family_id);
-
- for($i=0; $i < $max; $i++) {
- $id = $family_id[$i];
- $name = $family_name[$i];
- $phone = $family_phone[$id];
- $vis_pri = $family_visit_pri[$id];
- $vis_notes = $family_visit_notes[$id];
+ $vis_pri = $this->db->f('priority');
+ $vis_notes = $this->db->f('notes');
// If this family has had a yearly visit this year, don't show them on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
@@ -2249,9 +2217,9 @@ class tc
if(!$this->db2->next_record()) {
$sql = "SELECT * FROM tc_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
- $this->db->query($sql,__LINE__,__FILE__);
- if($this->db->next_record()) {
- $date = $this->db->f('date');
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ $date = $this->db3->f('date');
} else {
$date = "";
}
@@ -2376,11 +2344,11 @@ class tc
$this->t->set_var('lang_num_months','Years of History');
}
- $sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
- $interviewer = $this->db->f('indiv');
+ $interviewer = $this->db->f('individual');
$interview_type = 'ppi';
} else {
print "-E- Unable to locate President in tc_presidency table ";
@@ -2390,20 +2358,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 AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='Elder' and ti.valid=1 ORDER BY ti.individual ASC";
$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_priority[$individual[$i]] = $this->db->f('priority');
+ $indiv_notes[$individual[$i]] = $this->db->f('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 +2383,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 +2404,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; }
@@ -2500,10 +2468,10 @@ class tc
$notes = get_var('notes',array('GET','POST'));
$interview_type = get_var('interview_type',array('GET','POST'));
- $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
- $indiv = $this->db2->f('indiv');
+ $indiv = $this->db2->f('individual');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
$this->t->set_var('interviewer',$interviewer . ' selected');
@@ -2520,7 +2488,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 +2499,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 +2611,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 +2657,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 +2685,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 +2699,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';
@@ -2823,10 +2791,10 @@ class tc
$notes = get_var('notes',array('GET','POST'));
$interview_type = get_var('interview_type',array('GET','POST'));
- $sql = "SELECT * FROM tc_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1 OR tp.district!=0)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
- $indiv = $this->db2->f('indiv');
+ $indiv = $this->db2->f('individual');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
$this->t->set_var('interviewer',$interviewer . ' selected');
@@ -2842,7 +2810,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 +2821,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 +2849,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'); }
@@ -2965,7 +2933,7 @@ class tc
for ($i=0; $i < count($visit_list); $i++) {
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM tc_family WHERE family=".$visit_list[$i]['family'];
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.family=".$visit_list[$i]['family'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
@@ -2993,7 +2961,7 @@ class tc
}
// List the families that are available to record a visit against
- $sql = "SELECT * FROM tc_family WHERE companionship != 0 and valid=1";
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship != 0 and tf.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -3133,7 +3101,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 +3122,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 +3156,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 +3181,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 +3202,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 +3226,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 +3243,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 +3277,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 +3288,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 +3303,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 +3312,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 +3382,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 +3418,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 +3456,6 @@ 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]['name'] = $this->db->f('name');
$calling[$i]['position'] = $this->db->f('position');
$calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3510,11 +3477,10 @@ class tc
}
# Display a list ordered by organization
- $sql = "SELECT * FROM tc_calling ORDER BY sequence ASC";
+ $sql = "SELECT * FROM tc_calling ORDER BY organization ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $calling[$i]['id'] = $this->db->f('indiv_id');
$calling[$i]['name'] = $this->db->f('name');
$calling[$i]['position'] = $this->db->f('position');
$calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3570,30 +3536,26 @@ class tc
$header_row.= "Location ";
$table_data = "";
- $sql = "SELECT * FROM tc_presidency where valid=1 GROUP BY indiv";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 GROUP BY tp.individual ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$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 AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 ORDER BY ti.name ASC";
$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'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $familyid2address[$family_id[$i]] = $this->db2->f('address');
- }
+ $familyid2address[$family_id[$i]] = $this->db->f('address');
$i++;
}
array_multisort($family_name, $family_id);
@@ -3609,7 +3571,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 +3588,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_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -3656,7 +3618,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 +3629,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 +3644,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 +3675,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 +3700,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 +3713,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_id = $this->db2->f('mls_id');
}
- $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'";
+ $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
@@ -3793,10 +3755,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 +3770,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 +3811,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 +3821,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 +3852,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 +3897,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']);
@@ -4079,9 +4041,8 @@ class tc
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 . "'" .
@@ -4089,10 +4050,10 @@ class tc
" WHERE presidency=" . $id,__LINE__,__FILE__);
} else {
//print "Adding New Entry ";
- $this->db2->query("INSERT INTO tc_presidency (presidency,indiv,district,name," .
+ $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district," .
"email,president,counselor,secretary,valid) " .
"VALUES (NULL,'" . $indiv . "','" . $district . "','" .
- $name . "','" . $email . "','" . $president . "','" .
+ $email . "','" . $president . "','" .
$counselor . "','" . $secretary . "','1'" .
")",__LINE__,__FILE__);
}
@@ -4118,15 +4079,14 @@ class tc
")",__LINE__,__FILE__);
// Requery the tc_presidency table
- $sql = "SELECT * FROM tc_presidency where valid=1";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
// Extract the data for each presidency record
$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');
$valid = 1;
// If we have a valid district, add it to the district table
@@ -4147,16 +4107,16 @@ 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";
+ $sql = "SELECT tp.*, ti.name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
$header_row = "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');
@@ -4174,10 +4134,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 {
@@ -4240,8 +4200,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.' ';
}
@@ -4298,7 +4258,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 = "";
@@ -4319,7 +4279,7 @@ class tc
$dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
$dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
- $sql = "SELECT * FROM tc_presidency where presidency='$presidency'";
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$email = $this->db2->f('email');
@@ -4330,7 +4290,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');
@@ -4341,18 +4301,18 @@ class tc
}
if($family > 0) {
- $sql = "SELECT * FROM tc_family where family='$family'";
+ $sql = "SELECT * FROM tc_family WHERE family='$family'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $family_name = $this->db2->f('name');
- $phone = $this->db2->f('phone');
- $indiv_id = $this->db2->f('indiv_id');
- $appt_name = $family_name . " Family Visit";
- $sql = "SELECT * FROM tc_indiv where indiv='$indiv_id'";
+ $individual = $this->db2->f('individual');
+ $sql = "SELECT * FROM tc_individual where individual='$individual'";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$phone = $this->db3->f('phone');
+ $family_name = $this->db3->f('name');
+ $phone = $this->db3->f('phone');
}
+ $appt_name = $family_name . " Family Visit";
$duration = $this->default_visit_appt_duration * 60;
}
}