X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.tc.inc.php;h=05b2a5232777e4f13924f4a8f0dd5f38bdf0cd07;hb=40bab501e1ba7d982bead980469dcd975d141130;hp=bcf18e26a79ba6cfb9ee1f9b721ed95a6b287e56;hpb=be758016f3cd29cef9b854c3473df80c12668763;p=eq%2F.git

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index bcf18e2..05b2a52 100644
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -79,6 +79,9 @@ class tc
 			include("setup/tc_config");
 		}
 
+		$this->jquery_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.js');
+		$this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js');
+		
 		$this->script_path = "$this->application_path"."/bin";
 		$this->max_presidency_members = 99;
 		$this->max_appointments = 32768;
@@ -92,6 +95,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 +409,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');
@@ -411,7 +420,8 @@ class tc
 		$this->t->set_block('ht_sandbox_t','companionship_table_list','ct_list');
 
 		$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',$this->jquery_url);
+		 
 	    $action = get_var('action',array('GET','POST'));
 
 		$this->t->set_var('title','Hometeaching Sandbox'); 
@@ -561,6 +571,8 @@ class tc
 					$this->db3->query($sql,__LINE__,__FILE__);
 				}
 			}
+		} else if ($_POST['changes']) {
+			$this->ht_sandbox_changes();
 		}
 		
 		// get list of companionships
@@ -651,8 +663,16 @@ class tc
 			$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_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__);
@@ -663,10 +683,12 @@ 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";
 				}
 				$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\" bgcolor=\"#c9c9c9\">$companion_names</th></tr>";
+				$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
@@ -675,11 +697,13 @@ class tc
 				while ($this->db2->next_record()) {
 					$family_name = $this->db2->f('name') . " Family";
 					$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=$this->sandbox_stats_num_months; $m > 0; $m--) {
 						$month = $this->current_month - $m;
@@ -713,8 +737,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>";
 		}
@@ -726,7 +752,162 @@ class tc
 		$this->t->pfp('out','ht_sandbox_t');
 		$this->save_sessiondata();
 	}
-      
+
+	function ht_sandbox_changes()
+	{
+		$email_contents = "Please review the following changes to home teaching.\r\n\r\n";
+		// list all companionships deleted
+		$email_contents .= "Removed Companionships\r\n\r\n";
+		$sql = "SELECT * FROM tc_companionship WHERE companionship NOT IN (SELECT tc_companionship FROM tc_companionship_sandbox) AND valid=1";
+		$this->db->query($sql,__LINE__,__FILE__);
+		while ($this->db->next_record()) {
+			$companionship = $this->db->f('companionship');
+			$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.individual=ti.individual AND tc.companionship=$companionship";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			$companion_names = "";
+			while ($this->db2->next_record()) {
+				if ($companion_names == "") {
+					$companion_names .= $this->db2->f('name');
+				} else {
+					$companion_names .= " / " . $this->db2->f('name');
+				}
+			}
+			$email_contents .= "\t$companion_names\r\n";
+		}
+		$email_contents .= "\r\n";
+		
+		// list all companionships added
+		$email_contents .= "New Companionships\r\n\r\n";
+		$sql = "SELECT * FROM tc_companionship_sandbox WHERE tc_companionship=0";
+		$this->db->query($sql,__LINE__,__FILE__);
+		while ($this->db->next_record()) {
+			$companionship = $this->db->f('companionship');
+			$sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.individual=ti.individual AND tcs.companionship=$companionship";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			$companion_names = "";
+			while ($this->db2->next_record()) {
+				if ($companion_names == "") {
+					$companion_names .= $this->db2->f('name');
+				} else {
+					$companion_names .= " / " . $this->db2->f('name');
+				}
+			}
+			$email_contents .= "\t$companion_names\r\n";
+			$sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND companionship=$companionship";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			while ($this->db2->next_record()) {
+				$family_name = $this->db2->f('name') . " Family";
+				$email_contents .= "\t\t$family_name\r\n";
+			}
+		}
+		$email_contents .= "\r\n";
+		
+		// list all companionships with changes
+		$email_contents .= "Modified Companionships\r\n\r\n";
+		$sql = "SELECT tcps.* FROM tc_companionship AS tc JOIN tc_companionship_sandbox AS tcps WHERE tc.companionship=tcps.tc_companionship AND tc.valid=1";
+		$this->db->query($sql,__LINE__,__FILE__);
+		while ($this->db->next_record()) {
+			$companionship = $this->db->f('companionship');
+			$tc_companionship = $this->db->f('tc_companionship');
+			$companionship_changed = 0;
+			
+			// get current companion list
+			$sql = "SELECT * FROM tc_companion_sandbox AS tc JOIN tc_individual AS ti WHERE tc.companionship=$companionship AND tc.individual=ti.individual";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			$companion_names = "";
+			while ($this->db2->next_record()) {
+				if ($companion_names == "") {
+					$companion_names .= $this->db2->f('name');
+				} else {
+					$companion_names .= " / " . $this->db2->f('name');
+				}
+			}
+			
+			// list removed companions
+			$sql = "SELECT * FROM tc_companion AS tc JOIN tc_individual AS ti WHERE tc.companionship=$tc_companionship AND tc.individual=ti.individual AND tc.individual NOT IN (SELECT individual FROM tc_companion_sandbox WHERE companionship=$companionship)";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			while ($this->db2->next_record()) {
+				if ($companionship_changed == 0) {
+					$companionship_changed = 1;
+					$email_contents .= "\t$companion_names\r\n";
+				}
+				$name = $this->db2->f('name');
+				$email_contents .= "\t\tremoved $name as a companion\r\n";
+			}
+			
+			// list added companions
+			$sql = "SELECT * FROM tc_companion_sandbox AS tcs JOIN tc_individual AS ti WHERE tcs.companionship=$companionship AND tcs.individual=ti.individual AND tcs.individual NOT IN (SELECT individual FROM tc_companion WHERE companionship=$tc_companionship)";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			while ($this->db2->next_record()) {
+				if ($companionship_changed == 0) {
+					$companionship_changed = 1;
+					$email_contents .= "\t$companion_names\r\n";
+				}
+				$name = $this->db2->f('name');
+				$email_contents .= "\t\tadded $name as a companion\r\n";
+			}
+			
+			// list removed families
+			$sql = "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship=$tc_companionship AND tf.family NOT IN (SELECT tc_family FROM tc_family_sandbox WHERE companionship=$companionship)";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			while ($this->db2->next_record()) {
+				if ($companionship_changed == 0) {
+					$companionship_changed = 1;
+					$email_contents .= "\t$companion_names\r\n";
+				}
+				$name = $this->db2->f('name');
+				$email_contents .= "\t\tremoved $name Family\r\n";
+			}
+			
+			// list added families
+			$sql = "SELECT * FROM tc_family_sandbox AS tfs JOIN tc_individual AS ti WHERE tfs.individual=ti.individual AND tfs.companionship=$companionship AND tfs.individual NOT IN (SELECT individual FROM tc_family WHERE companionship=$tc_companionship)";
+			$this->db2->query($sql,__LINE__,__FILE__);
+			while ($this->db2->next_record()) {
+				if ($companionship_changed == 0) {
+					$companionship_changed = 1;
+					$email_contents .= "\t$companion_names\r\n";
+				}
+				$name = $this->db2->f('name');
+				$email_contents .= "\t\tadded $name Family\r\n";
+			}
+		}
+		$email_contents .= "\r\n";
+		
+		// email changes to presidency
+		$sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1) AND tp.valid=1";
+		$this->db->query($sql,__LINE__,__FILE__);
+		while ($this->db->next_record()) {
+			$email = "";
+			if ($this->db->f('email1') != "") {
+				$email = $this->db->f('email1');
+			} else { 
+				$email = $this->db->f('email2');
+			}
+			if ($to == "") {
+				$to .= $email;
+			} else {
+				$to .= ", $email";
+			}
+		}
+		$sql = "SELECT DISTINCT tp.email AS email1, ti.email AS email2 FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.president=1 AND tp.valid=1";
+		$this->db->query($sql,__LINE__,__FILE__);
+		if ($this->db->next_record()) {
+			if ($this->db->f('email1') != "") {
+				$from = $this->db->f('email1');
+			} else { 
+				$from = $this->db->f('email2');
+			}
+		} else {
+			$from = "president@3rdcounselor";
+		}
+		$subject = "HomeTeaching Changes";
+		$message .= "$email_contents";
+		$headers = "From: $from\r\n" .
+		           "Reply-To: $from\r\n" .
+		           "X-Mailer: PHP/" . phpversion();
+
+		mail($to, $subject, $message, $headers);
+	}
 
 	function ht_update()
 	{
@@ -1885,11 +2066,11 @@ class tc
 			$year_start = $year . "-" . $start_of_period . "-01";
 			$year_end = $year . "-" . $end_of_period . "-31";
 			$sql = "SELECT * FROM tc_interview WHERE date >= '$year_start' AND date <= '$year_end' ".
-			       "AND individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
+			       "AND individual=" . $id . " AND type='P' ORDER BY date DESC";
 			$this->db2->query($sql,__LINE__,__FILE__);
 
 			if(!$this->db2->next_record()) {
-				$sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND interview_type='ppi' ORDER BY date DESC";
+				$sql = "SELECT * FROM tc_interview WHERE individual=" . $id . " AND type='P' ORDER BY date DESC";
 				$this->db->query($sql,__LINE__,__FILE__);
 				if($this->db->next_record()) { 
 					$date = $this->db->f('date'); 
@@ -1900,7 +2081,7 @@ class tc
 				$link_data['individual'] = $id;
 				$link_data['name'] = $name;
 				$link_data['interview'] = '';
-				$link_data['interview_type'] = 1;
+				$link_data['type'] = 1;
 				$link_data['action'] = 'add';
 				$link_data['interviewer'] = $interviewer;
 				$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
@@ -1933,7 +2114,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'] = $this->db2->f('interview_type');
+				$link_data['type'] = $this->db2->f('type');
 				$link_data['action'] = 'view';
 				$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);    
 				$indivs_with_yearly_ppi++;
@@ -2246,11 +2427,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' AND interview_type='hti'";
+					$sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND individual='$id' AND type='H'";
 					$this->db2->query($sql,__LINE__,__FILE__);
 
 					if(!$this->db2->next_record()) {
-						$sql = "SELECT * FROM tc_interview WHERE individual='$id' AND interview_type='hti' ORDER BY date DESC";
+						$sql = "SELECT * FROM tc_interview WHERE individual='$id' AND type='H' ORDER BY date DESC";
 						$this->db3->query($sql,__LINE__,__FILE__);
 						if($this->db3->next_record()) { 
 							$date = $this->db3->f('date'); 
@@ -2262,7 +2443,7 @@ class tc
 						$link_data['name'] = $name;
 						$link_data['interview'] = '';
 						$link_data['action'] = 'add';
-						$link_data['interview_type'] = 'hti';
+						$link_data['type'] = 'H';
 						$link_data['interviewer'] = $districts[$d]['supervisor'];
 						$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
 						$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
@@ -2292,7 +2473,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['type'] = 'H';
 						$link_data['action'] = 'view';
 						$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);    
 						$comps_with_quarterly_int++;
@@ -2699,7 +2880,7 @@ class tc
 			$link_data['individual'] = $id;
 			$link_data['name'] = $name;
 			$link_data['interview'] = '';
-			$link_data['interview_type'] = 'ppi'; 
+			$link_data['type'] = 'P'; 
 			$link_data['action'] = 'add';
 			$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
 			$this->nextmatchs->template_alternate_row_color(&$this->t);
@@ -2710,7 +2891,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' ORDER BY date DESC";
+				       "AND individual=" . $id . " AND type='P' ORDER BY date DESC";
 				$this->db2->query($sql,__LINE__,__FILE__);
 
 				if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
@@ -2722,7 +2903,7 @@ class tc
 					$link_data['indiv'] = $id;
 					$link_data['name'] = $name;
 					$link_data['interview'] = $this->db2->f('interview');
-					$link_data['interview_type'] = 'ppi';
+					$link_data['type'] = 'P';
 					$link_data['action'] = 'view';
 					$date = $this->db2->f('date');
 					$date_array = explode("-",$date);
@@ -2772,7 +2953,7 @@ class tc
 		$individual = get_var('individual',array('GET','POST'));
 		$date = get_var('date',array('GET','POST'));
 		$notes = get_var('notes',array('GET','POST'));
-		$interview_type = get_var('interview_type',array('GET','POST'));
+		$type = get_var('type',array('GET','POST'));
 
 	    $sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND ";
 	    if($this->yearly_ppi_interviewer == 1) { $sql .= " (tp.president=1)"; }
@@ -2801,7 +2982,7 @@ class tc
 			                 ", individual='" . $individual . "'" .
 			                 ", date='" . $date . "'" .
 			                 ", notes=\"" . $notes . "\"" .
-			                 ", interview_type='" . $interview_type . "'" .
+			                 ", type='" . $type . "'" .
 			                 " WHERE interview=" . $interview,__LINE__,__FILE__);
 			$this->ppi_view();
 			return false;
@@ -2809,9 +2990,9 @@ class tc
 
 		if($action == 'insert') {
 			$notes = get_var('notes',array('POST'));
-			$this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+			$this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
 			                 "VALUES ('" . $interviewer . "','" . $individual . "','" .
-			                 $date . "',\"" . $notes . "\",'" . $interview_type  ."')",__LINE__,__FILE__);
+			                 $date . "',\"" . $notes . "\",'" . $type  ."')",__LINE__,__FILE__);
 			$this->ppi_view();
 			return false;
 		}
@@ -2824,7 +3005,7 @@ class tc
 			$this->t->set_var('individual',$individual);
 			$this->t->set_var('date','');
 			$this->t->set_var('notes','');
-			$this->t->set_var('interview_type',$interview_type);
+			$this->t->set_var('type',$type);
 			$this->t->set_var('eqpresppi_checked','checked');
 			$this->t->set_var('lang_done','Cancel');
 			$this->t->set_var('lang_action','Adding New PPI');
@@ -2833,7 +3014,7 @@ class tc
 		}
 
 		if($action == 'edit' || $action == 'view') {
-			$sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='ppi'";
+			$sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='P'";
 			$this->db->query($sql,__LINE__,__FILE__);
 			$this->db->next_record();
 			$this->t->set_var('interview',$interview);
@@ -2842,8 +3023,8 @@ class tc
 			$this->t->set_var('individual',$this->db->f('individual'));
 			$this->t->set_var('date',$this->db->f('date'));
 			$this->t->set_var('notes',$this->db->f('notes'));
-			$this->t->set_var('interview_type',$this->db->f('interview_type'));
-			if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+			$this->t->set_var('type',$this->db->f('type'));
+			if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
 		}
 
 		if($action == 'edit') {
@@ -2976,7 +3157,7 @@ class tc
 					$link_data['individual'] = $individual;
 					$link_data['name'] = $name;
 					$link_data['interview'] = '';
-					$link_data['interview_type'] = 'hti';
+					$link_data['type'] = 'H';
 					$link_data['action'] = 'add';
 					$link = $GLOBALS['phpgw']->link('/tc/index.php',$link_data);
 					$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
@@ -2996,7 +3177,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 interview_type='hti' ORDER BY date DESC";
+						       "AND individual=" . $individual . " AND type='H' ORDER BY date DESC";
 						$this->db2->query($sql,__LINE__,__FILE__);
 						$header_row .= "<th width=$int_width><font size=-2>$month</th>";
 
@@ -3014,7 +3195,7 @@ class tc
 							$link_data['name'] = $name;
 							$link_data['interview'] = $this->db2->f('interview');
 							$link_data['action'] = 'view';
-							$link_data['interview_type'] = 'hti';
+							$link_data['type'] = 'H';
 							$date = $this->db2->f('date');
 							$date_array = explode("-",$date);
 							$month = $date_array[1];
@@ -3101,7 +3282,7 @@ class tc
 		$individual = get_var('individual',array('GET','POST'));
 		$date = get_var('date',array('GET','POST'));
 		$notes = get_var('notes',array('GET','POST'));
-		$interview_type = get_var('interview_type',array('GET','POST'));
+		$type = get_var('type',array('GET','POST'));
 
 		$sql = "SELECT * FROM tc_presidency AS tp JOIN tc_individual AS ti WHERE tp.individual=ti.individual AND tp.valid=1 AND (tp.president=1 OR tp.counselor=1 OR tp.secretary=1 OR tp.district!=0)";
 		$this->db2->query($sql,__LINE__,__FILE__);
@@ -3125,7 +3306,7 @@ class tc
 			                 ", individual='" . $individual . "'" .
 			                 ", date='" . $date . "'" .
 			                 ", notes=\"" . $notes . "\"" .
-			                 ", interview_type='" . $interview_type . "'" .
+			                 ", type='" . $type . "'" .
 			                 " WHERE interview=" . $interview,__LINE__,__FILE__);
 			$this->int_view();
 			return false;
@@ -3133,9 +3314,9 @@ class tc
 
 		if($action == 'insert') {
 			$notes = get_var('notes',array('POST'));
-			$this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,interview_type) " .
+			$this->db->query("INSERT INTO tc_interview (interviewer,individual,date,notes,type) " .
 			                 "VALUES ('" . $interviewer . "','" . $individual . "','" .
-			                 $date . "',\"" . $notes ."\",'" . $interview_type . "')",__LINE__,__FILE__);
+			                 $date . "',\"" . $notes ."\",'" . $type . "')",__LINE__,__FILE__);
 			$this->int_view();
 			return false;
 		}
@@ -3148,7 +3329,7 @@ class tc
 			$this->t->set_var('individual',$individual);
 			$this->t->set_var('date','');
 			$this->t->set_var('notes','');
-			$this->t->set_var('interview_type',$interview_type);
+			$this->t->set_var('type',$type);
 			$this->t->set_var('lang_done','Cancel');
 			$this->t->set_var('lang_action','Adding New Interview');
 			$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_update&interview=' .
@@ -3156,7 +3337,7 @@ class tc
 		}
 
 		if($action == 'edit' || $action == 'view') {
-			$sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND interview_type='hti'";
+			$sql = "SELECT * FROM tc_interview WHERE interview=" . $interview . " AND type='H'";
 			$this->db->query($sql,__LINE__,__FILE__);
 			$this->db->next_record();
 			$this->t->set_var('interview',$interview);
@@ -3165,8 +3346,8 @@ class tc
 			$this->t->set_var('individual',$this->db->f('individual'));
 			$this->t->set_var('date',$this->db->f('date'));
 			$this->t->set_var('notes',$this->db->f('notes'));
-			$this->t->set_var('interview_type',$this->db->f('interview_type'));
-			if($this->db->f('interview_type') == 'ppi') { $this->t->set_var('eqpresppi_checked','checked'); }
+			$this->t->set_var('type',$this->db->f('type'));
+			if($this->db->f('type') == 'P') { $this->t->set_var('eqpresppi_checked','checked'); }
 		}
 
 		if($action == 'edit') {
@@ -3760,11 +3941,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');
+		$this->t->set_block('org_view_t','calling_list','list');
+	    $this->t->set_var('jquery_url',$this->jquery_url);
+	    $this->t->set_var('jquery_tablesorter_url',$this->jquery_tablesorter_url);
 
-		# 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";
+		$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()) {
@@ -3785,32 +3966,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('list1','calling_list',True);
-		}
-
-		# 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";
-		$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('list2','org_list',True);
+			$this->t->fp('list','calling_list',True);
 		}
 
 		$this->t->pfp('out','org_view_t');
@@ -3926,6 +4082,35 @@ class tc
 					// Update an existing appointment
 					if($appointment < $this->max_appointments)
 					{
+					    // If we deleted the appointment, we still need to send a cancellation to the right people
+					    // Make a note of the old email now in case we need it later
+					    $old_indiv_email = "";
+					    $sql = "SELECT * FROM tc_appointment where appointment='$appointment'";
+					    $this->db->query($sql,__LINE__,__FILE__);
+					    if($this->db->next_record()) {
+						  $old_individual = $this->db->f('individual');
+						  $old_family = $this->db->f('family');
+						  if($old_individual > 0) {
+							$sql = "SELECT * FROM tc_individual where individual='$old_individual'";
+							$this->db2->query($sql,__LINE__,__FILE__);
+							if($this->db2->next_record()) {
+							  $old_indiv_email = $this->db2->f('email');
+							}
+						  }
+						  if($old_family > 0) {
+							$sql = "SELECT * FROM tc_family WHERE family='$old_family'";
+							$this->db2->query($sql,__LINE__,__FILE__);
+							if($this->db2->next_record()) {
+							  $old_individual = $this->db2->f('individual');
+							  $sql = "SELECT * FROM tc_individual where individual='$old_individual'";
+							  $this->db3->query($sql,__LINE__,__FILE__);
+							  if($this->db3->next_record()) {
+								$old_indiv_email = $this->db3->f('email');
+							  }
+							}
+						  }
+						}
+						
 						//Only perform a database update if we have made a change to this appointment
 						$sql = "SELECT * FROM tc_appointment where " .
 						       "appointment='$appointment'" .
@@ -3949,7 +4134,7 @@ class tc
 							                  " WHERE appointment=" . $appointment,__LINE__,__FILE__);
 
 							// Email the appointment
-							$this->email_appt($appointment);
+						    $this->email_appt($appointment, $old_indiv_email);
 						}
 					}
 
@@ -4550,7 +4735,7 @@ class tc
 		$this->save_sessiondata();   
 	}
 
-	function email_appt($appointment)
+	function email_appt($appointment, $old_indiv_email)
 	{
 		//print "Emailing notification of appointment: $appointment <br>";
 
@@ -4570,7 +4755,7 @@ class tc
 			$appt_name = "";
 			$phone = "";
 			$uid = $this->db->f('uid');
-
+		  		  
 			// Extract the year, month, day, hours, minutes, seconds from the appointment time
 			$appt_date = $this->db->f('date');
 			$date_array = explode("-",$appt_date);
@@ -4604,6 +4789,10 @@ class tc
 				if($this->db2->next_record()) {
 					$indiv_name = $this->db2->f('name');
 					$phone = $this->db2->f('phone');
+  				    $indiv_email = $this->db2->f('email');
+				    if(($this->email_individual_appt == 1) && ($indiv_email != "")) {
+					  $email .= ", $indiv_email";
+					}
 					$appt_name = $indiv_name . " Interview";
 					$duration = $this->default_ppi_appt_duration * 60;
 				}
@@ -4620,6 +4809,10 @@ class tc
 						$phone = $this->db3->f('phone');
 						$family_name = $this->db3->f('name');
 						$phone = $this->db3->f('phone');
+					    $indiv_email = $this->db3->f('email');
+					    if(($this->email_individual_appt == 1) && ($indiv_email != "")) {
+						  $email .= ", $indiv_email";
+						}
 					}
 					$appt_name = $family_name . " Family Visit";
 					$duration = $this->default_visit_appt_duration * 60;
@@ -4634,7 +4827,7 @@ class tc
 			if(($uid == 0) && ($appt_name != "")) {
 				// Create a new calendar item for this appointment, since this must be the first time we
 				// are sending it out.
-				print "Sent new appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+				print "Sent new appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "<br>";
 				$uid = rand() . rand(); // Generate a random identifier for this appointment
 				$subject = "Created: $appt_name";
 
@@ -4648,7 +4841,10 @@ class tc
 			} else if(($uid != 0) && ($appt_name == "")) {
 				// Remove the calendar item for this appointment since it has already been sent
 				// and there is no name we have changed it to.
-				print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
+			    if(($this->email_individual_appt == 1) && ($old_indiv_email != "")) {
+				  $email .= ", $old_indiv_email";
+				}
+				print "Sent deleted appointment for " . $interviewer . " to '" . $email . "' for " . $appt_date . " " . $appt_time . "<br>";
 				$subject = "Canceled: $appt_date $appt_time";
 
 				$this->db->query("UPDATE tc_appointment set" .
@@ -4660,7 +4856,7 @@ class tc
 				                      $dtend, $date, $location, $subject, $subject, $uid);
 			} else if($uid != 0) {
 				// Update the existing appointment since we have changed it
-				print "Sent updated appointment to " . $interviewer . " at " . $email . " for " . $appt_name . "<br>";
+				print "Sent updated appointment for " . $interviewer . " to '" . $email . "' for " . $appt_name . "<br>";
 
 				$subject = "Canceled: $appt_date $appt_time";
 				$action = "CANCEL";