";
+ $this->t->set_var('district_table',$sandbox_table_data);
+
+ $this->t->pfp('out','ht_sandbox_t');
+ $this->save_sessiondata();
+ }
+
+ function ht_sandbox_changes()
+ {
+ $email_contents = "Please review the following changes to home teaching.\r\n\r\n";
+ // list all companionships deleted
+ $email_contents .= "Removed Companionships\r\n\r\n";
+ $sql = "SELECT * FROM tc_companionship WHERE companionship NOT IN (SELECT tc_companionship FROM tc_companionship_sandbox) AND valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record()) {
+ $companionship = $this->db->f('companionship');
+ $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $companion_names = "";
+ while ($this->db2->next_record()) {
+ if ($companion_names == "") {
+ $companion_names .= $this->db2->f('name');
+ } else {
+ $companion_names .= " / " . $this->db2->f('name');
+ }
+ }
+ $email_contents .= "\t$companion_names\r\n";
+ }
+ $email_contents .= "\r\n";
+
+ // list all companionships added
+ $email_contents .= "New Companionships\r\n\r\n";
+ $sql = "SELECT * FROM tc_companionship_sandbox WHERE tc_companionship=0";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record()) {
+ $companionship = $this->db->f('companionship');
+ $sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.individual=ti.individual AND tcs.companionship=$companionship";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $companion_names = "";
+ while ($this->db2->next_record()) {
+ if ($companion_names == "") {
+ $companion_names .= $this->db2->f('name');
+ } else {
+ $companion_names .= " / " . $this->db2->f('name');
+ }
+ }
+ $email_contents .= "\t$companion_names\r\n";
+ $sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND companionship=$companionship";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record()) {
+ $family_name = $this->db2->f('name') . " Family";
+ $email_contents .= "\t\t$family_name\r\n";
+ }
+ }
+ $email_contents .= "\r\n";
+
+ // list all companionships with changes
+ $email_contents .= "Modified Companionships\r\n\r\n";
+ $sql = "SELECT tcps.* FROM tc_companionship AS tc JOIN tc_companionship_sandbox AS tcps WHERE tc.companionship=tcps.tc_companionship AND tc.valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record()) {
+ $companionship = $this->db->f('companionship');
+ $tc_companionship = $this->db->f('tc_companionship');
+ $companionship_changed = 0;
+
+ // get current companion list
+ $sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.companionship=$companionship AND tc.individual=ti.individual";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $companion_names = "";
+ while ($this->db2->next_record()) {
+ if ($companion_names == "") {
+ $companion_names .= $this->db2->f('name');
+ } else {
+ $companion_names .= " / " . $this->db2->f('name');
+ }
+ }
+
+ // list removed companions
+ $sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.companionship=$tc_companionship AND tc.individual=ti.individual AND tc.individual NOT IN (SELECT individual FROM tc_companion_sandbox WHERE companionship=$companionship)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record()) {
+ if ($companionship_changed == 0) {
+ $companionship_changed = 1;
+ $email_contents .= "\t$companion_names\r\n";
+ }
+ $name = $this->db2->f('name');
+ $email_contents .= "\t\tremoved $name as a companion\r\n";
+ }
+
+ // list added companions
+ $sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.companionship=$companionship AND tcs.individual=ti.individual AND tcs.individual NOT IN (SELECT individual FROM tc_companion WHERE companionship=$tc_companionship)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record()) {
+ if ($companionship_changed == 0) {
+ $companionship_changed = 1;
+ $email_contents .= "\t$companion_names\r\n";
+ }
+ $name = $this->db2->f('name');
+ $email_contents .= "\t\tadded $name as a companion\r\n";
+ }
+
+ // list removed families
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship=$tc_companionship AND tf.family NOT IN (SELECT tc_family FROM tc_family_sandbox WHERE companionship=$companionship)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record()) {
+ if ($companionship_changed == 0) {
+ $companionship_changed = 1;
+ $email_contents .= "\t$companion_names\r\n";
+ }
+ $name = $this->db2->f('name');
+ $email_contents .= "\t\tremoved $name Family\r\n";
+ }
+
+ // list added families
+ $sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND tfs.companionship=$companionship AND tfs.individual NOT IN (SELECT individual FROM tc_family WHERE companionship=$tc_companionship)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record()) {
+ if ($companionship_changed == 0) {
+ $companionship_changed = 1;
+ $email_contents .= "\t$companion_names\r\n";
+ }
+ $name = $this->db2->f('name');
+ $email_contents .= "\t\tadded $name Family\r\n";
+ }
+ }
+ $email_contents .= "\r\n";
+
+ // email changes to presidency
+ $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1) AND tp.valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record()) {
+ $email = "";
+ if ($this->db->f('email1') != "") {
+ $email = $this->db->f('email1');
+ } else {
+ $email = $this->db->f('email2');
+ }
+ if ($to == "") {
+ $to .= $email;
+ } else {
+ $to .= ", $email";
+ }
+ }
+ $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if ($this->db->next_record()) {
+ if ($this->db->f('email1') != "") {
+ $from = $this->db->f('email1');
+ } else {
+ $from = $this->db->f('email2');
+ }
+ } else {
+ $from = "president@3rdcounselor";
+ }
+ $subject = "HomeTeaching Changes";
+ $message .= "$email_contents";
+ $headers = "From: $from\r\n" .
+ "Reply-To: $from\r\n" .
+ "X-Mailer: PHP/" . phpversion();
+
+ mail($to, $subject, $message, $headers);
+ }
+
function ht_update()
{
$this->t->set_file(array('ht_update_t' => 'ht_update.tpl'));
@@ -474,8 +1007,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 +1212,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 {
@@ -712,7 +1245,7 @@ class tc
$this->db->query("UPDATE tc_activity set " .
" assignment='" . $activity['assignment'] .
"', date='" . $activity['date'] . "'" .
- ", notes='" . $activity['notes'] . "'" .
+ ", notes=\"" . $activity['notes'] . "\"" .
" WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
// Delete all the individuals who have particiapted in this activity
@@ -721,7 +1254,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__);
}
@@ -737,10 +1270,10 @@ class tc
$activity['notes']= get_var('notes',array('POST'));
$this->db->query("INSERT INTO tc_activity (assignment,date,notes) " .
"VALUES ('" . $activity['assignment'] . "','" .
- $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+ $activity['date'] . "',\"" . $activity['notes'] . "\")",__LINE__,__FILE__);
$sql = "SELECT * FROM tc_activity WHERE assignment='".$activity['assignment']."' " .
- " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+ " AND date='".$activity['date']."' AND notes=\"".$activity['notes']."\"";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
//print "activity: " . $this->db->f('activity') . " ";
@@ -748,7 +1281,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__);
@@ -983,8 +1516,7 @@ class tc
$this->t->set_block('par_view_t','header_list','list1');
$this->t->set_block('par_view_t','individual_list','list2');
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -1094,8 +1626,7 @@ class tc
}
$this->t->set_var('filter_input',$filter_input);
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -1333,51 +1864,26 @@ class tc
$this->t->set_var('lang_reset','Clear Changes');
$this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
- $this->t->set_var('ppi_link_title','Yearly PPIs');
+ $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs');
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
- $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+ $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched&action=save'));
- $this->t->set_var('title','Yearly PPI Scheduler');
-
- $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
- $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
- $header_row = "
";
+ $appt_table_data = "";
+ $table_data="";
$total_indivs=0; $indivs_with_yearly_ppi=0;
- // 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";
- $this->t->set_var('table_title',$table_title);
- $this->t->set_var('appt_table_title',$appt_table_title);
-
- // query the database for all the appointments
- $sql = "SELECT * FROM tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ // Get the President
+ $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti where tp.individual=ti.individual AND tp.valid=1 AND ";
+ if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; }
+ if($this->yearly_ppi_interviewer == 2) { $sql .= " (tp.president=1 OR tp.counselor=1)"; }
+ if($this->yearly_ppi_interviewer == 3) { $sql .= " (tp.president=1 OR tp.counselor=1 OR tp.secretary=1)"; }
$this->db->query($sql,__LINE__,__FILE__);
-
while ($this->db->next_record()) {
- $appointment = $this->db->f('appointment');
- $indiv = $this->db->f('individual');
- $location = $this->db->f('location');
- if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; }
+ $presidency_name = $this->db->f('name');
+ $presidency_name_array = explode(",",$presidency_name);
+ $presidency_last_name = $presidency_name_array[0];
+ $presidency_id = $this->db->f('presidency');
+ $presidency_address = $this->db->f('address');
+ $presidency_location = "$presidency_last_name"." home ($presidency_address)";
+ $appt_table_data = "";
+
+ // Display a scheduling table for this presidency member
+ $not_completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Not Completed";
+ $appt_table_title = $presidency_name . ": " . $this->ppi_frequency_label." PPI Appointment Slots";
+ $this->t->set_var('not_completed_table_title',$not_completed_table_title);
+ $this->t->set_var('appt_table_title',$appt_table_title);
+
+ // query the database for all the appointments
+ $sql = "SELECT * FROM tc_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $this->db2->query($sql,__LINE__,__FILE__);
+
+ while ($this->db2->next_record()) {
+ $appointment = $this->db2->f('appointment');
+ $indiv = $this->db2->f('individual');
+ $location = $this->db2->f('location');
+ if(($location == "") && ($indiv > 0)) { $location = $presidency_location; }
- $date = $this->db->f('date');
+ $date = $this->db2->f('date');
$date_array = explode("-",$date);
$year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
$day_string = date("l d-M-Y", mktime(0,0,0,$month,$day,$year));
- $time = $this->db->f('time');
+ $time = $this->db2->f('time');
$time_array = explode(":",$time);
$time_string = date("g:i a", mktime($time_array[0], $time_array[1], $time_array[2]));
@@ -1492,14 +2003,14 @@ class tc
$appt_table_data.= '
';
@@ -1510,15 +2021,16 @@ class tc
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
- }
-
- $this->t->set_var('appt_table_data',$appt_table_data);
- $this->t->set_var('appt_header_row',$appt_header_row);
- $this->t->set_var('appt_table_width',$appt_table_width);
+ }
+ $this->t->set_var('appt_table_data',$appt_table_data);
+ $this->t->set_var('appt_header_row',$appt_header_row);
+ $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
+ $this->t->fp('apptlist','appt_list',True);
+ }
+
// PPI SCHEDULING TABLE
- // TODO: changed this so it picks the quorum dynamically
- $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";
+ $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='$this->default_stewardship' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1534,7 +2046,7 @@ class tc
}
$max = count($individual);
-
+
for($i=0; $i < $max; $i++) {
$id = $individual[$i];
$name = $indiv_name[$i];
@@ -1542,10 +2054,11 @@ class tc
$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 individual=" . $id . " AND interview_type='ppi'";
+ // If this individual has had a PPI this period, don't show him on the schedule list
+ $year_start = $year . "-" . $start_of_period . "-01";
+ $year_end = $year . "-" . $end_of_period . "-31";
+ $sql = "SELECT * FROM tc_interview WHERE date >= '$year_start' AND date <= '$year_end' ".
+ "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
@@ -1610,27 +2123,24 @@ class tc
}
} // End for individuals Loop
- $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
- $completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
- $completed_header_row = "
Individual Name
";
- $completed_header_row.= "
Phone
";
- $completed_header_row.= "
Date
";
- $completed_header_row.= "
PPI Notes
";
+ $completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Completed";
+ $completed_header_row = "
";
$table_data=""; $completed_data=""; $totals_data="";
$year = date('Y');
@@ -1687,8 +2194,7 @@ class tc
//print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end ";
// create the individual id -> individual name mapping
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$individual_data = NULL;
@@ -1729,11 +2235,6 @@ class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$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()) {
$supervisor_address = $this->db2->f('address');
}
@@ -1766,17 +2267,12 @@ class tc
$hti_pri = $entry['pri'];
//print "hti_notes: $hti_notes indiv_name: $indiv_name ";
// Perform database save actions here
- $this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__);
if ($this->db->next_record()) {
$scheduling_priority = $this->db->f('scheduling_priority');
- $this->db2->query("UPDATE tc_scheduling_priority SET priority='$hti_pri' and notes=\"hti_notes\" where scheduling_priority=$scheduling_priority",__LINE__,__FILE__);
+ //$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__);
}
-/*
- $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');
@@ -1784,7 +2280,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, tc_individual AS ti) WHERE td.district=tp.district AND 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()) {
@@ -1792,22 +2288,16 @@ 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++;
}
// APPOINTMENT TABLE
$district = 1;
- $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
- $appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
- $appt_header_row = "
Date
";
- $appt_header_row.= "
Time
";
- $appt_header_row.= "
Individual
";
- $appt_header_row.= "
Location
";
+ $appt_header_row = "
Date
";
+ $appt_header_row.= "
Time
";
+ $appt_header_row.= "
Individual
";
+ $appt_header_row.= "
Location
";
$appt_table_data = "";
$total_comps=0; $comps_with_quarterly_int=0;
@@ -1822,11 +2312,6 @@ class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$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()) {
$supervisor_address = $this->db2->f('address');
}
@@ -1885,7 +2370,6 @@ class tc
$this->t->set_var('appt_table_data',$appt_table_data);
$this->t->set_var('appt_header_row',$appt_header_row);
- $this->t->set_var('appt_table_width',$appt_table_width);
// INTERVIEW SCHEDULING TABLE
@@ -1902,7 +2386,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 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'];
+ $sql = "SELECT * FROM tc_companion 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'];
@@ -1935,11 +2419,11 @@ class tc
}
// If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
- $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id'";
+ $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND interview_type='hti'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE individual='$id' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date = $this->db3->f('date');
@@ -1951,6 +2435,7 @@ class tc
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
+ $link_data['interview_type'] = 'hti';
$link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$table_data.= "
";
@@ -2342,16 +2777,15 @@ class tc
$totals_data.= "
$percent%
";
$totals_data.= "
";
- $this->t->set_var('table_width',$table_width);
$this->t->set_var('header_row',$header_row);
$this->t->set_var('table_data',$table_data);
$this->t->set_var('totals_header_row',$totals_header_row);
- $this->t->set_var('totals_table_width',$totals_table_width);
$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->set_var('totals',$totals_data);
$this->t->fp('familylist','family_list',True);
+ $this->t->set_var('lang_save_appt','Save Appts');
+ $this->t->set_var('lang_save_pri_notes','Save Pri / Notes');
$this->t->fp('apptlist','appt_list',True);
$this->t->pfp('out','vis_sched_t');
@@ -2376,12 +2810,12 @@ class tc
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
$this->t->set_var('ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_view'));
- $this->t->set_var('ppi_link_title','Yearly PPIs');
+ $this->t->set_var('ppi_link_title',$this->ppi_frequency_label . ' PPIs');
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
- $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+ $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
- $this->t->set_var('title','Yearly PPIs');
+ $this->t->set_var('title',$this->ppi_frequency_label . ' PPIs');
$num_months = get_var('num_months',array('GET','POST'));
if($num_months == '') { $num_months = $this->default_ppi_num_years; }
$this->t->set_var('num_months',$num_months);
@@ -2391,12 +2825,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('individual');
- $interview_type = 'ppi';
} else {
print "
-E- Unable to locate President in tc_presidency table
";
return;
@@ -2404,8 +2837,7 @@ class tc
$this->t->set_var('district_number','*');
$this->t->set_var('district_name',$president_name);
- // TODO: changed this so it picks the quorum dynamically
- $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";
+ $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority as tsp where ti.scheduling_priority=tsp.scheduling_priority and ti.steward='$this->default_stewardship' and ti.valid=1 ORDER BY ti.individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -2420,7 +2852,7 @@ class tc
array_multisort($indiv_name, $individual);
//var_dump($indiv_name); print "
";
@@ -2732,7 +3169,7 @@ class tc
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
$sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
- "AND individual=" . $individual;
+ "AND individual=" . $individual . " AND interview_type='hti' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "
$month
";
@@ -2746,10 +3183,11 @@ class tc
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['indiv'] = $individual;
+ $link_data['individual'] = $individual;
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
+ $link_data['interview_type'] = 'hti';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
$month = $date_array[1];
@@ -2826,27 +3264,27 @@ class tc
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view'));
$this->t->set_var('readonly','');
$this->t->set_var('disabled','');
- $this->t->set_var('interview_type_checked','');
+ $this->t->set_var('eqpresppi','');
$action = get_var('action',array('GET','POST'));
$companionship = get_var('companionship',array('GET','POST'));
$interviewer = get_var('interviewer',array('GET','POST'));
$name = get_var('name',array('GET','POST'));
$interview = get_var('interview',array('GET','POST'));
- $indiv = get_var('indiv',array('GET','POST'));
+ $individual = get_var('individual',array('GET','POST'));
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
$interview_type = get_var('interview_type',array('GET','POST'));
- $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');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
- $this->t->set_var('interviewer',$interviewer . ' selected');
+ $this->t->set_var('interviewer',$indiv . ' selected');
} else {
- $this->t->set_var('interviewer',$interviewer);
+ $this->t->set_var('interviewer',$indiv);
}
$this->t->set_var('interviewer_name',$interviewer_name);
$this->t->fp('int_list','interviewer_list',True);
@@ -2857,9 +3295,9 @@ class tc
$this->db->query("UPDATE tc_interview set " .
" interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", individual='" . $indiv . "'" .
+ ", individual='" . $individual . "'" .
", date='" . $date . "'" .
- ", notes='" . $notes . "'" .
+ ", notes=\"" . $notes . "\"" .
", interview_type='" . $interview_type . "'" .
" WHERE interview=" . $interview,__LINE__,__FILE__);
$this->int_view();
@@ -2869,8 +3307,8 @@ class tc
if($action == 'insert') {
$notes = get_var('notes',array('POST'));
$this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
- "VALUES ('" . $interviewer . "','" . $indiv . "','" .
- $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
+ "VALUES ('" . $interviewer . "','" . $individual . "','" .
+ $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2880,9 +3318,10 @@ class tc
$this->t->set_var('interview', '');
$this->t->set_var('interviewer', $interviewer);
$this->t->set_var('name',$name);
- $this->t->set_var('indiv',$indiv);
+ $this->t->set_var('individual',$individual);
$this->t->set_var('date','');
$this->t->set_var('notes','');
+ $this->t->set_var('interview_type',$interview_type);
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New Interview');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_update&interview=' .
@@ -2890,16 +3329,17 @@ class tc
}
if($action == 'edit' || $action == 'view') {
- $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+ $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='hti'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$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('individual'));
+ $this->t->set_var('individual',$this->db->f('individual'));
$this->t->set_var('date',$this->db->f('date'));
$this->t->set_var('notes',$this->db->f('notes'));
- if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
+ $this->t->set_var('interview_type',$this->db->f('interview_type'));
+ if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit') {
@@ -2980,7 +3420,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']." AND ti.steward='$this->default_stewardship'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
@@ -3008,7 +3448,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 AND ti.steward='$this->default_stewardship'";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -3064,7 +3504,7 @@ class tc
$notes = get_var('notes',array('POST'));
$this->db->query("UPDATE tc_visit set " .
" date='" . $date . "'" .
- ", notes='" . $notes . "'" .
+ ", notes=\"" . $notes . "\"" .
" WHERE visit=" . $visit,__LINE__,__FILE__);
$this->vis_view();
return false;
@@ -3074,7 +3514,7 @@ class tc
$notes = get_var('notes',array('POST'));
$this->db->query("INSERT INTO tc_visit (family,companionship,date,notes) " .
"VALUES ('" . $family . "','" . $companionship . "','" .
- $date . "','" . $notes . "')",__LINE__,__FILE__);
+ $date . "',\"" . $notes . "\")",__LINE__,__FILE__);
$this->vis_view();
return false;
}
@@ -3168,8 +3608,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; }
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -3358,8 +3797,7 @@ class tc
return false;
}
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -3499,11 +3937,10 @@ class tc
$this->t->set_block('org_view_t','org_list','list2');
# Display a list ordered alphabetically
- $sql = "SELECT * FROM tc_calling ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $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');
@@ -3525,11 +3962,10 @@ class tc
}
# Display a list ordered by organization
- $sql = "SELECT * FROM tc_calling ORDER BY sequence ASC";
+ $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual 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');
@@ -3574,18 +4010,18 @@ class tc
$this->t->set_var('schedule_int_link_title','Schedule Hometeaching Interviews');
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
- $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
+ $this->t->set_var('schedule_ppi_link_title','Schedule ' . $this->ppi_frequency_label . ' PPIs');
- $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
+ $date_width=160; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
$table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width;
$header_row = "
Date
";
$header_row.= "
Time
";
- $header_row.= "
individual
";
+ $header_row.= "
Individual
";
$header_row.= "
Family
";
$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()) {
@@ -3593,22 +4029,18 @@ class tc
$presidency_data[$i]['name'] = $this->db->f('name');
$presidency_data[$i]['indiv'] = $this->db->f('individual');
$presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
- $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['individual'];
+ $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
$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 ti.steward='$this->default_stewardship' 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);
@@ -3631,6 +4063,10 @@ class tc
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
+ // Zero out family or individual if they are invalid
+ if($indiv == "") { $indiv=0; }
+ if($family == "") { $family=0; }
+
// Update our location
if($location == "") {
if($family > 0) {
@@ -3641,13 +4077,9 @@ class tc
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
+ #print "presidency2indiv: $presidency $presidency2indiv[$presidency] ";
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$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()) {
$supervisor_address = $this->db2->f('address');
}
@@ -3727,8 +4159,7 @@ class tc
//Header('Location: ' . $take_me_to_url);
}
- // 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 where steward='$this->default_stewardship' and valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -3768,11 +4199,6 @@ class tc
$supervisor_last_name = $supervisor_name_array[0];
$sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
$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()) {
$supervisor_address = $this->db2->f('address');
}
@@ -3806,7 +4232,7 @@ class tc
$table_data.= "";
// individual drop down list (for PPIs)
- $table_data.= '