$this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js');
$this->script_path = "$this->application_path"."/bin";
$this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js');
$this->script_path = "$this->application_path"."/bin";
- // 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";
+ // email changes to leader
+ $sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND (tl.type='P' OR tl.type='C' OR tl.type='S') AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$email = "";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$email = "";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record()) {
if ($this->db->f('email1') != "") {
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record()) {
if ($this->db->f('email1') != "") {
$indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
$indiv = $entry['individual'];
$appointment = $entry['appointment'];
$location = $entry['location'];
- $presidency_location = $entry['presidency_location'];
- if($location == "") { $location = $presidency_location; }
+ $leader_location = $entry['leader_location'];
+ if($location == "") { $location = $leader_location; }
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
- $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)"; }
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti where tl.individual=ti.individual AND tl.valid=1 AND ";
+ if($this->yearly_ppi_interviewer == 1) { $sql .= " (tl.type='P')"; }
+ if($this->yearly_ppi_interviewer == 2) { $sql .= " (tl.type='P' OR tl.type='C')"; }
+ if($this->yearly_ppi_interviewer == 3) { $sql .= " (tl.type='P' OR tl.type='C' OR tl.type='S')"; }
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
- $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)";
+ $leader_name = $this->db->f('name');
+ $leader_name_array = explode(",",$leader_name);
+ $leader_last_name = $leader_name_array[0];
+ $leader_id = $this->db->f('leader');
+ $leader_address = $this->db->f('address');
+ $leader_location = "$leader_last_name"." home ($leader_address)";
$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
$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
$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');
$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');
$date = $this->db2->f('date');
$date_array = explode("-",$date);
$date = $this->db2->f('date');
$date_array = explode("-",$date);
}
$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_data',$appt_table_data);
$this->t->set_var('appt_header_row',$appt_header_row);
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['leader'] = $this->db->f('leader');
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['leader'] = $this->db->f('leader');
$this->t->set_var('appt_table_title',$appt_table_title);
// query the database for all the appointments
$this->t->set_var('appt_table_title',$appt_table_title);
// query the database for all the appointments
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$interviewer = $this->db->f('individual');
} else {
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$interviewer = $this->db->f('individual');
} else {
$notes = get_var('notes',array('GET','POST'));
$type = get_var('type',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
$type = get_var('type',array('GET','POST'));
- $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)"; }
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1 AND ";
+ if($this->yearly_ppi_interviewer == 1) { $sql .= " (tl.type='P')"; }
+ if($this->yearly_ppi_interviewer == 2) { $sql .= " (tl.type='P' OR tl.type='C')"; }
+ if($this->yearly_ppi_interviewer == 3) { $sql .= " (tl.type='P' OR tl.type='C' OR tl.type='S')"; }
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
$notes = get_var('notes',array('GET','POST'));
$type = get_var('type',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
$type = get_var('type',array('GET','POST'));
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
$indiv = $this->db2->f('individual');
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
- $presidency_data[$i]['id'] = $this->db->f('presidency');
- $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]['indiv'];
+ $leader_data[$i]['id'] = $this->db->f('leader');
+ $leader_data[$i]['name'] = $this->db->f('name');
+ $leader_data[$i]['indiv'] = $this->db->f('individual');
+ $leader2name[$leader_data[$i]['id']] = $leader_data[$i]['name'];
+ $leader2indiv[$leader_data[$i]['id']] = $leader_data[$i]['indiv'];
- foreach ($new_data as $presidency_array) {
- foreach ($presidency_array as $entry) {
- $presidency = $entry['presidency'];
+ foreach ($new_data as $leader_array) {
+ foreach ($leader_array as $entry) {
+ $leader = $entry['leader'];
$family_address = $familyid2address[$family];
$location = "$family_last_name"." home ($family_address)";
} else if($indiv > 0) {
$family_address = $familyid2address[$family];
$location = "$family_last_name"." home ($family_address)";
} else if($indiv > 0) {
- #print "presidency2indiv: $presidency $presidency2indiv[$presidency]<br>";
- $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
+ #print "leader2indiv: $leader $leader2indiv[$leader]<br>";
+ $sql = "SELECT * FROM tc_individual where individual='$leader2indiv[$leader]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$leader_address = $this->db2->f('address');
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$leader_address = $this->db2->f('address');
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM tc_appointment where " .
"appointment='$appointment'" .
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM tc_appointment where " .
"appointment='$appointment'" .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
//print "adding entry: appt=$appointment date: $date time: $time individual: $indiv family: $family<br>";
else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
//print "adding entry: appt=$appointment date: $date time: $time individual: $indiv family: $family<br>";
- $this->db2->query("INSERT INTO tc_appointment (appointment,presidency,family,individual,date,time,location,uid) " .
- "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $indiv . "','" .
+ $this->db2->query("INSERT INTO tc_appointment (appointment,leader,family,individual,date,time,location,uid) " .
+ "VALUES (NULL,'" . $leader . "','" . $family . "','" . $indiv . "','" .
$date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
// Now reselect this entry from the database to see if we need
$date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
// Now reselect this entry from the database to see if we need
- for ($i=0; $i < count($presidency_data); $i++) {
- $presidency = $presidency_data[$i]['id'];
- $interviewer = $presidency_data[$i]['individual'];
- $name = $presidency_data[$i]['name'];
- $this->t->set_var('presidency_name',$name);
+ for ($i=0; $i < count($leader_data); $i++) {
+ $leader = $leader_data[$i]['id'];
+ $interviewer = $leader_data[$i]['individual'];
+ $name = $leader_data[$i]['name'];
+ $this->t->set_var('leader_name',$name);
$this->db->query($sql,__LINE__,__FILE__);
// Prefill any existing appointment slots
$this->db->query($sql,__LINE__,__FILE__);
// Prefill any existing appointment slots
$family_address = $familyid2address[$family];
$location = "$family_last_name"." home ($family_address)";
} else if($indiv > 0) {
$family_address = $familyid2address[$family];
$location = "$family_last_name"." home ($family_address)";
} else if($indiv > 0) {
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$leader_address = $this->db2->f('address');
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$leader_address = $this->db2->f('address');
- $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options);
+ $table_data.= $this->jscal->input('sched['.$leader.']['.$appointment.'][date]',$date,'','','','','',$this->cal_options);
- $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
+ $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $leader, $appointment);
- $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
- $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
+ $table_data.= '<input type=hidden name="sched['.$leader.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+ $table_data.= '<input type=hidden name="sched['.$leader.']['.$appointment.'][leader]" value="'.$leader.'">';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
- $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+ $table_data.= $this->jscal->input('sched['.$leader.']['.$appointment.'][date]','','','','','','',$this->cal_options);
- $table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
+ $table_data .= $this->get_time_selection_form(0, 0, 0, $leader, $appointment);
- $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
- $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
+ $table_data.= '<input type=hidden name="sched['.$leader.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+ $table_data.= '<input type=hidden name="sched['.$leader.']['.$appointment.'][leader]" value="'.$leader.'">';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
$this->t->set_var('table_data',$table_data);
$this->t->set_var('header_row',$header_row);
$this->t->set_var('table_width',$table_width);
$this->t->set_var('table_data',$table_data);
$this->t->set_var('header_row',$header_row);
$this->t->set_var('table_width',$table_width);
$this->t->set_block('admin_t','upload','uploadhandle');
$this->t->set_block('admin_t','admin','adminhandle');
$this->t->set_block('admin_t','cmd','cmdhandle');
$this->t->set_block('admin_t','upload','uploadhandle');
$this->t->set_block('admin_t','admin','adminhandle');
$this->t->set_block('admin_t','cmd','cmdhandle');
$this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.admin&action=upload'));
$this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.admin&action=upload'));
- $this->t->set_var('presidency_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.admin&action=presidency'));
+ $this->t->set_var('leader_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.admin&action=leader'));
$this->t->set_var('uploadstatus',$uploadstatus);
$this->t->pfp('uploadhandle','upload',True);
}
$this->t->set_var('uploadstatus',$uploadstatus);
$this->t->pfp('uploadhandle','upload',True);
}
$new_data = get_var('eqpres',array('POST'));
foreach ($new_data as $entry) {
$id = $entry['id'];
$new_data = get_var('eqpres',array('POST'));
foreach ($new_data as $entry) {
$id = $entry['id'];
- if($id < $this->max_presidency_members) {
+ $leader_type = 'D';
+ if ($secretary == 1) {$leader_type = 'S';}
+ if ($counselor == 1) {$leader_type = 'C';}
+ if ($president == 1) {$leader_type = 'P';}
+ if($id < $this->max_leader_members) {
" individual=" . $indiv .
" ,district=" . $district .
" ,email='" . $email . "'" .
" individual=" . $indiv .
" ,district=" . $district .
" ,email='" . $email . "'" .
- " ,president='" . $president . "'" .
- " ,counselor='" . $counselor . "'" .
- " ,secretary='" . $secretary . "'" .
- " WHERE presidency=" . $id,__LINE__,__FILE__);
+ " ,type='" . $leader_type . "'" .
+ " WHERE leader=" . $id,__LINE__,__FILE__);
- $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district," .
- "email,president,counselor,secretary,valid) " .
+ $this->db2->query("INSERT INTO tc_leader (leader,individual,district," .
+ "email,type,valid) " .
"VALUES (NULL,'" . $indiv . "','" . $district . "','" .
"VALUES (NULL,'" . $indiv . "','" . $district . "','" .
- $email . "','" . $president . "','" .
- $counselor . "','" . $secretary . "','1'" .
+ $email . "','" . $leader_type . "','1'" .
- // Requery the tc_presidency table
- $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
+ // Requery the tc_leader table
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$indiv = $this->db->f('individual');
$name = $this->db->f('name');
$district = $this->db->f('district');
$indiv = $this->db->f('individual');
$name = $this->db->f('name');
$district = $this->db->f('district');
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
$header_row = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th>";
while ($this->db->next_record()) {
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
$header_row = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th>";
while ($this->db->next_record()) {
$indiv = $this->db->f('individual');
$district = $this->db->f('district');
$name = $this->db->f('name');
$email = $this->db->f('email');
$indiv = $this->db->f('individual');
$district = $this->db->f('district');
$name = $this->db->f('name');
$email = $this->db->f('email');
- $president = $this->db->f('president');
- $counselor = $this->db->f('counselor');
- $secretary = $this->db->f('secretary');
+ $leader_type = $this->db->f('type');
+ if ($leader_type == 'P') {$president = 1;} else {$president = 0;}
+ if ($leader_type == 'C') {$counselor = 1;} else {$counselor = 0;}
+ if ($leader_type == 'S') {$secretary = 1;} else {$secretary = 0;}
// Create the forms needed in the table
$table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
// Create the forms needed in the table
$table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
$table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$table_data.='</select></td>';
$table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="'.$indivname.'">';
} else {
$table_data.='</select></td>';
$table_data.='<input type=hidden name="eqpres['.$id.'][name]" value="'.$indivname.'">';
} else {
- $table_data.= '<td align=left><input type=text size="20" name="eqpresname" value="Presidency"></td>';
- $table_data.= '<input type=hidden name="eqpres['.$id.'][name]" value="Presidency">';
+ $table_data.= '<td align=left><input type=text size="20" name="eqpresname" value="Leader"></td>';
+ $table_data.= '<input type=hidden name="eqpres['.$id.'][name]" value="Leader">';
$table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
// individual
$table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
$table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
// individual
$table_data.= '<td align=center><select name="eqpres['.$id.'][indiv]">';
$this->t->set_var('header_row',$header_row);
$this->t->set_var('table_data',$table_data);
$this->t->set_var('header_row',$header_row);
$this->t->set_var('table_data',$table_data);
$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));
$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 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'";
+ $sql = "SELECT tl.email AS email1, ti.email AS email2, ti.name AS name FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.leader='$leader'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
if ($this->db2->f('email1') != "") {
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
if ($this->db2->f('email1') != "") {
mail($to, $subject, $message, $headers);
}
mail($to, $subject, $message, $headers);
}
- function get_time_selection_form($hour, $minute, $pm, $presidency, $appointment)
+ function get_time_selection_form($hour, $minute, $pm, $leader, $appointment)
if($blank == 1) { $form_data.= '<option value=""></option>'; }
foreach(range(1,12) as $num) {
if($hour == $num) {
if($blank == 1) { $form_data.= '<option value=""></option>'; }
foreach(range(1,12) as $num) {
if($hour == $num) {