X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%24link?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=a372ec072e7d178432a0d6ecee8381a123f49ebd;hb=d44ff755c9574fd3701083415c5f3bc4c7b7116e;hp=976709f698adde9b94b3a6a7bb1e7e9fb3523abf;hpb=adeefb69d6de73bde041fd236d418757f2920f72;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 976709f..a372ec0 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()
{
@@ -190,7 +203,7 @@ class tc
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_view'));
$this->t->set_var('title','Hometeaching');
- $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -258,7 +271,7 @@ class tc
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
@@ -474,8 +487,8 @@ class tc
$table_data.= "
$companion_table_entry
";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from tc_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
- $sql = $sql . " 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.companionship=".$unique_companionships[$j]['companionship'];
+ $sql = $sql . " ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$family_name = $this->db->f('name');
@@ -679,7 +692,7 @@ class tc
for ($i=0; $i < count($names); $i++) {
//$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('indiv_name',$names[$i]);
+ $this->t->set_var('individual_name',$names[$i]);
if(($i+1) % 3 == 0) {
$this->t->set_var('table_sep',"
");
} else {
@@ -721,7 +734,7 @@ class tc
// Re-add the individuals who are checked as having participated in this activity
$indivs = get_var('individual_name',array('POST'));
if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with
- foreach ($indivs as $indiv) {
+ foreach ($indivs as $individual) {
$this->db->query("INSERT INTO tc_participation (individual,activity) " .
"VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
}
@@ -748,7 +761,7 @@ class tc
}
$indivs = get_var('individual_name',array('POST'));
- foreach ($indivs as $indiv)
+ foreach ($indivs as $individual)
{
$this->db->query("INSERT INTO tc_participation (individual,activity) " .
"VALUES (" . $individual . ",". $activity['activity'] . ")",__LINE__,__FILE__);
@@ -1353,7 +1366,7 @@ class tc
$year = date('Y');
// Get the President
- $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');
@@ -1364,16 +1377,7 @@ class tc
$interviewer = $this->db->f('individual');
$district_number = '*';
$district_name = $president_name;
- $sql = "SELECT * FROM tc_individual where individual='$president_id'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_id');
- }
- $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
- $this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $president_address = $this->db2->f('address');
- }
+ $president_address = $this->db->f('address');
} else {
print "
-E- Unable to locate President in tc_presidency table
";
return;
@@ -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'];
+ $notes = $entry['notes'];
$individual = $entry['individual'];
- $ppi_pri = $entry['pri'];
+ $priority = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE tc_individual set " .
- " ppi_notes='" . $ppi_notes . "'" .
- ",ppi_pri='" . $ppi_pri . "'" .
- " WHERE individual=" . $individual,__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');
@@ -1508,7 +1514,7 @@ class tc
// PPI SCHEDULING TABLE
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual 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;
@@ -1517,8 +1523,8 @@ class tc
$individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
$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');
+ $indiv_priority[$individual[$i]] = $this->db->f('priority');
+ $indiv_notes[$individual[$i]] = $this->db->f('notes');
$i++;
$total_indivs++;
}
@@ -1529,8 +1535,8 @@ class tc
$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";
@@ -1558,12 +1564,12 @@ class tc
$this->t->set_var('tr_color',$tr_color);
$table_data.= "
';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -2376,7 +2343,7 @@ 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');
@@ -2390,15 +2357,15 @@ class tc
$this->t->set_var('district_name',$president_name);
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY individual ASC";
+ $sql = "SELECT * FROM tc_individual 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()) {
$individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
$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');
+ $indiv_priority[$individual[$i]] = $this->db->f('priority');
+ $indiv_notes[$individual[$i]] = $this->db->f('notes');
$i++;
}
$total_indivs=$i;
@@ -2500,7 +2467,7 @@ 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('individual');
@@ -2633,7 +2600,7 @@ class tc
else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
- $sql = "SELECT * FROM tc_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -2823,7 +2790,7 @@ 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('individual');
@@ -2965,7 +2932,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 +2960,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();
@@ -3488,7 +3455,6 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $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');
@@ -3510,11 +3476,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('individual');
$calling[$i]['name'] = $this->db->f('name');
$calling[$i]['position'] = $this->db->f('position');
$calling[$i]['sustained'] = $this->db->f('sustained');
@@ -3570,7 +3535,7 @@ class tc
$header_row.= "
Location
";
$table_data = "";
- $sql = "SELECT * FROM tc_presidency where valid=1 GROUP BY individual ORDER BY name ASC";
+ $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()) {
@@ -3582,18 +3547,14 @@ class tc
$i++;
}
- $sql = "SELECT * FROM tc_family where valid=1 and individual != 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_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');
- }
+ $familyid2address[$family_id[$i]] = $this->db->f('address');
$i++;
}
array_multisort($family_name, $family_id);
@@ -4081,7 +4042,6 @@ class tc
$this->db2->query("UPDATE tc_presidency set" .
" individual=" . $indiv .
" ,district=" . $district .
- " ,name='" . $name . "'" .
" ,email='" . $email . "'" .
" ,president='" . $president . "'" .
" ,counselor='" . $counselor . "'" .
@@ -4089,10 +4049,10 @@ class tc
" WHERE presidency=" . $id,__LINE__,__FILE__);
} else {
//print "Adding New Entry ";
- $this->db2->query("INSERT INTO tc_presidency (presidency,individual,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__);
}
@@ -4112,13 +4072,13 @@ class tc
$name = "High Priests";
$indiv = 0;
$valid = 0;
- $this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " .
- "VALUES ('" . $district . "','" . $name . "','" .
+ $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+ "VALUES ('" . $district . "','" .
$indiv . "','" . $valid . "'" .
")",__LINE__,__FILE__);
// 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
@@ -4126,13 +4086,12 @@ class tc
$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
if($district > 0) {
- $this->db2->query("INSERT INTO tc_district (district,name,supervisor,valid) " .
- "VALUES ('" . $district . "','" . $name . "','" .
+ $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
+ "VALUES ('" . $district . "','" .
$indiv . "','" . $valid . "'" .
")",__LINE__,__FILE__);
}
@@ -4149,7 +4108,7 @@ class tc
// 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
";
@@ -4319,7 +4278,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');
@@ -4341,18 +4300,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');
$individual = $this->db2->f('individual');
- $appt_name = $family_name . " Family Visit";
$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;
}
}