X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=8f62c1bb89068af5648d85407d2e2a16d3389ce0;hb=f797899c6416d6731e4c014fd9b1cfd0dd94a829;hp=9e6f8e2df09cd95c9eb7f1be7e12d719c75e0b6f;hpb=4988a4401709530d1d8ca1f640a6d0c207e74f44;p=eq%2F.git diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 9e6f8e2..8f62c1b 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -37,7 +37,8 @@ class eq 'vis_view' => True, 'vis_update' => True, 'att_view' => True, - 'att_update' => True + 'att_update' => True, + 'dir_view' => True ); function eq() @@ -105,6 +106,9 @@ class eq $link_data['menuaction'] = 'eq.eq.att_view'; $this->t->set_var('link_attendance',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); $this->t->set_var('lang_attendance','Attendance'); + $link_data['menuaction'] = 'eq.eq.dir_view'; + $this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data)); + $this->t->set_var('lang_dir','Directory'); $this->t->pparse('out','eq_header'); } @@ -143,6 +147,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); @@ -159,6 +164,7 @@ class eq { $aaronic_id = $this->db->f('aaronic'); $aaronic[$aaronic_id]['name'] = $this->db->f('name'); + $aaronic[$aaronic_id]['phone'] = $this->db->f('phone'); } $total_families = 0; @@ -192,15 +198,21 @@ 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'); - if($elder_id) { $name = $elders[$elder_id]; } - else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } - $companion_table_entry .= "$name"; + if($elder_id) { + $name = $elders[$elder_id]; + $phone = $elder_phone[$elder_id]; + } + else if($aaronic_id) { + $name = $aaronic[$aaronic_id]['name']; + $phone = $aaronic[$aaronic_id]['phone']; + } + $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 +229,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 +258,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++; @@ -307,7 +328,7 @@ class eq if($action == 'save') { // Get a list of all the companionships in 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; while ($this->db->next_record()) @@ -317,6 +338,15 @@ 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. + + //$comp=$unique_companionships[$j]['companionship']; + //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district
"; // 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 +381,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); @@ -367,10 +398,11 @@ class eq { $aaronic_id = $this->db->f('aaronic'); $aaronic[$aaronic_id]['name'] = $this->db->f('name'); + $aaronic[$aaronic_id]['phone'] = $this->db->f('phone'); } // 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 +411,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 +423,21 @@ 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'); - if($elder_id) { $name = $elders[$elder_id]; } - else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } - $companion_table_entry .= "$name"; + if($elder_id) { + $name = $elders[$elder_id]; + $phone = $elder_phone[$elder_id]; + } + else if($aaronic_id) { + $name = $aaronic[$aaronic_id]['name']; + $phone = $aaronic[$aaronic_id]['phone']; + } + $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 +452,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 +874,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); @@ -850,6 +889,7 @@ class eq { $aaronic_id = $this->db->f('aaronic'); $aaronic[$aaronic_id]['name'] = $this->db->f('name'); + $aaronic[$aaronic_id]['phone'] = $this->db->f('phone'); } $total_companionships = 0; @@ -867,7 +907,7 @@ class eq // Select all the unique companionship numbers for this district if($eqpresppi == 1) { - $sql = "SELECT distinct companionship FROM eq_companionship"; + $sql = "SELECT distinct companionship FROM eq_companionship where valid=1"; } else { $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district']; @@ -895,6 +935,8 @@ class eq } $this->db->query($sql,__LINE__,__FILE__); $k=0; + $comp = $unique_companionships[$j]['companionship']; + for($m=$num_months; $m >= 0; $m--) { $ppi_recorded[$comp][$m] = 0; } while ($this->db->next_record()) { // Get this companions information @@ -902,23 +944,26 @@ class eq $companionship = $this->db->f('companionship'); $elder_id = $this->db->f('elder'); $aaronic_id = $this->db->f('aaronic'); - if($elder_id) { $name = $elders[$elder_id]; } - else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; } + if($elder_id) { + $name = $elders[$elder_id]; + $phone = $elder_phone[$elder_id]; + } + else if($aaronic_id) { + $name = $aaronic[$aaronic_id]['name']; + $phone = $aaronic[$aaronic_id]['phone']; + } $link_data['menuaction'] = 'eq.eq.ppi_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $supervisor; $link_data['elder'] = $elder_id; + $link_data['aaronic'] = $aaronic_id; $link_data['name'] = $name; $link_data['ppi'] = ''; $link_data['eqpresppi'] = $eqpresppi; $link_data['action'] = 'add'; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - if($aaronic_id == 0) { - $table_data.= "$name"; - } else { - $table_data.= "$name"; - } - + $table_data.= "$name"; + // Find out how many times PPIs were performed in the past $num_months for this Elder $header_row="Companionship"; for($m=$num_months; $m >= 0; $m--) { @@ -926,26 +971,30 @@ class eq $year = date('Y') - $m; $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01"; $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ". - "AND elder=" . $elder_id . " AND eqpresppi=1"; + "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=1"; $this->db2->query($sql,__LINE__,__FILE__); $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"; + "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=0"; $this->db2->query($sql,__LINE__,__FILE__); $header_row .= "$month"; } if(!$total_ppis[$m]) { $total_ppis[$m] = 0; } if($this->db2->next_record()) { - $ppis[$m]++; $total_ppis[$m]++; + if(!$ppi_recorded[$companionship][$m]) { + $ppis[$m]++; $total_ppis[$m]++; $ppi_recorded[$companionship][$m]=1; + } $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['aaronic'] = $aaronic_id; $link_data['name'] = $name; $link_data['ppi'] = $this->db2->f('ppi'); $link_data['eqpresppi'] = $eqpresppi; @@ -955,12 +1004,7 @@ class eq $month = $date_array[1]; $day = $date_array[2]; $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); - - if($aaronic_id == 0) { - $table_data .= '
'.$month.'-'.$day.''; - } else { - $table_data .= ''; - } + $table_data .= '
'.$month.'-'.$day.''; } else { $table_data .= " "; } } @@ -1066,10 +1110,11 @@ class eq $name = get_var('name',array('GET','POST')); $ppi = get_var('ppi',array('GET','POST')); $elder = get_var('elder',array('GET','POST')); + $aaronic = get_var('aaronic',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); $eqpresppi = get_var('eqpresppi',array('GET','POST')); - + $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) @@ -1096,6 +1141,7 @@ class eq " ppi='" . $ppi . "'" . ", interviewer='" . $interviewer . "'" . ", elder='" . $elder . "'" . + ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . ", eqpresppi='" . $eqpresppi . "'" . @@ -1107,8 +1153,8 @@ class eq if($action == 'insert') { $notes = $this->db->db_addslashes(get_var('notes',array('POST'))); - $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" + $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) " + . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" . $date . "','" . $notes . "','" . $eqpresppi ."')",__LINE__,__FILE__); $this->ppi_view(); return false; @@ -1121,6 +1167,7 @@ class eq $this->t->set_var('interviewer', $interviewer); $this->t->set_var('name',$name); $this->t->set_var('elder',$elder); + $this->t->set_var('aaronic',$aaronic); $this->t->set_var('date',''); $this->t->set_var('notes',''); $this->t->set_var('eqpresppi',$eqpresppi); @@ -1139,6 +1186,7 @@ class eq $this->t->set_var('name',$name); $this->t->set_var('interviewer', $this->db->f('interviewer')); $this->t->set_var('elder',$this->db->f('elder')); + $this->t->set_var('aaronic',$this->db->f('aaronic')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); $this->t->set_var('eqpresppi',$this->db->f('eqpresppi')); @@ -1420,7 +1468,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']; @@ -1434,6 +1483,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']); @@ -1441,7 +1493,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'; @@ -1472,6 +1526,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 .= ' '; @@ -1484,6 +1543,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(); } @@ -1637,6 +1725,14 @@ class eq $this->save_sessiondata(); } + function dir_view() + { + $this->t->set_file(array('form' => 'dir_view.tpl')); + + $this->t->pfp('out','form'); + $this->save_sessiondata(); + } + } ?>