projects
/
eq
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99caca5
)
fixed ordering of interviews/visits so that they show last one, clarified queries...
author
Owen Leonard
<owen@balawis.leonard.fam>
Sat, 2 Oct 2010 22:09:36 +0000
(16:09 -0600)
committer
Owen Leonard
<owen@balawis.leonard.fam>
Sat, 2 Oct 2010 22:09:36 +0000
(16:09 -0600)
inc/class.tc.inc.php
patch
|
blob
|
history
diff --git
a/inc/class.tc.inc.php
b/inc/class.tc.inc.php
index a1bdaf28b1a16f47670299291f073856c1d1bd7d..c64c6f38788eb0911fd3d3f227a420bea5024e6a 100644
(file)
--- 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' ".
// 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()) {
$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
}
// 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()) {
$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');
$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' ".
$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; }
$this->db2->query($sql,__LINE__,__FILE__);
if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@
-2506,7
+2506,7
@@
class tc
}
if($action == 'edit' || $action == 'view') {
}
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);
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
@@
-2669,7
+2669,7
@@
class tc
$month_end = "$year"."-"."$month"."-"."31";
$month = "$month"."/"."$year";
$sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ".
$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 .= "<th width=$int_width><font size=-2>$month</th>";
$this->db2->query($sql,__LINE__,__FILE__);
$header_row .= "<th width=$int_width><font size=-2>$month</th>";
@@
-2829,7
+2829,7
@@
class tc
}
if($action == 'edit' || $action == 'view') {
}
if($action == 'edit' || $action == 'view') {
- $sql = "SELECT * FROM tc_interview WHERE interview="
.$interview
;
+ $sql = "SELECT * FROM tc_interview WHERE interview="
. $interview . " AND interview_type='hti'"
;
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$this->t->set_var('interview',$interview);