From 47e6860c835dfef75f83a38d0c17b36062ebc470 Mon Sep 17 00:00:00 2001 From: Alan Jack Pippin Date: Sun, 12 Aug 2007 15:43:51 -0600 Subject: [PATCH] Changed interview viewing tool to display results by quarter --- inc/class.eq.inc.php | 26 ++++++++++++++++---------- templates/default/int_view.tpl | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 362ed4c..06c61e0 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -2041,14 +2041,13 @@ class eq $this->t->set_block('int_view_t','district_list','list'); $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view')); - $num_months = get_var('num_months',array('GET','POST')); - if($num_months == '') { $num_months = $this->default_int_num_months; } - $this->t->set_var('num_months',$num_months); - if($num_months == 1) { $this->t->set_var('lang_num_months','Month of History'); } - else { $this->t->set_var('lang_num_months','Months of History'); } + $num_quarters = get_var('num_quarters',array('GET','POST')); + if($num_quarters == '') { $num_quarters = $this->default_int_num_quarters; } + $this->t->set_var('num_quarters',$num_quarters); + if($num_quarters == 1) { $this->t->set_var('lang_num_quarters','Quarter of History'); } + else { $this->t->set_var('lang_num_quarters','Quarters of History'); } $this->t->set_var('lang_filter','Filter'); - $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view')); - + $this->t->set_var('int_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view')); $this->t->set_var('int_link_title','Hometeaching Interviews'); @@ -2057,6 +2056,13 @@ class eq $this->t->set_var('title','Hometeaching Interviews'); + $num_months = $num_quarters * 3 - 1; + $current_month = $this->current_month; + if($current_month >= 1 && $current_month <= 3) { $current_month=3; } + else if($current_month >= 4 && $current_month <= 6) { $current_month=6; } + else if($current_month >= 7 && $current_month <= 9) { $current_month=9; } + else if($current_month >= 10 && $current_month <= 12) { $current_month=12; } + $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -2152,7 +2158,7 @@ class eq // Find out how many times Interviews were performed in the past $num_months for this Elder $header_row="Companionship"; for($m=$num_months; $m >= 0; $m--) { - $month = $this->current_month - $m; + $month = $current_month - $m; $year = $this->current_year; if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; } if($month < 10) { $month = "0"."$month"; } @@ -2195,7 +2201,7 @@ class eq $stat_data = "$num_companionships Companionships
Interview Quarterly Totals:
"; for($m=$num_months; $m >=0; $m--) { - $month = $this->current_month - $m; + $month = $current_month - $m; if(($month % 3) == 1) { $quarter_total = $ints[$m]; } else { $quarter_total += $ints[$m]; } $percent = ceil(($quarter_total / $num_companionships)*100); @@ -2214,7 +2220,7 @@ class eq $quarter_total = 0; $totals = "$total_companionships Total Comps
Interview Quarterly Totals:
"; for($m=$num_months; $m >=0; $m--) { - $month = $this->current_month - $m; + $month = $current_month - $m; if(($month % 3) == 1) { $quarter_total = $total_ints[$m]; } else { $quarter_total += $total_ints[$m]; } $percent = ceil(($quarter_total / $total_companionships)*100); diff --git a/templates/default/int_view.tpl b/templates/default/int_view.tpl index b091f18..7ba137c 100644 --- a/templates/default/int_view.tpl +++ b/templates/default/int_view.tpl @@ -15,8 +15,8 @@
- Showing - {lang_num_months} + Showing + {lang_num_quarters} -- 2.34.1