From: Alan Pippin <apippin@pippins.net>
Date: Thu, 28 Oct 2010 16:59:24 +0000 (-0600)
Subject: Merge branch 'owenleonard/ht_sandbox'
X-Git-Tag: release_1_1_0
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=commitdiff_plain;h=refs%2Ftags%2Frelease_1_1_0;hp=-c;p=eq%2F.git

Merge branch 'owenleonard/ht_sandbox'
---

5ae6b075235ebca24477826e45076cf5542d18b9
diff --combined inc/class.tc.inc.php
index fc699ea,8b435da..fef4dd9
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@@ -79,6 -79,9 +79,9 @@@ class t
  			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 +95,11 @@@
  		$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 +409,7 @@@
  	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 +420,8 @@@
  		$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 +571,8 @@@
  					$this->db3->query($sql,__LINE__,__FILE__);
  				}
  			}
+ 		} else if ($_POST['changes']) {
+ 			$this->ht_sandbox_changes();
  		}
  		
  		// get list of companionships
@@@ -651,8 -663,16 +663,16 @@@
  			$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,9 -683,13 +683,13 @@@
  					} 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_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";
@@@ -673,12 -697,15 +697,15 @@@
  				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');
- 					$sandbox_table_data .= "<tr>";
+ 				    $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--) {
+ 					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; }
@@@ -710,8 -737,10 +737,10 @@@
  				}
  				$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>";
  		}
@@@ -723,7 -752,162 +752,162 @@@
  		$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()
  	{
@@@ -3757,36 -3941,11 +3941,11 @@@
  	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',$this->jquery_url);
+ 	    $this->t->set_var('jquery_tablesorter_url',$this->jquery_tablesorter_url);
  
- 		# 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()) {
@@@ -3807,7 -3966,7 +3966,7 @@@
  			$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');
@@@ -3923,35 -4082,6 +4082,35 @@@
  					// 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'" .
@@@ -3975,7 -4105,7 +4134,7 @@@
  							                  " WHERE appointment=" . $appointment,__LINE__,__FILE__);
  
  							// Email the appointment
 -							$this->email_appt($appointment);
 +						    $this->email_appt($appointment, $old_indiv_email);
  						}
  					}
  
@@@ -4576,7 -4706,7 +4735,7 @@@
  		$this->save_sessiondata();   
  	}
  
 -	function email_appt($appointment)
 +	function email_appt($appointment, $old_indiv_email)
  	{
  		//print "Emailing notification of appointment: $appointment <br>";
  
@@@ -4596,7 -4726,7 +4755,7 @@@
  			$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);
@@@ -4630,10 -4760,6 +4789,10 @@@
  				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;
  				}
@@@ -4650,10 -4776,6 +4809,10 @@@
  						$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;
@@@ -4668,7 -4790,7 +4827,7 @@@
  			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";
  
@@@ -4682,10 -4804,7 +4841,10 @@@
  			} 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" .
@@@ -4697,7 -4816,7 +4856,7 @@@
  				                      $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";