Fixed bug with "Add Activity" button to move it outside of the for loop

[eq/.git] / inc / class.eq.inc.php

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 32f824585502991769491f2e19841ef45a616e0b..9b59778a16192a093c58ed19d00f7b3c79536323 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -660,15 +660,15 @@ class eq
          $this->t->set_var('edit',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
          $this->t->set_var('lang_edit','Edit');
 
-         $link_data['menuaction'] = 'eq.eq.act_update';
-         $link_data['activity'] = '0';
-         $link_data['action'] = 'add';
-         $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
-                           . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
-
          $this->t->fp('list','act_list',True);
        }
 
+      $link_data['menuaction'] = 'eq.eq.act_update';
+      $link_data['activity'] = '0';
+      $link_data['action'] = 'add';
+      $this->t->set_var('add','<form method="POST" action="' . $GLOBALS['phpgw']->link('/eq/index.php',$link_data)
+                       . '"><input type="submit" name="Add" value="' . 'Add Activity' .'"></font></form>');
+
       $this->t->pfp('out','act_list_t');
       $this->save_sessiondata();
     }
@@ -772,12 +772,14 @@ class eq
          
          // Re-add the elders who are checked as having participated in this activity
          $elders = get_var('elder_name',array('POST'));
-         foreach ($elders as $elder)
-           {
-             $this->db->query("INSERT INTO eq_participation (elder,activity) "
-                              . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
-           }
-
+         if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with
+           foreach ($elders as $elder)
+             {
+               $this->db->query("INSERT INTO eq_participation (elder,activity) "
+                                . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
+             }
+         }
+         
          $this->act_list();
          return false;
        }
@@ -1599,7 +1601,7 @@ class eq
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
-           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.ppi_update';
@@ -3649,7 +3651,7 @@ class eq
       $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched'));
       $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs');
       
-      $date_width=150; $time_width=225; $elder_width=200; $family_width=200; $location_width=100;
+      $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100;
       $table_width=$date_width + $time_width + $elder_width + $family_width + $location_width;
       $header_row = "<th width=$date_width><font size=-2>Date</th>";
       $header_row.= "<th width=$time_width><font size=-2>Time</th>";      
@@ -3887,7 +3889,7 @@ class eq
            $table_data.= "</td>";
            
            // Elder drop down list (for PPIs)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';  
            for ($j=0; $j < count($elder_id); $j++) {
              $id = $elder_id[$j];
@@ -3898,7 +3900,7 @@ class eq
            $table_data.='</select></td>';
 
            // Family drop down list (for Visits)
-           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
+           $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
            $table_data.= '<option value=0></option>';              
            for ($j=0; $j < count($elder_id); $j++) {
              $id = $family_id[$j];
@@ -3910,7 +3912,7 @@ class eq
 
            // Location text box
            $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
-           $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'">';
+           $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="'.$location.'" STYLE="font-size : 8pt">';
            
            $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
            $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';
@@ -3936,7 +3938,7 @@ class eq
          $table_data.= "</td>";
          
          // Elder drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder]>';
+         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][elder] STYLE="font-size : 8pt">';
          $table_data.= '<option value=0></option>';  
          for ($j=0; $j < count($elder_id); $j++) {
            $id = $elder_id[$j];
@@ -3946,7 +3948,7 @@ class eq
          $table_data.='</select></td>';
          
          // Family drop down list
-         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family]>';
+         $table_data.= '<td align=center><select name=sched['.$presidency.']['.$appointment.'][family] STYLE="font-size : 8pt">';
          $table_data.= '<option value=0></option>';        
          for ($j=0; $j < count($elder_id); $j++) {
            $id = $family_id[$j];
@@ -3957,7 +3959,7 @@ class eq
 
          // Location text box
          $table_data.= '<td align=center><input type=text size="25" maxlength="120" ';
-         $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="">';
+         $table_data.= 'name="sched['.$presidency.']['.$appointment.'][location]" value="" STYLE="font-size : 8pt">';
          
          $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][appointment]" value="'.$appointment.'">';
          $table_data.= '<input type=hidden name="sched['.$presidency.']['.$appointment.'][presidency]" value="'.$presidency.'">';