X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=38786c2677d685232f0bea25f0352cc112cb7c39;hb=70a759d295cc5da026b112a2498d5d1958ab23af;hp=362ed4cedc7a84a51a612e9c4fe1d87b46fe1927;hpb=8eee9e62fd605609b2c97e42ce3093be5dc16b06;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 362ed4c..38786c2 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -63,7 +63,7 @@ class eq $this->default_int_num_quarters = 1; $this->default_int_num_months = 3; $this->default_int_num_years = 0; - $this->default_att_num_quarters = 3; + $this->default_att_num_quarters = 1; $this->default_att_num_months = 3; $this->upload_target_path = "/home/users/eqpres/eq_data/"; $this->script_path = "/usr/share/phpgroupware/eq/"; @@ -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); @@ -2567,13 +2573,20 @@ class eq $this->t->set_block('att_view_t','elder_list','list3'); $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view')); - $num_months = get_var('num_months',array('GET','POST')); - if($num_months == '') { $num_months = $this->default_att_num_months; } - $this->t->set_var('num_months',$num_months); + $num_quarters = get_var('num_quarters',array('GET','POST')); + if($num_quarters == '') { $num_quarters = $this->default_att_num_quarters; } + $this->t->set_var('num_quarters',$num_quarters); $this->t->set_var('lang_filter','Filter'); - 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'); } - + 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'); } + + $num_months = $num_quarters * 3; + $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_elder where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -2584,13 +2597,12 @@ class eq $i++; } array_multisort($elder_name, $elder_id); - // Create a list of sunday dates for a window of 3 months back and current month $i=0; $last_time = 0; $found_sunday = 0; - $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, date("m")-$num_months, 1, date("y"))); + $sunday_list[0]['date'] = date("Y-m-d", mktime(0, 0, 0, $current_month-$num_months, 1, date("y"))); $last_date = explode("-",$sunday_list[0]['date']); $last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]); $time_limit = mktime(0, 0, 0, date("m"), date("t"), date("y")); @@ -2598,7 +2610,7 @@ class eq { $day = date("w",$last_time); if(date("w",$last_time) == 0) { - $sunday_list[$i]['date'] = date("Y-m-d", $last_time); + $sunday_list[$i]['date'] = date("Y-m-d", $last_time); $last_date = explode("-",$sunday_list[$i]['date']); $last_time = mktime(0, 0, 0, $last_date[1], $last_date[2], $last_date[0]); $sunday_list[$i]['day'] = $last_date[2];