X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=b25ed33354f0969e58ab07237e620c40d56af9ea;hb=816f52ad6f787625d4758484615624e438b63058;hp=dd3343c3c7614e4349bdc4fc6c3a9384e2ea8534;hpb=5be4f84484b7a86269ae91194950a4f9c3a7550e;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index dd3343c..b25ed33 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -170,7 +170,7 @@ class eq $unique_companionships=''; // Select all the unique companionship numbers for this district - $sql = "SELECT distinct companionship FROM eq_companionship where district=". $districts[$i]['district']; + $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district']; $this->db->query($sql,__LINE__,__FILE__); $j=0; while ($this->db->next_record()) @@ -217,9 +217,10 @@ class eq // in the past $num_months for this Family $header_row="Families"; for($m=$num_months; $m >= 0; $m--) { - $month = date('m/Y', strtotime('-'.$m.' month')); - $month_start = date('Y-m', strtotime('-'.$m.' month')); $month_start .= "-01"; - $month_end = date('Y-m', strtotime('-'.$m.' month')); $month_end .= "-31"; + if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; } + $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day')); + $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01"; + $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31"; $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ". " AND companionship=" . $unique_companionships[$j]['companionship']. " AND family=". $family_id; @@ -243,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++; @@ -870,7 +877,7 @@ class eq $sql = "SELECT distinct companionship FROM eq_companionship"; } else { - $sql = "SELECT distinct companionship FROM eq_companionship where district=". $districts[$i]['district']; + $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district']; } $this->db->query($sql,__LINE__,__FILE__); $j=0; @@ -879,9 +886,9 @@ class eq $unique_companionships[$j]['companionship'] = $this->db->f('companionship'); $j++; } - + $comp_width=400; $ppi_width=25; $table_width=$comp_width + $num_months*$ppi_width; - $table_data=""; $num_companionships = 0; $num_elders = 0; + $table_data=""; $num_companionships = $j; $num_elders = 0; for($m=$num_months; $m >= 0; $m--) { $ppis[$m] = 0; } for ($j=0; $j < count($unique_companionships); $j++) { // Select all the companions in each companionship @@ -898,7 +905,7 @@ class eq while ($this->db->next_record()) { // Get this companions information - $num_elders++; $num_companionships++; + $num_elders++; $companionship = $this->db->f('companionship'); $elder_id = $this->db->f('elder'); $aaronic_id = $this->db->f('aaronic'); @@ -931,9 +938,10 @@ class eq $header_row .= "$year"; } else { - $month = date('m/Y', strtotime('-'.$m.' month')); - $month_start = date('Y-m', strtotime('-'.$m.' month')); $month_start .= "-01"; - $month_end = date('Y-m', strtotime('-'.$m.' month')); $month_end .= "-31"; + if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; } + $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day')); + $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01"; + $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31"; $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ". "AND elder=" . $elder_id . " AND eqpresppi=0"; $this->db2->query($sql,__LINE__,__FILE__); @@ -967,7 +975,6 @@ class eq $table_data .= ""; $k++; } - if($num_companionships % 2 != 0) { $num_companionships++; } $table_data .= "
"; } // Now add Elders not assigned to any companionship to the table if we are in eqpresppi mode @@ -978,7 +985,7 @@ class eq $this->db->query($sql,__LINE__,__FILE__); if(!$this->db->next_record()) { // We found an Elder not in a companionship, add them to the table - $num_elders++; $num_companionships++; + $num_elders++; $companionship=0; $name = $elders[$elder_id]; $link_data['menuaction'] = 'eq.eq.ppi_update'; @@ -1018,7 +1025,6 @@ class eq } } } - $num_companionships = ceil($num_companionships/2); $total_companionships += $num_companionships; if($eqpresppi == 1) { $stat_data = "$num_elders Elders
PPI Totals:"; @@ -1208,7 +1214,7 @@ class eq { $this->nextmatchs->template_alternate_row_color(&$this->t); - $sql = "SELECT * FROM eq_family WHERE valid=1 AND family=".$visit_list[$i]['family']; + $sql = "SELECT * FROM eq_family WHERE family=".$visit_list[$i]['family']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); @@ -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(); }