X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=9bc77a08047864924c5f710379d6b678ce167707;hb=822abf1339b489e81ccfcd3a30d467d437af449a;hp=53de695e33061ddc190754d3a71239a147eca8dc;hpb=37d22c01cf5181413568afe66ceb6ec716664e04;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 53de695..9bc77a0 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -726,9 +726,9 @@ class eq
       
       if($action == 'save')
 	{
-	  $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
-	  $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-	  $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $activity['assignment'] = get_var('assignment',array('POST'));
+	  $activity['date'] = get_var('date',array('POST'));
+	  $activity['notes']= get_var('notes',array('POST'));
 	  $this->db->query("UPDATE eq_activity set " .
 			   "   assignment='" . $activity['assignment'] .
 			   "', date='" . $activity['date'] . "'" .
@@ -752,9 +752,9 @@ class eq
 
       if($action == 'insert')
 	{
-	  $activity['assignment'] = $this->db->db_addslashes(get_var('assignment',array('POST')));
-	  $activity['date'] = $this->db->db_addslashes(get_var('date',array('POST')));
-	  $activity['notes']= $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $activity['assignment'] = get_var('assignment',array('POST'));
+	  $activity['date'] = get_var('date',array('POST'));
+	  $activity['notes']= get_var('notes',array('POST'));
 	  $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
 			   . "VALUES ('" . $activity['assignment'] . "','"
 			   . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
@@ -763,7 +763,7 @@ class eq
 	     . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
 	  $this->db->query($sql,__LINE__,__FILE__);
 	  if($this->db->next_record()) {
-	    print "activity: " . $this->db->f('activity') . "<br>";
+	    //print "activity: " . $this->db->f('activity') . "<br>";
 	    $activity['activity'] = $this->db->f('activity');
 	  }
 	  
@@ -937,8 +937,8 @@ class eq
 
       if($action == 'save')
 	{
-	  $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-	  $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST')));
+	  $assignment['name'] = get_var('name',array('POST'));
+	  $assignment['code'] = get_var('code',array('POST'));
 	  $this->db->query("UPDATE eq_assignment set " .
 			   "  name='" . $assignment['name'] . "'" .
 			   ", code='" . $assignment['code'] . "'" .
@@ -950,8 +950,8 @@ class eq
 
       if($action == 'insert')
 	{
-	  $assignment['name'] = $this->db->db_addslashes(get_var('name',array('POST')));
-	  $assignment['code'] = $this->db->db_addslashes(get_var('code',array('POST')));
+	  $assignment['name'] = get_var('name',array('POST'));
+	  $assignment['code'] = get_var('code',array('POST'));
 	  $this->db->query("INSERT INTO eq_assignment (name,code) "
 			   . "VALUES ('" . $assignment['name'] . "','"
 			   . $assignment['code'] . "')",__LINE__,__FILE__);
@@ -1096,6 +1096,23 @@ class eq
       $this->t->set_block('willing_view_t','header_list','list1');
       $this->t->set_block('willing_view_t','elder_list','list2');
 
+      $this->t->set_var('lang_filter','Filter');
+      $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:');
+
+      $filter_unwilling = get_var('filter_unwilling',array('POST'));
+      $this->t->set_var('filter_unwilling',$filter_unwilling);
+      
+      if($filter_unwilling == 'y' || $filter_unwilling == '') { 
+	$filter_input = "<input type=\"radio\" name=\"filter_unwilling\" value=\"y\" checked>Y";
+	$filter_input.= "<input type=\"radio\" name=\"filter_unwilling\" value=\"n\">N";
+	$filter_input.= "&nbsp;&nbsp;";
+      } else {
+	$filter_input = "<input type=\"radio\" name=\"filter_unwilling\" value=\"y\">Y";
+	$filter_input.= "<input type=\"radio\" name=\"filter_unwilling\" value=\"n\" checked>N";
+	$filter_input.= "&nbsp;&nbsp;";
+      }
+      $this->t->set_var('filter_input',$filter_input);
+      
       $sql = "SELECT * FROM eq_elder where valid=1";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
@@ -1144,14 +1161,13 @@ class eq
       }
 
       for ($i=0; $i < count($elder_id); $i++) {
-	$willing_table = ''; 
-	$this->nextmatchs->template_alternate_row_color(&$this->t);
+	$willing_table = ''; $elder_willing=0;
 	$this->t->set_var('elder_name',$elder_name[$i]);
 	$this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]);
 	$this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id='
 							    . $elder_id[$i] . '&action=' . 'edit'));
 	for ($j=0; $j < count($assignment_list); $j++) {
-	  $found_willingness=0;
+	  $found_willingness=0; 
 	  $sql = "SELECT * FROM eq_willingness where "
 	     . " assignment=" . $assignment_list[$j]['assignment']
 	     . " AND elder=" . $elder_id[$i];
@@ -1177,21 +1193,27 @@ class eq
 	      
 	    if($this->db->f('willing') == 'y') {
 	      $total_willing[$j]++;
+	      $elder_willing=1;
 	      $willing_table .= '<td align=center><img src="checkmark.gif"><br><font size=-2>'.$date_part.'</font></td></td>';
 	    }
 	    else if($this->db->f('willing') == 'n') {
 	      $willing_table .= '<td align=center><img src="x.gif"></td>';
 	    }
 	    else {
+	      $elder_willing=1;
 	      $willing_table .= "<td>&nbsp;</td>";
 	    }
 	  }
 	  if(!$found_willingness) {
+	    $elder_willing=1;
 	    $willing_table .= "<td>&nbsp;</td>";
 	  }
 	}
-	$this->t->set_var('willing_table',$willing_table);
-	$this->t->fp('list2','elder_list',True);
+	if(($elder_willing == 1) || ($filter_unwilling == 'n')) { 
+	  $this->t->set_var('willing_table',$willing_table);
+	  $this->t->fp('list2','elder_list',True);
+	  $this->nextmatchs->template_alternate_row_color(&$this->t);
+	} 
       }
 
       $stat_table = '<td><b>Total Willing to Serve</b></td>';
@@ -1409,6 +1431,7 @@ class eq
 	$president_name = $this->db->f('name');
 	$president_id = $this->db->f('elder');
 	$presidency_id = $this->db->f('presidency');
+	$interviewer = $this->db->f('elder');
 	$district_number = '*';
 	$district_name = $president_name;
       } else {
@@ -1531,6 +1554,7 @@ class eq
 	    $link_data['ppi'] = '';
 	    $link_data['eqpresppi'] = 1;
 	    $link_data['action'] = 'add';
+	    $link_data['interviewer'] = $interviewer;
 	    $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
 	    $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 	    $this->t->set_var('tr_color',$tr_color);
@@ -1683,6 +1707,7 @@ class eq
 	     $elder_name = $entry['elder_name'];
 	     $int_pri = $entry['pri'];
 	     $aaronic = $entry['aaronic'];
+	     //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
 	     if($aaronic == 0) { 
 	       // Perform database save actions here
 	       $this->db->query("UPDATE eq_elder set " .
@@ -1882,24 +1907,29 @@ class eq
 		$link_data['name'] = $name;
 		$link_data['interview'] = '';
 		$link_data['action'] = 'add';
+		$link_data['interviewer'] = $districts[$d]['supervisor'];
 		$link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
 		$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
 		$table_data.= "<td align=center>$phone</td>";
 		$table_data.= "<td align=center>";
-		$table_data.= '<select name=int_notes['.$i.'][pri]>';
-		foreach(range(0,6) as $num) {
-		  if($num == 0) { $num = 1; } else {$num = $num*5; }
-		  if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
-		  $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+		if($aaronic == 0) { 
+		  $table_data.= '<select name=int_notes['.$i.'][pri]>';
+		  foreach(range(0,6) as $num) {
+		    if($num == 0) { $num = 1; } else {$num = $num*5; }
+		    if($int_pri == $num) { $selected[$num] = 'selected="selected"'; } else { $selected[$num] = ''; }
+		    $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+		  }
+		  $table_data.= '</select></td>';
 		}
-		$table_data.= '</select></td>';
 		$table_data.= "<td align=center>$date</td>";
-		$table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
+		if($aaronic == 0) { 
+		  $table_data.= '<td><input type=text size="50" maxlength="128" name="int_notes['.$i.'][notes]" value="'.$int_notes.'">';
+		}
 		$table_data.= '<input type=hidden name="int_notes['.$i.'][elder_id]" value="'.$id.'">';
 		$table_data.= '<input type=hidden name="int_notes['.$i.'][elder_name]" value="'.$name.'">';
 		$table_data.= '<input type=hidden name="int_notes['.$i.'][aaronic]" value="'.$aaronic.'">';
 		$table_data.= '</td>';
-		$table_data.= '</tr>';
+		$table_data.= '</tr>'."\n";
 		$i++;
 	      } else {
 		$link_data['menuaction'] = 'eq.eq.int_update';
@@ -2201,7 +2231,7 @@ class eq
 	    $families_with_yearly_visit++;
 	    $date = $this->db2->f('date');
 	    $vis_notes = $this->db2->f('notes');
-	    if(strlen($vis_notes) > 40) { $vis_notes = substr($vis_notes,0,40) . "..."; }
+	    if(strlen($vis_notes) > 40) { $vis_notes = stripslashes(substr($vis_notes,0,40) . "..."); }
 	    $completed_data.= "<tr bgcolor=". $this->t->get_var('tr_color2') ."><td title=\"$phone\"><a href=$link>$name Family</a></td>";
 	    $completed_data.= "<td align=center>$phone</td>";
 	    $completed_data.= "<td align=center><a href=".$link.">$date</a></td>";
@@ -2212,7 +2242,7 @@ class eq
 	  }
       }
 
-      $name_width=175; $phone_width=100; $date_width=100; $notes_width=300;
+      $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>";      
@@ -2402,28 +2432,17 @@ class eq
       $notes = get_var('notes',array('GET','POST'));
       $eqpresppi = get_var('eqpresppi',array('GET','POST'));
       
-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
-      $this->db->query($sql,__LINE__,__FILE__);
-      while ($this->db->next_record())
-	{
-	  $supervisor = $this->db->f('supervisor');
-	  $sql = "SELECT * FROM eq_elder WHERE elder=" . $supervisor;
-	  $this->db2->query($sql,__LINE__,__FILE__);
-	  $this->db2->next_record();
-	  $interviewer_name = $this->db2->f('name');
-	  
-	  if($supervisor == $interviewer) { 
-	    $this->t->set_var('interviewer',$supervisor . ' selected');
-	  } else {
-	    $this->t->set_var('interviewer',$interviewer);
-	  }
-	  $this->t->set_var('interviewer_name',$interviewer_name);
-	  $this->t->fp('int_list','interviewer_list',True);
-	}
-      
+      $sql = "SELECT * FROM eq_elder WHERE elder=" . $interviewer;
+      $this->db2->query($sql,__LINE__,__FILE__);
+      $this->db2->next_record();
+      $interviewer_name = $this->db2->f('name');
+      $this->t->set_var('interviewer',$interviewer . ' selected');
+      $this->t->set_var('interviewer_name',$interviewer_name);
+      $this->t->fp('int_list','interviewer_list',True);
+    
       if($action == 'save')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("UPDATE eq_ppi set " .
 			   "   ppi='" . $ppi . "'" .
 		    ", interviewer='" . $interviewer . "'" .
@@ -2438,7 +2457,7 @@ class eq
 
       if($action == 'insert')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
 			   . "VALUES ('" . $interviewer . "','" . $elder . "','"
 			   . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
@@ -2752,7 +2771,7 @@ class eq
       
       if($action == 'save')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("UPDATE eq_interview set " .
 		     "   interview='" . $interview . "'" .
 		    ", interviewer='" . $interviewer . "'" .
@@ -2767,7 +2786,7 @@ class eq
 
       if($action == 'insert')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("INSERT INTO eq_interview (interviewer,elder,aaronic,date,notes) "
 			   . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
 			   . $date . "','" . $notes ."')",__LINE__,__FILE__);
@@ -2965,7 +2984,7 @@ class eq
       
       if($action == 'save')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("UPDATE eq_visit set " .
 			   "  date='" . $date . "'" .
 			  ", notes='" . $notes . "'" .
@@ -2976,7 +2995,7 @@ class eq
 
       if($action == 'insert')
 	{
-	  $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
+	  $notes = get_var('notes',array('POST'));
 	  $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
 			   . "VALUES ('" . $family . "','" . $companionship . "','"
 			   . $date . "','" . $notes . "')",__LINE__,__FILE__);
@@ -3519,40 +3538,64 @@ class eq
 		 $time = $hour.':'.$minute.':'.'00';
 		 $uid = 0;
 
+		 // Zero out the family or elder if date = NULL
+		 if($date == "") {
+		   $elder = 0;
+		   $family = 0;
+		 }
+		 
 		 // Update an existing appointment
 		 if($appointment < $this->max_appointments)
 		   {
 		     //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'";
+			" and presidency='$presidency'" .
+			" 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" .
+		       $old_date = $this->db->f('date');
+		       $old_time = $this->db->f('time');
+		       $this->db2->query("UPDATE eq_appointment set" .
 					" family=" . $family . 
 					" ,elder=" . $elder . 
 					" ,date='" . $date . "'" .
 					" ,time='" . $time . "'" .
+					" ,presidency='" . $presidency . "'" .
 					" WHERE appointment=" . $appointment,__LINE__,__FILE__);
 		       
 		       // Email the appointment
-		       if(($date != "") && ($time != "")) { 
-			 $this->email_appt($appointment);
-		       }
+		       $this->email_appt($appointment);
 		     }
 		   }
 		 
 		 // Add a new appointment
 		 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
 		   {
-		     $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
+		     //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";
+		     $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
 			   . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
 			   . $elder . "','" . $date . "','" . $time  . "','" . $uid ."')",__LINE__,__FILE__);
-		     
-		     //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";		     
+
+		     // Now reselect this entry from the database to see if we need
+		     // to send an appointment out for it.
+		     $sql = "SELECT * FROM eq_appointment where " .
+			"elder='$elder'" .
+			" and family='$family'" .
+			" and presidency='$presidency'" .
+			" and date='$date'" .
+			" and time='$time'" .
+			" and uid='$uid'";
+		     $this->db3->query($sql,__LINE__,__FILE__);
+		     if($this->db3->next_record()) {
+		       // Email the appointment if warranted
+		       if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) { 
+			 $this->email_appt($this->db3->f('appointment'));
+		       }
+		     }
 		   }
 	       }
 	   }