X-Git-Url: http://git.pippins.net/embedvideo/.git/%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%01%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%0F%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD%EF%BF%BD?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=f07b9b936a2f0d12ca5b4f19ae71170ebe06fd33;hb=e5086ad471f964105838ad01cc3d0214f5521e35;hp=a5e3138315ffe8938fe390b86d3a5a0180f3fff8;hpb=a9171dd4976295aaa97b29e035a0dbf594a438cc;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index a5e3138..f07b9b9 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -725,7 +725,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
@@ -750,10 +750,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') . " ";
@@ -1338,7 +1338,7 @@ class tc
$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
$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'));
+ $action = get_var('action',array('GET','POST'));
$this->t->set_var('lang_save','Save Appt / Pri / Notes');
$this->t->set_var('lang_reset','Clear Changes');
@@ -1363,24 +1363,6 @@ class tc
$year = date('Y');
- // 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('individual');
- $presidency_id = $this->db->f('presidency');
- $interviewer = $this->db->f('individual');
- $district_number = '*';
- $district_name = $president_name;
- $president_address = $this->db->f('address');
- } else {
- print "
-E- Unable to locate President in tc_presidency table
";
- return;
- }
-
if($action == 'save') {
// Save any changes made to the appointment table
$new_data = get_var('appt_notes',array('POST'));
@@ -1389,7 +1371,8 @@ class tc
$indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
- if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+ $presidency_location = $entry['presidency_location'];
+ if($location == "") { $location = $presidency_location; }
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
@@ -1446,35 +1429,52 @@ class tc
$appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
$appt_header_row = "
Date
";
$appt_header_row.= "
Time
";
- $appt_header_row.= "
indiv
";
+ $appt_header_row.= "
Individual
";
$appt_header_row.= "
Location
";
- $appt_table_data = "";
+ $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
+ $district_number = '*';
+ $district_name = $presidency_name;
+ $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";
+ $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]));
@@ -1485,14 +1485,14 @@ class tc
$appt_table_data.= '
';
@@ -1503,12 +1503,15 @@ 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('appt_table_width',$appt_table_width);
+ $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
+ $this->t->fp('apptlist','appt_list',True);
+ }
+
// PPI SCHEDULING TABLE
$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__);
@@ -1537,7 +1540,7 @@ class tc
// If this individual has had a yearly PPI this year, don't show him on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
$sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
- "AND individual=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
@@ -1604,7 +1607,7 @@ class tc
$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 = "
";
@@ -1720,11 +1724,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');
}
@@ -1804,11 +1803,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');
}
@@ -1917,11 +1911,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');
@@ -1982,7 +1976,7 @@ class tc
$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 = "