X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=47dee2eccb243054f448a2bb54852aab0d608844;hb=10ad4c2678cb664844bfbc5066f0b817c6cb4a2f;hp=a1bdaf28b1a16f47670299291f073856c1d1bd7d;hpb=99caca5e48c5336900cde692cbe1dba0c0fb87cc;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index a1bdaf2..47dee2e 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -1537,7 +1537,7 @@ class tc
// If this individual has had a yearly PPI this year, don't show him on the schedule list
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
$sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
- "AND individual=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
@@ -1907,11 +1907,11 @@ class tc
}
// If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
- $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id'";
+ $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND interview_type='hti'";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$this->db2->next_record()) {
- $sql = "SELECT * FROM tc_interview WHERE individual='$id' ORDER BY date DESC";
+ $sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
$this->db3->query($sql,__LINE__,__FILE__);
if($this->db3->next_record()) {
$date = $this->db3->f('date');
@@ -2387,7 +2387,7 @@ class tc
$year = date('Y') - $m;
$year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
$sql = "SELECT * FROM tc_interview WHERE date > '$year_start' AND date < '$year_end' ".
- "AND individual=" . $id . " AND interview_type='ppi'";
+ "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2457,15 +2457,16 @@ class tc
$indiv = $this->db2->f('individual');
$interviewer_name = $this->db2->f('name');
if($indiv == $interviewer) {
- $this->t->set_var('interviewer',$interviewer . ' selected');
+ $this->t->set_var('interviewer',$indiv . ' selected');
} else {
- $this->t->set_var('interviewer',$interviewer);
+ $this->t->set_var('interviewer',$indiv);
}
+ #print "indiv: $indiv interviewer: $interviewer
";
$this->t->set_var('interviewer_name',$interviewer_name);
$this->t->set_var('eqpresppi_checked','checked');
$this->t->fp('int_list','interviewer_list',True);
}
-
+ #print "selected interviewer: $interviewer
";
if($action == 'save') {
$notes = get_var('notes',array('POST'));
$this->db->query("UPDATE tc_interview set " .
@@ -2506,7 +2507,7 @@ class tc
}
if($action == 'edit' || $action == 'view') {
- $sql = "SELECT * FROM tc_interview WHERE interview=".$interview;
+ $sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
@@ -2669,7 +2670,7 @@ class tc
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
$sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
- "AND individual=" . $individual;
+ "AND individual=" . $individual . " AND interview_type='hti' ORDER BY date DESC";
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "