X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=0b2a73caf9cfd38b2ec3b3468dd2410a698938b0;hb=d359a8acb0a18d5f5b4c3daf90a233f6ef39083e;hp=4c26542c8efcc38020379282c3aec1f27e86166c;hpb=b3872cd7052dadb30eace5b37b246501860c80dd;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 4c26542..0b2a73c 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -1031,7 +1031,7 @@ class eq
 	  $i++;
 	}
       
-      $elder_width=270; $part_width=25; $assignment_width=50;
+      $elder_width=300; $part_width=25; $assignment_width=50;
       $total_width=$elder_width+$part_width;
       for ($i=0; $i < count($assignment_list); $i++) {
 	$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
@@ -1063,8 +1063,9 @@ class eq
 	    }
 	  }
 	  if($checkmark) {
-	    $part_table .= '<td align=center><img src="checkmark.gif">'.$num_matches.'<br>'.$date.'</td>';
-	    $participated++;
+	    $part_table .= '<td align=center><img src="checkmark.gif">';
+	    $part_table .= '<font size=-2>'.$num_matches.'</font><br>';
+	    $part_table .= '<font size=-2>'.$date.'</font></td>';
 	  } else {
 	    $part_table .= '<td>&nbsp;</td>';
 	  }
@@ -1123,13 +1124,17 @@ class eq
 
 	     //print "elder: $elder appointment: $appointment <br>";
 	     
-	     // Perform database save actions here
-	     $this->db->query("UPDATE eq_appointment set " .
-			      " elder='" . $elder . "'" .
-			      " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
-	     // Email the appointment
-	     $this->email_appt($appointment);
+	     //Only perform a database update if we have made a change to this appointment
+	     $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'";
+	     $this->db->query($sql,__LINE__,__FILE__);
+	     if(!$this->db->next_record()) {
+	       // Perform database save actions here
+	       $this->db->query("UPDATE eq_appointment set " .
+				" elder='" . $elder . "'" .
+				" WHERE appointment=" . $appointment,__LINE__,__FILE__);
+	       // Email the appointment
+	       $this->email_appt($appointment);
+	     }
 
 	   }
 	  
@@ -1411,14 +1416,18 @@ class eq
 	     $appointment = $entry['appointment'];
 
 	     //print "elder: $elder appointment: $appointment <br>";
-	     
-	     // Perform database save actions here
-	     $this->db->query("UPDATE eq_appointment set " .
-			      " elder='" . $elder . "'" .
-			      " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
-	     // Email the appointment
-	     $this->email_appt($appointment);
+	     //Only perform a database update if we have made a change to this appointment
+	     $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder'";
+	     $this->db->query($sql,__LINE__,__FILE__);
+	     if(!$this->db->next_record()) {
+	       // Perform database save actions here
+	       $this->db->query("UPDATE eq_appointment set " .
+				" elder='" . $elder . "'" .
+				" WHERE appointment=" . $appointment,__LINE__,__FILE__);
+	       
+	       // Email the appointment
+	       $this->email_appt($appointment);
+	     }
 	   }
 	  
 	  // Save any changes made to the int notes table
@@ -1751,14 +1760,20 @@ class eq
 	   {
 	     $family = $entry['family'];
 	     $appointment = $entry['appointment'];
-	     
-	     // Perform database save actions here
-	     $this->db->query("UPDATE eq_appointment set " .
-			      " family='" . $family . "'" .
-			      " WHERE appointment=" . $appointment,__LINE__,__FILE__);
 
-	     // Email the appointment
-	     $this->email_appt($appointment);
+	     //Only perform a database update if we have made a change to this appointment
+	     $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family'";
+	     $this->db->query($sql,__LINE__,__FILE__);
+	     if(!$this->db->next_record()) {
+
+	       // Perform database save actions here
+	       $this->db->query("UPDATE eq_appointment set " .
+				" family='" . $family . "'" .
+				" WHERE appointment=" . $appointment,__LINE__,__FILE__);
+	       
+	       // Email the appointment
+	       $this->email_appt($appointment);
+	     }
 	   }
 	  
 	  // Save any changes made to the visit notes table
@@ -3263,21 +3278,33 @@ class eq
 		 // Update an existing appointment
 		 if($appointment != 0)
 		   {
-		     $this->db->query("UPDATE eq_appointment set" .
-			      " family=" . $family . 
-			      " ,elder=" . $elder . 
-			      " ,date='" . $date . "'" .
-			      " ,time='" . $time . "'" .
-			      " WHERE appointment=" . $appointment,__LINE__,__FILE__);
-
-		     // Email the appointment
-		     $this->email_appt($appointment);
+		     //Only perform a database update if we have made a change to this appointment
+		     $sql = "SELECT * FROM eq_appointment where " .
+			"appointment='$appointment'" .
+			"and elder='$elder'" .
+			"and family='$family'" .
+			"and date='$date'" .
+			"and time='$time'";
+		     $this->db->query($sql,__LINE__,__FILE__);
+		     if(!$this->db->next_record()) {
+		       $this->db->query("UPDATE eq_appointment set" .
+					" family=" . $family . 
+					" ,elder=" . $elder . 
+					" ,date='" . $date . "'" .
+					" ,time='" . $time . "'" .
+					" WHERE appointment=" . $appointment,__LINE__,__FILE__);
+		       
+		       // Email the appointment
+		       if(($date != "") && ($time != "")) { 
+			 $this->email_appt($appointment);
+		       }
+		     }
 		   }
 		 
 		 // Add a new appointment
 		 else if(($appointment == 0) && ($date != "") && ($time != ""))
 		   {
-		     $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time) "
+		     $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
 			   . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
 			   . $elder . "','" . $date . "','" . $time  . "','" . $uid ."')",__LINE__,__FILE__);