var $upload_target_path;
var $script_path;
var $max_appointments;
- var $max_presidency_members;
+ var $max_leader_members;
var $ppi_frequency_label;
var $public_functions = array
include("setup/tc_config");
}
+ $this->jquery_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.js');
+ $this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js');
+
$this->script_path = "$this->application_path"."/bin";
- $this->max_presidency_members = 99;
+ $this->max_leader_members = 99;
$this->max_appointments = 32768;
$this->db = $GLOBALS['phpgw']->db;
$this->grants = $GLOBALS['phpgw']->acl->get_grants('tc');
$this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
+ $GLOBALS['phpgw_info']['flags']['css'] .= "-->\n</style>\n"
+ . '<link rel="stylesheet" type="text/css" media="all" href="'
+ . $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.css').'"/>'
+ . "\n<style type=\"text/css\">\n<!--\n";
+
$this->jscal = CreateObject('tc.jscalendar'); // before phpgw_header() !!!
$this->cal_options = 'daFormat : "%Y-%m-%d",
ifFormat : "%Y-%m-%d",
$this->t->set_var('ht_sandbox_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox'));
$this->t->set_var('ht_sandbox_link_title','Hometeaching Sandbox');
- $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
+ $sql = "SELECT * FROM tc_district AS td JOIN (tc_individual AS ti, tc_leader AS tl) WHERE td.leader=tl.leader AND tl.individual=ti.individual AND td.valid=1 ORDER BY td.district ASC";
$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]['supervisor'] = $this->db->f('supervisor');
+ $districts[$i]['leader'] = $this->db->f('leader');
$i++;
}
for ($i=0; $i < count($districts); $i++) {
$this->t->set_var('district_number',$districts[$i]['district']);
$this->t->set_var('district_name',$districts[$i]['name']);
- $supervisor = $districts[$i]['supervisor'];
+ $leader = $districts[$i]['leader'];
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$i]['district'];
+ $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$i]['district'];
$this->db->query($sql,__LINE__,__FILE__);
$j=0; $unique_companionships = '';
while ($this->db->next_record()) {
function ht_sandbox()
{
$this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl'));
+ $this->t->set_block('ht_sandbox_t','switch_case_list','sc_list');
$this->t->set_block('ht_sandbox_t','comp_list','c_list');
$this->t->set_block('ht_sandbox_t','district_list','d_list');
$this->t->set_block('ht_sandbox_t','unassigned_ht_list','uht_list');
$this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list');
$this->t->set_var('submit_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox&action=add'));
-
+ $this->t->set_var('jquery_url',$this->jquery_url);
+
$action = get_var('action',array('GET','POST'));
$this->t->set_var('title','Hometeaching Sandbox');
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$district = $this->db->f('district');
- $supervisor = $this->db->f('supervisor');
- $sql = "INSERT INTO tc_district_sandbox (district,supervisor) VALUES (\"$district\",\"$supervisor\")";
+ $leader = $this->db->f('leader');
+ $sql = "INSERT INTO tc_district_sandbox (district,leader) VALUES (\"$district\",\"$leader\")";
$this->db2->query($sql,__LINE__,__FILE__);
}
# populate family, companion, and companionship tables
- $sql = "SELECT * FROM tc_companionship WHERE valid=1";
+ $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$companionship = $this->db->f('companionship');
$this->db3->query($sql,__LINE__,__FILE__);
}
}
+ } else if ($_POST['changes']) {
+ $this->ht_sandbox_changes();
}
// get list of companionships
$sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox WHERE district=$districts[$d] ORDER BY companionship ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
+ $switch_case_list = "";
$sandbox_table_data .= "<tr><td><table>";
$companionship = $this->db->f('companionship');
+
+ $switch_case_list .= "case '". $companionship ."':\n";
+ $switch_case_list .= " $(\"#district option:selected\").removeAttr(\"selected\");\n";
+ $switch_case_list .= " $(\"#assignedHT option:selected\").removeAttr(\"selected\");\n";
+ $switch_case_list .= " $(\"#assignedFamilies option:selected\").removeAttr(\"selected\");\n";
+ $switch_case_list .= " $(\"#district option[value='".$districts[$d]."']\").attr(\"selected\",true);\n";
+
# get names of companions in this companionship
$sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship ORDER BY ti.name ASC";
$this->db2->query($sql,__LINE__,__FILE__);
} else {
$companion_names .= " / " . $this->db2->f('name');
}
+ $individual = $this->db2->f('individual');
+ $switch_case_list .= " $(\"#assignedHT option[value='".$individual."']\").attr(\"selected\",true);\n";
}
- $sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
- $sandbox_table_data .= "<tr><td><table>";
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+ $sandbox_table_data .= "<th bgcolor=#d3dce3 align=\"Left\">$companion_names</th></tr>";
+ $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><table>";
# get families they visit
$sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
while ($this->db2->next_record()) {
$family_name = $this->db2->f('name') . " Family";
$family_id = $this->db2->f('tc_family');
+ $family = $this->db2->f('family');
$tc_companionship = $this->db2->f('tc_companionship');
- $sandbox_table_data .= "<tr>";
+ $this->nextmatchs->template_alternate_row_color(&$this->t);
+ $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
$sandbox_table_data .= "<td align=\"Left\" width=\"1000\">$family_name</td>";
-
+ $switch_case_list .= " $(\"#assignedFamilies option[value='".$family."']\").attr(\"selected\",true);\n";
+
# get 12 months visit data for given family
- for($m=$this->sandbox_stats_num_months; $m >= 0; $m--) {
+ for($m=$this->sandbox_stats_num_months; $m > 0; $m--) {
$month = $this->current_month - $m;
$year = $this->current_year;
if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
}
$sandbox_table_data .= "</table></td></tr>";
$sandbox_table_data .= "</table></td></tr>";
+ $switch_case_list .= "break;\n";
+ $this->t->set_var('switch_case_list',$switch_case_list);
+ $this->t->fp('sc_list','switch_case_list',True);
}
-
$sandbox_table_data .= "</table>";
$sandbox_table_data .= "</td>";
}
$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 type='H' 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.type='H' 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 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 = "";
+ 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_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.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()
{
if($action == 'save') {
// Get a list of all the companionships in this district
- $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $district;
+ $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
$j=0; $unique_companionships = '';
while ($this->db->next_record()) {
}
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $district;
+ $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
$j=0; $unique_companionships = '';
while ($this->db->next_record()) {
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 ".
- "companionship=". $unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1 AND companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$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
$total_indivs=0; $indivs_with_yearly_ppi=0;
// 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)"; }
+ $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()) {
- $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)";
$appt_table_data = "";
- // Display a scheduling table for this presidency member
+ // Display a scheduling table for this leader 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";
+ $appt_table_title = $leader_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";
+ $sql = "SELECT * FROM tc_appointment where leader=".$leader_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; }
+ if(($location == "") && ($indiv > 0)) { $location = $leader_location; }
$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('lang_save','Save Appts for ' . $presidency_name);
+ $this->t->set_var('lang_save','Save Appts for ' . $leader_name);
$this->t->fp('apptlist','appt_list',True);
}
$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";
+ "AND individual=" . $id . " AND type='P' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND type='P' ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$date = $this->db->f('date');
$link_data['individual'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = '';
- $link_data['interview_type'] = 1;
+ $link_data['type'] = 1;
$link_data['action'] = 'add';
$link_data['interviewer'] = $interviewer;
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$link_data['individual'] = $this->db2->f('individual');
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
- $link_data['interview_type'] = $this->db2->f('interview_type');
+ $link_data['type'] = $this->db2->f('type');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$indivs_with_yearly_ppi++;
$i++;
}
// add any YM that are home teachers
- $sql = "SELECT * FROM tc_companionship where valid=1";
+ $sql = "SELECT * FROM tc_companionship WHERE type='H' AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$tmp_individual = $this->db->f('individual');
$appointment = $entry['appointment'];
$location = $entry['location'];
if($location == "") {
- $supervisor = $entry['supervisor'];
- $supervisor_array = explode(",", $individ2name[$supervisor]);
- $supervisor_last_name = $supervisor_array[0];
- $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
+ $leader = $entry['leader'];
+ $leader_array = explode(",", $individ2name[$leader]);
+ $leader_last_name = $leader_array[0];
+ $sql = "SELECT * FROM tc_individual where individual='$leader'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $supervisor_address = $this->db2->f('address');
+ $leader_address = $this->db2->f('address');
}
- $location = "$supervisor_last_name"." home ($supervisor_address)";
+ $location = "$leader_last_name"." home ($leader_address)";
}
if($indiv == 0) { $location = ""; }
}
// Get the Districts
- $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";
+ $sql = "SELECT * FROM tc_district AS td JOIN (tc_leader AS tl, tc_individual AS ti) WHERE td.leader=tl.leader AND tl.individual=ti.individual AND td.valid=1 ORDER BY td.district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
$district = $this->db->f('district');
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
- $districts[$i]['supervisor'] = $this->db->f('supervisor');
- $districts[$i]['presidency'] = $this->db->f('presidency');
+ $districts[$i]['leader'] = $this->db->f('leader');
$i++;
}
$table_data=""; $appt_table_data="";
$this->t->set_var('district_number',$districts[$d]['district']);
$this->t->set_var('district_name',$districts[$d]['name']);
- $supervisor = $districts[$d]['supervisor'];
- $supervisor_array = explode(",", $supervisor);
- $supervisor_last_name = $supervisor_array[0];
- $sql = "SELECT * FROM tc_individual where individual='$supervisor'";
+ $leader = $districts[$d]['leader'];
+ $leader_array = explode(",", $leader);
+ $leader_last_name = $leader_array[0];
+ $sql = "SELECT * FROM tc_individual where individual='$leader'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $supervisor_address = $this->db2->f('address');
+ $leader_address = $this->db2->f('address');
}
- $location = "$supervisor_last_name"." home ($supervisor_address)";
+ $location = "$leader_last_name"." home ($leader_address)";
$table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Individuals with Interviews Not Completed";
$appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview 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=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM tc_appointment where leader=".$districts[$d]['leader']." and date>=CURDATE() ORDER BY date ASC, time ASC";
$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 = "$supervisor_last_name"." home ($supervisor_address)"; }
+ if(($location == "") && ($indiv > 0)) { $location = "$leader_last_name"." home ($leader_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
$appt_table_data.= 'name="appt_notes['.$appointment.'][location]" value="'.$location.'">';
$appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][appointment]" value="'.$appointment.'">';
- $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][supervisor]" value="'.$supervisor.'">';
+ $appt_table_data.= '<input type=hidden name="appt_notes['.$appointment.'][leader]" value="'.$leader.'">';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
// INTERVIEW SCHEDULING TABLE
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$d]['district'];
+ $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$d]['district'];
$this->db->query($sql,__LINE__,__FILE__);
$j=0; $unique_companionships = '';
while ($this->db->next_record())
}
// 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' AND interview_type='hti'";
+ $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND type='H'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND type='H' 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_data['type'] = 'H';
+ $link_data['interviewer'] = $districts[$d]['leader'];
$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>";
$table_data.= "<td align=center>$phone</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['type'] = 'H';
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$comps_with_quarterly_int++;
$appt_table_data = "";
// Find out what the President ID is
- $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";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
- $presidency_name = $this->db->f('name');
- $presidency_id = $this->db->f('presidency');
+ $leader_name = $this->db->f('name');
+ $leader_id = $this->db->f('leader');
} else {
- print "<hr><font color=red><h3>-E- Unable to locate Presidency in tc_presidency table</h3></font></hr>";
+ print "<hr><font color=red><h3>-E- Unable to locate Presidency in tc_leader table</h3></font></hr>";
return;
}
// 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";
+ $sql = "SELECT * FROM tc_appointment where leader=$leader_id and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record()) {
$this->t->set_var('lang_num_months','Years of History');
}
- $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";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.type='P' AND tl.valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
$interviewer = $this->db->f('individual');
} else {
- print "<hr><font color=red><h3>-E- Unable to locate President in tc_presidency table</h3></font></hr>";
+ print "<hr><font color=red><h3>-E- Unable to locate President in tc_leader table</h3></font></hr>";
return;
}
$this->t->set_var('district_number','*');
$link_data['individual'] = $id;
$link_data['name'] = $name;
$link_data['interview'] = '';
- $link_data['interview_type'] = 'ppi';
+ $link_data['type'] = 'P';
$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' ORDER BY date DESC";
+ "AND individual=" . $id . " AND type='P' 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'] = 'ppi';
+ $link_data['type'] = 'P';
$link_data['action'] = 'view';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
$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'));
+ $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');
+ $leader = $this->db2->f('leader');
$interviewer_name = $this->db2->f('name');
- if($indiv == $interviewer) {
- $this->t->set_var('interviewer',$indiv . ' selected');
+ if($leader == $interviewer) {
+ $this->t->set_var('interviewer',$leader . ' selected');
} else {
- $this->t->set_var('interviewer',$indiv);
+ $this->t->set_var('interviewer',$leader);
}
#print "indiv: $indiv interviewer: $interviewer<br>";
$this->t->set_var('interviewer_name',$interviewer_name);
", individual='" . $individual . "'" .
", date='" . $date . "'" .
", notes=\"" . $notes . "\"" .
- ", interview_type='" . $interview_type . "'" .
+ ", type='" . $type . "'" .
" WHERE interview=" . $interview,__LINE__,__FILE__);
$this->ppi_view();
return false;
if($action == 'insert') {
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+ $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
"VALUES ('" . $interviewer . "','" . $individual . "','" .
- $date . "',\"" . $notes . "\",'" . $interview_type ."')",__LINE__,__FILE__);
+ $date . "',\"" . $notes . "\",'" . $type ."')",__LINE__,__FILE__);
$this->ppi_view();
return false;
}
$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('type',$type);
$this->t->set_var('eqpresppi_checked','checked');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New PPI');
}
if($action == 'edit' || $action == 'view') {
- $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
+ $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='P'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
$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') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+ $this->t->set_var('type',$this->db->f('type'));
+ if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit') {
else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
- $sql = "SELECT * FROM tc_district AS td JOIN tc_individual AS ti WHERE td.supervisor=ti.individual AND td.valid=1 ORDER BY td.district ASC";
+ $sql = "SELECT * FROM tc_district AS td JOIN (tc_individual AS ti, tc_leader AS tl) WHERE td.leader=tl.leader AND tl.individual=ti.individual AND td.valid=1 ORDER BY td.district ASC";
$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]['supervisor'] = $this->db->f('supervisor');
+ $districts[$i]['leader'] = $this->db->f('leader');
$i++;
}
for ($i=0; $i < count($districts); $i++) {
$this->t->set_var('district_number',$districts[$i]['district']);
$this->t->set_var('district_name',$districts[$i]['name']);
- $supervisor = $districts[$i]['supervisor'];
+ $leader = $districts[$i]['leader'];
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM tc_companionship where valid=1 and district=". $districts[$i]['district'];
+ $sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE type='H' AND valid=1 AND district=". $districts[$i]['district'];
$this->db->query($sql,__LINE__,__FILE__);
$j=0; $unique_companionships = '';
while ($this->db->next_record()) {
$phone = $indiv_phone[$individual];
$link_data['menuaction'] = 'tc.tc.int_update';
$link_data['companionship'] = $companionship;
- $link_data['interviewer'] = $supervisor;
+ $link_data['interviewer'] = $leader;
$link_data['individual'] = $individual;
$link_data['name'] = $name;
$link_data['interview'] = '';
- $link_data['interview_type'] = 'hti';
+ $link_data['type'] = 'H';
$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 interview_type='hti' ORDER BY date DESC";
+ "AND individual=" . $individual . " AND type='H' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "<th width=$int_width><font size=-2>$month</th>";
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
- $link_data['interview_type'] = 'hti';
+ $link_data['type'] = 'H';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
$month = $date_array[1];
$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'));
+ $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 (tp.president=1 OR tp.counselor=1 OR tp.secretary=1 OR tp.district!=0)";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN (tc_individual AS ti, tc_district AS td) WHERE tl.individual=ti.individual AND tl.leader=td.leader AND tl.valid=1 AND (tl.type='P' OR tl.type='C' OR tl.type='D' OR td.district!=0)";
$this->db2->query($sql,__LINE__,__FILE__);
while ($this->db2->next_record()) {
- $indiv = $this->db2->f('individual');
+ $leader = $this->db2->f('leader');
$interviewer_name = $this->db2->f('name');
- if($indiv == $interviewer) {
- $this->t->set_var('interviewer',$indiv . ' selected');
+ if($leader == $interviewer) {
+ $this->t->set_var('interviewer',$leader . ' selected');
} else {
- $this->t->set_var('interviewer',$indiv);
+ $this->t->set_var('interviewer',$leader);
}
$this->t->set_var('interviewer_name',$interviewer_name);
$this->t->fp('int_list','interviewer_list',True);
", individual='" . $individual . "'" .
", date='" . $date . "'" .
", notes=\"" . $notes . "\"" .
- ", interview_type='" . $interview_type . "'" .
+ ", type='" . $type . "'" .
" WHERE interview=" . $interview,__LINE__,__FILE__);
$this->int_view();
return false;
if($action == 'insert') {
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+ $this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
"VALUES ('" . $interviewer . "','" . $individual . "','" .
- $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
+ $date . "',\"" . $notes ."\",'" . $type . "')",__LINE__,__FILE__);
$this->int_view();
return false;
}
$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('type',$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 . " AND interview_type='hti'";
+ $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='H'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
$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') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+ $this->t->set_var('type',$this->db->f('type'));
+ if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
}
if($action == 'edit') {
function org_view()
{
$this->t->set_file(array('org_view_t' => 'org_view.tpl'));
- $this->t->set_block('org_view_t','calling_list','list1');
- $this->t->set_block('org_view_t','org_list','list2');
+ $this->t->set_block('org_view_t','calling_list','list');
+ $this->t->set_var('jquery_url',$this->jquery_url);
+ $this->t->set_var('jquery_tablesorter_url',$this->jquery_tablesorter_url);
- # Display a list ordered alphabetically
- $sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual 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()) {
$this->t->set_var('organization', $organization);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
- $this->t->fp('list1','calling_list',True);
- }
-
- # Display a list ordered by organization
- $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]['name'] = $this->db->f('name');
- $calling[$i]['position'] = $this->db->f('position');
- $calling[$i]['sustained'] = $this->db->f('sustained');
- $calling[$i]['organization'] = $this->db->f('organization');
- $i++;
- }
- for ($i=0; $i < count($calling); $i++) {
- $name = $calling[$i]['name'];
- $position = $calling[$i]['position'];
- $sustained = $calling[$i]['sustained'];
- $organization = $calling[$i]['organization'];
- $this->t->set_var('name', $name);
- $this->t->set_var('position', $position);
- $this->t->set_var('sustained', $sustained);
- $this->t->set_var('organization', $organization);
- $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
- $this->t->set_var('tr_color',$tr_color);
- $this->t->fp('list2','org_list',True);
+ $this->t->fp('list','calling_list',True);
}
$this->t->pfp('out','org_view_t');
function schedule()
{
$this->t->set_file(array('sched_t' => 'schedule.tpl'));
- $this->t->set_block('sched_t','presidency_list','list');
+ $this->t->set_block('sched_t','leader_list','list');
$action = get_var('action',array('GET','POST'));
$header_row.= "<th width=$location_width><font size=-2>Location</th>";
$table_data = "";
- $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";
+ $sql = "SELECT * FROM tc_leader AS tl JOIN tc_individual AS ti WHERE tl.individual=ti.individual AND tl.valid=1 GROUP BY tl.individual ORDER BY ti.name ASC";
$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'];
$i++;
}
if($action == 'save') {
$new_data = get_var('sched',array('POST'));
- 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'];
$appointment = $entry['appointment'];
$location = $entry['location'];
$date = $entry['date'];
$family_address = $familyid2address[$family];
$location = "$family_last_name"." home ($family_address)";
} 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]'";
+ $leader_name_array = explode(",",$leader2name[$leader]);
+ $leader_last_name = $leader_name_array[0];
+ #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()) {
- $supervisor_address = $this->db2->f('address');
+ $leader_address = $this->db2->f('address');
}
- $location = "$supervisor_last_name"." home ($supervisor_address)";
+ $location = "$leader_last_name"." home ($leader_address)";
}
}
// Update an existing appointment
if($appointment < $this->max_appointments)
{
+ // If we deleted the appointment, we still need to send a cancellation to the right people
+ // Make a note of the old email now in case we need it later
+ $old_indiv_email = "";
+ $sql = "SELECT * FROM tc_appointment where appointment='$appointment'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->next_record()) {
+ $old_individual = $this->db->f('individual');
+ $old_family = $this->db->f('family');
+ if($old_individual > 0) {
+ $sql = "SELECT * FROM tc_individual where individual='$old_individual'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $old_indiv_email = $this->db2->f('email');
+ }
+ }
+ if($old_family > 0) {
+ $sql = "SELECT * FROM tc_family WHERE family='$old_family'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $old_individual = $this->db2->f('individual');
+ $sql = "SELECT * FROM tc_individual where individual='$old_individual'";
+ $this->db3->query($sql,__LINE__,__FILE__);
+ if($this->db3->next_record()) {
+ $old_indiv_email = $this->db3->f('email');
+ }
+ }
+ }
+ }
+
//Only perform a database update if we have made a change to this appointment
$sql = "SELECT * FROM tc_appointment where " .
"appointment='$appointment'" .
- " and presidency='$presidency'" .
+ " and leader='$leader'" .
" and individual='$indiv'" .
" and family='$family'" .
" and date='$date'" .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
" ,location='" . $location . "'" .
- " ,presidency='" . $presidency . "'" .
+ " ,leader='" . $leader . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
- $this->email_appt($appointment);
+ $this->email_appt($appointment, $old_indiv_email);
}
}
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
$sql = "SELECT * FROM tc_appointment where " .
"individual='$indiv'" .
" and family='$family'" .
- " and presidency='$presidency'" .
+ " and leader='$leader'" .
" and date='$date'" .
" and time='$time'" .
" and uid='$uid'" .
}
array_multisort($indiv_name, $individual);
- 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);
$table_data="";
// query the database for all the appointments
- $sql = "SELECT * FROM tc_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM tc_appointment where leader=$leader and date>=CURDATE() ORDER BY date ASC, time ASC";
$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) {
- $supervisor_name_array = explode(",",$presidency2name[$presidency]);
- $supervisor_last_name = $supervisor_name_array[0];
- $sql = "SELECT * FROM tc_individual where individual='$presidency2indiv[$presidency]'";
+ $leader_name_array = explode(",",$leader2name[$leader]);
+ $leader_last_name = $leader_name_array[0];
+ $sql = "SELECT * FROM tc_individual where individual='$leader2indiv[$leader]'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $supervisor_address = $this->db2->f('address');
+ $leader_address = $this->db2->f('address');
}
- $location = "$supervisor_last_name"." home ($supervisor_address)";
+ $location = "$leader_last_name"." home ($leader_address)";
}
}
// Date selection
$table_data.= '<td align=left>';
- $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.= '</td>';
// Hour & Minutes selection
$table_data.= "<td align=center>";
- $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.= "</td>";
// individual drop down list (for PPIs)
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$leader.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$table_data.='</select></td>';
// Family drop down list (for Visits)
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$leader.']['.$appointment.'][family] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $family_id[$j];
// Location text box
$table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
- $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'" STYLE="font-size : 8pt">';
+ $table_data.= 'name="sched['.$leader.']['.$appointment.'][location]" value="'.$location.'" STYLE="font-size : 8pt">';
- $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);
// Date selection
$table_data.= '<td align=left>';
- $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.= '</td>';
// Time selection
$table_data.= "<td align=center>";
- $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.= "</td>";
// individual drop down list
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$leader.']['.$appointment.'][individual] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $individual[$j];
$table_data.='</select></td>';
// Family drop down list
- $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
+ $table_data.= '<td align=center><select name=sched['.$leader.']['.$appointment.'][family] STYLE="font-size : 8pt">';
$table_data.= '<option value=0></option>';
for ($j=0; $j < count($individual); $j++) {
$id = $family_id[$j];
// Location text box
$table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
- $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="" STYLE="font-size : 8pt">';
+ $table_data.= 'name="sched['.$leader.']['.$appointment.'][location]" value="" STYLE="font-size : 8pt">';
- $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);
$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->fp('list','presidency_list',True);
+ $this->t->fp('list','leader_list',True);
}
$this->t->pfp('out','sched_t');
$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','presidency','presidencyhandle');
+ $this->t->set_block('admin_t','leader','leaderhandle');
$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'));
$action = get_var('action',array('GET','POST'));
$this->t->set_var('uploadstatus',$uploadstatus);
$this->t->pfp('uploadhandle','upload',True);
}
- } else if($action == "presidency") {
+ } else if($action == "leader") {
$new_data = get_var('eqpres',array('POST'));
+
+ // Delete all the previous district entries from the table
+ $this->db->query("DELETE from tc_district where valid=1",__LINE__,__FILE__);
+ $this->db->query("DELETE from tc_district where valid=0",__LINE__,__FILE__);
+
+ // Always add a "District 0" assigned to the High Priests Group
+ $district = 0;
+ $name = "High Priests";
+ $indiv = 0;
+ $valid = 0;
+ $this->db2->query("INSERT INTO tc_district (district,leader,valid) " .
+ "VALUES ('" . $district . "','" .
+ $indiv . "','" . $valid . "'" .
+ ")",__LINE__,__FILE__);
+
foreach ($new_data as $entry) {
$id = $entry['id'];
$email = $entry['email'];
//print "counselor=$counselor secretary=$secretary<br>";
if(($indiv > 0) || ($name != "")) {
- 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) {
//print "Updating Existing Entry<br>";
- $this->db2->query("UPDATE tc_presidency set" .
+ $this->db2->query("UPDATE tc_leader set" .
" 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__);
} else {
//print "Adding New Entry<br>";
- $this->db2->query("INSERT INTO tc_presidency (presidency,individual,district," .
- "email,president,counselor,secretary,valid) " .
- "VALUES (NULL,'" . $indiv . "','" . $district . "','" .
- $email . "','" . $president . "','" .
- $counselor . "','" . $secretary . "','1'" .
+ $this->db2->query("INSERT INTO tc_leader (leader,individual," .
+ "email,type,valid) " .
+ "VALUES (NULL,'" . $indiv . "','" .
+ $email . "','" . $leader_type . "','1'" .
")",__LINE__,__FILE__);
+ $id = mysql_insert_id();
+ }
+
+ // If we have a valid district, add it to the district table
+ if($district > 0) {
+ $valid = 1;
+ $this->db2->query("INSERT INTO tc_district (district,leader,valid) " .
+ "VALUES ('" . $district . "','" .
+ $id . "','" . $valid . "'" .
+ ")",__LINE__,__FILE__);
}
} else {
//print "Ignoring Blank Entry<br>";
}
}
- // Now update the tc_district table appropriately
-
- // Delete all the previous district entries from the table
- $this->db->query("DELETE from tc_district where valid=1",__LINE__,__FILE__);
- $this->db->query("DELETE from tc_district where valid=0",__LINE__,__FILE__);
-
- // Always add a "District 0" assigned to the High Priests Group
- $district = 0;
- $name = "High Priests";
- $indiv = 0;
- $valid = 0;
- $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
- "VALUES ('" . $district . "','" .
- $indiv . "','" . $valid . "'" .
- ")",__LINE__,__FILE__);
-
- // 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";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record()) {
- // Extract the data for each presidency record
- $id = $this->db->f('presidency');
- $indiv = $this->db->f('individual');
- $name = $this->db->f('name');
- $district = $this->db->f('district');
- $valid = 1;
-
- // If we have a valid district, add it to the district table
- if($district > 0) {
- $this->db2->query("INSERT INTO tc_district (district,supervisor,valid) " .
- "VALUES ('" . $district . "','" .
- $indiv . "','" . $valid . "'" .
- ")",__LINE__,__FILE__);
- }
- }
-
$this->t->set_var('adminhandle','');
$this->t->pfp('adminhandle','admin');
}
$this->t->pfp('adminhandle','admin');
}
- // Now save off the data needed for a Presidency Table Update
+ // Now save off the data needed for a Leader Table Update
- $sql = "SELECT tp.*, ti.name FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1";
+ $sql = "SELECT tl.*, ti.name 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__);
$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()) {
- // Extract the data for each presidency record
- $id = $this->db->f('presidency');
+ // Extract the data for each leader record
+ $id = $this->db->f('leader');
$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;}
+
+ $sql = "SELECT * FROM tc_district AS td JOIN tc_leader AS tl WHERE td.leader=tl.leader AND td.leader=$id AND td.district!=0 AND td.valid=1";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if ($this->db2->next_record()) {
+ $district = $this->db2->f('district');
+ } else {
+ $district = 0;
+ }
// Create the forms needed in the table
$table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
- // Presidency ID
+ // Leader ID
$table_data .= '<input type=hidden name="eqpres['.$id.'][id]" value="'.$id.'">';
// individual
- if($eqpresidency == 0) {
+ if($eqleader == 0) {
$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.= '<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">';
}
// Email Address
}
// Now create 1 blank row to always have a line available to add a new individual with
- $id = $this->max_presidency_members;
+ $id = $this->max_leader_members;
$table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
- // Presidency ID
+ // Leader ID
$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->pfp('presidencyhandle','presidency',True);
+ $this->t->pfp('leaderhandle','leader',True);
$this->save_sessiondata();
}
- function email_appt($appointment)
+ function email_appt($appointment, $old_indiv_email)
{
//print "Emailing notification of appointment: $appointment <br>";
while ($this->db->next_record()) {
$appointment = $this->db->f('appointment');
- $presidency = $this->db->f('presidency');
+ $leader = $this->db->f('leader');
$location = $this->db->f('location');
$interviewer = "";
$email = "";
$appt_name = "";
$phone = "";
$uid = $this->db->f('uid');
-
+
// Extract the year, month, day, hours, minutes, seconds from the appointment time
$appt_date = $this->db->f('date');
$date_array = explode("-",$appt_date);
$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') != "") {
if($this->db2->next_record()) {
$indiv_name = $this->db2->f('name');
$phone = $this->db2->f('phone');
+ $indiv_email = $this->db2->f('email');
+ if(($this->email_individual_appt == 1) && ($indiv_email != "")) {
+ $email .= ", $indiv_email";
+ }
$appt_name = $indiv_name . " Interview";
$duration = $this->default_ppi_appt_duration * 60;
}
$phone = $this->db3->f('phone');
$family_name = $this->db3->f('name');
$phone = $this->db3->f('phone');
+ $indiv_email = $this->db3->f('email');
+ if(($this->email_individual_appt == 1) && ($indiv_email != "")) {
+ $email .= ", $indiv_email";
+ }
}
$appt_name = $family_name . " Family Visit";
$duration = $this->default_visit_appt_duration * 60;
if(($uid == 0) && ($appt_name != "")) {
// Create a new calendar item for this appointment, since this must be the first time we
// are sending it out.
- print "Sent new appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+ print "Sent new appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "<br>";
$uid = rand() . rand(); // Generate a random identifier for this appointment
$subject = "Created: $appt_name";
} else if(($uid != 0) && ($appt_name == "")) {
// Remove the calendar item for this appointment since it has already been sent
// and there is no name we have changed it to.
- print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
+ if(($this->email_individual_appt == 1) && ($old_indiv_email != "")) {
+ $email .= ", $old_indiv_email";
+ }
+ print "Sent deleted appointment for " . $interviewer . " to '" . $email . "' for " . $appt_date . " " . $appt_time . "<br>";
$subject = "Canceled: $appt_date $appt_time";
$this->db->query("UPDATE tc_appointment set" .
$dtend, $date, $location, $subject, $subject, $uid);
} else if($uid != 0) {
// Update the existing appointment since we have changed it
- print "Sent updated appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+ print "Sent updated appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "<br>";
$subject = "Canceled: $appt_date $appt_time";
$action = "CANCEL";
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)
{
$form_data = "";
$blank = 0;
if($this->time_drop_down_lists == 1) {
// Create drop down lists to get the time
- $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
+ $form_data.= '<select name=sched['.$leader.']['.$appointment.'][hour]>';
if($blank == 1) { $form_data.= '<option value=""></option>'; }
foreach(range(1,12) as $num) {
if($hour == $num) {
}
$form_data.= '</select>';
$form_data.= ' : ';
- $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
+ $form_data.= '<select name=sched['.$leader.']['.$appointment.'][minute]>';
if($blank == 1) { $form_data.= '<option value=""></option>'; }
$num = 0;
while($num < 60) {
$minute = "";
$ampm = "";
}
- $form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][hour] value='.$hour.'>';
+ $form_data.= '<input type=text size=2 name=sched['.$leader.']['.$appointment.'][hour] value='.$hour.'>';
$form_data.= ':';
- $form_data.= '<input type=text size=2 name=sched['.$presidency.']['.$appointment.'][minute] value='.$minute.'>';
+ $form_data.= '<input type=text size=2 name=sched['.$leader.']['.$appointment.'][minute] value='.$minute.'>';
$form_data.= ' ';
}
// Always use a drop-down select form for am/pm
- $form_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
+ $form_data.= '<select name=sched['.$leader.']['.$appointment.'][pm]>';
if($blank == 0) {
if($pm == 0) {
$form_data.= '<option value=0 selected>am</option>';
projects / eq / .git / blobdiff
![[eq/.git]](/embedvideo/.git/static/git-logo.png?p=eq/.git;a=tree;hb=1d7d0afcd39dbd2c4c4ebe13ac110cb984270761){kind=link}
