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=6b2b8aa346d1c04c10038bf8555ec33d399f8d88;hpb=a09d03a95920d3698aa9c1dc7556b44451cfd24a;p=eq%2F.git
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 6b2b8aa..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');
}
@@ -160,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;
@@ -197,9 +202,14 @@ class eq
$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']; }
+ 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.= "
|
";
@@ -318,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())
@@ -334,7 +344,9 @@ class eq
// 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__);
@@ -369,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);
@@ -385,6 +398,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');
}
// Select all the unique companionship numbers for this district
@@ -409,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.= "
|
";
// 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'];
@@ -854,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);
@@ -868,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;
@@ -885,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'];
@@ -913,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
@@ -920,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--) {
@@ -944,7 +971,7 @@ 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 | ";
}
@@ -954,17 +981,20 @@ class eq
$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'] = $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;
@@ -974,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 .= " | "; }
}
@@ -1085,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())
@@ -1115,6 +1141,7 @@ class eq
" ppi='" . $ppi . "'" .
", interviewer='" . $interviewer . "'" .
", elder='" . $elder . "'" .
+ ", aaronic='" . $aaronic . "'" .
", date='" . $date . "'" .
", notes='" . $notes . "'" .
", eqpresppi='" . $eqpresppi . "'" .
@@ -1126,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;
@@ -1140,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);
@@ -1158,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'));
@@ -1696,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();
+ }
+
}
?>
|---|