X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=8c2984e511210cbe2e203254bdb40552d074112f;hb=4d253dd156e29b53b2b2d0307d71eaef3379df8d;hp=9e6f8e2df09cd95c9eb7f1be7e12d719c75e0b6f;hpb=4988a4401709530d1d8ca1f640a6d0c207e74f44;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 9e6f8e2..8c2984e 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -217,11 +217,14 @@ class eq
// in the past $num_months for this Family
$header_row="| Families | ";
for($m=$num_months; $m >= 0; $m--) {
- $month = date('m/Y', strtotime('-'.$m.' month'));
- $month_start = date('Y-m', strtotime('-'.$m.' month')); $month_start .= "-01";
- $month_end = date('Y-m', strtotime('-'.$m.' month')); $month_end .= "-31";
+ if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
+ $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
+ $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
+ $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
+ // 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=" . $unique_companionships[$j]['companionship'].
+ " AND companionship!=0".
" AND family=". $family_id;
$this->db2->query($sql,__LINE__,__FILE__);
$link_data['menuaction'] = 'eq.eq.ht_update';
@@ -243,9 +246,15 @@ class eq
else if($this->db2->f('visited') == 'n') {
$table_data .= ' | ';
}
- else { $table_data .= " | "; }
+ else {
+ $visits[$m]++; $total_visits[$m]++;
+ $table_data .= " | ";
+ }
+ }
+ else {
+ $visits[$m]++; $total_visits[$m]++;
+ $table_data .= " | ";
}
- else { $table_data .= " | "; }
}
$table_data .= "";
$k++;
@@ -317,6 +326,13 @@ 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.
+
// 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'] .
" AND " . "date='" . $date . "'",__LINE__,__FILE__);
@@ -414,7 +430,7 @@ class eq
$header_row="Families | ";
$sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
- " AND companionship=" . $unique_companionships[$j]['companionship'] .
+ " AND companionship!=0".
" AND family=". $family_id;
$this->db2->query($sql,__LINE__,__FILE__);
$value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date;
@@ -931,9 +947,10 @@ class eq
$header_row .= "$year | ";
}
else {
- $month = date('m/Y', strtotime('-'.$m.' month'));
- $month_start = date('Y-m', strtotime('-'.$m.' month')); $month_start .= "-01";
- $month_end = date('Y-m', strtotime('-'.$m.' month')); $month_end .= "-31";
+ if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; }
+ $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day'));
+ $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
+ $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
$sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
"AND elder=" . $elder_id . " AND eqpresppi=0";
$this->db2->query($sql,__LINE__,__FILE__);
@@ -944,7 +961,7 @@ class eq
$ppis[$m]++; $total_ppis[$m]++;
$link_data['menuaction'] = 'eq.eq.ppi_update';
$link_data['companionship'] = $companionship;
- $link_data['interviewer'] = $supervisor;
+ $link_data['interviewer'] = $this->db2->f('interviewer');
$link_data['elder'] = $elder_id;
$link_data['name'] = $name;
$link_data['ppi'] = $this->db2->f('ppi');
@@ -1420,7 +1437,8 @@ class eq
$last_time += 90000;
if($found_sunday) { $i++; $found_sunday=0; }
}
-
+
+ $total_elders = count($elder_id);
$old_month=$sunday_list[0]['month']; $span=0;
for ($i=0; $i < count($sunday_list); $i++) {
$date = $sunday_list[$i]['date'];
@@ -1434,6 +1452,9 @@ class eq
$link_data['month'] = $sunday_list[$i-1]['month'];
$link_data['year'] = $sunday_list[$i-1]['year'];
$link_data['action'] = 'update_month';
+ $cur_month = $sunday_list[$i-1]['month'];
+ $cur_year = $sunday_list[$i-1]['year'];
+ $header_row .= "$cur_month $cur_year | ";
$this->t->set_var('update_month',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
$this->t->set_var('month',$sunday_list[$i-1]['month']);
$this->t->set_var('year',$sunday_list[$i-1]['year']);
@@ -1441,7 +1462,9 @@ class eq
$this->t->fp('list1','month_list',True);
} $span++;
}
-
+ $this->t->set_var('total_elders',$total_elders);
+ $this->t->set_var('header_row',$header_row);
+
$elder_width=200; $att_width=25; $total_width=$elder_width;
for ($i=0; $i < count($sunday_list); $i++) {
$link_data['menuaction'] = 'eq.eq.att_update';
@@ -1472,6 +1495,11 @@ class eq
. $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
+ $cur_month = $sunday_list[$j]['month'];
+ if($attended[$i][$cur_month] != 1) {
+ $attended[$i][$cur_month]=1;
+ $attendance[$cur_month]++;
+ }
$att_table .= ' | ';
} else {
$att_table .= ' | ';
@@ -1484,6 +1512,35 @@ class eq
$this->t->set_var('elder_width',$elder_width);
$this->t->set_var('att_width',$att_width);
+ # Now calculate attendance for these months
+ $attendance_str = "";
+ $nonattendance_str = "";
+ $aveattendance_str = "";
+ $avenonattendance_str = "";
+ $num_months=0;
+ $ave_total_attended=0;
+ foreach($attendance as $att => $value) {
+ $total_attended = $attendance[$att];
+ $ave_total_attended += $attendance[$att]; $num_months++;
+ $percent = ceil(($total_attended / $total_elders)*100);
+ $attendance_str.="$total_attended ($percent%) | ";
+ $total_nonattended = $total_elders - $total_attended;
+ $percent = ceil(($total_nonattended / $total_elders)*100);
+ $nonattendance_str.="$total_nonattended ($percent%) | ";
+
+ $total_attended = ceil(($ave_total_attended / $num_months));
+ $percent = ceil(($total_attended / $total_elders)*100);
+ $aveattendance_str .= "$total_attended ($percent%) | ";
+ $total_attended = $total_elders - ceil(($ave_total_attended / $num_months));
+ $percent = ceil(($total_attended / $total_elders)*100);
+ $avenonattendance_str .= "$total_attended ($percent%) | ";
+ }
+
+ $this->t->set_var('attendance',$attendance_str);
+ $this->t->set_var('aveattendance',$aveattendance_str);
+ $this->t->set_var('nonattendance',$nonattendance_str);
+ $this->t->set_var('avenonattendance',$avenonattendance_str);
+
$this->t->pfp('out','att_view_t');
$this->save_sessiondata();
}