X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=737306148f4acec3f3e593be403d2504171de504;hb=7a87ac31d4d7dcbcd415168d5adf7d18489adaf1;hp=dd3343c3c7614e4349bdc4fc6c3a9384e2ea8534;hpb=5be4f84484b7a86269ae91194950a4f9c3a7550e;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index dd3343c..7373061 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -143,6 +143,7 @@ class eq { $elder_id[$i] = $this->db->f('elder'); $elder_name[$i] = $this->db->f('name'); + $elder_phone[$elder_id[$i]] = $this->db->f('phone'); $i++; } array_multisort($elder_name, $elder_id); @@ -170,7 +171,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()) @@ -192,15 +193,16 @@ class eq while ($this->db->next_record()) { // Get this companions information - if($companion_table_entry != "") { $companion_table_entry .= " / "; } + if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); $elder_id = $this->db->f('elder'); $aaronic_id = $this->db->f('aaronic'); + $phone = $elder_phone[$elder_id]; if($elder_id) { $name = $elders[$elder_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } - $companion_table_entry .= "$name"; + $companion_table_entry .= "$name"; } - $table_data.= "$companion_table_entry
"; + $table_data.= "$companion_table_entry
"; // Get the names of the families assigned this home teaching companionship $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship']; @@ -217,11 +219,14 @@ 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"; + // Add this to the query to filter on only visits made by this companionship: + // " AND companionship=" . $unique_companionships[$j]['companionship']. $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ". - " AND companionship=" . $unique_companionships[$j]['companionship']. + " AND companionship!=0". " AND family=". $family_id; $this->db2->query($sql,__LINE__,__FILE__); $link_data['menuaction'] = 'eq.eq.ht_update'; @@ -243,9 +248,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++; @@ -317,6 +328,13 @@ class eq } for ($j=0; $j < count($unique_companionships); $j++) { + // FIXME: We won't be able to go back and edit history on families that have been + // reassigned to a different companionship. The following delete command will not delete + // the history of visits under an older companionship, only the ones for the existing + // companionship. This will lead to duplicate visits being entered for an older + // month for the same family, making it impossible to change the past history once + // a family is reassigned. However, you will be able to view the history just fine. + // Delete all the visits that have taken place for all families for this month $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] . " AND " . "date='" . $date . "'",__LINE__,__FILE__); @@ -351,6 +369,7 @@ class eq { $elder_id[$i] = $this->db->f('elder'); $elder_name[$i] = $this->db->f('name'); + $elder_phone[$elder_id[$i]] = $this->db->f('phone'); $i++; } array_multisort($elder_name, $elder_id); @@ -370,7 +389,7 @@ class eq } // Select all the unique companionship numbers for this district - $sql = "SELECT distinct companionship FROM eq_companionship where district=". $district; + $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district; $this->db->query($sql,__LINE__,__FILE__); $j=0; $unique_companionships=''; while ($this->db->next_record()) @@ -379,7 +398,7 @@ class eq $j++; } - $comp_width=300; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width; + $comp_width=300; $visit_width=25; $table_width=$comp_width + $visit_width; $table_data=""; $num_companionships = 0; $num_families = 0; $visits=0; for ($j=0; $j < count($unique_companionships); $j++) { $companion_table_entry = ""; @@ -391,15 +410,16 @@ class eq while ($this->db->next_record()) { // Get this companions information - if($companion_table_entry != "") { $companion_table_entry .= " / "; } + if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); $elder_id = $this->db->f('elder'); $aaronic_id = $this->db->f('aaronic'); + $phone = $elder_phone[$elder_id]; if($elder_id) { $name = $elders[$elder_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } - $companion_table_entry .= "$name"; + $companion_table_entry .= "$name"; } - $table_data.= "$companion_table_entry
"; + $table_data.= "$companion_table_entry
"; // Get the names of the families assigned this home teaching companionship $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship']; @@ -414,7 +434,7 @@ class eq $header_row="Families"; $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ". - " AND companionship=" . $unique_companionships[$j]['companionship'] . + " AND companionship!=0". " AND family=". $family_id; $this->db2->query($sql,__LINE__,__FILE__); $value = $family_id . "/" . $unique_companionships[$j]['companionship'] . "/" . $date; @@ -836,6 +856,7 @@ class eq { $elder_id[$i] = $this->db->f('elder'); $elder_name[$i] = $this->db->f('name'); + $elder_phone[$elder_id[$i]] = $this->db->f('phone'); $i++; } array_multisort($elder_name, $elder_id); @@ -870,7 +891,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 +900,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,10 +919,11 @@ 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'); + $phone = $elder_phone[$elder_id]; if($elder_id) { $name = $elders[$elder_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } $link_data['menuaction'] = 'eq.eq.ppi_update'; @@ -914,7 +936,7 @@ class eq $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); if($aaronic_id == 0) { - $table_data.= "$name"; + $table_data.= "$name"; } else { $table_data.= "$name"; } @@ -931,9 +953,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__); @@ -944,7 +967,7 @@ class eq $ppis[$m]++; $total_ppis[$m]++; $link_data['menuaction'] = 'eq.eq.ppi_update'; $link_data['companionship'] = $companionship; - $link_data['interviewer'] = $supervisor; + $link_data['interviewer'] = $this->db2->f('interviewer'); $link_data['elder'] = $elder_id; $link_data['name'] = $name; $link_data['ppi'] = $this->db2->f('ppi'); @@ -967,7 +990,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 +1000,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 +1040,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 +1229,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 +1443,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 +1458,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 +1468,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 +1501,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 +1518,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(); }