X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=35357da8cddd39774b2103b78bdc1af406a6df32;hb=313ff5eba49eb7284ad6d8d6e0439c776af9d670;hp=6c80090beb3fa8560297662d70df92300cfc8e95;hpb=fb4fe3b1180e8c1178007e1d2e593f8970bd4c13;p=eq%2F.git

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 6c80090..35357da 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -92,6 +92,11 @@ class tc
 		$this->grants     = $GLOBALS['phpgw']->acl->get_grants('tc');
 		$this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
 
+		$GLOBALS['phpgw_info']['flags']['css'] .= "-->\n</style>\n"
+		   . '<link rel="stylesheet" type="text/css" media="all" href="'
+		   . $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.css').'"/>'
+		   . "\n<style type=\"text/css\">\n<!--\n";
+
 		$this->jscal = CreateObject('tc.jscalendar');   // before phpgw_header() !!!
 		$this->cal_options = 'daFormat    : "%Y-%m-%d",
 		                      ifFormat    : "%Y-%m-%d",
@@ -401,6 +406,7 @@ class tc
 	function ht_sandbox()
 	{
 		$this->t->set_file(array('ht_sandbox_t' => 'ht_sandbox.tpl'));
+	    $this->t->set_block('ht_sandbox_t','switch_case_list','sc_list');
 		$this->t->set_block('ht_sandbox_t','comp_list','c_list');
 		$this->t->set_block('ht_sandbox_t','district_list','d_list');
 		$this->t->set_block('ht_sandbox_t','unassigned_ht_list','uht_list');
@@ -410,24 +416,173 @@ class tc
 		$this->t->set_block('ht_sandbox_t','district_table_list','dt_list');
 		$this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list');
 
-		$this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox'));
+		$this->t->set_var('submit_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox&action=add'));
+	    $this->t->set_var('jquery_url',$GLOBALS['phpgw']->link('inc/jquery/jquery.js'));
+		 
+	    $action = get_var('action',array('GET','POST'));
 
-		$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ht_sandbox'));
 		$this->t->set_var('title','Hometeaching Sandbox'); 
 
+		if ($_POST['add']) {
+			#$this->t->set_var('debug_list',$_POST['add']);
+			$companionship = get_var('companionship',array('POST'));
+			$district = get_var('district',array('POST'));
+			$assignedHT_list = get_var('assignedHT',array('POST'));
+			$unassignedHT_list = get_var('unassignedHT',array('POST'));
+			$assigned_family_list = get_var('assignedFamiles',array('POST'));
+			$unassigned_family_list = get_var('unassignedFamilies',array('POST'));
+			
+			if ($assignedHT_list || $unassignedHT_list) {
+				$sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"NULL\",\"$district\")";
+				$this->db2->query($sql,__LINE__,__FILE__);
+				$companionship_sandbox = mysql_insert_id();
+				
+				foreach ($assignedHT_list as $individual) {
+					$sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+					$this->db->query($sql,__LINE__,__FILE__);
+				}
+				foreach ($unassignedHT_list as $individual) {
+					$sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+					$this->db->query($sql,__LINE__,__FILE__);
+				}
+				foreach ($assigned_family_list as $family) {
+					$sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
+					$this->db->query($sql,__LINE__,__FILE__);
+				}
+				foreach ($unassigned_family_list as $family) {
+					$sql = "UPDATE tc_family_sandbox SET companionship=$companionship_sandbox WHERE family=$family";
+					$this->db->query($sql,__LINE__,__FILE__);
+				}
+			} else {
+				$this->t->set_var('debug_list','You must select at least one companion!');
+			}
+		} else if ($_POST['delete']) {
+			#$this->t->set_var('debug_list',$_POST['delete']);
+			$companionship = get_var('companionship',array('POST'));
+			#$this->t->set_var('debug_list',$companionship);
+			
+			if ($companionship > 0) {
+				# unassign families
+				$sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
+				$this->db->query($sql,__LINE__,__FILE__);
+				
+				# remove companions
+				$sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
+				$this->db->query($sql,__LINE__,__FILE__);
+				
+				# remove companionship
+				$sql = "DELETE FROM tc_companionship_sandbox WHERE companionship=$companionship";
+				$this->db->query($sql,__LINE__,__FILE__);
+			} else {
+				$this->t->set_var('debug_list','You must select a companionship to delete!');
+			}
+		} else if ($_POST['update']) {
+			#$this->t->set_var('debug_list',$_POST['update']);
+			$companionship = get_var('companionship',array('POST'));
+			$district = get_var('district',array('POST'));
+			$assignedHT_list = get_var('assignedHT',array('POST'));
+			$unassignedHT_list = get_var('unassignedHT',array('POST'));
+			$assigned_family_list = get_var('assignedFamiles',array('POST'));
+			$unassigned_family_list = get_var('unassignedFamilies',array('POST'));
+			#$this->t->set_var('debug_list',$district);
+			
+			if ($companionship > 0) {
+				if ($assignedHT_list || $unassignedHT_list) {
+					# clear out existing info about companionship
+					$sql = "UPDATE tc_family_sandbox SET companionship=NULL WHERE companionship=$companionship";
+					$this->db->query($sql,__LINE__,__FILE__);
+					$sql = "DELETE FROM tc_companion_sandbox WHERE companionship=$companionship";
+					$this->db->query($sql,__LINE__,__FILE__);
+					
+					# set new info about companionship
+					$sql = "UPDATE tc_companionship_sandbox SET district=$district WHERE companionship=$companionship";
+					$this->db->query($sql,__LINE__,__FILE__);
+					foreach ($assignedHT_list as $individual) {
+						$sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
+						$this->db->query($sql,__LINE__,__FILE__);
+					}
+					foreach ($unassignedHT_list as $individual) {
+						$sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship\")";
+						$this->db->query($sql,__LINE__,__FILE__);
+					}
+					foreach ($assigned_family_list as $family) {
+						$sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
+						$this->db->query($sql,__LINE__,__FILE__);
+					}
+					foreach ($unassigned_family_list as $family) {
+						$sql = "UPDATE tc_family_sandbox SET companionship=$companionship WHERE family=$family";
+						$this->db->query($sql,__LINE__,__FILE__);
+					}
+				} else {
+					$this->t->set_var('debug_list','You must select at least one companion!');
+				}
+			} else {
+				$this->t->set_var('debug_list','You must select a companionship to update!');
+			}
+		} else if ($_POST['reset']) {
+			#$this->t->set_var('debug_list',$_POST['reset']);
+			
+			$sql = "TRUNCATE TABLE tc_district_sandbox";
+			$this->db->query($sql,__LINE__,__FILE__);
+			$sql = "TRUNCATE TABLE tc_family_sandbox";
+			$this->db->query($sql,__LINE__,__FILE__);
+			$sql = "TRUNCATE TABLE tc_companion_sandbox";
+			$this->db->query($sql,__LINE__,__FILE__);
+			$sql = "TRUNCATE TABLE tc_companionship_sandbox";
+			$this->db->query($sql,__LINE__,__FILE__);
+			
+			# populate tc_district_sandbox
+			$sql = "SELECT * FROM tc_district WHERE valid=1";
+			$this->db->query($sql,__LINE__,__FILE__);
+			while ($this->db->next_record()) {
+				$district = $this->db->f('district');
+				$supervisor = $this->db->f('supervisor');
+				$sql = "INSERT INTO tc_district_sandbox (district,supervisor) VALUES (\"$district\",\"$supervisor\")";
+				$this->db2->query($sql,__LINE__,__FILE__);
+			}
+			
+			# populate family, companion, and companionship tables
+			$sql = "SELECT * FROM tc_companionship WHERE valid=1";
+			$this->db->query($sql,__LINE__,__FILE__);
+			while ($this->db->next_record()) {
+				$companionship = $this->db->f('companionship');
+				$district = $this->db->f('district');
+				$sql = "INSERT INTO tc_companionship_sandbox (tc_companionship,district) VALUES (\"$companionship\",\"$district\")";
+				$this->db2->query($sql,__LINE__,__FILE__);
+				$companionship_sandbox = mysql_insert_id();
+				
+				$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship AND tc.valid=1 AND ti.valid=1";
+				$this->db2->query($sql,__LINE__,__FILE__);
+				while ($this->db2->next_record()) {
+					$individual = $this->db2->f('individual');
+					$sql = "INSERT INTO tc_companion_sandbox (individual,companionship) VALUES (\"$individual\",\"$companionship_sandbox\")";
+					$this->db3->query($sql,__LINE__,__FILE__);
+				}
+				
+				$sql = "SELECT * FROM tc_family WHERE companionship=$companionship AND valid=1";
+				$this->db2->query($sql,__LINE__,__FILE__);
+				while ($this->db2->next_record()) {
+					$individual = $this->db2->f('individual');
+					$family = $this->db2->f('family');
+					$sql = "INSERT INTO tc_family_sandbox (tc_family,individual,companionship) VALUES (\"$family\",\"$individual\",\"$companionship_sandbox\")";
+					$this->db3->query($sql,__LINE__,__FILE__);
+				}
+			}
+		}
+		
 		// get list of companionships
-		$sql = "SELECT DISTINCT companionship FROM tc_companionship where valid=1 ORDER BY companionship ASC";
+		$sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox ORDER BY companionship ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$unique_companionships = '';
 		$unique_companionships[0]['companionship'] = 0;
-		$this->t->set_var('companionship_list','<option value="0">New</option>');
-		$this->t->fp('list','comp_list',True);
+		$this->t->set_var('companionship_list','<option value="0">New Companionship</option>');
+		$this->t->fp('c_list','comp_list',True);
 		$j=1;
 		while ($this->db->next_record()) {
 			$companionship = $this->db->f('companionship');
 			$unique_companionships[$j]['companionship'] = $companionship;
 			$combined_companionship = "";
-			$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship AND tc.valid=1 ORDER BY ti.name ASC";
+			$sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship ORDER BY ti.name ASC";
 			$this->db2->query($sql,__LINE__,__FILE__);
 			while ($this->db2->next_record()) {
 				if ($combined_companionship == "") {
@@ -436,19 +591,19 @@ class tc
 					$combined_companionship .= " / " . $this->db2->f('name');
 				}
 			}
-			$this->t->set_var('companionship_list','<option value="'.$j.'">'.$combined_companionship.'</option>');
+			$this->t->set_var('companionship_list','<option value="'.$companionship.'">'.$combined_companionship.'</option>');
 			$this->t->fp('c_list','comp_list',True);
 			$j++;
 		}
 
 		# get list of districts
-		$sql = "SELECT DISTINCT district FROM tc_district WHERE valid=1 ORDER BY district ASC";
+		$sql = "SELECT DISTINCT district FROM tc_district_sandbox ORDER BY district ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$districts = '';
 		$num_districts=0;
 		while ($this->db->next_record()) {
 			$districts[$num_districts] = $this->db->f('district');
-			$this->t->set_var('district','<option value="'.$num_districts.'">'.$districts[$num_districts].'</option>');
+			$this->t->set_var('district','<option value="'.$districts[$num_districts].'">'.$districts[$num_districts].'</option>');
 			$this->t->fp('d_list','district_list',True);
 			$num_districts++;
 		}
@@ -456,51 +611,33 @@ class tc
 		# get list of individuals who are and are not home teachers
 		$sql = "SELECT * FROM tc_individual WHERE steward='$this->default_stewardship' AND valid=1 ORDER BY name ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
-		$unassigned_ht = '';
-		$assigned_ht = '';
-		$num_ht_assigned=0; $num_ht_unassigned=0;
 		while ($this->db->next_record()) {
 			$individual = $this->db->f('individual');
 			$name = $this->db->f('name');
-			$sql = "SELECT DISTINCT * FROM tc_companion WHERE individual=$individual AND valid=1";
+			$sql = "SELECT DISTINCT * FROM tc_companion_sandbox WHERE individual=$individual";
 			$this->db2->query($sql,__LINE__,__FILE__);
 			if ($this->db2->next_record()) {
-				$assigned_ht[$num_ht_assigned]['individual'] = $individual;
-				$assigned_ht[$num_ht_assigned]['name'] = $name;
-				$this->t->set_var('assigned_ht','<option value="'.$num_ht_assigned.'">'.$name.'</option>');
+				$this->t->set_var('assigned_ht','<option value="'.$individual.'">'.$name.'</option>');
 				$this->t->fp('aht_list','assigned_ht_list',True);
-				$num_ht_assigned++;
 			} else {
-				$unassigned_ht[$num_ht_unassigned]['individual'] = $individual;
-				$unassigned_ht[$num_ht_unassigned]['name'] = $name;
-				$this->t->set_var('unassigned_ht','<option value="'.$num_ht_unassigned.'">'.$name.'</option>');
+				$this->t->set_var('unassigned_ht','<option value="'.$individual.'">'.$name.'</option>');
 				$this->t->fp('uht_list','unassigned_ht_list',True);
-				$num_ht_unassigned++;
 			}
 		}
 		
 		# get list of families who are and are not assigned home teachers
-		$sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.valid=1 ORDER BY ti.name ASC";
+		$sql = "SELECT * FROM tc_family_sandbox AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual ORDER BY ti.name ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
-		$unassigned_families = '';
-		$assigned_families = '';
-		$num_families_assigned=0; $num_families_unassigned=0;
 		while ($this->db->next_record()) {
 			$individual = $this->db->f('individual');
 			$family = $this->db->f('family');
 			$name = $this->db->f('name');
 			if ($this->db->f('companionship') != 0) {
-				$assigned_families[$num_families_assigned]['family'] = $family;
-				$assigned_families[$num_families_assigned]['name'] = $name;
-				$this->t->set_var('assigned_family','<option value="'.$num_families_assigned.'">'.$name.' Family</option>');
+				$this->t->set_var('assigned_family','<option value="'.$family.'">'.$name.' Family</option>');
 				$this->t->fp('af_list','assigned_family_list',True);
-				$num_families_assigned++;
 			} else {
-				$unassigned_families[$num_families_unassigned]['family'] = $family;
-				$unassigned_families[$num_families_unassigned]['name'] = $name;
-				$this->t->set_var('unassigned_family','<option value="'.$num_families_assigned.'">'.$name.' Family</option>');
+				$this->t->set_var('unassigned_family','<option value="'.$family.'">'.$name.' Family</option>');
 				$this->t->fp('uf_list','unassigned_family_list',True);
-				$num_families_unassigned++;
 			}
 		}
 		
@@ -518,13 +655,21 @@ class tc
 		for ($d = 0; $d < $num_districts; $d++) {
 			$sandbox_table_data .= "<td valign=\"Top\">";
 			$sandbox_table_data .= "<table>";
-			$sql = "SELECT DISTINCT companionship FROM tc_companionship WHERE district=$districts[$d] AND valid=1 ORDER BY companionship ASC";
+			$sql = "SELECT DISTINCT companionship FROM tc_companionship_sandbox WHERE district=$districts[$d] ORDER BY companionship ASC";
 			$this->db->query($sql,__LINE__,__FILE__);
 			while ($this->db->next_record()) {
+			    $switch_case_list = "";
 				$sandbox_table_data .= "<tr><td><table>";
 				$companionship = $this->db->f('companionship');
+
+			    $switch_case_list .= "case '". $companionship ."':\n";
+				$switch_case_list .= "  $(\"#district option:selected\").removeAttr(\"selected\");\n";
+				$switch_case_list .= "  $(\"#assignedHT option:selected\").removeAttr(\"selected\");\n";
+				$switch_case_list .= "  $(\"#assignedFamilies option:selected\").removeAttr(\"selected\");\n";
+				$switch_case_list .= "  $(\"#district option[value='".$districts[$d]."']\").attr(\"selected\",true);\n";
+
 				# get names of companions in this companionship
-				$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship AND tc.valid=1 ORDER BY ti.name ASC";
+				$sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND companionship=$companionship ORDER BY ti.name ASC";
 				$this->db2->query($sql,__LINE__,__FILE__);
 				$companion_names = "";
 				while ($this->db2->next_record()) {
@@ -533,21 +678,29 @@ class tc
 					} else {
 						$companion_names .= " / " . $this->db2->f('name');
 					}
+					$individual = $this->db2->f('individual');
+					$switch_case_list .= "  $(\"#assignedHT option[value='".$individual."']\").attr(\"selected\",true);\n";
 				}
-				$sandbox_table_data .= "<tr><th align=\"Left\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
-				$sandbox_table_data .= "<tr><td><table>";
+				$this->nextmatchs->template_alternate_row_color(&$this->t);
+				$sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+				$sandbox_table_data .= "<th bgcolor=#d3dce3 align=\"Left\">$companion_names</th></tr>";
+				$sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><table>";
 				
 				# get families they visit
-				$sql = "SELECT * FROM tc_companionship AS tcp JOIN (tc_family AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual AND tcp.valid=1";
+				$sql = "SELECT * FROM tc_companionship_sandbox AS tcp JOIN (tc_family_sandbox AS tf, tc_individual AS ti) WHERE tcp.companionship=$companionship AND tcp.companionship=tf.companionship AND tf.individual=ti.individual";
 				$this->db2->query($sql,__LINE__,__FILE__);
 				while ($this->db2->next_record()) {
 					$family_name = $this->db2->f('name') . " Family";
-					$family_id = $this->db2->f('family');
-					$sandbox_table_data .= "<tr>";
-					$sandbox_table_data .= "<td>$family_name</td>";
-					
+					$family_id = $this->db2->f('tc_family');
+				    $family = $this->db2->f('family');
+					$tc_companionship = $this->db2->f('tc_companionship');
+				    $this->nextmatchs->template_alternate_row_color(&$this->t);
+				    $sandbox_table_data .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+					$sandbox_table_data .= "<td align=\"Left\" width=\"1000\">$family_name</td>";
+				    $switch_case_list .= "  $(\"#assignedFamilies option[value='".$family."']\").attr(\"selected\",true);\n";
+				  
 					# get 12 months visit data for given family
-					for($m=12; $m >= 0; $m--) {
+					for($m=$this->sandbox_stats_num_months; $m > 0; $m--) {
 						$month = $this->current_month - $m;
 						$year = $this->current_year;
 						if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; }
@@ -556,14 +709,18 @@ class tc
 						$month_end = "$year"."-"."$month"."-"."31";
 						$month = "$month"."/"."$year";
 
-						$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id;
+						if ($this->sandbox_visits_comp_only == 0) {
+							$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship!=0 AND family=". $family_id;
+						} else {
+							$sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' AND companionship=$tc_companionship AND family=". $family_id;
+						}
 						$query_id = $this->db3->query($sql,__LINE__,__FILE__);
 
 						if($this->db3->next_record()) {
 							if($this->db3->f('visited') == 'y') {
-								$sandbox_table_data .= '<td align=center><img src="images/checkmark.gif"></td>';
+								$sandbox_table_data .= "<td align=\"Right\"><img src=\"images/checkmark.gif\"></td>";
 							} else if($this->db3->f('visited') == 'n') {
-								$sandbox_table_data .= '<td align=center><img src="images/x.gif"></td>';
+								$sandbox_table_data .= "<td align=\"Right\"><img src=\"images/x.gif\"></td>";
 							} else {
 								$sandbox_table_data .= "<td>&nbsp;</td>";
 							}
@@ -575,8 +732,10 @@ class tc
 				}
 				$sandbox_table_data .= "</table></td></tr>";
 				$sandbox_table_data .= "</table></td></tr>";
+				$switch_case_list .= "break;\n";
+				$this->t->set_var('switch_case_list',$switch_case_list);
+				$this->t->fp('sc_list','switch_case_list',True);
 			}
-			
 			$sandbox_table_data .= "</table>";
 			$sandbox_table_data .= "</td>";
 		}
@@ -1547,7 +1706,7 @@ class tc
 		$this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
 		$this->t->set_block('ppi_sched_t','individual_list','indivlist');
 		$this->t->set_block('ppi_sched_t','appt_list','apptlist');
-	    $action = get_var('action',array('GET','POST'));
+		$action = get_var('action',array('GET','POST'));
 
 		$this->t->set_var('lang_save','Save Appt / Pri / Notes');
 		$this->t->set_var('lang_reset','Clear Changes');
@@ -1561,13 +1720,11 @@ class tc
 		$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.ppi_sched&action=save'));
 		$this->t->set_var('title',$this->ppi_frequency_label . ' PPI Scheduler');
 
-		$indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20;
-		$table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width;
-		$header_row = "<th width=$indiv_width><font size=-2>individual Name</th>";
-		$header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-		$header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-		$header_row.= "<th width=$ppi_date_width><font size=-2>Last PPI</th>";
-		$header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+		$header_row = "<th ><font size=-2>Individual Name</th>";
+		$header_row.= "<th><font size=-2>Phone</th>";
+		$header_row.= "<th><font size=-2>Priority</th>";
+		$header_row.= "<th><font size=-2>Last PPI</th>";
+		$header_row.= "<th><font size=-2>Scheduling Notes</th>";
 		$table_data=""; $completed_data=""; $totals_data="";
 
 		$year = date('Y');
@@ -1638,12 +1795,10 @@ class tc
 		array_multisort($indiv_name, $individual);
 
 		// APPOINTMENT TABLE
-		$date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
-		$appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
-		$appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
-		$appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-		$appt_header_row.= "<th width=$indiv_width><font size=-2>Individual</th>";
-		$appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+		$appt_header_row = "<th><font size=-2>Date</th>";
+		$appt_header_row.= "<th><font size=-2>Time</th>";      
+		$appt_header_row.= "<th><font size=-2>Individual</th>";
+		$appt_header_row.= "<th><font size=-2>Location</th>";
 		$appt_table_data = "";
 		$table_data="";
 
@@ -1665,10 +1820,8 @@ class tc
 		  $appt_table_data = "";
 
 		  // Display a scheduling table for this presidency member
-		  $district_number = '*';
-		  $district_name = $presidency_name;
-		  $not_completed_table_title = "District ".$district_number.": ".$district_name.": All indivs with " . $this->ppi_frequency_label . " PPI Not Completed";
-		  $appt_table_title = "District ".$district_number.": ".$district_name.": ".$this->ppi_frequency_label." PPI Appointment Slots";
+		  $not_completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Not Completed";
+		  $appt_table_title = $presidency_name . ": " . $this->ppi_frequency_label." PPI Appointment Slots";
 		  $this->t->set_var('not_completed_table_title',$not_completed_table_title);
 		  $this->t->set_var('appt_table_title',$appt_table_title);
 
@@ -1719,7 +1872,8 @@ class tc
 		  }
 		  $this->t->set_var('appt_table_data',$appt_table_data);
 		  $this->t->set_var('appt_header_row',$appt_header_row);
-		  $this->t->set_var('appt_table_width',$appt_table_width);
+       		  $this->t->set_var('lang_save','Save Appts for ' . $presidency_name);
+
 		  $this->t->fp('apptlist','appt_list',True);
 		}
 		
@@ -1817,27 +1971,22 @@ class tc
 			}
 		} // End for individuals Loop
 
-		$completed_table_title = "District ".$district_number.": ".$district_name.": All indivs with " . $this->ppi_frequency_label . " PPI Completed";
-		$name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
-		$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
-		$completed_header_row = "<th width=$name_width><font size=-2>Individual</th>";
-		$completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-		$completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-		$completed_header_row.= "<th width=$notes_width><font size=-2>PPI Notes</th>";
+		$completed_table_title = "All individuals with " . $this->ppi_frequency_label . " PPI Completed";
+		$completed_header_row = "<th><font size=-2>Individual</th>";
+		$completed_header_row.= "<th><font size=-2>Phone</th>";      
+		$completed_header_row.= "<th><font size=-2>Date</th>";
+		$completed_header_row.= "<th><font size=-2>PPI Notes</th>";
 
 		$this->t->set_var('completed_table_title',$completed_table_title);
-		$this->t->set_var('table_width',$table_width);
 		$this->t->set_var('header_row',$header_row);
 		$this->t->set_var('table_data',$table_data);
 		$this->t->set_var('completed_header_row',$completed_header_row);
-		$this->t->set_var('completed_table_width',$completed_table_width);
 		$this->t->set_var('completed',$completed_data);
+		$this->t->set_var('lang_save','Save Pri / Notes'); 
 		$this->t->fp('indivlist','individual_list',True); 
 
-		$indivs_width=300; $totals_width=100;
-		$totals_table_width=$indivs_width + $totals_width;
-		$totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
-		$totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+		$totals_header_row = "<th><font size=-2>Individuals</th>";
+		$totals_header_row.= "<th><font size=-2>$year</th>";
 		$totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
 		$totals_data.= "<td align=left><font size=-2><b>Total Individuals with " . $this->ppi_frequency_label . " PPIs completed:</b></font></td>";
 		$totals_data.= "<td align=center><font size=-2><b>$indivs_with_yearly_ppi / $total_indivs</b></font></td>";
@@ -1851,7 +2000,7 @@ class tc
 
 		$this->t->set_var('totals',$totals_data);
 		$this->t->set_var('totals_header_row',$totals_header_row);
-		$this->t->set_var('totals_table_width',$totals_table_width);
+		$this->t->set_var('ppi_frequency_label',$this->ppi_frequency_label);
 
 		$this->t->pfp('out','ppi_sched_t');
 		$this->save_sessiondata(); 
@@ -1865,7 +2014,6 @@ class tc
 		$this->t->set_block('int_sched_t','appt_list','apptlist');
 		$action = get_var('action',array('GET','POST'));
 
-		$this->t->set_var('lang_save','Save Appt / Pri / Notes');
 		$this->t->set_var('lang_reset','Clear Changes');
 
 		$this->t->set_var('int_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_view'));
@@ -1877,13 +2025,11 @@ class tc
 		$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched&action=save'));
 		$this->t->set_var('title','Hometeaching Interviews Scheduler');
 
-		$indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20;
-		$table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width;
-		$header_row = "<th width=$indiv_width><font size=-2>Individual</th>";
-		$header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-		$header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-		$header_row.= "<th width=$int_date_width><font size=-2>Last Interview</th>";
-		$header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+		$header_row = "<th><font size=-2>Individual</th>";
+		$header_row.= "<th><font size=-2>Phone</th>";
+		$header_row.= "<th><font size=-2>Priority</th>";
+		$header_row.= "<th><font size=-2>Last Interview</th>";
+		$header_row.= "<th><font size=-2>Scheduling Notes</th>";
 		$table_data=""; $completed_data=""; $totals_data="";
 
 		$year = date('Y');
@@ -1996,12 +2142,10 @@ class tc
 
 		// APPOINTMENT TABLE
 		$district = 1;
-		$date_width=250; $time_width=100; $indiv_width=200; $location_width=100;
-		$appt_table_width=$date_width + $time_width + $indiv_width + $location_width;
-		$appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
-		$appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-		$appt_header_row.= "<th width=$indiv_width><font size=-2>Individual</th>";
-		$appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+		$appt_header_row = "<th><font size=-2>Date</th>";
+		$appt_header_row.= "<th><font size=-2>Time</th>";      
+		$appt_header_row.= "<th><font size=-2>Individual</th>";
+		$appt_header_row.= "<th><font size=-2>Location</th>";
 		$appt_table_data = ""; 
 
 		$total_comps=0; $comps_with_quarterly_int=0;
@@ -2074,7 +2218,6 @@ class tc
 
 			$this->t->set_var('appt_table_data',$appt_table_data);
 			$this->t->set_var('appt_header_row',$appt_header_row);
-			$this->t->set_var('appt_table_width',$appt_table_width);
 
 			// INTERVIEW SCHEDULING TABLE
 
@@ -2187,28 +2330,24 @@ class tc
 				}
 			}
 
-			$name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
-			$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
-			$completed_header_row = "<th width=$name_width><font size=-2>Individual</th>";
-			$completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-			$completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-			$completed_header_row.= "<th width=$notes_width><font size=-2>Interview Notes</th>";
+			$completed_header_row = "<th><font size=-2>Individual</th>";
+			$completed_header_row.= "<th><font size=-2>Phone</th>";      
+			$completed_header_row.= "<th><font size=-2>Date</th>";
+			$completed_header_row.= "<th><font size=-2>Interview Notes</th>";
 
-			$this->t->set_var('table_width',$table_width);
 			$this->t->set_var('header_row',$header_row);
 			$this->t->set_var('table_data',$table_data);
 			$this->t->set_var('completed_header_row',$completed_header_row);
-			$this->t->set_var('completed_table_width',$completed_table_width);
 			$this->t->set_var('completed',$completed_data);
+			$this->t->set_var('lang_save_appt','Save Appts for ' . $districts[$d]['name']);
+			$this->t->set_var('lang_save_pri_notes','Save Pri / Notes for '. $districts[$d]['name']);
 			$this->t->fp('indivlist','individual_list',True);
 
 		} // End for each district loop
 
 
-		$indivs_width=300; $totals_width=100;
-		$totals_table_width=$indivs_width + $totals_width;
-		$totals_header_row = "<th width=$indivs_width><font size=-2>Individuals</th>";
-		$totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+		$totals_header_row = "<th><font size=-2>Individuals</th>";
+		$totals_header_row.= "<th><font size=-2>$year</th>";
 		$totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
 		$totals_data.= "<td align=left><font size=-2><b>Total Companionships with interviews completed:</b></font></td>";
 		$totals_data.= "<td align=center><font size=-2><b>$comps_with_quarterly_int / $total_comps</b></font></td>";
@@ -2222,7 +2361,6 @@ class tc
 
 		$this->t->set_var('totals',$totals_data);
 		$this->t->set_var('totals_header_row',$totals_header_row);
-		$this->t->set_var('totals_table_width',$totals_table_width);
 
 		$this->t->pfp('out','int_sched_t');
 		$this->save_sessiondata(); 
@@ -2236,7 +2374,6 @@ class tc
 		$this->t->set_block('vis_sched_t','appt_list','apptlist');
 		$action = get_var('action',array('GET','POST'));
 
-		$this->t->set_var('lang_save','Save Appt / Pri / Notes');
 		$this->t->set_var('lang_reset','Clear Changes');
 
 		$this->t->set_var('vis_link',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_view'));
@@ -2248,13 +2385,11 @@ class tc
 		$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.vis_sched&action=save'));
 		$this->t->set_var('title','Presidency Yearly Visit Scheduler');
 
-		$family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20;
-		$table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width;
-		$header_row = "<th width=$family_width><font size=-2>Family Name</th>";
-		$header_row.= "<th width=$phone_width><font size=-2>Phone</th>";
-		$header_row.= "<th width=$pri_width><font size=-2>Priority</th>";
-		$header_row.= "<th width=$visit_date_width><font size=-2>Last Visit</th>";
-		$header_row.= "<th width=$notes_width><font size=-2>Scheduling Notes</th>";
+		$header_row = "<th><font size=-2>Family Name</th>";
+		$header_row.= "<th><font size=-2>Phone</th>";
+		$header_row.= "<th><font size=-2>Priority</th>";
+		$header_row.= "<th><font size=-2>Last Visit</th>";
+		$header_row.= "<th><font size=-2>Scheduling Notes</th>";
 		$table_data=""; $completed_data=""; $totals_data="";
 
 		$year = date('Y');
@@ -2324,12 +2459,10 @@ class tc
 		}
 
 		// APPOINTMENT TABLE
-		$date_width=250; $time_width=100; $family_width=250; $location_width=100;
-		$appt_table_width=$date_width + $time_width + $family_width + $location_width;
-		$appt_header_row = "<th width=$date_width><font size=-2>Date</th>";
-		$appt_header_row.= "<th width=$time_width><font size=-2>Time</th>";      
-		$appt_header_row.= "<th width=$family_width><font size=-2>Family</th>";
-		$appt_header_row.= "<th width=$location_width><font size=-2>Location</th>";
+		$appt_header_row = "<th><font size=-2>Date</th>";
+		$appt_header_row.= "<th><font size=-2>Time</th>";      
+		$appt_header_row.= "<th><font size=-2>Family</th>";
+		$appt_header_row.= "<th><font size=-2>Location</th>";
 		$appt_table_data = ""; 
 
 		// Find out what the President ID is
@@ -2394,7 +2527,6 @@ class tc
 
 		$this->t->set_var('appt_table_data',$appt_table_data);
 		$this->t->set_var('appt_header_row',$appt_header_row);
-		$this->t->set_var('appt_table_width',$appt_table_width);
 
 
 		// VISIT SCHEDULING TABLE
@@ -2475,17 +2607,13 @@ class tc
 			}
 		}
 
-		$name_width=190; $phone_width=100; $date_width=100; $notes_width=300;
-		$completed_table_width=$name_width + $phone_width + $date_width + $notes_width;
-		$completed_header_row = "<th width=$name_width><font size=-2>Family Name</th>";
-		$completed_header_row.= "<th width=$phone_width><font size=-2>Phone</th>";      
-		$completed_header_row.= "<th width=$date_width><font size=-2>Date</th>";
-		$completed_header_row.= "<th width=$notes_width><font size=-2>Visit Notes</th>";
+		$completed_header_row = "<th><font size=-2>Family Name</th>";
+		$completed_header_row.= "<th><font size=-2>Phone</th>";      
+		$completed_header_row.= "<th><font size=-2>Date</th>";
+		$completed_header_row.= "<th><font size=-2>Visit Notes</th>";
 
-		$family_width=300; $totals_width=100;
-		$totals_table_width=$family_width + $totals_width;
-		$totals_header_row = "<th width=$family_width><font size=-2>Families</th>";
-		$totals_header_row.= "<th width=$totals_width><font size=-2>$year</th>";
+		$totals_header_row = "<th><font size=-2>Families</th>";
+		$totals_header_row.= "<th><font size=-2>$year</th>";
 		$totals_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
 		$totals_data.= "<td align=left><font size=-2><b>Total Families with yearly Visits completed:</b></font></td>";
 		$totals_data.= "<td align=center><font size=-2><b>$families_with_yearly_visit / $total_families</b></font></td>";
@@ -2497,16 +2625,15 @@ class tc
 		$totals_data.= "<td align=center><font size=-2><b>$percent%</b></font></td>";
 		$totals_data.= "</tr>";
 
-		$this->t->set_var('table_width',$table_width);
 		$this->t->set_var('header_row',$header_row);
 		$this->t->set_var('table_data',$table_data);
 		$this->t->set_var('totals_header_row',$totals_header_row);
-		$this->t->set_var('totals_table_width',$totals_table_width);
 		$this->t->set_var('completed_header_row',$completed_header_row);
-		$this->t->set_var('completed_table_width',$completed_table_width);
 		$this->t->set_var('completed',$completed_data);
 		$this->t->set_var('totals',$totals_data);
 		$this->t->fp('familylist','family_list',True);
+		$this->t->set_var('lang_save_appt','Save Appts');
+		$this->t->set_var('lang_save_pri_notes','Save Pri / Notes');
 		$this->t->fp('apptlist','appt_list',True);
 
 		$this->t->pfp('out','vis_sched_t');
@@ -3654,36 +3781,11 @@ class tc
 	function org_view()
 	{
 		$this->t->set_file(array('org_view_t' => 'org_view.tpl'));
-		$this->t->set_block('org_view_t','calling_list','list1');
-		$this->t->set_block('org_view_t','org_list','list2');
-
-		# Display a list ordered alphabetically
-		$sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual ORDER BY name ASC";
-		$this->db->query($sql,__LINE__,__FILE__);
-		$i=0;
-		while ($this->db->next_record()) {
-			$calling[$i]['name'] = $this->db->f('name');
-			$calling[$i]['position'] = $this->db->f('position');
-			$calling[$i]['sustained'] = $this->db->f('sustained');
-			$calling[$i]['organization'] = $this->db->f('organization');
-			$i++;
-		}   
-		for ($i=0; $i < count($calling); $i++) {
-			$name = $calling[$i]['name'];
-			$position = $calling[$i]['position'];
-			$sustained = $calling[$i]['sustained'];
-			$organization = $calling[$i]['organization'];
-			$this->t->set_var('name', $name);
-			$this->t->set_var('position', $position);
-			$this->t->set_var('sustained', $sustained);
-			$this->t->set_var('organization', $organization);
-			$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
-			$this->t->set_var('tr_color',$tr_color);
-			$this->t->fp('list1','calling_list',True);
-		}
+		$this->t->set_block('org_view_t','calling_list','list');
+	    $this->t->set_var('jquery_url',$GLOBALS['phpgw']->link('inc/jquery/jquery.js'));
+	    $this->t->set_var('jquery_tablesorter_url',$GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js'));
 
-		# Display a list ordered by organization
-		$sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY organization ASC";
+		$sql = "SELECT * FROM tc_calling AS tc JOIN tc_individual AS ti where tc.individual=ti.individual ORDER BY name ASC";
 		$this->db->query($sql,__LINE__,__FILE__);
 		$i=0;
 		while ($this->db->next_record()) {
@@ -3704,7 +3806,7 @@ class tc
 			$this->t->set_var('organization', $organization);
 			$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 			$this->t->set_var('tr_color',$tr_color);
-			$this->t->fp('list2','org_list',True);
+			$this->t->fp('list','calling_list',True);
 		}
 
 		$this->t->pfp('out','org_view_t');