for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM tc_companionship where valid=1 and ".
+ $sql = "SELECT * FROM tc_companion where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$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
$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') . "<br>";
$this->t->set_var('assignment_data',$assignment_data);
// Create individual selection boxes
- $sql = "SELECT * FROM tc_individual";
+ $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship'";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$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()) {
}
$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()) {
}
// create the individual id -> individual name mapping
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 and steward='$this->default_stewardship' ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$individual = NULL;
$this->t->set_var('appt_table_width',$appt_table_width);
// 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;
// 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()) {
//print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
// 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;
$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');
}
$hti_pri = $entry['pri'];
//print "hti_notes: $hti_notes indiv_name: $indiv_name <Br>";
// 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->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");
$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');
}
$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'];
}
// 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');
$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.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
$link_data['individual'] = $this->db2->f('individual');
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
+ $link_data['interview_type'] = 'hti';
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$comps_with_quarterly_int++;
$year = date('Y');
// create the family id -> family name mapping
- $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";
+ $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 AND ti.steward='$this->default_stewardship' ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
foreach ($new_data as $entry) {
$visit_notes = $entry['notes'];
$family = $entry['family_id'];
- $visit_pri = $entry['pri'];
+ $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->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__);
}
}
// VISIT SCHEDULING TABLE
- $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";
+ $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 AND ti.steward='$this->default_stewardship' ORDER BY tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$interviewer = $this->db->f('individual');
- $interview_type = 'ppi';
} else {
print "<hr><font color=red><h3>-E- Unable to locate President in tc_presidency table</h3></font></hr>";
return;
$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()) {
$link_data['menuaction'] = 'tc.tc.ppi_update';
$link_data['interviewer'] = $interviewer;
- $link_data['indiv'] = $id;
+ $link_data['individual'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = '';
- $link_data['interview_type'] = $interview_type;
+ $link_data['interview_type'] = 'ppi';
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$this->nextmatchs->template_alternate_row_color(&$this->t);
$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 individual=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
$link_data['indiv'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
- $link_data['interview_type'] = $interview_type;
+ $link_data['interview_type'] = 'ppi';
$link_data['action'] = 'view';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
$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'));
$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);
}
+ #print "indiv: $indiv interviewer: $interviewer<br>";
$this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->set_var('interview_type_checked','');
+ $this->t->set_var('eqpresppi_checked','checked');
$this->t->fp('int_list','interviewer_list',True);
}
-
+ #print "selected interviewer: $interviewer<br>";
if($action == 'save') {
$notes = get_var('notes',array('POST'));
$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->ppi_view();
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->ppi_view();
return false;
}
$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('interview_type_checked','checked');
+ $this->t->set_var('eqpresppi_checked','checked');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New PPI');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_update&interview=' .
}
if($action == 'edit' || $action == 'view') {
- $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+ $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
$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('indiv'));
+ $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'));
$this->t->set_var('interview_type',$this->db->f('interview_type'));
- if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
+ if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit') {
for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions in each companionship
- $sql = "SELECT * FROM tc_companionship where valid=1 and ".
+ $sql = "SELECT * FROM tc_companion where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $supervisor;
- $link_data['indiv'] = $individual;
+ $link_data['individual'] = $individual;
$link_data['name'] = $name;
$link_data['interview'] = '';
+ $link_data['interview_type'] = 'hti';
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
$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 .= "<th width=$int_width><font size=-2>$month</th>";
$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];
$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'));
$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);
$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();
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;
}
$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=' .
}
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') {
for ($i=0; $i < count($visit_list); $i++) {
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.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();
}
// List the families that are available to record a visit against
- $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";
+ $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();
$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;
$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;
}
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()) {
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()) {
$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()) {
}
# Display a list ordered by organization
- $sql = "SELECT * FROM tc_calling ORDER BY organization 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()) {
$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');
- $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 = "<th width=$date_width><font size=-2>Date</th>";
$header_row.= "<th width=$time_width><font size=-2>Time</th>";
$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 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";
+ $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()) {
$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) {
} else if($indiv > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
+ print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
$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');
}
//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()) {
$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');
}
$table_data.= "</td>";
// individual drop down list (for PPIs)
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$table_data.= "</td>";
// individual drop down list
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][indiv] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$this->t->pfp('out','admin_t');
- // 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()) {
$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 AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.presidency='$presidency'";
+ $sql = "SELECT tp.email AS email1, ti.email AS email2, ti.name AS name 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');
+ if ($this->db2->f('email1') != "") {
+ $email = $this->db2->f('email1');
+ } else {
+ $email = $this->db2->f('email2');
+ }
$interviewer = $this->db2->f('name');
}
projects / eq / .git / blobdiff