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

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index ac82465..0b2a73c 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -1014,33 +1014,58 @@ class eq
       $i = 0;
       while ($this->db->next_record())
 	{
-	  $activity_list[$i]['name'] = $this->db->f('name');
+	  $activity_list[$i]['assignment'] = $this->db->f('assignment');
 	  $activity_list[$i]['date'] = $this->db->f('date');
 	  $activity_list[$i]['activity']  = $this->db->f('activity');
-	  if($activity_list[$i]['date'] == '0000-00-00') { $activity_list[$i]['date']=""; }
 	  $i++;
 	}
 
-      $elder_width=250; $part_width=25; $act_width=50;
+      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while($this->db->next_record())
+	{
+	  $assignment_list[$i]['assignment'] = $this->db->f('assignment');
+	  $assignment_list[$i]['name'] = $this->db->f('name');
+	  $assignment_list[$i]['code'] = $this->db->f('code');
+	  $i++;
+	}
+      
+      $elder_width=300; $part_width=25; $assignment_width=50;
       $total_width=$elder_width+$part_width;
-      for ($i=0; $i < count($activity_list); $i++) {
-	$this->t->set_var('activity_name',$activity_list[$i]['name']);
-	$this->t->set_var('activity_date',$activity_list[$i]['date']);
+      for ($i=0; $i < count($assignment_list); $i++) {
+	$this->t->set_var('assignment_name',$assignment_list[$i]['name']);
+	$this->t->set_var('assignment_code',$assignment_list[$i]['code']);
 	$this->t->fp('list1','header_list',True);
-	$total_width += $act_width;
+	$total_width += $assignment_width;
       }
 
       for ($i=0; $i < count($elder_id); $i++) {
 	$participated=0; $part_table = ''; 
 	$this->nextmatchs->template_alternate_row_color(&$this->t);
 	$this->t->set_var('elder_name',$elder_name[$i]);
-	for ($j=0; $j < count($activity_list); $j++) {
-	  $sql = "SELECT * FROM eq_participation where activity="
-	     . $activity_list[$j]['activity'] . " AND elder=" . $elder_id[$i];
-	  $this->db->query($sql,__LINE__,__FILE__);
-	  if($this->db->next_record()) {
-	    $part_table .= '<td align=center><img src="checkmark.gif"></td>';
-	    $participated++;
+	for ($j=0; $j < count($assignment_list); $j++) {
+	  $date = "0000-00-00"; $checkmark=0; $num_matches=0;
+	  for ($k=0; $k < count($activity_list); $k++) {
+	    if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { 
+	      $sql = "SELECT * FROM eq_participation where "
+		 . " activity=" . $activity_list[$k]['activity']
+		 . " AND elder=" . $elder_id[$i];
+	      $this->db->query($sql,__LINE__,__FILE__);
+	      while($this->db->next_record()) {
+		if($activity_list[$k]['date'] > $date) { 
+		  $date = $activity_list[$k]['date'];
+		}
+		$checkmark=1;
+		$num_matches++;
+		$participated++;
+	      }
+	    }
+	  }
+	  if($checkmark) {
+	    $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>';
 	  }
@@ -1099,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);
+	     }
 
 	   }
 	  
@@ -1387,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
@@ -1727,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
@@ -3239,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__);