Removed all calls to db->db_addslashes. This seems to be unnecessary.
[eq/.git] / inc / class.eq.inc.php
index 4c26542c8efcc38020379282c3aec1f27e86166c..1c25d7ace95cfcfcc977fe99cdac21f5ff65a44c 100644 (file)
@@ -30,6 +30,7 @@ class eq
   var $current_month;
   var $upload_target_path;
   var $script_path;
+  var $max_appointments;
   
   var $public_functions = array
     (
@@ -55,6 +56,8 @@ class eq
      'schedule'   => True,
      'admin'      => True,
      'email_appt' => True,
+     'willing_view'   => True,
+     'willing_update' => True,
      'send_ical_appt' => True,
      'assign_view'    => True,
      'assign_update'  => True,
@@ -69,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/";
       
@@ -127,6 +131,9 @@ class eq
       $link_data['menuaction'] = 'eq.eq.act_list';
       $this->t->set_var('link_activity',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_activity','Activities');
+      $link_data['menuaction'] = 'eq.eq.willing_view';
+      $this->t->set_var('link_willing',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_willing','Willingness');
       $link_data['menuaction'] = 'eq.eq.assign_view';
       $this->t->set_var('link_assignment',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_assignment','Assignments');
@@ -719,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'] . "'" .
@@ -745,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__);
@@ -930,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'] . "'" .
@@ -943,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__);
@@ -1031,7 +1038,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 +1070,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>';
          }
@@ -1081,9 +1089,246 @@ class eq
       $this->t->pfp('out','par_view_t');
       $this->save_sessiondata(); 
     }
-  
-  function ppi_sched()
+
+    function willing_view()
+    {
+      $this->t->set_file(array('willing_view_t' => 'willing_view.tpl'));
+      $this->t->set_block('willing_view_t','header_list','list1');
+      $this->t->set_block('willing_view_t','elder_list','list2');
+
+      $sql = "SELECT * FROM eq_elder where valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $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);
+
+      $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++;
+       }
+
+      $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=275; $willing_width=40; $assignment_width=50;
+      $total_width=$elder_width+$willing_width;
+      
+      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 += $assignment_width;
+       $total_willing[$i] = 0;
+      }
+
+      for ($i=0; $i < count($elder_id); $i++) {
+       $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++) {
+         $found_willingness=0;
+         $sql = "SELECT * FROM eq_willingness where "
+            . " assignment=" . $assignment_list[$j]['assignment']
+            . " AND elder=" . $elder_id[$i];
+         $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"><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 {
+             $willing_table .= "<td>&nbsp;</td>";
+           }
+         }
+         if(!$found_willingness) {
+           $willing_table .= "<td>&nbsp;</td>";
+         }
+       }
+       $this->t->set_var('willing_table',$willing_table);
+       $this->t->fp('list2','elder_list',True);
+      }
+
+      $stat_table = '<td><b>Total Willing to Serve</b></td>';
+      for ($j=0; $j < count($assignment_list); $j++) {
+       $stat_table .= "<td align=center><b>".$total_willing[$j]."</b></td>";
+      }
+      $this->t->set_var('stat_table',$stat_table);
+      
+      $this->t->set_var('total_width',$total_width);
+      $this->t->set_var('elder_width',$elder_width);
+      $this->t->set_var('willing_width',$willing_width);
+      $this->t->pfp('out','willing_view_t');
+      $this->save_sessiondata(); 
+    }
+    
+  function willing_update()
     {
+      //print "<font color=red>Willingness Update Under Constrcution</font>";
+      //$this->willing_view();
+      //return false;
+      
+      $this->t->set_file(array('willing_update_t' => 'willing_update.tpl'));
+      $this->t->set_block('willing_update_t','assignment_list','list');
+      $this->t->set_block('willing_update_t','save','savehandle');
+      
+      $elder_id = get_var('elder_id',array('GET','POST'));
+      $this->t->set_var('elder_id',$elder_id);
+      $action = get_var('action',array('GET','POST'));
+      
+      $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view'));
+      $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&action=save'));
+      $this->t->set_var('lang_done','Cancel');
+      $this->t->set_var('title','Willingness Update ');
+      
+      if($action == 'save')
+       {
+         // Delete all the previous willingness entries for this elder
+         $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
+             
+         // Now, add the assignment willingness that is checked for this elder
+         $new_data = get_var('willingness',array('POST'));
+         foreach ($new_data as $data)
+           {
+             $data_array = explode("/",$data);
+             $assignment = $data_array[0];
+             $willing = $data_array[1];
+             //print "elder_id: $elder_id assignment: $assignment willing: $willing<br>";
+             $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) "
+                              . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
+           }      
+         $this->willing_view();
+         return false;
+       }
+      
+      $assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width;
+      $table_data=""; 
+
+      // Find out the elder's name
+      $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      if($this->db->next_record()) {
+       $elder_name = $this->db->f('name');
+       $this->t->set_var('elder_name',$elder_name);
+      }
+      
+      // Select all the assignments
+      $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      
+      while ($this->db->next_record())
+       {
+         $assignment = $this->db->f('assignment');
+         $assignment_name = $this->db->f('name');
+         $assignment_code = $this->db->f('code');
+
+         $this->nextmatchs->template_alternate_row_color(&$this->t);
+         $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$assignment_name</td>";
+         
+         $header_row="<th width=$comp_width><font size=-2>Assignments</th><th>Willingness</th>";
+         $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+         $this->db2->query($sql,__LINE__,__FILE__);
+         $value = $assignment;
+            
+         if($this->db2->next_record()) {
+             if($this->db2->f('willing') == 'y') {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y" checked>Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/"> ';
+               $table_data .= '</td>';
+             } else if($this->db2->f('willing') == 'n') {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n" checked>N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/">';
+               $table_data .= '</td>';
+             } else {
+               $table_data .= '<td width=100 align=center>';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+               $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/" checked> ';
+               $table_data .= '</td>';
+             }
+           }
+         else {
+           $table_data .= '<td width=100 align=center>';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/y">Y';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/n">N';
+           $table_data .= '<input type="radio" name="willingness['.$assignment.']" value="'.$value.'/" checked> ';
+           $table_data .= '</td>';
+         }
+         
+         $table_data .= "\n";
+         $table_data .= "</tr>"; 
+         $table_data .= "<tr><td colspan=20></td></tr>";
+       }
+      
+      $table_data .= "<tr><td colspan=20><hr></td></tr>";
+      
+      $this->t->set_var('table_width',$table_width);
+      $this->t->set_var('header_row',$header_row);
+      $this->t->set_var('table_data',$table_data);
+      $this->t->fp('list','assignment_list',True);
+
+      $this->t->set_var('lang_reset','Clear Form');
+      $this->t->set_var('lang_save','Save Changes');
+      $this->t->set_var('savehandle','');
+      
+      $this->t->pfp('out','willing_update_t');
+      $this->t->pfp('addhandle','save');
+      
+      $this->save_sessiondata();
+    }
+    
+    
+    function ppi_sched()
+      {
       $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl'));
       $this->t->set_block('ppi_sched_t','elder_list','elderlist');
       $this->t->set_block('ppi_sched_t','appt_list','apptlist');
@@ -1123,13 +1368,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 +1660,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 +2004,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
@@ -1942,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>";
@@ -2164,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 . "'" .
@@ -2179,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__);
@@ -2493,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 . "'" .
@@ -2508,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__);
@@ -2706,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 . "'" .
@@ -2717,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__);
@@ -3261,24 +3520,36 @@ class eq
                 $uid = 0;
 
                 // Update an existing appointment
-                if($appointment != 0)
+                if($appointment < $this->max_appointments)
                   {
-                    $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 != ""))
+                else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
-                    $this->db->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time) "
-                          . "VALUES ('" . $appointment . "','" . $presidency . "','" . $family . "','"
+                    $this->db->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>";                    
@@ -3415,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>";
-       
-       // 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>';
+       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>';
        
-       // 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);