X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclass.eq.inc.php;h=9b59778a16192a093c58ed19d00f7b3c79536323;hb=5b890635d41024cad8348023e9fccae419ddaaca;hp=2ffb985a68c0870437e2752f0c88dd3727e06302;hpb=eb177664b7f5915b1d1a31e6d148cc02bbe062f3;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 2ffb985..9b59778 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -660,15 +660,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();
}
@@ -772,12 +772,14 @@ class eq
// 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 eq_participation (elder,activity) "
+ . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+ }
+ }
+
$this->act_list();
return false;
}
@@ -1423,6 +1425,16 @@ class eq
$interviewer = $this->db->f('elder');
$district_number = '*';
$district_name = $president_name;
+ $sql = "SELECT * FROM eq_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 eq_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 eq_presidency table
";
return;
@@ -1438,7 +1450,7 @@ class eq
$elder = $entry['elder'];
$appointment = $entry['appointment'];
$location = $entry['location'];
- if($location == "") { $location = "$president_last_name"." home"; }
+ 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
@@ -1518,7 +1530,7 @@ class eq
$appointment = $this->db->f('appointment');
$elder = $this->db->f('elder');
$location = $this->db->f('location');
- if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home"; }
+ if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home ($president_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -1589,7 +1601,7 @@ class eq
$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 eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 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';
@@ -1747,7 +1759,17 @@ class eq
$supervisor = $entry['supervisor'];
$supervisor_array = explode(",", $elderid2name[$supervisor]);
$supervisor_last_name = $supervisor_array[0];
- $location = "$supervisor_last_name"." home";
+ $sql = "SELECT * FROM eq_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 eq_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 = ""; }
@@ -1830,6 +1852,17 @@ class eq
$supervisor = $districts[$d]['supervisor'];
$supervisor_array = explode(",", $supervisor);
$supervisor_last_name = $supervisor_array[0];
+ $sql = "SELECT * FROM eq_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 eq_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);
@@ -1844,7 +1877,7 @@ class eq
$appointment = $this->db->f('appointment');
$elder = $this->db->f('elder');
$location = $this->db->f('location');
- if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home"; }
+ if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; }
$date = $this->db->f('date');
$date_array = explode("-",$date);
@@ -3618,7 +3651,7 @@ 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=225; $elder_width=200; $family_width=200; $location_width=100;
+ $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100;
$table_width=$date_width + $time_width + $elder_width + $family_width + $location_width;
$header_row = "Date | ";
$header_row.= "Time | ";
@@ -3636,6 +3669,7 @@ class eq
$presidency_data[$i]['name'] = $this->db->f('name');
$presidency_data[$i]['elder'] = $this->db->f('elder');
$presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name'];
+ $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder'];
$i++;
}
@@ -3688,7 +3722,17 @@ class eq
else if($elder > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
- $location = "$supervisor_last_name"." home";
+ $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM eq_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)";
}
}
@@ -3805,7 +3849,17 @@ class eq
else if($elder > 0) {
$supervisor_name_array = explode(",",$presidency2name[$presidency]);
$supervisor_last_name = $supervisor_name_array[0];
- $location = "$supervisor_last_name"." home";
+ $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ if($this->db2->next_record()) {
+ $indiv_id = $this->db2->f('indiv_id');
+ }
+ $sql = "SELECT * FROM eq_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)";
}
}
@@ -3835,7 +3889,7 @@ class eq
$table_data.= "";
// Elder drop down list (for PPIs)
- $table_data.= ' |