X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=inc%2Fclass.eq.inc.php;h=1c25d7ace95cfcfcc977fe99cdac21f5ff65a44c;hb=d606bcf23ab3cc274e432950364fa783c52c9c00;hp=c4e73ef26180e8887470302d23fa9588f31f34d3;hpb=7bcd66aba8d66b948c78b1ae3dc830888a4693f0;p=eq%2F.git

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index c4e73ef..1c25d7a 100644
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -30,6 +30,7 @@ class eq
   var $current_month;
   var $upload_target_path;
   var $script_path;
+  var $max_appointments;
   
   var $public_functions = array
     (
@@ -71,6 +72,7 @@ class eq
       $this->default_int_num_years = 0;
       $this->default_att_num_quarters = 1;
       $this->default_vis_num_years = 1;
+      $this->max_appointments = 32768;
       $this->upload_target_path = "/home/users/eqpres/eq_data/";
       $this->script_path = "/usr/share/phpgroupware/eq/";
       
@@ -724,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'] . "'" .
@@ -750,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__);
@@ -935,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'] . "'" .
@@ -948,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__);
@@ -1101,6 +1103,7 @@ class eq
 	{
 	  $elder_name[$i] = $this->db->f('name');
 	  $elder_id[$i] = $this->db->f('elder');
+	  $elder_phone[$elder_id[$i]] = $this->db->f('phone');
 	  $i++;
 	}
       array_multisort($elder_name, $elder_id);
@@ -1115,8 +1118,21 @@ class eq
 	  $assignment_list[$i]['code'] = $this->db->f('code');
 	  $i++;
 	}
+
+      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $total_records = $this->db->num_rows();
+
+      $i = 0;
+      while ($this->db->next_record())
+	{
+	  $activity_list[$i]['assignment'] = $this->db->f('assignment');
+	  $activity_list[$i]['date'] = $this->db->f('date');
+	  $activity_list[$i]['activity']  = $this->db->f('activity');
+	  $i++;
+	}
       
-      $elder_width=230; $willing_width=40; $assignment_width=50;
+      $elder_width=275; $willing_width=40; $assignment_width=50;
       $total_width=$elder_width+$willing_width;
       
       for ($i=0; $i < count($assignment_list); $i++) {
@@ -1131,6 +1147,7 @@ class eq
 	$willing_table = ''; 
 	$this->nextmatchs->template_alternate_row_color(&$this->t);
 	$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++) {
@@ -1141,9 +1158,26 @@ class eq
 	  $this->db->query($sql,__LINE__,__FILE__);
 	  while($this->db->next_record()) {
 	    $found_willingness=1;
+	    $date_part="";
+	    $sql = "SELECT * FROM eq_activity where "
+	       . " assignment=". $assignment_list[$j]['assignment']
+	       . " ORDER by date DESC";
+	    $this->db2->query($sql,__LINE__,__FILE__);
+	    if($this->db2->next_record()) {
+	      $activity = $this->db2->f('activity');
+	      $date = $this->db2->f('date');
+	      $sql = "SELECT * FROM eq_participation where "
+		 . " activity=" . $activity
+		 . " AND elder=". $elder_id[$i];
+	      $this->db3->query($sql,__LINE__,__FILE__);
+	      if($this->db3->next_record()) {
+		$date_part = $date;
+	      } 
+	    }
+	      
 	    if($this->db->f('willing') == 'y') {
 	      $total_willing[$j]++;
-	      $willing_table .= '<td align=center><img src="checkmark.gif"></td>';
+	      $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>';
@@ -2167,7 +2201,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>";
@@ -2389,7 +2423,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_ppi set " .
 			   "   ppi='" . $ppi . "'" .
 		    ", interviewer='" . $interviewer . "'" .
@@ -2404,7 +2438,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__);
@@ -2718,7 +2752,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 . "'" .
@@ -2733,7 +2767,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__);
@@ -2931,7 +2965,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 . "'" .
@@ -2942,7 +2976,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__);
@@ -3486,7 +3520,7 @@ class eq
 		 $uid = 0;
 
 		 // Update an existing appointment
-		 if($appointment != 0)
+		 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 " .
@@ -3512,10 +3546,10 @@ class eq
 		   }
 		 
 		 // Add a new appointment
-		 else if(($appointment == 0) && ($date != "") && ($time != ""))
+		 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
 		   {
 		     $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,uid) "
-			   . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
+			   . "VALUES (NULL,'" . $presidency . "','" . $family . "','"
 			   . $elder . "','" . $date . "','" . $time  . "','" . $uid ."')",__LINE__,__FILE__);
 		     
 		     //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";		     
@@ -3652,59 +3686,64 @@ class eq
 	  }
 
 	// Create blank appointment slot
-	$appointment = 0;
-	$table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
-
-        // Date selection
-	$table_data.= '<td align=left>';
-	$table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
-	$table_data.= '</td>';
-	
-	// Time selection
-	$table_data.= "<td align=center>";
-	$table_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
-	$table_data.= '<option value=""></option>';
-	foreach(range(1,12) as $num) {
-	  $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
-	}
-	$table_data.= '</select>';
-	$table_data.= '&nbsp;:&nbsp;';
-	$table_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
-	$table_data.= '<option value=""></option>';
-	foreach(range(0,3) as $num) {
-	  $num = $num * 15; if($num == 0) { $num = "00"; }
-	  $table_data.= '<option value='.$num.'>'.$num.'</option>';
-	}
-	$table_data.= '</select>';
-	$table_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
-	$table_data.= '<option value=""></option>';
-	$table_data.= '<option value=0>am</option>';
-	$table_data.= '<option value=1>pm</option>';
-	$table_data.= '</select>';
-	$table_data.= "</td>";
+	for ($b=0; $b < 4; $b++) {
+	  $appointment = $this->max_appointments + $b;
+	  $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
+
+	  // Date selection
+	  $table_data.= '<td align=left>';
+	  $table_data.= $this->jscal->input('sched['.$presidency.']['.$appointment.'][date]','','','','','','',$this->cal_options);
+	  $table_data.= '</td>';
 	
-	// Elder drop down list
-	$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
-	$table_data.= '<option value=0></option>';  
-	for ($j=0; $j < count($elder_id); $j++) {
-	  $id = $elder_id[$j];
-	  $name = $elder_name[$j];
-	  $table_data.= '<option value='.$id.'>'.$name.'</option>';
-	}
-	$table_data.='</select></td>';
-	
-	// Family drop down list
-	$table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
-	$table_data.= '<option value=0></option>';  	    
-	for ($j=0; $j < count($elder_id); $j++) {
-	  $id = $family_id[$j];
-	  $name = $family_name[$j];
-	  $table_data.= '<option value='.$id.'>'.$name.' Family</option>';
-	}
-	$table_data.='</select></td>';
-
-	$table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
-	$table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
+	  // Time selection
+	  $table_data.= "<td align=center>";
+	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][hour]>';
+	  $table_data.= '<option value=""></option>';
+	  foreach(range(1,12) as $num) {
+	    $table_data.= '<option value='.$num.' '.$selected[$num].'>'.$num.'</option>';
+	  }
+	  $table_data.= '</select>';
+	  $table_data.= '&nbsp;:&nbsp;';
+	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][minute]>';
+	  $table_data.= '<option value=""></option>';
+	  foreach(range(0,3) as $num) {
+	    $num = $num * 15; if($num == 0) { $num = "00"; }
+	    $table_data.= '<option value='.$num.'>'.$num.'</option>';
+	  }
+	  $table_data.= '</select>';
+	  $table_data.= '<select name=sched['.$presidency.']['.$appointment.'][pm]>';
+	  $table_data.= '<option value=""></option>';
+	  $table_data.= '<option value=0>am</option>';
+	  $table_data.= '<option value=1>pm</option>';
+	  $table_data.= '</select>';
+	  $table_data.= "</td>";
+	  
+	  // Elder drop down list
+	  $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
+	  $table_data.= '<option value=0></option>';  
+	  for ($j=0; $j < count($elder_id); $j++) {
+	    $id = $elder_id[$j];
+	    $name = $elder_name[$j];
+	    $table_data.= '<option value='.$id.'>'.$name.'</option>';
+	  }
+	  $table_data.='</select></td>';
+	  
+	  // Family drop down list
+	  $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
+	  $table_data.= '<option value=0></option>';  	    
+	  for ($j=0; $j < count($elder_id); $j++) {
+	    $id = $family_id[$j];
+	    $name = $family_name[$j];
+	    $table_data.= '<option value='.$id.'>'.$name.' Family</option>';
+	  }
+	  $table_data.='</select></td>';
+	  
+	  $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
+	  $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
+
+	  $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+	  $this->t->set_var('tr_color',$tr_color);
+	}
 	
 	$this->t->set_var('table_data',$table_data);
 	$this->t->set_var('header_row',$header_row);