";
@@ -290,7 +290,7 @@ class tc
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
- // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
+ // look for visits made by any other companionship other than 0. (0 == Presidency Visit)
$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
@@ -427,20 +427,20 @@ class tc
return false;
}
- $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY individual ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $indiv_id[$i] = $this->db->f('indiv');
+ $individual[$i] = $this->db->f('individual');
$indiv_name[$i] = $this->db->f('name');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
- // Make an array mapping indiv_ids to indiv_names
- for($i=0; $i < count($indiv_id); $i++) {
- $id = $indiv_id[$i];
+ // Make an array mapping individuals to indiv_names
+ for($i=0; $i < count($individual); $i++) {
+ $id = $individual[$i];
$indivs[$id] = $indiv_name[$i];
}
@@ -466,9 +466,9 @@ class tc
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= "
';
}
$this->t->set_var('part_table',$part_table);
- $this->t->fp('list2','indiv_list',True);
+ $this->t->fp('list2','individual_list',True);
}
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('indiv_width',$indiv_width);
+ $this->t->set_var('individual_width',$individual_width);
$this->t->set_var('part_width',$part_width);
$this->t->set_var('act_width',$act_width);
$this->t->pfp('out','par_view_t');
@@ -1075,7 +1075,7 @@ class tc
{
$this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
$this->t->set_block('willing_view_t','header_list','list1');
- $this->t->set_block('willing_view_t','indiv_list','list2');
+ $this->t->set_block('willing_view_t','individual_list','list2');
$this->t->set_var('lang_filter','Filter');
$this->t->set_var('lang_filter_unwilling','Filter out unwilling individuals:');
@@ -1095,16 +1095,16 @@ class tc
$this->t->set_var('filter_input',$filter_input);
// TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$indiv_name[$i] = $this->db->f('name');
- $indiv_id[$i] = $this->db->f('indiv');
- $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $individual[$i] = $this->db->f('individual');
+ $indiv_phone[$individual[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($indiv_name, $indiv_id);
+ array_multisort($indiv_name, $individual);
$sql = "SELECT * FROM tc_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
@@ -1112,7 +1112,7 @@ class tc
while($this->db->next_record()) {
$assignment_list[$i]['assignment'] = $this->db->f('assignment');
$assignment_list[$i]['name'] = $this->db->f('name');
- $assignment_list[$i]['code'] = $this->db->f('code');
+ $assignment_list[$i]['abbreviation'] = $this->db->f('abbreviation');
$i++;
}
@@ -1133,23 +1133,23 @@ class tc
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
- $this->t->set_var('assignment_code',$assignment_list[$i]['code']);
+ $this->t->set_var('assignment_abbreviation',$assignment_list[$i]['abbreviation']);
$this->t->fp('list1','header_list',True);
$total_width += $assignment_width;
$total_willing[$i] = 0;
}
- for ($i=0; $i < count($indiv_id); $i++) {
+ for ($i=0; $i < count($individual); $i++) {
$willing_table = ''; $indiv_willing=0;
- $this->t->set_var('indiv_name',$indiv_name[$i]);
- $this->t->set_var('indiv_phone',$indiv_phone[$indiv_id[$i]]);
- $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_update&indiv_id=' .
- $indiv_id[$i] . '&action=' . 'edit'));
+ $this->t->set_var('individual_name',$indiv_name[$i]);
+ $this->t->set_var('individual_phone',$indiv_phone[$individual[$i]]);
+ $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_update&individual=' .
+ $individual[$i] . '&action=' . 'edit'));
for ($j=0; $j < count($assignment_list); $j++) {
$found_willingness=0;
$sql = "SELECT * FROM tc_willingness where " .
" assignment=" . $assignment_list[$j]['assignment'] .
- " AND indiv=" . $indiv_id[$i];
+ " AND individual=" . $individual[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
$found_willingness=1;
@@ -1163,7 +1163,7 @@ class tc
$date = $this->db2->f('date');
$sql = "SELECT * FROM tc_participation where " .
" activity=" . $activity .
- " AND indiv=". $indiv_id[$i];
+ " AND individual=". $individual[$i];
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date_part = $date;
@@ -1188,7 +1188,7 @@ class tc
}
if(($indiv_willing == 1) || ($filter_unwilling == 'n')) {
$this->t->set_var('willing_table',$willing_table);
- $this->t->fp('list2','indiv_list',True);
+ $this->t->fp('list2','individual_list',True);
$this->nextmatchs->template_alternate_row_color(&$this->t);
}
}
@@ -1200,7 +1200,7 @@ class tc
$this->t->set_var('stat_table',$stat_table);
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('indiv_width',$indiv_width);
+ $this->t->set_var('individual_width',$indiv_width);
$this->t->set_var('willing_width',$willing_width);
$this->t->pfp('out','willing_view_t');
$this->save_sessiondata();
@@ -1216,8 +1216,8 @@ class tc
$this->t->set_block('willing_update_t','assignment_list','list');
$this->t->set_block('willing_update_t','save','savehandle');
- $indiv_id = get_var('indiv_id',array('GET','POST'));
- $this->t->set_var('indiv_id',$indiv_id);
+ $individual = get_var('individual',array('GET','POST'));
+ $this->t->set_var('individual',$individual);
$action = get_var('action',array('GET','POST'));
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_view'));
@@ -1227,7 +1227,7 @@ class tc
if($action == 'save') {
// Delete all the previous willingness entries for this individual
- $this->db->query("DELETE from tc_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__);
+ $this->db->query("DELETE from tc_willingness where individual=" . $individual ,__LINE__,__FILE__);
// Now, add the assignment willingness that is checked for this individual
$new_data = get_var('willingness',array('POST'));
@@ -1235,9 +1235,9 @@ class tc
$data_array = explode("/",$data);
$assignment = $data_array[0];
$willing = $data_array[1];
- //print "indiv_id: $indiv_id assignment: $assignment willing: $willing ";
- $this->db->query("INSERT INTO tc_willingness (indiv,assignment,willing) " .
- "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+ //print "individual: $individual assignment: $assignment willing: $willing ";
+ $this->db->query("INSERT INTO tc_willingness (individual,assignment,willing) " .
+ "VALUES (" . $individual .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
}
$this->willing_view();
return false;
@@ -1247,11 +1247,11 @@ class tc
$table_data="";
// Find out the individual's name
- $sql = "SELECT * FROM tc_indiv WHERE indiv=".$indiv_id." AND valid=1";
+ $sql = "SELECT * FROM tc_individual WHERE individual=".$individual." AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$indiv_name = $this->db->f('name');
- $this->t->set_var('indiv_name',$indiv_name);
+ $this->t->set_var('individual_name',$indiv_name);
}
// Select all the assignments
@@ -1261,13 +1261,13 @@ class tc
while ($this->db->next_record()) {
$assignment = $this->db->f('assignment');
$assignment_name = $this->db->f('name');
- $assignment_code = $this->db->f('code');
+ $assignment_abbreviation = $this->db->f('abbreviation');
$this->nextmatchs->template_alternate_row_color(&$this->t);
$table_data.="
$assignment_name
";
$header_row="
Assignments
Willingness
";
- $sql = "SELECT * FROM tc_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment;
+ $sql = "SELECT * FROM tc_willingness WHERE individual=".$individual." AND assignment=".$assignment;
$this->db2->query($sql,__LINE__,__FILE__);
$value = $assignment;
@@ -1325,7 +1325,7 @@ class tc
function ppi_sched()
{
$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
- $this->t->set_block('ppi_sched_t','indiv_list','indivlist');
+ $this->t->set_block('ppi_sched_t','individual_list','indivlist');
$this->t->set_block('ppi_sched_t','appt_list','apptlist');
$action = get_var('action',array('GET','POST'));
@@ -1352,24 +1352,24 @@ class tc
$year = date('Y');
- // Get the EQ President
+ // Get the President
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$president_name_array = explode(",",$president_name);
$president_last_name = $president_name_array[0];
- $president_id = $this->db->f('indiv');
+ $president_id = $this->db->f('individual');
$presidency_id = $this->db->f('presidency');
- $interviewer = $this->db->f('indiv');
+ $interviewer = $this->db->f('individual');
$district_number = '*';
$district_name = $president_name;
- $sql = "SELECT * FROM tc_indiv where indiv='$president_id'";
+ $sql = "SELECT * FROM tc_individual where individual='$president_id'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $indiv_id = $this->db2->f('indiv_id');
+ $mls_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()) {
$president_address = $this->db2->f('address');
@@ -1384,19 +1384,19 @@ class tc
$new_data = get_var('appt_notes',array('POST'));
if($new_data != "") {
foreach ($new_data as $entry) {
- $indiv = $entry['indiv'];
+ $indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
+ $sql = "SELECT * FROM tc_appointment where appointment='$appointment' and individual='$indiv' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
// Perform database save actions here
$this->db->query("UPDATE tc_appointment set " .
- " indiv='" . $indiv . "'" .
+ " individual='" . $indiv . "'" .
",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -1406,17 +1406,27 @@ 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->db2->query("UPDATE tc_scheduling_priority SET priority='$priority' AND notes=\"$notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
+ }
+
+/*
+ $this->db->query("UPDATE tc_individual set " .
+ " notes='" . $notes . "'" .
+ ",priority='" . $priority . "'" .
+ " WHERE individual=" . $individual,__LINE__,__FILE__);
+*/
+
}
@@ -1426,17 +1436,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 +1459,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 +1472,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 +1489,12 @@ class tc
$appt_table_data.= "
$day_string
";
$appt_table_data.= "
$time_string
";
- $appt_table_data.= '
'."\n";
@@ -1969,7 +1977,7 @@ class tc
} 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';
@@ -2001,7 +2009,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 +2069,7 @@ class tc
$year = date('Y');
// create the family id -> family name mapping
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@ -2069,7 +2077,7 @@ class tc
$family_id[$i] = $this->db->f('family');
$family_name[$i] = $this->db->f('name');
$familyid2name[$family_id[$i]] = $family_name[$i];
- $sql = "SELECT * FROM tc_indiv where family='$family_id[$i]'";
+ $sql = "SELECT * FROM tc_individual where family='$family_id[$i]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$familyid2address[$family_id[$i]] = $this->db2->f('address');
@@ -2118,10 +2126,17 @@ class tc
$visit_pri = $entry['pri'];
// Perform database save actions here
+ $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->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri' AND notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'",__LINE__,__FILE__);
+ }
+/*
$this->db->query("UPDATE tc_family set " .
" visit_notes='" . $visit_notes . "'" .
",visit_pri='" . $visit_pri . "'" .
" WHERE family=" . $family,__LINE__,__FILE__);
+*/
}
$take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched');
@@ -2137,7 +2152,7 @@ class tc
$appt_header_row.= "
Location
";
$appt_table_data = "";
- // Find out what the EQ Presidency ID is
+ // Find out what the President ID is
$sql = "SELECT * FROM tc_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
@@ -2203,7 +2218,7 @@ class tc
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC";
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_scheduling_priority AS tsp WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY tsp.priority ASC, tf.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2224,7 +2239,7 @@ class tc
$total_families++;
}
- $sql = "SELECT * FROM tc_indiv where valid=1";
+ $sql = "SELECT * FROM tc_individual where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$family = $this->db->f('family');
@@ -2380,7 +2395,7 @@ class tc
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
- $interviewer = $this->db->f('indiv');
+ $interviewer = $this->db->f('individual');
$interview_type = 'ppi';
} else {
print "
-E- Unable to locate President in tc_presidency table
";
@@ -2390,20 +2405,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 "