projects
/
eq
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3ceab85
)
Fixed issues with EQ Attendance tool not properly calculating the percent per month
author
Alan Jack Pippin
<ajp@pippin.(none)>
Mon, 6 Aug 2007 00:47:38 +0000
(18:47 -0600)
committer
Alan J. Pippin
<ajp@pippins.net>
Mon, 6 Aug 2007 00:47:38 +0000
(18:47 -0600)
inc/class.eq.inc.php
patch
|
blob
|
history
diff --git
a/inc/class.eq.inc.php
b/inc/class.eq.inc.php
index 7890ba1c6f2fd619f3c8fa10fa1bb73347abab1b..1fac1b24b5846d3cbe0c61bc8987d4d738744524 100644
(file)
--- a/
inc/class.eq.inc.php
+++ b/
inc/class.eq.inc.php
@@
-2345,6
+2345,10
@@
class eq
function att_view()
{
function att_view()
{
+ $monthnum['Jan']=1; $monthnum['Feb']=2; $monthnum['Mar']=3; $monthnum['Apr']=4;
+ $monthnum['May']=5; $monthnum['Jun']=6; $monthnum['Jul']=7; $monthnum['Aug']=8;
+ $monthnum['Sep']=9; $monthnum['Oct']=10; $monthnum['Nov']=11; $monthnum['Dec']=12;
+
$this->t->set_file(array('att_view_t' => 'att_view.tpl'));
$this->t->set_block('att_view_t','act_list','list');
$this->t->set_file(array('att_view_t' => 'att_view.tpl'));
$this->t->set_block('att_view_t','act_list','list');
@@
-2438,6
+2442,7
@@
class eq
$this->t->set_var('year',$sunday_list[$i]['year']);
$this->t->fp('list2','header_list',True);
$total_width += $att_width;
$this->t->set_var('year',$sunday_list[$i]['year']);
$this->t->fp('list2','header_list',True);
$total_width += $att_width;
+ $attendance[$monthnum[$sunday_list[$i]['month']]]=0;
}
for ($i=0; $i < count($elder_id); $i++) {
}
for ($i=0; $i < count($elder_id); $i++) {
@@
-2456,8
+2461,8
@@
class eq
$cur_month = $sunday_list[$j]['month'];
if($attended[$i][$cur_month] != 1) {
$attended[$i][$cur_month]=1;
$cur_month = $sunday_list[$j]['month'];
if($attended[$i][$cur_month] != 1) {
$attended[$i][$cur_month]=1;
- $attendance[$
cur_month
]++;
- }
+ $attendance[$
monthnum[$cur_month]
]++;
+ }
$att_table .= '<td align=center><img src="checkmark.gif"></td>';
} else {
$att_table .= '<td> </td>';
$att_table .= '<td align=center><img src="checkmark.gif"></td>';
} else {
$att_table .= '<td> </td>';
@@
-2477,6
+2482,7
@@
class eq
$avenonattendance_str = "";
$num_months=0;
$ave_total_attended=0;
$avenonattendance_str = "";
$num_months=0;
$ave_total_attended=0;
+ ksort($attendance);
foreach($attendance as $att => $value) {
$total_attended = $attendance[$att];
$ave_total_attended += $attendance[$att]; $num_months++;
foreach($attendance as $att => $value) {
$total_attended = $attendance[$att];
$ave_total_attended += $attendance[$att]; $num_months++;