X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/checkmark.gif?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=a1bdaf28b1a16f47670299291f073856c1d1bd7d;hb=99caca5e48c5336900cde692cbe1dba0c0fb87cc;hp=409b87e6bf0cd05a0709f1f70a132d26aa42b206;hpb=2c76842b2a7410be2e1231bf3cbc369303f784b2;p=eq%2F.git
diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 409b87e..a1bdaf2 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -255,7 +255,7 @@ class tc
for ($j=0; $j < count($unique_companionships); $j++) {
$companion_table_entry = "";
// Select all the companions in each companionship
- $sql = "SELECT * FROM tc_companionship where valid=1 and ".
+ $sql = "SELECT * FROM tc_companion where valid=1 and ".
"companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
@@ -725,7 +725,7 @@ class tc
$this->db->query("UPDATE tc_activity set " .
" assignment='" . $activity['assignment'] .
"', date='" . $activity['date'] . "'" .
- ", notes='" . $activity['notes'] . "'" .
+ ", notes=\"" . $activity['notes'] . "\"" .
" WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
// Delete all the individuals who have particiapted in this activity
@@ -750,10 +750,10 @@ class tc
$activity['notes']= get_var('notes',array('POST'));
$this->db->query("INSERT INTO tc_activity (assignment,date,notes) " .
"VALUES ('" . $activity['assignment'] . "','" .
- $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
+ $activity['date'] . "',\"" . $activity['notes'] . "\")",__LINE__,__FILE__);
$sql = "SELECT * FROM tc_activity WHERE assignment='".$activity['assignment']."' " .
- " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
+ " AND date='".$activity['date']."' AND notes=\"".$activity['notes']."\"";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record()) {
//print "activity: " . $this->db->f('activity') . " ";
@@ -825,7 +825,7 @@ class tc
$this->t->set_var('assignment_data',$assignment_data);
// Create individual selection boxes
- $sql = "SELECT * FROM tc_individual";
+ $sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship'";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -996,8 +996,7 @@ class tc
$this->t->set_block('par_view_t','header_list','list1');
$this->t->set_block('par_view_t','individual_list','list2');
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -1107,8 +1106,7 @@ class tc
}
$this->t->set_var('filter_input',$filter_input);
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
while ($this->db->next_record()) {
@@ -1431,8 +1429,7 @@ class tc
}
// create the individual id -> individual name mapping
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where valid=1 and steward='$this->default_stewardship' ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$individual = NULL;
@@ -1513,8 +1510,7 @@ class tc
$this->t->set_var('appt_table_width',$appt_table_width);
// PPI SCHEDULING TABLE
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='Elder' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC";
+ $sql = "SELECT * FROM tc_individual AS ti JOIN tc_scheduling_priority AS tsp WHERE ti.scheduling_priority=tsp.scheduling_priority AND steward='$this->default_stewardship' AND valid=1 ORDER BY tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
@@ -1683,8 +1679,7 @@ class tc
//print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end ";
// create the individual id -> individual name mapping
- // TODO: changed this so it picks the quorum dynamically
- $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC";
+ $sql = "SELECT * FROM tc_individual where steward='$this->default_stewardship' and valid=1 ORDER BY name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$individual_data = NULL;
@@ -1725,11 +1720,6 @@ class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_id');
- }
- $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
- $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@ -1762,7 +1752,7 @@ class tc
$hti_pri = $entry['pri'];
//print "hti_notes: $hti_notes indiv_name: $indiv_name ";
// Perform database save actions here
- $this->db->query("SELECT * FROM tc_companionship WHERE individual=$individual and valid=1",__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM tc_companion WHERE individual=$individual and valid=1",__LINE__,__FILE__);
if ($this->db->next_record()) {
$scheduling_priority = $this->db->f('scheduling_priority');
//$this->logToFile("int_sched", "UPDATE tc_scheduling_priority SET priority='$hti_pri', notes=\"$hti_notes\" WHERE scheduling_priority='$scheduling_priority'");
@@ -1809,11 +1799,6 @@ class tc
$supervisor_last_name = $supervisor_array[0];
$sql = "SELECT * FROM tc_individual where individual='$supervisor'";
$this->db2->query($sql,__LINE__,__FILE__);
- if($this->db2->next_record()) {
- $mls_id = $this->db2->f('mls_id');
- }
- $sql = "SELECT * FROM tc_individual where mls_id='$mls_id'";
- $this->db2->query($sql,__LINE__,__FILE__);
if($this->db2->next_record()) {
$supervisor_address = $this->db2->f('address');
}
@@ -1889,7 +1874,7 @@ class tc
$i=0;
for ($j=0; $j < count($unique_companionships); $j++) {
// Select all the companions from each companionship
- $sql = "SELECT * FROM tc_companionship AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
+ $sql = "SELECT * FROM tc_companion AS tc JOIN (tc_scheduling_priority AS tsp, tc_individual AS ti) WHERE tc.scheduling_priority=tsp.scheduling_priority AND tc.individual=ti.individual AND tc.valid=1 AND tc.companionship=". $unique_companionships[$j]['companionship'];
$this->db->query($sql,__LINE__,__FILE__);
$k=0; $int_completed=0;
$comp = $unique_companionships[$j]['companionship'];
@@ -1938,6 +1923,7 @@ class tc
$link_data['name'] = $name;
$link_data['interview'] = '';
$link_data['action'] = 'add';
+ $link_data['interview_type'] = 'hti';
$link_data['interviewer'] = $districts[$d]['supervisor'];
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$table_data.= "
";
@@ -1967,6 +1953,7 @@ class tc
$link_data['individual'] = $this->db2->f('individual');
$link_data['name'] = $name;
$link_data['interview'] = $this->db2->f('interview');
+ $link_data['interview_type'] = 'hti';
$link_data['action'] = 'view';
$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
$comps_with_quarterly_int++;
@@ -2056,7 +2043,7 @@ class tc
$year = date('Y');
// create the family id -> family name mapping
- $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY ti.name ASC";
+ $sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
$family_id = NULL;
@@ -2107,12 +2094,10 @@ class tc
$visit_notes = $entry['notes'];
$family = $entry['family_id'];
$visit_pri = $entry['pri'];
-
// Perform database save actions here
$this->db->query("SELECT * FROM tc_family WHERE family='$family'",__LINE__,__FILE__);
if ($this->db->next_record()) {
$scheduling_priority = $this->db->f('scheduling_priority');
- //$this->logToFile("vis_sched", "UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'");
$this->db2->query("UPDATE tc_scheduling_priority SET priority='$visit_pri', notes=\"$visit_notes\" WHERE scheduling_priority='$scheduling_priority'", __LINE__, __FILE__);
}
}
@@ -2196,7 +2181,7 @@ class tc
// VISIT SCHEDULING TABLE
- $sql = "SELECT * FROM tc_family AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 ORDER BY tsp.priority ASC, ti.name ASC";
+ $sql = "SELECT * FROM tc_family AS tf JOIN (tc_scheduling_priority AS tsp, tc_individual as ti) WHERE tf.scheduling_priority=tsp.scheduling_priority AND tf.individual=ti.individual AND tf.valid=1 AND tf.individual != 0 AND tf.companionship != 0 AND ti.steward='$this->default_stewardship' ORDER BY tsp.priority ASC, ti.name ASC";
$this->db->query($sql,__LINE__,__FILE__);
$total_families=0; $families_with_yearly_visit=0;
@@ -2232,7 +2217,7 @@ class tc
$table_data.= "