X-Git-Url: http://git.pippins.net/embedvideo/.git/.%24link.?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2b16e7a39c0cbb333d32bf24a7ee2094fef88aa7;hb=abf09ae712c55d6e251ffd4a89dc63faa64b971a;hp=b3730dde2037d5e54e53b94646cc4d95fa1aab7a;hpb=d0fe650e8a63864d8fd593aec3429abdec5eac95;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index b3730dd..2b16e7a 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -1,7 +1,8 @@
True,
'schedule' => True,
'admin' => True,
+ 'email' => True,
'email_appt' => True,
'willing_view' => True,
'willing_update' => True,
@@ -68,11 +70,10 @@ class eq
function eq()
{
- $base_path = $_SERVER['DOCUMENT_ROOT'];
- if(file_exists("$base_path/eq/setup/eq_config.local")) {
- include("$base_path/eq/setup/eq_config.local");
+ if(file_exists("setup/3rd_config.local")) {
+ include("setup/3rd_config.local");
} else {
- include("$base_path/eq/setup/eq_config");
+ include("setup/3rd_config");
}
$this->script_path = "$this->application_path"."/bin";
@@ -94,7 +95,7 @@ class eq
mondayFirst : false,
weekNumbers : false';
- $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor';
+ $GLOBALS['phpgw_info']['flags']['app_header'] = 'The 3rd Counselor';
$GLOBALS['phpgw']->common->phpgw_header();
$this->current_day = `date '+%d'`;
@@ -115,11 +116,11 @@ class eq
function display_app_header()
{
- $this->t->set_file(array('eq_header' => 'header.tpl'));
+ $this->t->set_file(array('3rd_header' => 'header.tpl'));
- if (isset($phpgw_info['user']['preferences']['eq']['eq_font']))
+ if (isset($phpgw_info['user']['preferences']['eq']['3rd_font']))
{
- $font = $phpgw_info['user']['preferences']['eq']['eq_font'];
+ $font = $phpgw_info['user']['preferences']['eq']['3rd_font'];
}
else
{
@@ -167,8 +168,11 @@ class eq
$link_data['menuaction'] = 'eq.eq.schedule';
$this->t->set_var('link_schedule',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_schedule','Scheduling');
+ $link_data['menuaction'] = 'eq.eq.email';
+ $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+ $this->t->set_var('lang_email','Email');
- $this->t->pparse('out','eq_header');
+ $this->t->pparse('out','3rd_header');
}
function ht_view()
@@ -187,7 +191,7 @@ class eq
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
$this->t->set_var('title','Hometeaching');
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -198,25 +202,25 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
- // Make an array mapping elder_ids to elder_names
- for($i=0; $i < count($elder_id); $i++) {
- $id = $elder_id[$i];
- $elders[$id] = $elder_name[$i];
+ // Make an array mapping indiv_ids to indiv_names
+ for($i=0; $i < count($indiv_id); $i++) {
+ $id = $indiv_id[$i];
+ $indivs[$id] = $indiv_name[$i];
}
- $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+ $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -224,19 +228,18 @@ class eq
$aaronic[$aaronic_id]['name'] = $this->db->f('name');
$aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
}
-
- $total_families = 0;
+
$this->nextmatchs->template_alternate_row_color(&$this->t);
+ for($m=$num_months; $m >= 0; $m--) { $total_families[$m]=0; }
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'];
- $unique_companionships='';
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$i]['district'];
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -244,12 +247,12 @@ class eq
}
$comp_width=450; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width;
- $table_data=""; $num_companionships = 0; $num_families = 0;
- for($m=$num_months; $m >= 0; $m--) { $visits[$m] = 0; }
+ $table_data=""; $num_companionships = 0;
+ for($m=$num_months; $m >= 0; $m--) { $visits[$m]=0; $num_families[$m]=0; }
for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
@@ -258,11 +261,11 @@ class eq
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= "
/ "; }
$companionship = $this->db->f('companionship');
- $elder_id = $this->db->f('elder');
+ $indiv_id = $this->db->f('indiv');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) {
- $name = $elders[$elder_id];
- $phone = $elder_phone[$elder_id];
+ if($indiv_id) {
+ $name = $indivs[$indiv_id];
+ $phone = $indiv_phone[$indiv_id];
}
else if($aaronic_id) {
$name = $aaronic[$aaronic_id]['name'];
@@ -273,13 +276,12 @@ class eq
$table_data.= " ";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
while ($this->db->next_record())
{
- $num_families++; $total_families++;
$family_name = $this->db->f('name');
$family_id = $this->db->f('family');
$this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -301,14 +303,14 @@ class eq
// " AND companionship=" . $unique_companionships[$j]['companionship'].
// First check to see if the currently assigned companionship has visited them
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship=".$unique_companionships[$j]['companionship'].
" AND family=". $family_id;
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
// look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
@@ -327,19 +329,21 @@ class eq
if(!$total_visits[$m]) { $total_visits[$m] = 0; }
if($this->db2->next_record()) {
if($this->db2->f('visited') == 'y') {
- $visits[$m]++; $total_visits[$m]++;
+ $visits[$m]++; $total_visits[$m]++;
+ $num_families[$m]++; $total_families[$m]++;
$table_data .= ' ';
}
else if($this->db2->f('visited') == 'n') {
+ $num_families[$m]++; $total_families[$m]++;
$table_data .= ' ';
}
else {
- $visits[$m]++; $total_visits[$m]++;
+ //$visits[$m]++; $total_visits[$m]++;
$table_data .= " ";
}
}
else {
- $visits[$m]++; $total_visits[$m]++;
+ //$visits[$m]++; $total_visits[$m]++;
$table_data .= " ";
}
}
@@ -349,11 +353,15 @@ class eq
$table_data .= " ";
}
$table_data .= " ";
- $stat_data = "$num_families Families Visit Totals: ";
+ $stat_data = "Families Hometaught: Hometeaching Percentage: ";
for($m=$num_months; $m >=0; $m--) {
- $percent = ceil(($visits[$m] / $num_families)*100);
- $stat_data .= "$visits[$m] $percent% ";
+ if($num_families[$m] > 0) {
+ $percent = ceil(($visits[$m] / $num_families[$m])*100);
+ } else {
+ $percent = 0;
+ }
+ $stat_data .= "$visits[$m] / $num_families[$m] $percent% ";
}
$stat_data .= " ";
@@ -364,10 +372,14 @@ class eq
$this->t->fp('list','district_list',True);
}
- $totals = "$total_families Total Families Visit Totals: ";
+ $totals = "Total Families Hometaught: Total Hometeaching Percentage: ";
for($m=$num_months; $m >=0; $m--) {
- $percent = ceil(($total_visits[$m] / $total_families)*100);
- $totals .= "$total_visits[$m] $percent% ";
+ if($total_families[$m] > 0) {
+ $percent = ceil(($total_visits[$m] / $total_families[$m])*100);
+ } else {
+ $percent = 0;
+ }
+ $totals .= "$total_visits[$m] / $total_families[$m] $percent% ";
}
$totals .= " ";
@@ -403,9 +415,9 @@ class eq
if($action == 'save')
{
// Get a list of all the companionships in this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -414,9 +426,9 @@ class eq
for ($j=0; $j < count($unique_companionships); $j++)
{
//$comp=$unique_companionships[$j]['companionship'];
- //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district ";
+ //print "deleting from 3rd_visit where companionship=$comp and date=$date and district=$district ";
// Delete all the visits that have taken place for all families for this companionsthip for this month
- $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
+ $this->db->query("DELETE from 3rd_visit where companionship=" . $unique_companionships[$j]['companionship'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
}
@@ -434,7 +446,7 @@ class eq
$visited = $data_array[3];
if($visited == "") { $visited = $data_array[4]; }
//print "family_id: $family_id companionship: $companionship date: $date visited: $visited ";
- $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes,visited) "
+ $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes,visited) "
. "VALUES (" . $family_id .",". $companionship .",'". $date ."','','". $visited ."')",__LINE__,__FILE__);
}
}
@@ -442,25 +454,25 @@ class eq
return false;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
- // Make an array mapping elder_ids to elder_names
- for($i=0; $i < count($elder_id); $i++) {
- $id = $elder_id[$i];
- $elders[$id] = $elder_name[$i];
+ // Make an array mapping indiv_ids to indiv_names
+ for($i=0; $i < count($indiv_id); $i++) {
+ $id = $indiv_id[$i];
+ $indivs[$id] = $indiv_name[$i];
}
- $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+ $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -470,9 +482,9 @@ class eq
}
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;
$this->db->query($sql,__LINE__,__FILE__);
- $j=0; $unique_companionships='';
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -484,7 +496,7 @@ class eq
for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
@@ -493,11 +505,11 @@ class eq
// Get this companions information
if($companion_table_entry != "") { $companion_table_entry .= " / "; }
$companionship = $this->db->f('companionship');
- $elder_id = $this->db->f('elder');
+ $indiv_id = $this->db->f('indiv');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) {
- $name = $elders[$elder_id];
- $phone = $elder_phone[$elder_id];
+ if($indiv_id) {
+ $name = $indivs[$indiv_id];
+ $phone = $indiv_phone[$indiv_id];
}
else if($aaronic_id) {
$name = $aaronic[$aaronic_id]['name'];
@@ -508,12 +520,11 @@ class eq
$table_data.= " ";
// Get the names of the families assigned this home teaching companionship
- $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
+ $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
$sql = $sql . " ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
- $num_families++; $total_families++;
$family_name = $this->db->f('name');
$family_id = $this->db->f('family');
$this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -522,14 +533,14 @@ class eq
$header_row="Families ";
// First check to see if the currently assigned companionship has visited them
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship=".$unique_companionships[$j]['companionship'].
" AND family=". $family_id;
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->num_rows($query_id) == 0) {
// We did not find any visits made by the currently assigned companionship,
// look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
$query_id = $this->db2->query($sql,__LINE__,__FILE__);
@@ -540,13 +551,14 @@ class eq
if(!$total_visits) { $total_visits = 0; }
if($this->db2->next_record()) {
if($this->db2->f('visited') == 'y') {
- $visits++; $total_visits++;
+ $visits++; $total_visits++; $num_families++;
$table_data .= '';
$table_data .= ' Y';
$table_data .= ' N';
$table_data .= ' ';
$table_data .= ' ';
} else if($this->db2->f('visited') == 'n') {
+ $num_families++;
$table_data .= '';
$table_data .= ' Y';
$table_data .= ' N';
@@ -573,10 +585,10 @@ class eq
$table_data .= " ";
}
$table_data .= " ";
- $stat_data = "$num_families Families Visit Totals: ";
+ $stat_data = "Families Hometaught: Hometeaching Percentage: ";
$percent = ceil(($visits / $num_families)*100);
- $stat_data .= "$visits $percent% ";
+ $stat_data .= "$visits / $num_families $percent% ";
$stat_data .= " ";
$this->t->set_var('table_width',$table_width);
@@ -604,7 +616,7 @@ class eq
$this->t->set_var('lang_date','Date');
$this->t->set_var('lang_notes','Description');
- $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -616,7 +628,7 @@ class eq
$activity_list[$i]['date'] = $this->db->f('date');
$activity_list[$i]['notes'] = $this->db->f('notes');
- $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
+ $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
@@ -647,15 +659,15 @@ class eq
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('lang_edit','Edit');
- $link_data['menuaction'] = 'eq.eq.act_update';
- $link_data['activity'] = '0';
- $link_data['action'] = 'add';
- $this->t->set_var('add','');
-
$this->t->fp('list','act_list',True);
}
+ $link_data['menuaction'] = 'eq.eq.act_update';
+ $link_data['activity'] = '0';
+ $link_data['action'] = 'add';
+ $this->t->set_var('add','');
+
$this->t->pfp('out','act_list_t');
$this->save_sessiondata();
}
@@ -665,14 +677,14 @@ class eq
$this->t->set_file(array('act_view_t' => 'act_view.tpl'));
$this->t->set_block('act_view_t','part_list','list');
- $sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+ $sql = "SELECT * FROM 3rd_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('assignment', $this->db->f('assignment'));
$this->t->set_var('date', $this->db->f('date'));
$this->t->set_var('notes', $this->db->f('notes'));
- $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+ $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
@@ -697,21 +709,21 @@ class eq
$this->t->set_var('lang_edit','Edit');
$this->t->set_var('cal_date',$this->db->f('date'));
- // Now find out which elders participated in this activity
- $sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+ // Now find out which indivs participated in this activity
+ $sql = "SELECT * FROM 3rd_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
$i = 0;
while ($this->db->next_record())
{
- $part_list[$i]['elder'] = $this->db->f('elder');
+ $part_list[$i]['indiv'] = $this->db->f('indiv');
$i++;
}
for ($i=0; $i < count($part_list); $i++)
{
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $part_list[$i]['elder'];
+ $sql = "SELECT * FROM 3rd_indiv WHERE indiv=" . $part_list[$i]['indiv'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$names[$i] = $this->db->f('name');
@@ -720,7 +732,7 @@ class eq
for ($i=0; $i < count($names); $i++)
{
//$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('elder_name',$names[$i]);
+ $this->t->set_var('indiv_name',$names[$i]);
if(($i+1) % 3 == 0) { $this->t->set_var('table_sep',""); }
else { $this->t->set_var('table_sep',""); }
if(($i) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); }
@@ -734,7 +746,7 @@ class eq
function act_update()
{
$this->t->set_file(array('form' => 'act_update.tpl'));
- $this->t->set_block('form','elder_list','list');
+ $this->t->set_block('form','indiv_list','list');
$this->t->set_block('form','add','addhandle');
$this->t->set_block('form','edit','edithandle');
$this->t->set_var('lang_done','Done');
@@ -748,23 +760,25 @@ class eq
$activity['assignment'] = get_var('assignment',array('POST'));
$activity['date'] = get_var('date',array('POST'));
$activity['notes']= get_var('notes',array('POST'));
- $this->db->query("UPDATE eq_activity set " .
+ $this->db->query("UPDATE 3rd_activity set " .
" assignment='" . $activity['assignment'] .
"', date='" . $activity['date'] . "'" .
", notes='" . $activity['notes'] . "'" .
" WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
- // Delete all the elders who have particiapted in this activity
- $this->db->query("DELETE from eq_participation where activity=".$activity['activity'],__LINE__,__FILE__);
+ // Delete all the individuals who have particiapted in this activity
+ $this->db->query("DELETE from 3rd_participation where activity=".$activity['activity'],__LINE__,__FILE__);
+
+ // Re-add the individuals who are checked as having participated in this activity
+ $indivs = get_var('indiv_name',array('POST'));
+ if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with
+ foreach ($indivs as $indiv)
+ {
+ $this->db->query("INSERT INTO 3rd_participation (indiv,activity) "
+ . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ }
+ }
- // Re-add the elders who are checked as having participated in this activity
- $elders = get_var('elder_name',array('POST'));
- foreach ($elders as $elder)
- {
- $this->db->query("INSERT INTO eq_participation (elder,activity) "
- . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
- }
-
$this->act_list();
return false;
}
@@ -774,11 +788,11 @@ class eq
$activity['assignment'] = get_var('assignment',array('POST'));
$activity['date'] = get_var('date',array('POST'));
$activity['notes']= get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+ $this->db->query("INSERT INTO 3rd_activity (assignment,date,notes) "
. "VALUES ('" . $activity['assignment'] . "','"
. $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
- $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+ $sql = "SELECT * FROM 3rd_activity WHERE assignment='".$activity['assignment']."' "
. " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
@@ -786,11 +800,11 @@ class eq
$activity['activity'] = $this->db->f('activity');
}
- $elders = get_var('elder_name',array('POST'));
- foreach ($elders as $elder)
+ $indivs = get_var('indiv_name',array('POST'));
+ foreach ($indivs as $indiv)
{
- $this->db->query("INSERT INTO eq_participation (elder,activity) "
- . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO 3rd_participation (indiv,activity) "
+ . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__);
}
$this->act_list();
@@ -812,7 +826,7 @@ class eq
if($action == 'edit')
{
- $sql = "SELECT * FROM eq_activity WHERE activity=" . $activity['activity'];
+ $sql = "SELECT * FROM 3rd_activity WHERE activity=" . $activity['activity'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));
@@ -828,7 +842,7 @@ class eq
}
// Create the assignments drop-down list
- $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i = 0;
while ($this->db->next_record())
@@ -850,36 +864,36 @@ class eq
$assignment_data.='';
$this->t->set_var('assignment_data',$assignment_data);
- // Create elder selection boxes
- $sql = "SELECT * FROM eq_elder";
+ // Create individual selection boxes
+ $sql = "SELECT * FROM 3rd_indiv";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
if($this->db->f('valid') == 1 || $action != 'add') {
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
- $elder_valid[$i] = $this->db->f('valid');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_valid[$i] = $this->db->f('valid');
$i++;
}
}
- array_multisort($elder_name, $elder_id, $elder_valid);
+ array_multisort($indiv_name, $indiv_id, $indiv_valid);
$j=0;
- for ($i=0; $i < count($elder_id); $i++)
+ for ($i=0; $i < count($indiv_id); $i++)
{
//$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM eq_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i];
+ $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND indiv=" . $indiv_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) { $this->t->set_var('checked','checked'); $checked=1; }
else { $this->t->set_var('checked',''); $checked=0; }
- if($checked || $elder_valid[$i] == 1) {
- $this->t->set_var('elder_name',$elder_name[$i]);
- $this->t->set_var('elder',$elder_id[$i]);
+ if($checked || $indiv_valid[$i] == 1) {
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
+ $this->t->set_var('indiv',$indiv_id[$i]);
if(($j+1) % 3 == 0) { $this->t->set_var('table_sep'," "); }
else { $this->t->set_var('table_sep',""); }
if(($j) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); }
- $this->t->fp('list','elder_list',True);
+ $this->t->fp('list','indiv_list',True);
$j++;
}
}
@@ -905,7 +919,7 @@ class eq
$this->t->set_var('lang_name','Assignment Name');
$this->t->set_var('lang_code','Code');
- $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -958,7 +972,7 @@ class eq
{
$assignment['name'] = get_var('name',array('POST'));
$assignment['code'] = get_var('code',array('POST'));
- $this->db->query("UPDATE eq_assignment set " .
+ $this->db->query("UPDATE 3rd_assignment set " .
" name='" . $assignment['name'] . "'" .
", code='" . $assignment['code'] . "'" .
" WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
@@ -971,7 +985,7 @@ class eq
{
$assignment['name'] = get_var('name',array('POST'));
$assignment['code'] = get_var('code',array('POST'));
- $this->db->query("INSERT INTO eq_assignment (name,code) "
+ $this->db->query("INSERT INTO 3rd_assignment (name,code) "
. "VALUES ('" . $assignment['name'] . "','"
. $assignment['code'] . "')",__LINE__,__FILE__);
$this->assign_view();
@@ -991,7 +1005,7 @@ class eq
if($action == 'edit')
{
- $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment'];
+ $sql = "SELECT * FROM 3rd_assignment WHERE assignment=" . $assignment['assignment'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('name', $this->db->f('name'));
@@ -1020,20 +1034,20 @@ class eq
{
$this->t->set_file(array('par_view_t' => 'par_view.tpl'));
$this->t->set_block('par_view_t','header_list','list1');
- $this->t->set_block('par_view_t','elder_list','list2');
+ $this->t->set_block('par_view_t','indiv_list','list2');
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
- $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -1046,7 +1060,7 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while($this->db->next_record())
@@ -1057,8 +1071,8 @@ class eq
$i++;
}
- $elder_width=300; $part_width=25; $assignment_width=50;
- $total_width=$elder_width+$part_width;
+ $indiv_width=300; $part_width=25; $assignment_width=50;
+ $total_width=$indiv_width+$part_width;
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
$this->t->set_var('assignment_code',$assignment_list[$i]['code']);
@@ -1066,17 +1080,17 @@ class eq
$total_width += $assignment_width;
}
- for ($i=0; $i < count($elder_id); $i++) {
+ for ($i=0; $i < count($indiv_id); $i++) {
$participated=0; $part_table = '';
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('elder_name',$elder_name[$i]);
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
for ($j=0; $j < count($assignment_list); $j++) {
$date = "0000-00-00"; $checkmark=0; $num_matches=0;
for ($k=0; $k < count($activity_list); $k++) {
if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) {
- $sql = "SELECT * FROM eq_participation where "
+ $sql = "SELECT * FROM 3rd_participation where "
. " activity=" . $activity_list[$k]['activity']
- . " AND elder=" . $elder_id[$i];
+ . " AND indiv=" . $indiv_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
if($activity_list[$k]['date'] > $date) {
@@ -1099,10 +1113,10 @@ class eq
if($participated) { $part_table .= ' '.$participated.' '; }
else { $part_table .= ' '; }
$this->t->set_var('part_table',$part_table);
- $this->t->fp('list2','elder_list',True);
+ $this->t->fp('list2','indiv_list',True);
}
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('elder_width',$elder_width);
+ $this->t->set_var('indiv_width',$indiv_width);
$this->t->set_var('part_width',$part_width);
$this->t->set_var('act_width',$act_width);
$this->t->pfp('out','par_view_t');
@@ -1113,10 +1127,10 @@ class eq
{
$this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
$this->t->set_block('willing_view_t','header_list','list1');
- $this->t->set_block('willing_view_t','elder_list','list2');
+ $this->t->set_block('willing_view_t','indiv_list','list2');
$this->t->set_var('lang_filter','Filter');
- $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
+ $this->t->set_var('lang_filter_unwilling','Filter out unwilling individuals:');
$filter_unwilling = get_var('filter_unwilling',array('POST'));
$this->t->set_var('filter_unwilling',$filter_unwilling);
@@ -1132,19 +1146,19 @@ class eq
}
$this->t->set_var('filter_input',$filter_input);
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
- $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while($this->db->next_record())
@@ -1155,7 +1169,7 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -1168,8 +1182,8 @@ class eq
$i++;
}
- $elder_width=275; $willing_width=40; $assignment_width=50;
- $total_width=$elder_width+$willing_width;
+ $indiv_width=275; $willing_width=40; $assignment_width=50;
+ $total_width=$indiv_width+$willing_width;
for ($i=0; $i < count($assignment_list); $i++) {
$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
@@ -1179,31 +1193,31 @@ class eq
$total_willing[$i] = 0;
}
- for ($i=0; $i < count($elder_id); $i++) {
- $willing_table = ''; $elder_willing=0;
- $this->t->set_var('elder_name',$elder_name[$i]);
- $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
- $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
- . $elder_id[$i] . '&action=' . 'edit'));
+ for ($i=0; $i < count($indiv_id); $i++) {
+ $willing_table = ''; $indiv_willing=0;
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
+ $this->t->set_var('indiv_phone',$indiv_phone[$indiv_id[$i]]);
+ $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&indiv_id='
+ . $indiv_id[$i] . '&action=' . 'edit'));
for ($j=0; $j < count($assignment_list); $j++) {
$found_willingness=0;
- $sql = "SELECT * FROM eq_willingness where "
+ $sql = "SELECT * FROM 3rd_willingness where "
. " assignment=" . $assignment_list[$j]['assignment']
- . " AND elder=" . $elder_id[$i];
+ . " AND indiv=" . $indiv_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record()) {
$found_willingness=1;
$date_part="";
- $sql = "SELECT * FROM eq_activity where "
+ $sql = "SELECT * FROM 3rd_activity where "
. " assignment=". $assignment_list[$j]['assignment']
. " ORDER by date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$activity = $this->db2->f('activity');
$date = $this->db2->f('date');
- $sql = "SELECT * FROM eq_participation where "
+ $sql = "SELECT * FROM 3rd_participation where "
. " activity=" . $activity
- . " AND elder=". $elder_id[$i];
+ . " AND indiv=". $indiv_id[$i];
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date_part = $date;
@@ -1212,25 +1226,25 @@ class eq
if($this->db->f('willing') == 'y') {
$total_willing[$j]++;
- $elder_willing=1;
+ $indiv_willing=1;
$willing_table .= ''.$date_part.' ';
}
else if($this->db->f('willing') == 'n') {
$willing_table .= ' ';
}
else {
- $elder_willing=1;
+ $indiv_willing=1;
$willing_table .= " ";
}
}
if(!$found_willingness) {
- $elder_willing=1;
+ $indiv_willing=1;
$willing_table .= " ";
}
}
- if(($elder_willing == 1) || ($filter_unwilling == 'n')) {
+ if(($indiv_willing == 1) || ($filter_unwilling == 'n')) {
$this->t->set_var('willing_table',$willing_table);
- $this->t->fp('list2','elder_list',True);
+ $this->t->fp('list2','indiv_list',True);
$this->nextmatchs->template_alternate_row_color(&$this->t);
}
}
@@ -1242,7 +1256,7 @@ class eq
$this->t->set_var('stat_table',$stat_table);
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('elder_width',$elder_width);
+ $this->t->set_var('indiv_width',$indiv_width);
$this->t->set_var('willing_width',$willing_width);
$this->t->pfp('out','willing_view_t');
$this->save_sessiondata();
@@ -1258,8 +1272,8 @@ class eq
$this->t->set_block('willing_update_t','assignment_list','list');
$this->t->set_block('willing_update_t','save','savehandle');
- $elder_id = get_var('elder_id',array('GET','POST'));
- $this->t->set_var('elder_id',$elder_id);
+ $indiv_id = get_var('indiv_id',array('GET','POST'));
+ $this->t->set_var('indiv_id',$indiv_id);
$action = get_var('action',array('GET','POST'));
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view'));
@@ -1269,19 +1283,19 @@ class eq
if($action == 'save')
{
- // Delete all the previous willingness entries for this elder
- $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
+ // Delete all the previous willingness entries for this individual
+ $this->db->query("DELETE from 3rd_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__);
- // Now, add the assignment willingness that is checked for this elder
+ // Now, add the assignment willingness that is checked for this individual
$new_data = get_var('willingness',array('POST'));
foreach ($new_data as $data)
{
$data_array = explode("/",$data);
$assignment = $data_array[0];
$willing = $data_array[1];
- //print "elder_id: $elder_id assignment: $assignment willing: $willing ";
- $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) "
- . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+ //print "indiv_id: $indiv_id assignment: $assignment willing: $willing ";
+ $this->db->query("INSERT INTO 3rd_willingness (indiv,assignment,willing) "
+ . "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
}
$this->willing_view();
return false;
@@ -1290,16 +1304,16 @@ class eq
$assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width;
$table_data="";
- // Find out the elder's name
- $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+ // Find out the individual's name
+ $sql = "SELECT * FROM 3rd_indiv WHERE indiv=".$indiv_id." AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
- $elder_name = $this->db->f('name');
- $this->t->set_var('elder_name',$elder_name);
+ $indiv_name = $this->db->f('name');
+ $this->t->set_var('indiv_name',$indiv_name);
}
// Select all the assignments
- $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+ $sql = "SELECT * FROM 3rd_assignment ORDER by name ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
@@ -1312,7 +1326,7 @@ class eq
$table_data.=" $assignment_name ";
$header_row="Assignments Willingness ";
- $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+ $sql = "SELECT * FROM 3rd_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment;
$this->db2->query($sql,__LINE__,__FILE__);
$value = $assignment;
@@ -1371,7 +1385,7 @@ class eq
function ppi_sched()
{
$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
- $this->t->set_block('ppi_sched_t','elder_list','elderlist');
+ $this->t->set_block('ppi_sched_t','indiv_list','indivlist');
$this->t->set_block('ppi_sched_t','appt_list','apptlist');
$action = get_var('action',array('GET','POST'));
@@ -1387,9 +1401,9 @@ class eq
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched&action=save'));
$this->t->set_var('title','Yearly PPI Scheduler');
- $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
- $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
- $header_row = "Elder Name ";
+ $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
+ $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
+ $header_row = "individual Name ";
$header_row.= "Phone ";
$header_row.= "Priority ";
$header_row.= "Last PPI ";
@@ -1397,7 +1411,34 @@ class eq
$table_data=""; $completed_data=""; $totals_data="";
$year = date('Y');
-
+
+ // Get the EQ President
+ $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->next_record()) {
+ $president_name = $this->db->f('name');
+ $president_name_array = explode(",",$president_name);
+ $president_last_name = $president_name_array[0];
+ $president_id = $this->db->f('indiv');
+ $presidency_id = $this->db->f('presidency');
+ $interviewer = $this->db->f('indiv');
+ $district_number = '*';
+ $district_name = $president_name;
+ $sql = "SELECT * FROM 3rd_indiv where indiv='$president_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $president_address = $this->db2->f('address');
+ }
+ } else {
+ print "-E- Unable to locate President in 3rd_presidency table ";
+ return;
+ }
+
if($action == 'save')
{
// Save any changes made to the appointment table
@@ -1405,18 +1446,20 @@ class eq
if($new_data != "") {
foreach ($new_data as $entry)
{
- $elder = $entry['elder'];
+ $indiv = $entry['indiv'];
$appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
+ $location = $entry['location'];
+ if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+ if($indiv == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'";
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
// Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
+ $this->db->query("UPDATE 3rd_appointment set " .
+ " indiv='" . $indiv . "'" .
+ ",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
$this->email_appt($appointment);
@@ -1430,75 +1473,63 @@ class eq
foreach ($new_data as $entry)
{
$ppi_notes = $entry['notes'];
- $elder_id = $entry['elder_id'];
+ $indiv_id = $entry['indiv_id'];
$ppi_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_indiv set " .
" ppi_notes='" . $ppi_notes . "'" .
",ppi_pri='" . $ppi_pri . "'" .
- " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+ " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
}
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched');
//Header('Location: ' . $take_me_to_url);
}
-
- // Get the EQ President
- $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
- $this->db->query($sql,__LINE__,__FILE__);
- if($this->db->next_record()) {
- $president_name = $this->db->f('name');
- $president_id = $this->db->f('elder');
- $presidency_id = $this->db->f('presidency');
- $interviewer = $this->db->f('elder');
- $district_number = '*';
- $district_name = $president_name;
- } else {
- print "-E- Unable to locate EQ President in eq_presidency table ";
- return;
- }
- // create the elder id -> elder name mapping
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+ // create the individual id -> individual name mapping
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
- $elder_id = NULL;
- $elder_name = NULL;
+ $indiv_id = NULL;
+ $indiv_name = NULL;
while ($this->db->next_record())
{
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
// APPOINTMENT TABLE
- $date_width=150; $time_width=100; $elder_width=200;
- $appt_table_width=$date_width + $time_width + $elder_width;
+ $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
$appt_header_row = "Date ";
$appt_header_row.= "Time ";
- $appt_header_row.= "Elder ";
+ $appt_header_row.= "indiv ";
+ $appt_header_row.= "Location ";
$appt_table_data = "";
- $total_elders=0; $elders_with_yearly_ppi=0;
+ $total_indivs=0; $indivs_with_yearly_ppi=0;
// Display a scheduling table for the EQ President
$table_data=""; $appt_table_data="";
- $table_title = "District ".$district_number.": ".$district_name.": All Elders with Yearly PPI Not Completed";
+ $table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed";
$appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots";
$this->t->set_var('table_title',$table_title);
$this->t->set_var('appt_table_title',$appt_table_title);
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=".$presidency_id." 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');
- $elder = $this->db->f('elder');
+ $indiv = $this->db->f('indiv');
+ $location = $this->db->f('location');
+ if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1513,16 +1544,19 @@ class eq
$appt_table_data.= "$day_string ";
$appt_table_data.= "$time_string ";
- $appt_table_data.= '';
+ $appt_table_data.= '';
$appt_table_data.= ' ';
- for ($i=0; $i < count($elder_id); $i++) {
- $id = $elder_id[$i];
- $name = $elder_name[$i];
- if($elder_id[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+ for ($i=0; $i < count($indiv_id); $i++) {
+ $id = $indiv_id[$i];
+ $name = $indiv_name[$i];
+ if($indiv_id[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
$appt_table_data.= ''.$name.' ';
}
$appt_table_data.=' ';
-
+
+ $appt_table_data.= ' ';
+
$appt_table_data.= ' ';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1534,46 +1568,46 @@ class eq
$this->t->set_var('appt_table_width',$appt_table_width);
// PPI SCHEDULING TABLE
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY ppi_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
- $elder_id = NULL;
+ $indiv_id = NULL;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
- $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
- $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
+ $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
$i++;
- $total_elders++;
+ $total_indivs++;
}
- $max = count($elder_id);
+ $max = count($indiv_id);
for($i=0; $i < $max; $i++) {
- $id = $elder_id[$i];
- $name = $elder_name[$i];
- $phone = $elder_phone[$id];
- $ppi_pri = $elder_ppi_pri[$id];
- $ppi_notes = $elder_ppi_notes[$id];
+ $id = $indiv_id[$i];
+ $name = $indiv_name[$i];
+ $phone = $indiv_phone[$id];
+ $ppi_pri = $indiv_ppi_pri[$id];
+ $ppi_notes = $indiv_ppi_notes[$id];
- // If this elder has had a yearly PPI this year, don't show him on the schedule list
+ // 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 eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
- "AND elder=" . $id;
+ $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+ "AND indiv=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.ppi_update';
- $link_data['elder'] = $id;
+ $link_data['indiv'] = $id;
$link_data['name'] = $name;
- $link_data['ppi'] = '';
- $link_data['eqpresppi'] = 1;
+ $link_data['interview'] = '';
+ $link_data['interview_type'] = 1;
$link_data['action'] = 'add';
$link_data['interviewer'] = $interviewer;
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
@@ -1592,20 +1626,20 @@ class eq
$table_data.= ' ';
$table_data.= "$date ";
$table_data.= ' ';
- $table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
} else {
$link_data['menuaction'] = 'eq.eq.ppi_update';
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['elder'] = $this->db2->f('elder');
+ $link_data['indiv'] = $this->db2->f('indiv');
$link_data['name'] = $name;
- $link_data['ppi'] = $this->db2->f('ppi');
- $link_data['eqpresppi'] = $this->db2->f('eqpresppi');
+ $link_data['interview'] = $this->db2->f('interview');
+ $link_data['interview_type'] = $this->db2->f('interview_type');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
- $elders_with_yearly_ppi++;
+ $indivs_with_yearly_ppi++;
$date = $this->db2->f('date');
$ppi_notes = $this->db2->f('notes');
if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; }
@@ -1617,11 +1651,11 @@ class eq
$completed_data.= "$ppi_notes ";
$completed_data.= '';
}
- } // End for Elders Loop
+ } // End for individuals Loop
$name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
- $completed_header_row = "Elder Name ";
+ $completed_header_row = "Individual Name ";
$completed_header_row.= "Phone ";
$completed_header_row.= "Date ";
$completed_header_row.= "PPI Notes ";
@@ -1632,16 +1666,16 @@ class eq
$this->t->set_var('completed_header_row',$completed_header_row);
$this->t->set_var('completed_table_width',$completed_table_width);
$this->t->set_var('completed',$completed_data);
- $this->t->fp('elderlist','elder_list',True);
+ $this->t->fp('indivlist','indiv_list',True);
- $elders_width=300; $totals_width=100;
- $totals_table_width=$elders_width + $totals_width;
- $totals_header_row = "Elders ";
+ $indivs_width=300; $totals_width=100;
+ $totals_table_width=$indivs_width + $totals_width;
+ $totals_header_row = "Individuals ";
$totals_header_row.= "$year ";
$totals_data.= "";
- $totals_data.= "Total Elders with yearly PPIs completed: ";
- $totals_data.= "$elders_with_yearly_ppi / $total_elders ";
- $percent = ceil(($elders_with_yearly_ppi / $total_elders)*100);
+ $totals_data.= "Total Individuals with yearly PPIs completed: ";
+ $totals_data.= "$indivs_with_yearly_ppi / $total_indivs ";
+ $percent = ceil(($indivs_with_yearly_ppi / $total_indivs)*100);
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
$totals_data.= " ";
@@ -1661,7 +1695,7 @@ class eq
function int_sched()
{
$this->t->set_file(array('int_sched_t' => 'int_sched.tpl'));
- $this->t->set_block('int_sched_t','elder_list','elderlist');
+ $this->t->set_block('int_sched_t','indiv_list','indivlist');
$this->t->set_block('int_sched_t','appt_list','apptlist');
$action = get_var('action',array('GET','POST'));
@@ -1677,9 +1711,9 @@ class eq
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched&action=save'));
$this->t->set_var('title','Hometeaching Interviews Scheduler');
- $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
- $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $int_date_width;
- $header_row = "Elder Name ";
+ $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
+ $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width;
+ $header_row = "individual Name ";
$header_row.= "Phone ";
$header_row.= "Priority ";
$header_row.= "Last Interview ";
@@ -1694,7 +1728,22 @@ class eq
if($month >= 7 && $month <= 9) { $quarter_start=$year."-07-01"; $quarter_end=$year."-10-01"; }
if($month >= 10 && $month <= 12) { $quarter_start=$year."-10-01"; $quarter_end=$nextyear."-01-01"; }
//print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end ";
-
+
+ // create the individual id -> individual name mapping
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ $indiv_id_data = NULL;
+ $indiv_name_data = NULL;
+ while ($this->db->next_record())
+ {
+ $indiv_name_data[$i] = $this->db->f('name');
+ $indiv_id_data[$i] = $this->db->f('indiv');
+ $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
+ $i++;
+ }
+ array_multisort($indiv_name_data, $indiv_id_data);
+
if($action == 'save')
{
// Save any changes made to the appointment table
@@ -1702,17 +1751,36 @@ class eq
if($new_data != "") {
foreach ($new_data as $entry)
{
- $elder = $entry['elder'];
+ $indiv = $entry['indiv'];
$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 3rd_indiv where indiv='$supervisor'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ if($indiv == 0) { $location = ""; }
- //print "elder: $elder appointment: $appointment ";
+ //print "indiv: $indiv appointment: $appointment ";
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'";
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
// Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
- " elder='" . $elder . "'" .
+ $this->db->query("UPDATE 3rd_appointment set " .
+ " indiv='" . $indiv . "'" .
+ ",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -1726,17 +1794,17 @@ class eq
foreach ($new_data as $entry)
{
$int_notes = $entry['notes'];
- $elder_id = $entry['elder_id'];
- $elder_name = $entry['elder_name'];
+ $indiv_id = $entry['indiv_id'];
+ $indiv_name = $entry['indiv_name'];
$int_pri = $entry['pri'];
$aaronic = $entry['aaronic'];
- //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic ";
+ //print "int_notes: $int_notes indiv_name: $indiv_name aaronic: $aaronic ";
if($aaronic == 0) {
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_indiv set " .
" int_notes='" . $int_notes . "'" .
",int_pri='" . $int_pri . "'" .
- " WHERE elder=" . $elder_id,__LINE__,__FILE__);
+ " WHERE indiv=" . $indiv_id,__LINE__,__FILE__);
}
}
@@ -1746,7 +1814,7 @@ class eq
}
// Get the Districts
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -1755,7 +1823,7 @@ class eq
$districts[$i]['district'] = $this->db->f('district');
$districts[$i]['name'] = $this->db->f('name');
$districts[$i]['supervisor'] = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_presidency where district=$district and valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where district=$district and valid=1";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$districts[$i]['presidency'] = $this->db2->f('presidency');
@@ -1763,27 +1831,14 @@ class eq
$i++;
}
- // create the elder id -> elder name mapping
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- $elder_id_data = NULL;
- $elder_name_data = NULL;
- while ($this->db->next_record())
- {
- $elder_name_data[$i] = $this->db->f('name');
- $elder_id_data[$i] = $this->db->f('elder');
- $i++;
- }
- array_multisort($elder_name_data, $elder_id_data);
-
// APPOINTMENT TABLE
$district = 1;
- $date_width=150; $time_width=100; $elder_width=200;
- $appt_table_width=$date_width + $time_width + $elder_width;
+ $date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
$appt_header_row = "Date ";
$appt_header_row.= "Time ";
- $appt_header_row.= "Elder ";
+ $appt_header_row.= "Individual ";
+ $appt_header_row.= "Location ";
$appt_table_data = "";
$total_comps=0; $comps_with_quarterly_int=0;
@@ -1794,19 +1849,34 @@ class eq
$this->t->set_var('district_number',$districts[$d]['district']);
$this->t->set_var('district_name',$districts[$d]['name']);
$supervisor = $districts[$d]['supervisor'];
- $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Interviews Not Completed";
+ $supervisor_array = explode(",", $supervisor);
+ $supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM 3rd_indiv where indiv='$supervisor'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_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 eq_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=".$districts[$d]['presidency']." 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');
- $elder = $this->db->f('elder');
+ $indiv = $this->db->f('indiv');
+ $location = $this->db->f('location');
+ if(($location == "") && ($indiv > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1821,17 +1891,21 @@ class eq
$appt_table_data.= "$day_string ";
$appt_table_data.= "$time_string ";
- $appt_table_data.= '';
+ $appt_table_data.= '';
$appt_table_data.= ' ';
- for ($i=0; $i < count($elder_id_data); $i++) {
- $id = $elder_id_data[$i];
- $name = $elder_name_data[$i];
- if($elder_id_data[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+ for ($i=0; $i < count($indiv_id_data); $i++) {
+ $id = $indiv_id_data[$i];
+ $name = $indiv_name_data[$i];
+ if($indiv_id_data[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
$appt_table_data.= ''.$name.' ';
}
$appt_table_data.=' ';
+ $appt_table_data.= ' ';
+
$appt_table_data.= ' ';
+ $appt_table_data.= ' ';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
$this->t->set_var('tr_color',$tr_color);
@@ -1844,9 +1918,9 @@ class eq
// INTERVIEW SCHEDULING TABLE
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$d]['district'];
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -1856,7 +1930,7 @@ class eq
$i=0;
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions from each companionship
- $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0; $int_completed=0;
@@ -1867,38 +1941,38 @@ class eq
while ($this->db->next_record())
{
// Get this companions information
- $elder_id = $this->db->f('elder');
+ $indiv_id = $this->db->f('indiv');
$aaronic_id = $this->db->f('aaronic');
- $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+ $sql = "SELECT * FROM 3rd_indiv where indiv=$indiv_id";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
- $elder_id = $this->db2->f('elder');
- $elder_name = $this->db2->f('name');
- $elder_phone[$elder_id] = $this->db2->f('phone');
- $elder_int_pri[$elder_id] = $this->db2->f('int_pri');
- $elder_int_notes[$elder_id] = $this->db2->f('int_notes');
- $elder_aaronic = 0;
+ $indiv_id = $this->db2->f('indiv');
+ $indiv_name = $this->db2->f('name');
+ $indiv_phone[$indiv_id] = $this->db2->f('phone');
+ $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri');
+ $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes');
+ $indiv_aaronic = 0;
}
else {
- $sql = "SELECT * FROM eq_aaronic where aaronic=$aaronic_id";
+ $sql = "SELECT * FROM 3rd_aaronic where aaronic=$aaronic_id";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
- $elder_id = $this->db2->f('aaronic');
- $elder_name = $this->db2->f('name');
- $elder_phone[$elder_id] = $this->db2->f('phone');
- $elder_aaronic = 1;
+ $indiv_id = $this->db2->f('aaronic');
+ $indiv_name = $this->db2->f('name');
+ $indiv_phone[$indiv_id] = $this->db2->f('phone');
+ $indiv_aaronic = 1;
}
}
- $id = $elder_id;
- $name = $elder_name;
- $phone = $elder_phone[$id];
- $int_pri = $elder_int_pri[$id];
- $int_notes = $elder_int_notes[$id];
- $aaronic = $elder_aaronic;
+ $id = $indiv_id;
+ $name = $indiv_name;
+ $phone = $indiv_phone[$id];
+ $int_pri = $indiv_int_pri[$id];
+ $int_notes = $indiv_int_notes[$id];
+ $aaronic = $indiv_aaronic;
// If the companionship has already had its quarterly interview,
// Skip the other companion in the companionship.
@@ -1916,19 +1990,19 @@ class eq
}
// If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
- $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
- "AND elder=" . $id;
+ $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+ "AND indiv=" . $id;
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $id . " ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.int_update';
- $link_data['elder'] = $id;
+ $link_data['indiv'] = $id;
$link_data['aaronic'] = 0;
$link_data['name'] = $name;
- $link_data['ppi'] = '';
+ $link_data['interview'] = '';
$link_data['action'] = 'add';
$link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
@@ -1948,8 +2022,8 @@ class eq
if($aaronic == 0) {
$table_data.= ' ';
}
- $table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
$table_data.= ' '."\n";
@@ -1957,10 +2031,10 @@ class eq
} else {
$link_data['menuaction'] = 'eq.eq.int_update';
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['elder'] = $this->db2->f('elder');
+ $link_data['indiv'] = $this->db2->f('indiv');
$link_data['aaronic'] = $this->db2->f('aaronic');
$link_data['name'] = $name;
- $link_data['ppi'] = $this->db2->f('ppi');
+ $link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$comps_with_quarterly_int++;
@@ -1979,7 +2053,7 @@ class eq
$name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
- $completed_header_row = "Elder Name ";
+ $completed_header_row = "Individual Name ";
$completed_header_row.= "Phone ";
$completed_header_row.= "Date ";
$completed_header_row.= "Interview Notes ";
@@ -1990,14 +2064,14 @@ class eq
$this->t->set_var('completed_header_row',$completed_header_row);
$this->t->set_var('completed_table_width',$completed_table_width);
$this->t->set_var('completed',$completed_data);
- $this->t->fp('elderlist','elder_list',True);
+ $this->t->fp('indivlist','indiv_list',True);
} // End for each district loop
- $elders_width=300; $totals_width=100;
- $totals_table_width=$elders_width + $totals_width;
- $totals_header_row = "Elders ";
+ $indivs_width=300; $totals_width=100;
+ $totals_table_width=$indivs_width + $totals_width;
+ $totals_header_row = "Individuals ";
$totals_header_row.= "$year ";
$totals_data.= "";
$totals_data.= "Total Companionships with interviews completed: ";
@@ -2036,7 +2110,7 @@ class eq
$this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits');
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched&action=save'));
- $this->t->set_var('title','EQ Presidency Yearly Visit Scheduler');
+ $this->t->set_var('title','Presidency Yearly Visit Scheduler');
$family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20;
$table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width;
@@ -2048,7 +2122,26 @@ class eq
$table_data=""; $completed_data=""; $totals_data="";
$year = date('Y');
-
+
+ // create the family id -> family name mapping
+ $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ $family_id = NULL;
+ while ($this->db->next_record())
+ {
+ $family_id[$i] = $this->db->f('family');
+ $family_name[$i] = $this->db->f('name');
+ $familyid2name[$family_id[$i]] = $family_name[$i];
+ $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $familyid2address[$family_id[$i]] = $this->db2->f('address');
+ }
+ $i++;
+ }
+ array_multisort($family_name, $family_id);
+
if($action == 'save')
{
// Save any changes made to the appointment table
@@ -2058,15 +2151,23 @@ class eq
{
$family = $entry['family'];
$appointment = $entry['appointment'];
+ $location = $entry['location'];
+ if($location == "") {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ $location = "$family_last_name"." home ($family_address)";
+ }
+ if($family == 0) { $location = ""; }
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family'";
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and family='$family' and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
-
// Perform database save actions here
- $this->db->query("UPDATE eq_appointment set " .
+ $this->db->query("UPDATE 3rd_appointment set " .
" family='" . $family . "'" .
+ ",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -2080,14 +2181,14 @@ class eq
foreach ($new_data as $entry)
{
$visit_notes = $entry['notes'];
- $family_id = $entry['family_id'];
+ $family = $entry['family_id'];
$visit_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE eq_family set " .
+ $this->db->query("UPDATE 3rd_family set " .
" visit_notes='" . $visit_notes . "'" .
",visit_pri='" . $visit_pri . "'" .
- " WHERE family=" . $family_id,__LINE__,__FILE__);
+ " WHERE family=" . $family,__LINE__,__FILE__);
}
@@ -2096,46 +2197,39 @@ class eq
}
// APPOINTMENT TABLE
- $date_width=150; $time_width=100; $family_width=250;
- $appt_table_width=$date_width + $time_width + $family_width;
+ $date_width=250; $time_width=100; $family_width=250; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $family_width + $location_width;
$appt_header_row = "Date ";
$appt_header_row.= "Time ";
$appt_header_row.= "Family ";
+ $appt_header_row.= "Location ";
$appt_table_data = "";
// Find out what the EQ Presidency ID is
- $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where eqpres=1 and 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');
} else {
- print "-E- Unable to locate EQ Presidency in eq_presidency table ";
+ print "-E- Unable to locate Presidency in 3rd_presidency table ";
return;
}
-
- // create the family id -> family name mapping
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- $family_id = NULL;
- while ($this->db->next_record())
- {
- $family_id[$i] = $this->db->f('family');
- $family_name[$i] = $this->db->f('name');
- $i++;
- }
- array_multisort($family_name, $family_id);
-
+
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency_id 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');
$family = $this->db->f('family');
-
+ $location = $this->db->f('location');
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $family_address = $familyid2address[$family];
+ if(($location == "") && ($family > 0)) { $location = "$family_last_name"." home ($family_address)"; }
+
$date = $this->db->f('date');
$date_array = explode("-",$date);
$year = $date_array[0]; $month = $date_array[1]; $day = $date_array[2];
@@ -2159,6 +2253,9 @@ class eq
}
$appt_table_data.='';
+ $appt_table_data.= ' ';
+
$appt_table_data.= ' ';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -2171,7 +2268,7 @@ class eq
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
+ $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY visit_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2193,7 +2290,7 @@ class eq
$total_families++;
}
- $sql = "SELECT * FROM eq_parent where valid=1";
+ $sql = "SELECT * FROM 3rd_parent where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -2213,12 +2310,12 @@ class eq
// If this family has had a yearly visit this year, don't show them on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ".
+ $sql = "SELECT * FROM 3rd_visit WHERE date > '$year_start' AND date < '$year_end' ".
"AND family=" . $id . " AND companionship=0";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
$link_data['menuaction'] = 'eq.eq.vis_update';
@@ -2333,38 +2430,38 @@ class eq
if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
else { $this->t->set_var('lang_num_months','Years of History'); }
- $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$president_name = $this->db->f('name');
- $interviewer = $this->db->f('elder');
- $eqpresppi = 1;
+ $interviewer = $this->db->f('indiv');
+ $interview_type = 'ppi';
} else {
- print "-E- Unable to locate EQ President in eq_presidency table ";
+ print "-E- Unable to locate President in 3rd_presidency table ";
return;
}
$this->t->set_var('district_number','*');
$this->t->set_var('district_name',$president_name);
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
- $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri');
- $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
+ $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri');
+ $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes');
$i++;
}
- $total_elders=$i;
- array_multisort($elder_name, $elder_id);
- //var_dump($elder_name); print " "; var_dump($elder_id);
+ $total_indivs=$i;
+ array_multisort($indiv_name, $indiv_id);
+ //var_dump($indiv_name); print " "; var_dump($indiv_id);
- $header_row="Elder Name ";
+ $header_row="Individual Name ";
- $elder_width=400; $ppi_width=75; $table_width=$elder_width + $num_months*$ppi_width;
+ $indiv_width=400; $ppi_width=75; $table_width=$indiv_width + $num_months*$ppi_width;
$table_data="";
for($m=$num_months; $m >= 0; $m--) {
$year = date('Y') - $m;
@@ -2372,28 +2469,28 @@ class eq
$ppis[$m] = 0;
}
- for ($j=0; $j < count($elder_id); $j++) {
- $id = $elder_id[$j];
- $name = $elder_name[$j];
- $phone = $elder_phone[$id];
+ for ($j=0; $j < count($indiv_id); $j++) {
+ $id = $indiv_id[$j];
+ $name = $indiv_name[$j];
+ $phone = $indiv_phone[$id];
$link_data['menuaction'] = 'eq.eq.ppi_update';
$link_data['interviewer'] = $interviewer;
- $link_data['elder'] = $id;
+ $link_data['indiv'] = $id;
$link_data['name'] = $name;
- $link_data['ppi'] = '';
- $link_data['eqpresppi'] = $eqpresppi;
+ $link_data['interview'] = '';
+ $link_data['interview_type'] = $interview_type;
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$this->nextmatchs->template_alternate_row_color(&$this->t);
$table_data.= " $name ";
- // Find out how many times PPIs were performed in the past $num_months for this Elder
+ // Find out how many times PPIs were performed in the past $num_months for this individual
for($m=$num_months; $m >= 0; $m--) {
$year = date('Y') - $m;
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
- "AND elder=" . $id . " AND eqpresppi=1";
+ $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+ "AND indiv=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2402,10 +2499,10 @@ class eq
$link_data['menuaction'] = 'eq.eq.ppi_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['elder'] = $id;
+ $link_data['indiv'] = $id;
$link_data['name'] = $name;
- $link_data['ppi'] = $this->db2->f('ppi');
- $link_data['eqpresppi'] = $eqpresppi;
+ $link_data['interview'] = $this->db2->f('interview');
+ $link_data['interview_type'] = $interview_type;
$link_data['action'] = 'view';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
@@ -2420,9 +2517,9 @@ class eq
}
$table_data .= " ";
- $stat_data = "$total_elders Elders PPI Totals: ";
+ $stat_data = "$total_indivs Individuals PPI Totals: ";
for($m=$num_months; $m >=0; $m--) {
- $percent = ceil(($ppis[$m] / $total_elders)*100);
+ $percent = ceil(($ppis[$m] / $total_indivs)*100);
$stat_data .= "$ppis[$m] $percent% ";
}
$stat_data .= " ";
@@ -2450,34 +2547,41 @@ class eq
$companionship = get_var('companionship',array('GET','POST'));
$interviewer = get_var('interviewer',array('GET','POST'));
$name = get_var('name',array('GET','POST'));
- $ppi = get_var('ppi',array('GET','POST'));
- $elder = get_var('elder',array('GET','POST'));
+ $interview = get_var('interview',array('GET','POST'));
+ $indiv = get_var('indiv',array('GET','POST'));
$aaronic = get_var('aaronic',array('GET','POST'));
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
- $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+ $interview_type = get_var('interview_type',array('GET','POST'));
+
+ $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
$this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
- $this->t->set_var('interviewer',$interviewer . ' selected');
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->set_var('eqpresppi_checked','');
- $this->t->fp('int_list','interviewer_list',True);
+ while ($this->db2->next_record())
+ {
+ $indiv = $this->db2->f('indiv');
+ $interviewer_name = $this->db2->f('name');
+ if($indiv == $interviewer) {
+ $this->t->set_var('interviewer',$interviewer . ' selected');
+ } else {
+ $this->t->set_var('interviewer',$interviewer);
+ }
+ $this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->set_var('interview_type_checked','');
+ $this->t->fp('int_list','interviewer_list',True);
+ }
if($action == 'save')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("UPDATE eq_ppi set " .
- " ppi='" . $ppi . "'" .
+ $this->db->query("UPDATE 3rd_interview set " .
+ " interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", elder='" . $elder . "'" .
+ ", indiv='" . $indiv . "'" .
", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
- ", eqpresppi='" . $eqpresppi . "'" .
- " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+ ", interview_type='" . $interview_type . "'" .
+ " WHERE interview=" . $interview,__LINE__,__FILE__);
$this->ppi_view();
return false;
}
@@ -2485,9 +2589,9 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
- . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
- . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) "
+ . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','"
+ . $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__);
$this->ppi_view();
return false;
}
@@ -2495,33 +2599,33 @@ class eq
if($action == 'add')
{
$this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
- $this->t->set_var('ppi', '');
+ $this->t->set_var('interview', '');
$this->t->set_var('interviewer', $interviewer);
$this->t->set_var('name',$name);
- $this->t->set_var('elder',$elder);
+ $this->t->set_var('indiv',$indiv);
$this->t->set_var('date','');
$this->t->set_var('notes','');
- $this->t->set_var('eqpresppi',$eqpresppi);
- $this->t->set_var('eqpresppi_checked','checked');
+ $this->t->set_var('interview_type',$interview_type);
+ $this->t->set_var('interview_type_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('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
- . $ppi . '&action=' . 'insert'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+ . $interview . '&action=' . 'insert'));
}
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+ $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
- $this->t->set_var('ppi',$ppi);
+ $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('elder',$this->db->f('elder'));
+ $this->t->set_var('indiv',$this->db->f('indiv'));
$this->t->set_var('date',$this->db->f('date'));
$this->t->set_var('notes',$this->db->f('notes'));
- $this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
- if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+ $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($action == 'edit')
@@ -2529,8 +2633,8 @@ class eq
$this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Editing PPI');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
- . $ppi . '&action=' . 'save'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+ . $interview . '&action=' . 'save'));
}
if($action == 'view')
@@ -2541,8 +2645,8 @@ class eq
$this->t->set_var('disabled','DISABLED');
$this->t->set_var('lang_done','Done');
$this->t->set_var('lang_action','Viewing PPI');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
- . $ppi . '&action=' . 'edit'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+ . $interview . '&action=' . 'edit'));
}
$this->t->set_var('lang_reset','Clear Form');
@@ -2588,7 +2692,7 @@ class eq
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 eq_district where valid=1 ORDER BY district ASC";
+ $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -2599,23 +2703,23 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($elder_name, $elder_id);
- for($i=0; $i < count($elder_id); $i++) {
- $id = $elder_id[$i];
- $elders[$id] = $elder_name[$i];
+ array_multisort($indiv_name, $indiv_id);
+ for($i=0; $i < count($indiv_id); $i++) {
+ $id = $indiv_id[$i];
+ $indivs[$id] = $indiv_name[$i];
}
- $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+ $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
@@ -2630,13 +2734,11 @@ class eq
$this->t->set_var('district_number',$districts[$i]['district']);
$this->t->set_var('district_name',$districts[$i]['name']);
$supervisor = $districts[$i]['supervisor'];
- $unique_companionships='';
// Select all the unique companionship numbers for this district
- $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
-
+ $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$i]['district'];
$this->db->query($sql,__LINE__,__FILE__);
- $j=0;
+ $j=0; $unique_companionships = '';
while ($this->db->next_record())
{
$unique_companionships[$j]['companionship'] = $this->db->f('companionship');
@@ -2644,11 +2746,11 @@ class eq
}
$comp_width=250; $int_width=75; $table_width=$comp_width + $num_months*$int_width;
- $table_data=""; $num_companionships = $j; $num_elders = 0;
+ $table_data=""; $num_companionships = $j; $num_indivs = 0;
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 eq_companionship where valid=1 and ".
+ $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0;
@@ -2657,13 +2759,13 @@ class eq
while ($this->db->next_record())
{
// Get this companions information
- $num_elders++;
+ $num_indivs++;
$companionship = $this->db->f('companionship');
- $elder_id = $this->db->f('elder');
+ $indiv_id = $this->db->f('indiv');
$aaronic_id = $this->db->f('aaronic');
- if($elder_id) {
- $name = $elders[$elder_id];
- $phone = $elder_phone[$elder_id];
+ if($indiv_id) {
+ $name = $indivs[$indiv_id];
+ $phone = $indiv_phone[$indiv_id];
}
else if($aaronic_id) {
$name = $aaronic[$aaronic_id]['name'];
@@ -2672,15 +2774,15 @@ class eq
$link_data['menuaction'] = 'eq.eq.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $supervisor;
- $link_data['elder'] = $elder_id;
+ $link_data['indiv'] = $indiv_id;
$link_data['aaronic'] = $aaronic_id;
$link_data['name'] = $name;
- $link_data['ppi'] = '';
+ $link_data['interview'] = '';
$link_data['action'] = 'add';
$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
$table_data.= "$name ";
- // Find out how many times Interviews were performed in the past $num_months for this Elder
+ // Find out how many times Interviews were performed in the past $num_months for this individual
$header_row="Companionship ";
for($m=$num_months; $m >= 0; $m--) {
$month = $current_month - $m;
@@ -2690,8 +2792,8 @@ class eq
$month_start = "$year"."-"."$month"."-"."01";
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
- $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
- "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
+ $sql = "SELECT * FROM 3rd_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
+ "AND indiv=" . $indiv_id . " AND aaronic=" . $aaronic_id;
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "$month ";
@@ -2703,10 +2805,10 @@ class eq
$link_data['menuaction'] = 'eq.eq.int_update';
$link_data['companionship'] = $companionship;
$link_data['interviewer'] = $this->db2->f('interviewer');
- $link_data['elder'] = $elder_id;
+ $link_data['indiv'] = $indiv_id;
$link_data['aaronic'] = $aaronic_id;
$link_data['name'] = $name;
- $link_data['ppi'] = $this->db2->f('ppi');
+ $link_data['interview'] = $this->db2->f('interview');
$link_data['action'] = 'view';
$date = $this->db2->f('date');
$date_array = explode("-",$date);
@@ -2776,50 +2878,46 @@ class eq
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
$this->t->set_var('readonly','');
$this->t->set_var('disabled','');
- $this->t->set_var('eqpresppi_checked','');
+ $this->t->set_var('interview_type_checked','');
$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'));
- $ppi = get_var('ppi',array('GET','POST'));
- $elder = get_var('elder',array('GET','POST'));
+ $interview = get_var('interview',array('GET','POST'));
+ $indiv = get_var('indiv',array('GET','POST'));
$aaronic = get_var('aaronic',array('GET','POST'));
$date = get_var('date',array('GET','POST'));
$notes = get_var('notes',array('GET','POST'));
- $eqpresppi = get_var('eqpresppi',array('GET','POST'));
-
- $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- while ($this->db->next_record())
- {
- $supervisor = $this->db->f('supervisor');
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
- $this->db2->query($sql,__LINE__,__FILE__);
- $this->db2->next_record();
- $interviewer_name = $this->db2->f('name');
-
- if($supervisor == $interviewer) {
- $this->t->set_var('interviewer',$supervisor . ' selected');
- } else {
- $this->t->set_var('interviewer',$interviewer);
- }
- $this->t->set_var('interviewer_name',$interviewer_name);
- $this->t->fp('int_list','interviewer_list',True);
- }
+ $interview_type = get_var('interview_type',array('GET','POST'));
+
+ $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ while ($this->db2->next_record())
+ {
+ $indiv = $this->db2->f('indiv');
+ $interviewer_name = $this->db2->f('name');
+ if($indiv == $interviewer) {
+ $this->t->set_var('interviewer',$interviewer . ' selected');
+ } else {
+ $this->t->set_var('interviewer',$interviewer);
+ }
+ $this->t->set_var('interviewer_name',$interviewer_name);
+ $this->t->fp('int_list','interviewer_list',True);
+ }
if($action == 'save')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("UPDATE eq_ppi set " .
- " ppi='" . $ppi . "'" .
+ $this->db->query("UPDATE 3rd_interview set " .
+ " interview='" . $interview . "'" .
", interviewer='" . $interviewer . "'" .
- ", elder='" . $elder . "'" .
+ ", indiv='" . $indiv . "'" .
", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
- ", eqpresppi='" . $eqpresppi . "'" .
- " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+ ", interview_type='" . $interview_type . "'" .
+ " WHERE interview=" . $interview,__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2827,9 +2925,9 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
- . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
- . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) "
+ . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','"
+ . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);
$this->int_view();
return false;
}
@@ -2837,32 +2935,32 @@ class eq
if($action == 'add')
{
$this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
- $this->t->set_var('ppi', '');
+ $this->t->set_var('interview', '');
$this->t->set_var('interviewer', $interviewer);
$this->t->set_var('name',$name);
- $this->t->set_var('elder',$elder);
+ $this->t->set_var('indiv',$indiv);
$this->t->set_var('aaronic',$aaronic);
$this->t->set_var('date','');
$this->t->set_var('notes','');
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Adding New Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
- . $ppi . '&action=' . 'insert'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+ . $interview . '&action=' . 'insert'));
}
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+ $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
- $this->t->set_var('ppi',$ppi);
+ $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('elder',$this->db->f('elder'));
+ $this->t->set_var('indiv',$this->db->f('indiv'));
$this->t->set_var('aaronic',$this->db->f('aaronic'));
$this->t->set_var('date',$this->db->f('date'));
$this->t->set_var('notes',$this->db->f('notes'));
- if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+ if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }
}
if($action == 'edit')
@@ -2870,8 +2968,8 @@ class eq
$this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
$this->t->set_var('lang_done','Cancel');
$this->t->set_var('lang_action','Editing Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
- . $ppi . '&action=' . 'save'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+ . $interview . '&action=' . 'save'));
}
if($action == 'view')
@@ -2882,8 +2980,8 @@ class eq
$this->t->set_var('disabled','DISABLED');
$this->t->set_var('lang_done','Done');
$this->t->set_var('lang_action','Viewing Interview');
- $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
- . $ppi . '&action=' . 'edit'));
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+ . $interview . '&action=' . 'edit'));
}
$this->t->set_var('lang_reset','Clear Form');
@@ -2927,7 +3025,7 @@ class eq
$year = date('Y') - $num_years + 1;
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
- $sql = "SELECT * FROM eq_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
+ $sql = "SELECT * FROM 3rd_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -2944,7 +3042,7 @@ class eq
{
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $sql = "SELECT * FROM eq_family WHERE family=".$visit_list[$i]['family'];
+ $sql = "SELECT * FROM 3rd_family WHERE family=".$visit_list[$i]['family'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
@@ -2972,7 +3070,7 @@ class eq
}
// List the families that are available to record a visit against
- $sql = "SELECT * FROM eq_family WHERE valid=1";
+ $sql = "SELECT * FROM 3rd_family WHERE valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$total_records = $this->db->num_rows();
@@ -3026,7 +3124,7 @@ class eq
if($action == 'save')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("UPDATE eq_visit set " .
+ $this->db->query("UPDATE 3rd_visit set " .
" date='" . $date . "'" .
", notes='" . $notes . "'" .
" WHERE visit=" . $visit,__LINE__,__FILE__);
@@ -3037,7 +3135,7 @@ class eq
if($action == 'insert')
{
$notes = get_var('notes',array('POST'));
- $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
+ $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes) "
. "VALUES ('" . $family . "','" . $companionship . "','"
. $date . "','" . $notes . "')",__LINE__,__FILE__);
$this->vis_view();
@@ -3060,7 +3158,7 @@ class eq
if($action == 'edit' || $action == 'view')
{
- $sql = "SELECT * FROM eq_visit WHERE visit=".$visit;
+ $sql = "SELECT * FROM 3rd_visit WHERE visit=".$visit;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('visit',$visit);
@@ -3117,7 +3215,7 @@ class eq
$this->t->set_block('att_view_t','month_list','list1');
$this->t->set_block('att_view_t','header_list','list2');
- $this->t->set_block('att_view_t','elder_list','list3');
+ $this->t->set_block('att_view_t','indiv_list','list3');
$this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view'));
$num_quarters = get_var('num_quarters',array('GET','POST'));
@@ -3133,26 +3231,26 @@ class eq
else if($current_month >= 4 && $current_month <= 6) { $current_month=6; }
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 eq_elder where valid=1";
+
+ $sql = "SELECT * FROM 3rd_indiv where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
// Create a list of sunday dates for a window of 3 months back and current month
$i=0;
$last_time = 0;
$found_sunday = 0;
- $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, $current_month-$num_months, 1, date("y")));
+ $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, ($current_month-$num_months)+1, 1, date("y")));
$last_date = explode("-",$sunday_list[0]['date']);
$last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]);
- $time_limit = mktime(0, 0, 0, date("m"), date("t"), date("y"));
+ $time_limit = mktime(0, 0, 0, $current_month, 31, date("y"));
while($last_time < $time_limit)
{
$day = date("w",$last_time);
@@ -3163,13 +3261,14 @@ class eq
$sunday_list[$i]['day'] = $last_date[2];
$sunday_list[$i]['month'] = date("M",$last_time);
$sunday_list[$i]['year'] = $last_date[0];
- $found_sunday = 1;
+ $found_sunday = 1;
+ $last_date = $sunday_list[$i]['date'];
}
$last_time += 90000;
if($found_sunday) { $i++; $found_sunday=0; }
}
- $total_elders = count($elder_id);
+ $total_indivs = count($indiv_id);
$old_month=$sunday_list[0]['month']; $span=0;
for ($i=0; $i < count($sunday_list); $i++) {
$date = $sunday_list[$i]['date'];
@@ -3193,10 +3292,10 @@ class eq
$this->t->fp('list1','month_list',True);
} $span++;
}
- $this->t->set_var('total_elders',$total_elders);
+ $this->t->set_var('total_indivs',$total_indivs);
$this->t->set_var('header_row',$header_row);
- $elder_width=200; $att_width=25; $total_width=$elder_width;
+ $indiv_width=200; $att_width=25; $total_width=$indiv_width;
for ($i=0; $i < count($sunday_list); $i++) {
$link_data['menuaction'] = 'eq.eq.att_update';
$link_data['month'] = $sunday_list[$i]['month'];
@@ -3214,17 +3313,17 @@ class eq
$attendance[$monthnum[$sunday_list[$i]['month']]]=0;
}
- for ($i=0; $i < count($elder_id); $i++) {
+ for ($i=0; $i < count($indiv_id); $i++) {
$att_table = "";
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('elder_name',$elder_name[$i]);
- #print "checking for elder: " . $elder_id[$i] . " ";
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
+ #print "checking for indiv: " . $indiv_id[$i] . " ";
for ($j=0; $j < count($sunday_list); $j++) {
#print "checking for date: " . $sunday_list[$j]['date'] . " ";
- #print "SELECT * FROM eq_attendance WHERE date='"
- # . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . " ";
- $sql = "SELECT * FROM eq_attendance WHERE date='"
- . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+ #print "SELECT * FROM 3rd_attendance WHERE date='"
+ # . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . " ";
+ $sql = "SELECT * FROM 3rd_attendance WHERE date='"
+ . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$cur_month = $sunday_list[$j]['month'];
@@ -3238,10 +3337,10 @@ class eq
}
}
$this->t->set_var('att_table',$att_table);
- $this->t->fp('list3','elder_list',True);
+ $this->t->fp('list3','indiv_list',True);
}
$this->t->set_var('total_width',$total_width);
- $this->t->set_var('elder_width',$elder_width);
+ $this->t->set_var('indiv_width',$indiv_width);
$this->t->set_var('att_width',$att_width);
# Now calculate attendance for these months
@@ -3255,17 +3354,17 @@ class eq
foreach($attendance as $att => $value) {
$total_attended = $attendance[$att];
$ave_total_attended += $attendance[$att]; $num_months++;
- $percent = ceil(($total_attended / $total_elders)*100);
+ $percent = ceil(($total_attended / $total_indivs)*100);
$attendance_str.="$total_attended ($percent%) ";
- $total_nonattended = $total_elders - $total_attended;
- $percent = ceil(($total_nonattended / $total_elders)*100);
+ $total_nonattended = $total_indivs - $total_attended;
+ $percent = ceil(($total_nonattended / $total_indivs)*100);
$nonattendance_str.="$total_nonattended ($percent%) ";
$total_attended = ceil(($ave_total_attended / $num_months));
- $percent = ceil(($total_attended / $total_elders)*100);
+ $percent = ceil(($total_attended / $total_indivs)*100);
$aveattendance_str .= "$total_attended ($percent%) ";
- $total_attended = $total_elders - ceil(($ave_total_attended / $num_months));
- $percent = ceil(($total_attended / $total_elders)*100);
+ $total_attended = $total_indivs - ceil(($ave_total_attended / $num_months));
+ $percent = ceil(($total_attended / $total_indivs)*100);
$avenonattendance_str .= "$total_attended ($percent%) ";
}
@@ -3289,7 +3388,7 @@ class eq
$this->t->set_block('form','month_list','list1');
$this->t->set_block('form','header_list','list2');
- $this->t->set_block('form','elder_list','list3');
+ $this->t->set_block('form','indiv_list','list3');
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view'));
@@ -3301,41 +3400,41 @@ class eq
if($action == 'save_month' || $action == 'save_day')
{
- $new_data = get_var('elders_attended',array('POST'));
+ $new_data = get_var('indivs_attended',array('POST'));
$month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
if($action == 'save_month') {
- $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
}
if($action == 'save_day') {
- $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
}
foreach ($new_data as $data)
{
$data_array = explode("-",$data);
- $elder = $data_array[0];
+ $indiv = $data_array[0];
$date = "$data_array[1]-$data_array[2]-$data_array[3]";
- $this->db->query("INSERT INTO eq_attendance (elder,date) "
- . "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__);
+ $this->db->query("INSERT INTO 3rd_attendance (indiv,date) "
+ . "VALUES (" . $indiv . ",'". $date . "')",__LINE__,__FILE__);
}
$this->att_view();
return false;
}
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_name[$i] = $this->db->f('name');
- $elder_id[$i] = $this->db->f('elder');
- $elder_attending[$elder_id[$i]] = $this->db->f('attending');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_attending[$indiv_id[$i]] = $this->db->f('attending');
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
if($action == 'update_month')
{
@@ -3367,7 +3466,7 @@ class eq
$this->t->set_var('month',$sunday_list[$i-1]['month']);
$this->t->set_var('year',$sunday_list[$i-1]['year']);
$this->t->fp('list1','month_list',True);
- $elder_width=200; $att_width=25; $total_width=$elder_width;
+ $indiv_width=200; $att_width=25; $total_width=$indiv_width;
for ($i=0; $i < count($sunday_list); $i++) {
$link_data['menuaction'] = 'eq.eq.att_update';
$link_data['month'] = $sunday_list[$i]['month'];
@@ -3399,25 +3498,25 @@ class eq
$this->t->fp('list2','header_list',True);
}
- for ($i=0; $i < count($elder_id); $i++) {
+ for ($i=0; $i < count($indiv_id); $i++) {
$att_table = "";
$this->nextmatchs->template_alternate_row_color(&$this->t);
- $this->t->set_var('elder_name',$elder_name[$i]);
+ $this->t->set_var('indiv_name',$indiv_name[$i]);
for ($j=0; $j < count($sunday_list); $j++) {
- $sql = "SELECT * FROM eq_attendance WHERE date='"
- . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
+ $sql = "SELECT * FROM 3rd_attendance WHERE date='"
+ . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
- $value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];
+ $value = $indiv_id[$i] . "-" . $sunday_list[$j]['date'];
if($this->db->next_record()) {
- $att_table .= ' ';
- } else if($elder_attending[$elder_id[$i]] == 1) {
- $att_table .= ' ';
+ $att_table .= ' ';
+ } else if($indiv_attending[$indiv_id[$i]] == 1) {
+ $att_table .= ' ';
} else {
- $att_table .= ' ';
+ $att_table .= ' ';
}
}
$this->t->set_var('att_table',$att_table);
- $this->t->fp('list3','elder_list',True);
+ $this->t->fp('list3','indiv_list',True);
}
$this->t->set_var('lang_done', 'Cancel');
@@ -3435,7 +3534,7 @@ class eq
$this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
$this->t->set_block('dir_view_t','dir_list','list');
- $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_parent where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3471,7 +3570,7 @@ class eq
$this->t->set_block('org_view_t','org_list','list2');
# Display a list ordered alphabetically
- $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+ $sql = "SELECT * FROM 3rd_calling ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3499,7 +3598,7 @@ class eq
}
# Display a list ordered by organization
- $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+ $sql = "SELECT * FROM 3rd_calling ORDER BY sequence ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -3538,7 +3637,7 @@ class eq
$action = get_var('action',array('GET','POST'));
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule&action=save'));
- $this->t->set_var('title','EQ Scheduling Tool');
+ $this->t->set_var('title','Scheduling Tool');
$this->t->set_var('lang_save','Save Schedule');
$this->t->set_var('lang_reset','Cancel');
@@ -3552,14 +3651,45 @@ class eq
$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
$this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
- $date_width=150; $time_width=200; $elder_width=200; $family_width=200;
- $table_width=$date_width + $time_width + $elder_width + $family_width;
+ $date_width=150; $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 = "Date ";
$header_row.= "Time ";
- $header_row.= "Elder ";
+ $header_row.= "individual ";
$header_row.= "Family ";
+ $header_row.= "Location ";
$table_data = "";
+ $sql = "SELECT * FROM 3rd_presidency where valid=1";
+ $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('indiv');
+ $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
+ $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv'];
+ $i++;
+ }
+
+ $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
+ while ($this->db->next_record())
+ {
+ $family_id[$i] = $this->db->f('family');
+ $family_name[$i] = $this->db->f('name');
+ $familyid2name[$family_id[$i]] = $family_name[$i];
+ $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $familyid2address[$family_id[$i]] = $this->db2->f('address');
+ }
+ $i++;
+ }
+ array_multisort($family_name, $family_id);
+
if($action == 'save')
{
$new_data = get_var('sched',array('POST'));
@@ -3569,42 +3699,74 @@ class eq
{
$presidency = $entry['presidency'];
$appointment = $entry['appointment'];
+ $location = $entry['location'];
$date = $entry['date'];
$hour = $entry['hour'];
$minute = $entry['minute'];
$pm = $entry['pm'];
- $elder = $entry['elder'];
+ $indiv = $entry['indiv'];
$family = $entry['family'];
+ $location = $entry['location'];
if($pm) { $hour = $hour + 12; }
$time = $hour.':'.$minute.':'.'00';
$uid = 0;
- // Zero out the family or elder if date = NULL
+ // Update our location
+ if($location == "") {
+ if($family > 0) {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $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 3rd_indiv where indiv='$presidency2indiv[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ }
+
+ // Zero out the family or individual if date = NULL
if($date == "") {
- $elder = 0;
+ $indiv = 0;
$family = 0;
+ $location = "";
}
+
+ if(($indiv == 0) && ($family == 0)) { $location = ""; }
// Update an existing appointment
if($appointment < $this->max_appointments)
{
//Only perform a database update if we have made a change to this appointment
- $sql = "SELECT * FROM eq_appointment where " .
+ $sql = "SELECT * FROM 3rd_appointment where " .
"appointment='$appointment'" .
" and presidency='$presidency'" .
- " and elder='$elder'" .
+ " and indiv='$indiv'" .
" and family='$family'" .
" and date='$date'" .
- " and time='$time'";
+ " and time='$time'" .
+ " and location='$location'";
$this->db->query($sql,__LINE__,__FILE__);
if(!$this->db->next_record()) {
$old_date = $this->db->f('date');
$old_time = $this->db->f('time');
- $this->db2->query("UPDATE eq_appointment set" .
+ $this->db2->query("UPDATE 3rd_appointment set" .
" family=" . $family .
- " ,elder=" . $elder .
+ " ,indiv=" . $indiv .
" ,date='" . $date . "'" .
" ,time='" . $time . "'" .
+ " ,location='" . $location . "'" .
" ,presidency='" . $presidency . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
@@ -3616,24 +3778,25 @@ class eq
// Add a new appointment
else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
{
- //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family ";
- $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
- . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
- . $elder . "','" . $date . "','" . $time . "','" . $uid ."')",__LINE__,__FILE__);
+ //print "adding entry: appt=$appointment date: $date time: $time indiv: $indiv family: $family ";
+ $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,indiv,date,time,location,uid) "
+ . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $indiv . "','"
+ . $date . "','" . $time . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
// Now reselect this entry from the database to see if we need
// to send an appointment out for it.
- $sql = "SELECT * FROM eq_appointment where " .
- "elder='$elder'" .
+ $sql = "SELECT * FROM 3rd_appointment where " .
+ "indiv='$indiv'" .
" and family='$family'" .
" and presidency='$presidency'" .
" and date='$date'" .
" and time='$time'" .
- " and uid='$uid'";
+ " and uid='$uid'" .
+ " and location='$location'";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
// Email the appointment if warranted
- if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) {
+ if(($date != "") && ($time != "") && (($indiv > 0) || $family > 0)) {
$this->email_appt($this->db3->f('appointment'));
}
}
@@ -3644,58 +3807,61 @@ class eq
$take_me_to_url = $GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule');
//Header('Location: ' . $take_me_to_url);
}
-
- $sql = "SELECT * FROM eq_presidency where valid=1";
- $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]['elder'] = $this->db->f('elder');
- $i++;
- }
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder_phone[$elder_id[$i]] = $this->db->f('phone');
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv_phone[$indiv_id[$i]] = $this->db->f('phone');
$i++;
}
- array_multisort($elder_name, $elder_id);
-
- $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
- $this->db->query($sql,__LINE__,__FILE__);
- $i=0;
- while ($this->db->next_record())
- {
- $family_id[$i] = $this->db->f('family');
- $family_name[$i] = $this->db->f('name');
- $i++;
- }
- array_multisort($family_name, $family_id);
+ array_multisort($indiv_name, $indiv_id);
for ($i=0; $i < count($presidency_data); $i++) {
$presidency = $presidency_data[$i]['id'];
- $interviewer = $presidency_data[$i]['elder'];
+ $interviewer = $presidency_data[$i]['indiv'];
$name = $presidency_data[$i]['name'];
$this->t->set_var('presidency_name',$name);
$table_data="";
// query the database for all the appointments
- $sql = "SELECT * FROM eq_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+ $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
$this->db->query($sql,__LINE__,__FILE__);
// Prefill any existing appointment slots
while ($this->db->next_record())
{
$appointment = $this->db->f('appointment');
- $elder = $this->db->f('elder');
+ $indiv = $this->db->f('indiv');
$family = $this->db->f('family');
+ $location = $this->db->f('location');
+
+ if($location == "") {
+ if($family > 0) {
+ $family_name_array = explode(",", $familyid2name[$family]);
+ $family_last_name = $family_name_array[0];
+ $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 3rd_indiv where indiv='$presidency2indiv[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $supervisor_address = $this->db2->f('address');
+ }
+ $location = "$supervisor_last_name"." home ($supervisor_address)";
+ }
+ }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -3722,27 +3888,31 @@ class eq
$table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment);
$table_data.= "";
- // Elder drop down list (for PPIs)
- $table_data.= '';
+ // individual drop down list (for PPIs)
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $id = $elder_id[$j];
- $name = $elder_name[$j];
- if($elder_id[$j] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
+ for ($j=0; $j < count($indiv_id); $j++) {
+ $id = $indiv_id[$j];
+ $name = $indiv_name[$j];
+ if($indiv_id[$j] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
$table_data.= ''.$name.' ';
}
$table_data.=' ';
// Family drop down list (for Visits)
- $table_data.= '';
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
+ for ($j=0; $j < count($indiv_id); $j++) {
$id = $family_id[$j];
$name = $family_name[$j];
if($family_id[$j] == $family) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; }
$table_data.= ''.$name.' Family ';
}
$table_data.=' ';
+
+ // Location text box
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
@@ -3767,25 +3937,29 @@ class eq
$table_data .= $this->get_time_selection_form(0, 0, 0, $presidency, $appointment);
$table_data.= " ";
- // Elder drop down list
- $table_data.= '';
+ // individual drop down list
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $id = $elder_id[$j];
- $name = $elder_name[$j];
+ for ($j=0; $j < count($indiv_id); $j++) {
+ $id = $indiv_id[$j];
+ $name = $indiv_name[$j];
$table_data.= ''.$name.' ';
}
$table_data.=' ';
// Family drop down list
- $table_data.= '';
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
+ for ($j=0; $j < count($indiv_id); $j++) {
$id = $family_id[$j];
$name = $family_name[$j];
$table_data.= ''.$name.' Family ';
}
$table_data.=' ';
+
+ // Location text box
+ $table_data.= ' ';
$table_data.= ' ';
$table_data.= ' ';
@@ -3804,7 +3978,39 @@ class eq
$this->t->pfp('out','sched_t');
$this->save_sessiondata();
}
-
+
+ function email()
+ {
+ $this->t->set_file(array('email_t' => 'email.tpl'));
+ $this->t->set_block('email_t','indiv_list','list');
+
+ $action = get_var('action',array('GET','POST'));
+
+ $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email'));
+ $this->t->set_var('title','Email Tool');
+
+ $this->t->set_var('lang_email','Send Email');
+ $this->t->set_var('lang_reset','Cancel');
+
+ $this->t->set_var('email_member_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=member'));
+ $this->t->set_var('email_member_link_title','Email Quorum Member');
+
+ $this->t->set_var('email_quorum_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=quorum'));
+ $this->t->set_var('email_quorum_link_title','Email Quorum');
+
+ $this->t->set_var('email_reminder_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=reminder'));
+ $this->t->set_var('email_reminder_link_title','Email Reminders');
+
+ $this->t->set_var('email_edit_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.email&action=edit'));
+ $this->t->set_var('email_edit_link_title','Edit Email Addresses');
+
+ $table_width=600;
+ $this->t->set_var('table_width',$table_width);
+
+ $this->t->pfp('out','email_t');
+ $this->save_sessiondata();
+ }
+
function admin()
{
$this->t->set_file(array('admin_t' => 'admin.tpl'));
@@ -3820,17 +4026,17 @@ class eq
$this->t->pfp('out','admin_t');
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
{
- $elder_id[$i] = $this->db->f('elder');
- $elder_name[$i] = $this->db->f('name');
- $elder2name[$elder_id[$i]] = $elder_name[$i];
+ $indiv_id[$i] = $this->db->f('indiv');
+ $indiv_name[$i] = $this->db->f('name');
+ $indiv2name[$indiv_id[$i]] = $indiv_name[$i];
$i++;
}
- array_multisort($elder_name, $elder_id);
+ array_multisort($indiv_name, $indiv_id);
if($action == 'upload')
{
@@ -3844,6 +4050,12 @@ class eq
if(!move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path)) {
$uploadstatus = " -E- Unable to move the uploaded file to ";
$uploadstatus.= "the target path (check the path and permissions) of: $target_path ";
+ $uploadstatus = "The following file was uploaded successfully: ";
+ $uploadstatus.= "Tmp Filename : " . $_FILES['uploadedfile']['tmp_name'] . " ";
+ $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . " ";
+ $uploadstatus.= "Type : " . $_FILES['uploadedfile']['type'] . " ";
+ $uploadstatus.= "Size : " . $_FILES['uploadedfile']['size'] . " ";
+ $uploadstatus.= "Error : " . $_FILES['uploadedfile']['error'] . " ";
$this->t->set_var('uploadstatus',$uploadstatus);
$this->t->pfp('uploadhandle','upload',True);
return 0;
@@ -3908,7 +4120,7 @@ class eq
# run the import perl script to encorporate it into the DB
ob_start('ob_logstdout', 2);
- print "-> Importing the data into the EQ database \n";
+ print "-> Importing the data into the database \n";
ob_flush(); flush(); sleep(1);
$import_log = $this->upload_target_path . '/import.log';
$data_log = $this->upload_target_path . '/data.log';
@@ -3949,25 +4161,25 @@ class eq
{
$id = $entry['id'];
$email = $entry['email'];
- $elder = $entry['elder'];
+ $indiv = $entry['indiv'];
$name = $entry['name'];
$district = $entry['district'];
$president = $entry['president'];
$counselor = $entry['counselor'];
$secretary = $entry['secretary'];
$eqpresidency = $entry['eqpresidency'];
- // Set the elder id to 0 for EQ Presidency tagged entry
- if($eqpresidency == 1) { $elder="0"; }
- // Re-look up the elder name for the ID if we aren't an EQ Presidency tagged entry
- else { $name = $elder2name[$elder]; }
- //print "id=$id elder=$elder name=$name email=$email district=$district president=$president ";
+ // Set the individual id to 0 for EQ Presidency tagged entry
+ if($eqpresidency == 1) { $indiv="0"; }
+ // Re-look up the individual name for the ID if we aren't an EQ Presidency tagged entry
+ else { $name = $indiv2name[$indiv]; }
+ //print "id=$id indiv=$indiv name=$name email=$email district=$district president=$president ";
//print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency ";
- if(($elder > 0) || ($name != "")) {
+ if(($indiv > 0) || ($name != "")) {
if($id < $this->max_presidency_members) {
//print "Updating Existing Entry ";
- $this->db2->query("UPDATE eq_presidency set" .
- " elder=" . $elder .
+ $this->db2->query("UPDATE 3rd_presidency set" .
+ " indiv=" . $indiv .
" ,district=" . $district .
" ,name='" . $name . "'" .
" ,email='" . $email . "'" .
@@ -3979,9 +4191,9 @@ class eq
} else {
//print "Adding New Entry ";
- $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name,"
+ $this->db2->query("INSERT INTO 3rd_presidency (presidency,indiv,district,name,"
. "email,president,counselor,secretary,eqpres,valid) "
- . "VALUES (NULL,'" . $elder . "','" . $district . "','"
+ . "VALUES (NULL,'" . $indiv . "','" . $district . "','"
. $name . "','" . $email . "','" . $president . "','"
. $counselor . "','" . $secretary . "','" . $eqpres . "','1'"
.")",__LINE__,__FILE__);
@@ -3991,31 +4203,31 @@ class eq
}
}
- // Now update the eq_district table appropriately
+ // Now update the 3rd_district table appropriately
// Delete all the previous district entries from the table
- $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__);
- $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_district where valid=1",__LINE__,__FILE__);
+ $this->db->query("DELETE from 3rd_district where valid=0",__LINE__,__FILE__);
// Always add a "District 0" assigned to the High Priests Group
$district = 0;
$name = "High Priests";
- $elder = 0;
+ $indiv = 0;
$valid = 0;
- $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+ $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "
. "VALUES ('" . $district . "','" . $name . "','"
- . $elder . "','" . $valid . "'"
+ . $indiv . "','" . $valid . "'"
.")",__LINE__,__FILE__);
- // Requery the eq_presidency table
- $sql = "SELECT * FROM eq_presidency where valid=1";
+ // Requery the 3rd_presidency table
+ $sql = "SELECT * FROM 3rd_presidency where 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');
- $elder = $this->db->f('elder');
+ $indiv = $this->db->f('indiv');
$name = $this->db->f('name');
$district = $this->db->f('district');
$name = $this->db->f('name');
@@ -4023,9 +4235,9 @@ class eq
// If we have a valid district, add it to the district table
if($district > 0) {
- $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+ $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "
. "VALUES ('" . $district . "','" . $name . "','"
- . $elder . "','" . $valid . "'"
+ . $indiv . "','" . $valid . "'"
.")",__LINE__,__FILE__);
}
@@ -4042,15 +4254,15 @@ class eq
// Now save off the data needed for an EQ Presidency Table Update
- $sql = "SELECT * FROM eq_presidency where valid=1";
+ $sql = "SELECT * FROM 3rd_presidency where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$table_data = "";
- $header_row = "Elder Email District President Counselor Secretary EQ Presidency ";
+ $header_row = "Individual Email District President Counselor Secretary Presidency ";
while ($this->db->next_record())
{
// Extract the data for each presidency record
$id = $this->db->f('presidency');
- $elder = $this->db->f('elder');
+ $indiv = $this->db->f('indiv');
$district = $this->db->f('district');
$name = $this->db->f('name');
$email = $this->db->f('email');
@@ -4065,21 +4277,21 @@ class eq
// Presidency ID
$table_data .= ' ';
- // Elder
+ // individual
if($eqpresidency == 0) {
- $table_data.= '';
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $tmp_id = $elder_id[$j];
- $name = $elder_name[$j];
- if($elder_id[$j] == $elder) { $eldername = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
+ for ($j=0; $j < count($indiv_id); $j++) {
+ $tmp_id = $indiv_id[$j];
+ $name = $indiv_name[$j];
+ if($indiv_id[$j] == $indiv) { $indivname = $name; $selected = 'selected="selected"'; } else { $selected = ''; }
$table_data.= ''.$name.' ';
}
$table_data.=' ';
- $table_data.=' ';
+ $table_data.=' ';
} else {
- $table_data.= ' ';
- $table_data.= ' ';
+ $table_data.= ' ';
+ $table_data.= ' ';
}
// Email Address
@@ -4112,7 +4324,7 @@ class eq
else { $table_data .= '0 1 '; }
$table_data.=' ';
- // EQ Presidency
+ // Presidency
$table_data.= '';
if($eqpresidency == 1) { $table_data .= '0 1 '; }
else { $table_data .= '0 1 '; }
@@ -4124,17 +4336,17 @@ class eq
$this->t->set_var('tr_color',$tr_color);
}
- // Now create 1 blank row to always have a line available to add a new elder with
+ // Now create 1 blank row to always have a line available to add a new individual with
$id = $this->max_presidency_members;
$table_data .= "";
// Presidency ID
$table_data .= ' ';
- // Elder
- $table_data.= '';
+ // individual
+ $table_data.= '';
$table_data.= ' ';
- for ($j=0; $j < count($elder_id); $j++) {
- $tmp_id = $elder_id[$j];
- $name = $elder_name[$j];
+ for ($j=0; $j < count($indiv_id); $j++) {
+ $tmp_id = $indiv_id[$j];
+ $name = $indiv_name[$j];
$table_data.= ''.$name.' ';
}
$table_data.=' ';
@@ -4161,7 +4373,7 @@ class eq
$table_data.= '';
$table_data.= '0 1 ';
$table_data.=' ';
- // EQ Presidency
+ // Presidency
$table_data.= '';
$table_data.= '0 1 ';
$table_data.=' ';
@@ -4181,22 +4393,22 @@ class eq
{
//print "Emailing notification of appointment: $appointment ";
- $sql = "SELECT * FROM eq_appointment where appointment='$appointment'";
+ $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment'";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
$appointment = $this->db->f('appointment');
$presidency = $this->db->f('presidency');
+ $location = $this->db->f('location');
$interviewer = "";
$email = "";
- $elder = $this->db->f('elder');
- $elder_name = "";
+ $indiv = $this->db->f('indiv');
+ $indiv_name = "";
$family = $this->db->f('family');
$family_name = "";
$appt_name = "";
$phone = "";
- $location = "";
$uid = $this->db->f('uid');
// Extract the year, month, day, hours, minutes, seconds from the appointment time
@@ -4212,47 +4424,40 @@ class eq
$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));
- // Set the email address of the person making the appointment
- $from = $GLOBALS['phpgw_info']['user']['fullname'] . "<" .
- $GLOBALS['phpgw_info']['user']['preferences']['email']['address'] . ">";
-
- $sql = "SELECT * FROM eq_presidency where presidency='$presidency'";
+ $sql = "SELECT * FROM 3rd_presidency where presidency='$presidency'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$email = $this->db2->f('email');
$interviewer = $this->db2->f('name');
}
- if($elder > 0) {
- $sql = "SELECT * FROM eq_elder where elder='$elder'";
+ // Set the email address of the interviewer
+ $from = $email;
+
+ if($indiv > 0) {
+ $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
- $elder_name = $this->db2->f('name');
+ $indiv_name = $this->db2->f('name');
$phone = $this->db2->f('phone');
- $appt_name = $elder_name . " Interview";
- $location = "$interviewer"."'s home";
+ $appt_name = $indiv_name . " Interview";
$duration = $this->default_ppi_appt_duration * 60;
}
}
if($family > 0) {
- $sql = "SELECT * FROM eq_family where family='$family'";
+ $sql = "SELECT * FROM 3rd_family where family='$family'";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$family_name = $this->db2->f('name');
$phone = $this->db2->f('phone');
- $elder_id = $this->db2->f('elder_id');
+ $indiv_id = $this->db2->f('indiv_id');
$appt_name = $family_name . " Family Visit";
- $sql = "SELECT * FROM eq_elder where elder='$elder_id'";
+ $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv_id'";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$phone = $this->db3->f('phone');
}
- $sql = "SELECT * FROM eq_parent where family='$family'";
- $this->db3->query($sql,__LINE__,__FILE__);
- if($this->db3->next_record()) {
- $location=$this->db3->f('address');
- }
$duration = $this->default_visit_appt_duration * 60;
}
}
@@ -4269,7 +4474,7 @@ class eq
$uid = rand() . rand(); // Generate a random identifier for this appointment
$subject = "Created: $appt_name";
- $this->db->query("UPDATE eq_appointment set" .
+ $this->db->query("UPDATE 3rd_appointment set" .
" uid=" . $uid .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
@@ -4283,7 +4488,7 @@ class eq
print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . " ";
$subject = "Canceled: $appt_date $appt_time";
- $this->db->query("UPDATE eq_appointment set" .
+ $this->db->query("UPDATE 3rd_appointment set" .
" uid=0" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
@@ -4301,7 +4506,7 @@ class eq
$dtend, $date, $location, $subject, $subject, $uid);
$uid = rand() . rand(); // Generate a random identifier for this appointment
- $this->db->query("UPDATE eq_appointment set" .
+ $this->db->query("UPDATE 3rd_appointment set" .
" uid=" . $uid .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);