From: Alan Pippin <apippin@pippins.net>
Date: Fri, 1 Oct 2010 20:13:09 +0000 (-0600)
Subject: Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenle... 
X-Git-Tag: release_1_0_0~5
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%24link?a=commitdiff_plain;h=7bb723fd27b007ab4f83131542012aee588625aa;hp=-c;p=eq%2F.git

Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenleonard/database_changes
---

7bb723fd27b007ab4f83131542012aee588625aa
diff --combined inc/class.tc.inc.php
index c44a589,a5e3138..45d012e
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@@ -1757,7 -1757,7 +1757,7 @@@ class t
  				$hti_pri = $entry['pri'];
  				//print "hti_notes: $hti_notes indiv_name: $indiv_name <Br>";
  				// 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'");
@@@ -3522,7 -3522,7 +3522,7 @@@
  		$this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched'));
  		$this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
  
 -		$date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
 +		$date_width=160; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100;
  		$table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width;
  		$header_row = "<th width=$date_width><font size=-2>Date</th>";
  		$header_row.= "<th width=$time_width><font size=-2>Time</th>";