X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=2c53def85f89b6bc3f2b096dac6fc36556b5b32a;hb=477ea41b8890c9ffefd9f9b0fb58367492a59de9;hp=5ac7c0ab9769a6b88b9a68b8670e4876ad6a7f76;hpb=63574045f42044601bfc460bf844ea82387f421f;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 5ac7c0a..2c53def 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,12 +70,12 @@ class eq
function eq()
{
- if(file_exists('setup/eq_config.local')) {
- include('setup/eq_config.local');
+ if(file_exists("setup/eq_config.local")) {
+ include("setup/eq_config.local");
} else {
- include('setup/eq_config');
+ include("setup/eq_config");
}
-
+
$this->script_path = "$this->application_path"."/bin";
$this->max_presidency_members = 99;
$this->max_appointments = 32768;
@@ -114,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
{
@@ -166,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()
@@ -186,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())
@@ -197,7 +202,7 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -215,7 +220,7 @@ class eq
$elders[$id] = $elder_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())
{
@@ -223,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');
@@ -243,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__);
@@ -272,13 +276,12 @@ class eq
$table_data.= "
$companion_table_entry
";
// 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);
@@ -294,12 +297,24 @@ class eq
$month_start = "$year"."-"."$month"."-"."01";
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
+
//print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end ";
// Add this to the query to filter on only visits made by this companionship:
// " AND companionship=" . $unique_companionships[$j]['companionship'].
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
- " AND companionship!=0".
- " AND family=". $family_id;
+
+ // First check to see if the currently assigned companionship has visited them
+ $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 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__);
+ }
$this->db2->query($sql,__LINE__,__FILE__);
$link_data['menuaction'] = 'eq.eq.ht_update';
$link_data['date'] = $month_start;
@@ -314,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 .= '
";
@@ -390,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');
@@ -400,17 +425,10 @@ class eq
}
for ($j=0; $j < count($unique_companionships); $j++)
{
- // FIXME: We won't be able to go back and edit history on families that have been
- // reassigned to a different companionship. The following delete command will not delete
- // the history of visits under an older companionship, only the ones for the existing
- // companionship. This will lead to duplicate visits being entered for an older
- // month for the same family, making it impossible to change the past history once
- // a family is reassigned. However, you will be able to view the history just fine.
-
//$comp=$unique_companionships[$j]['companionship'];
- //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district ";
- // Delete all the visits that have taken place for all families for this month
- $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
+ //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 3rd_visit where companionship=" . $unique_companionships[$j]['companionship'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
}
@@ -428,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__);
}
}
@@ -436,7 +454,7 @@ class eq
return false;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -454,7 +472,7 @@ class eq
$elders[$id] = $elder_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())
{
@@ -464,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');
@@ -478,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__);
@@ -502,34 +520,45 @@ class eq
$table_data.= "
$companion_table_entry
";
// 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);
$table_data.="
$family_name Family
";
$header_row="
Families
";
- $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+
+ // First check to see if the currently assigned companionship has visited them
+ $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 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
" AND companionship!=0".
" AND family=". $family_id;
- $this->db2->query($sql,__LINE__,__FILE__);
+ $query_id = $this->db2->query($sql,__LINE__,__FILE__);
+ }
+
$value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
$header_row .= "
";
$this->t->set_var('table_width',$table_width);
@@ -587,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();
@@ -599,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())
{
@@ -630,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();
}
@@ -648,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())
{
@@ -681,7 +710,7 @@ class eq
$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')));
+ $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();
@@ -694,7 +723,7 @@ class eq
for ($i=0; $i < count($part_list); $i++)
{
- $sql = "SELECT * FROM eq_elder WHERE elder=" . $part_list[$i]['elder'];
+ $sql = "SELECT * FROM 3rd_elder WHERE elder=" . $part_list[$i]['elder'];
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$names[$i] = $this->db->f('name');
@@ -731,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__);
+ $this->db->query("DELETE from 3rd_participation where activity=".$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__);
- }
-
+ if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with
+ foreach ($elders as $elder)
+ {
+ $this->db->query("INSERT INTO 3rd_participation (elder,activity) "
+ . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ }
+ }
+
$this->act_list();
return false;
}
@@ -757,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()) {
@@ -772,7 +803,7 @@ class eq
$elders = get_var('elder_name',array('POST'));
foreach ($elders as $elder)
{
- $this->db->query("INSERT INTO eq_participation (elder,activity) "
+ $this->db->query("INSERT INTO 3rd_participation (elder,activity) "
. "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
}
@@ -795,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));
@@ -811,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())
@@ -834,7 +865,7 @@ class eq
$this->t->set_var('assignment_data',$assignment_data);
// Create elder selection boxes
- $sql = "SELECT * FROM eq_elder";
+ $sql = "SELECT * FROM 3rd_elder";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -852,7 +883,7 @@ class eq
for ($i=0; $i < count($elder_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 elder=" . $elder_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; }
@@ -888,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();
@@ -941,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__);
@@ -954,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();
@@ -974,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'));
@@ -1005,7 +1036,7 @@ class eq
$this->t->set_block('par_view_t','header_list','list1');
$this->t->set_block('par_view_t','elder_list','list2');
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_elder where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -1016,7 +1047,7 @@ class eq
}
array_multisort($elder_name, $elder_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();
@@ -1029,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,7 +1088,7 @@ class eq
$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];
$this->db->query($sql,__LINE__,__FILE__);
@@ -1115,7 +1146,7 @@ class eq
}
$this->t->set_var('filter_input',$filter_input);
- $sql = "SELECT * FROM eq_elder where valid=1";
+ $sql = "SELECT * FROM 3rd_elder where valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -1127,7 +1158,7 @@ class eq
}
array_multisort($elder_name, $elder_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())
@@ -1138,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();
@@ -1170,21 +1201,21 @@ class eq
. $elder_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];
$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];
$this->db3->query($sql,__LINE__,__FILE__);
@@ -1253,7 +1284,7 @@ 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__);
+ $this->db->query("DELETE from 3rd_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
// Now, add the assignment willingness that is checked for this elder
$new_data = get_var('willingness',array('POST'));
@@ -1263,7 +1294,7 @@ class eq
$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) "
+ $this->db->query("INSERT INTO 3rd_willingness (elder,assignment,willing) "
. "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
}
$this->willing_view();
@@ -1274,7 +1305,7 @@ class eq
$table_data="";
// Find out the elder's name
- $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+ $sql = "SELECT * FROM 3rd_elder WHERE elder=".$elder_id." AND valid=1";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
$elder_name = $this->db->f('name');
@@ -1282,7 +1313,7 @@ class eq
}
// 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())
@@ -1295,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 elder=".$elder_id." AND assignment=".$assignment;
$this->db2->query($sql,__LINE__,__FILE__);
$value = $assignment;
@@ -1380,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('elder');
+ $presidency_id = $this->db->f('presidency');
+ $interviewer = $this->db->f('elder');
+ $district_number = '*';
+ $district_name = $president_name;
+ $sql = "SELECT * FROM 3rd_elder where elder='$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 EQ President in 3rd_presidency table
";
+ return;
+ }
+
if($action == 'save')
{
// Save any changes made to the appointment table
@@ -1390,16 +1448,18 @@ class eq
{
$elder = $entry['elder'];
$appointment = $entry['appointment'];
-
- //print "elder: $elder appointment: $appointment ";
+ $location = $entry['location'];
+ if($location == "") { $location = "$president_last_name"." home ($president_address)"; }
+ if($elder == 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 elder='$elder' 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 " .
" elder='" . $elder . "'" .
+ ",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
$this->email_appt($appointment);
@@ -1417,7 +1477,7 @@ class eq
$ppi_pri = $entry['pri'];
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_elder set " .
" ppi_notes='" . $ppi_notes . "'" .
",ppi_pri='" . $ppi_pri . "'" .
" WHERE elder=" . $elder_id,__LINE__,__FILE__);
@@ -1427,24 +1487,9 @@ class eq
$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";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$elder_id = NULL;
@@ -1458,11 +1503,12 @@ class eq
array_multisort($elder_name, $elder_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; $elder_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
$appt_header_row = "
Date
";
$appt_header_row.= "
Time
";
$appt_header_row.= "
Elder
";
+ $appt_header_row.= "
Location
";
$appt_table_data = "";
$total_elders=0; $elders_with_yearly_ppi=0;
@@ -1475,13 +1521,15 @@ class eq
$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');
+ $location = $this->db->f('location');
+ if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home ($president_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1505,7 +1553,10 @@ class eq
$appt_table_data.= '';
}
$appt_table_data.='';
-
+
+ $appt_table_data.= '
';
+
$appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1517,7 +1568,7 @@ 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_elder where valid=1 ORDER BY ppi_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1544,19 +1595,19 @@ class eq
// If this elder 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 elder=" . $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 elder=" . $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['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);
@@ -1584,8 +1635,8 @@ class eq
$link_data['interviewer'] = $this->db2->f('interviewer');
$link_data['elder'] = $this->db2->f('elder');
$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++;
@@ -1677,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 elder id -> elder name mapping
+ $sql = "SELECT * FROM 3rd_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');
+ $elderid2name[$elder_id_data[$i]] = $elder_name_data[$i];
+ $i++;
+ }
+ array_multisort($elder_name_data, $elder_id_data);
+
if($action == 'save')
{
// Save any changes made to the appointment table
@@ -1687,15 +1753,34 @@ class eq
{
$elder = $entry['elder'];
$appointment = $entry['appointment'];
+ $location = $entry['location'];
+ if($location == "") {
+ $supervisor = $entry['supervisor'];
+ $supervisor_array = explode(",", $elderid2name[$supervisor]);
+ $supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$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($elder == 0) { $location = ""; }
//print "elder: $elder 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 elder='$elder' 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 " .
" elder='" . $elder . "'" .
+ ",location='" . $location . "'" .
" WHERE appointment=" . $appointment,__LINE__,__FILE__);
// Email the appointment
@@ -1716,7 +1801,7 @@ class eq
//print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic ";
if($aaronic == 0) {
// Perform database save actions here
- $this->db->query("UPDATE eq_elder set " .
+ $this->db->query("UPDATE 3rd_elder set " .
" int_notes='" . $int_notes . "'" .
",int_pri='" . $int_pri . "'" .
" WHERE elder=" . $elder_id,__LINE__,__FILE__);
@@ -1729,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())
@@ -1738,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');
@@ -1746,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; $elder_width=200; $location_width=100;
+ $appt_table_width=$date_width + $time_width + $elder_width + $location_width;
$appt_header_row = "
Date
";
$appt_header_row.= "
Time
";
$appt_header_row.= "
Elder
";
+ $appt_header_row.= "
Location
";
$appt_table_data = "";
$total_comps=0; $comps_with_quarterly_int=0;
@@ -1777,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'];
+ $supervisor_array = explode(",", $supervisor);
+ $supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM 3rd_elder where elder='$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 Elders 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');
+ $location = $this->db->f('location');
+ if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1814,7 +1901,11 @@ class eq
}
$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);
@@ -1827,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');
@@ -1839,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;
@@ -1853,7 +1944,7 @@ class eq
$elder_id = $this->db->f('elder');
$aaronic_id = $this->db->f('aaronic');
- $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+ $sql = "SELECT * FROM 3rd_elder where elder=$elder_id";
$this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record())
{
@@ -1865,7 +1956,7 @@ class eq
$elder_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())
{
@@ -1899,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' ".
+ $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
"AND elder=" . $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 elder=" . $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['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);
@@ -1943,7 +2034,7 @@ class eq
$link_data['elder'] = $this->db2->f('elder');
$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++;
@@ -2031,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 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');
+ $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
@@ -2041,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
@@ -2063,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__);
}
@@ -2079,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 EQ 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];
@@ -2142,6 +2253,9 @@ class eq
}
$appt_table_data.='';
+ $appt_table_data.= '
';
+
$appt_table_data.= '';
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -2154,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 elder_id != 0 ORDER BY visit_pri ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2176,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())
{
@@ -2196,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';
@@ -2316,20 +2430,20 @@ 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;
+ $interview_type = 'ppi';
} else {
- print "
-E- Unable to locate EQ President in eq_presidency table
";
+ print "
-E- Unable to locate EQ 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_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -2364,8 +2478,8 @@ class eq
$link_data['interviewer'] = $interviewer;
$link_data['elder'] = $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);
@@ -2375,8 +2489,8 @@ class eq
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 elder=" . $id . " AND interview_type='ppi'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2387,8 +2501,8 @@ class eq
$link_data['interviewer'] = $this->db2->f('interviewer');
$link_data['elder'] = $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);
@@ -2433,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'));
+ $interview = get_var('interview',array('GET','POST'));
$elder = get_var('elder',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())
+ {
+ $elder = $this->db2->f('elder');
+ $interviewer_name = $this->db2->f('name');
+ if($elder == $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 . "'" .
", 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;
}
@@ -2468,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) "
+ $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) "
. "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
- . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__);
+ . $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__);
$this->ppi_view();
return false;
}
@@ -2478,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('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('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')
@@ -2512,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')
@@ -2524,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');
@@ -2571,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())
@@ -2582,7 +2703,7 @@ class eq
$i++;
}
- $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+ $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record())
@@ -2598,7 +2719,7 @@ class eq
$elders[$id] = $elder_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())
{
@@ -2613,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');
@@ -2631,7 +2750,7 @@ class eq
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;
@@ -2658,7 +2777,7 @@ class eq
$link_data['elder'] = $elder_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.= "