From 87fe12720f10a6ef93f81726ccb90b812393d599 Mon Sep 17 00:00:00 2001 From: "Alan J. Pippin" Date: Tue, 11 Mar 2008 16:57:40 -0600 Subject: [PATCH] Changed the way hometeaching stats are calculated. If a family has a blank as a hometeaching visit status, that family will not count for the total homteaching percentages. Only families marked with Y or N will now count for the hometeaching percentages. --- inc/class.eq.inc.php | 45 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index a5cc2b4..ca6b809 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -223,9 +223,9 @@ 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']); @@ -243,8 +243,8 @@ 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 @@ -278,7 +278,6 @@ class eq $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); @@ -326,19 +325,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 .= ''; } else if($this->db2->f('visited') == 'n') { + $num_families[$m]++; $total_families[$m]++; $table_data .= ''; } else { - $visits[$m]++; $total_visits[$m]++; + //$visits[$m]++; $total_visits[$m]++; $table_data .= " "; } } else { - $visits[$m]++; $total_visits[$m]++; + //$visits[$m]++; $total_visits[$m]++; $table_data .= " "; } } @@ -348,11 +349,15 @@ class eq $table_data .= ""; } $table_data .= "
"; - $stat_data = "$num_families Families
Visit Totals:"; + $stat_data = "Families Hometaught:
Hometeaching Percentage:"; for($m=$num_months; $m >=0; $m--) { - $percent = ceil(($visits[$m] / $num_families)*100); - $stat_data .= "$visits[$m]
$percent%"; + if($num_families[$m] > 0) { + $percent = ceil(($visits[$m] / $num_families[$m])*100); + } else { + $percent = 0; + } + $stat_data .= "$visits[$m] / $num_families[$m]
$percent%"; } $stat_data .= ""; @@ -363,10 +368,14 @@ class eq $this->t->fp('list','district_list',True); } - $totals = "$total_families Total Families
Visit Totals:"; + $totals = "Total Families Hometaught:
Total Hometeaching Percentage:"; for($m=$num_months; $m >=0; $m--) { - $percent = ceil(($total_visits[$m] / $total_families)*100); - $totals .= "$total_visits[$m]
$percent%"; + if($total_families[$m] > 0) { + $percent = ceil(($total_visits[$m] / $total_families[$m])*100); + } else { + $percent = 0; + } + $totals .= "$total_visits[$m] / $total_families[$m]
$percent%"; } $totals .= ""; @@ -512,7 +521,6 @@ class eq $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); @@ -539,13 +547,14 @@ class eq if(!$total_visits) { $total_visits = 0; } if($this->db2->next_record()) { if($this->db2->f('visited') == 'y') { - $visits++; $total_visits++; + $visits++; $total_visits++; $num_families++; $table_data .= ''; $table_data .= 'Y'; $table_data .= 'N'; $table_data .= ' '; $table_data .= ''; } else if($this->db2->f('visited') == 'n') { + $num_families++; $table_data .= ''; $table_data .= 'Y'; $table_data .= 'N'; @@ -572,10 +581,10 @@ class eq $table_data .= ""; } $table_data .= "
"; - $stat_data = "$num_families Families
Visit Totals:"; + $stat_data = "Families Hometaught:
Hometeaching Percentage:"; $percent = ceil(($visits / $num_families)*100); - $stat_data .= "$visits
$percent%"; + $stat_data .= "$visits / $num_families
$percent%"; $stat_data .= ""; $this->t->set_var('table_width',$table_width); -- 2.34.1