From 816f52ad6f787625d4758484615624e438b63058 Mon Sep 17 00:00:00 2001 From: Alan Jack Pippin Date: Sun, 22 Jan 2006 21:53:45 -0700 Subject: [PATCH] Added stats to the bottom of the attendance view. Change HT stats so that a blank hometeaching status counts as visited. --- inc/class.eq.inc.php | 54 +++++++++++++++++++++++++++++++--- templates/default/att_view.tpl | 23 +++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index a20f156..b25ed33 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -244,9 +244,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++; @@ -1422,7 +1428,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']; @@ -1436,6 +1443,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']); @@ -1443,7 +1453,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'; @@ -1474,6 +1486,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 .= ' '; @@ -1486,6 +1503,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(); } diff --git a/templates/default/att_view.tpl b/templates/default/att_view.tpl index 7912c7f..42c3958 100644 --- a/templates/default/att_view.tpl +++ b/templates/default/att_view.tpl @@ -41,4 +41,27 @@ +
+ + + {header_row} + + + {attendance} + + + + {nonattendance} + + + + + {aveattendance} + + + + {avenonattendance} + +
{total_elders} Total Elders
Elders Attending:
Elders Not Attending:

Average Elders Attending:
Average Elders Not Attending:
+ -- 2.34.1