projects / eq / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added ability for aaronic to be given PPIs.
[eq/.git] / inc / class.eq.inc.php
diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 8c2984e511210cbe2e203254bdb40552d074112f..0512ca0c74d492a201e542759d9edafefd8c81ca 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -37,7 +37,8 @@ class eq
      'vis_view'   => True,
      'vis_update' => True,
      'att_view'   => True,
-     'att_update' => True
+     'att_update' => True,
+     'dir_view'   => True
      );
  
   function eq()
@@ -105,6 +106,9 @@ class eq
       $link_data['menuaction'] = 'eq.eq.att_view';     
       $this->t->set_var('link_attendance',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_attendance','Attendance');
+      $link_data['menuaction'] = 'eq.eq.dir_view';     
+      $this->t->set_var('link_dir',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_dir','Directory');
                
       $this->t->pparse('out','eq_header');
     }
@@ -143,6 +147,7 @@ class eq
        {
          $elder_id[$i] = $this->db->f('elder');
          $elder_name[$i] = $this->db->f('name');
+         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
          $i++;
        }
       array_multisort($elder_name, $elder_id);
@@ -159,6 +164,7 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       $total_families = 0;
@@ -192,15 +198,21 @@ class eq
          while ($this->db->next_record())
            {
              // Get this companions information
-             if($companion_table_entry != "") { $companion_table_entry .= " / "; }
+             if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
              $companionship = $this->db->f('companionship');
              $elder_id = $this->db->f('elder');
              $aaronic_id = $this->db->f('aaronic');
-             if($elder_id) { $name = $elders[$elder_id]; }
-             else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-             $companion_table_entry .= "$name";
+             if($elder_id) {
+               $name = $elders[$elder_id];
+               $phone = $elder_phone[$elder_id];
+             }
+             else if($aaronic_id) {
+               $name = $aaronic[$aaronic_id]['name'];
+               $phone = $aaronic[$aaronic_id]['phone'];                
+             }
+             $companion_table_entry .= "<td title=\"$phone\"><b>$name</b></td>";
            }
-         $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><b>$companion_table_entry<hr></td></tr>";
+         $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
          
          // Get the names of the families assigned this home teaching companionship
          $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
@@ -367,6 +379,7 @@ class eq
        {
          $elder_id[$i] = $this->db->f('elder');
          $elder_name[$i] = $this->db->f('name');
+         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
          $i++;
        }
       array_multisort($elder_name, $elder_id);
@@ -383,10 +396,11 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       // Select all the unique companionship numbers for this district
-      $sql = "SELECT distinct companionship FROM eq_companionship where district=". $district;
+      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships='';
       while ($this->db->next_record())
@@ -395,7 +409,7 @@ class eq
          $j++;
        }
       
-      $comp_width=300; $visit_width=25; $table_width=$comp_width + $num_months*$visit_width;
+      $comp_width=300; $visit_width=25; $table_width=$comp_width + $visit_width;
       $table_data=""; $num_companionships = 0; $num_families = 0; $visits=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
        $companion_table_entry = "";
@@ -407,15 +421,21 @@ class eq
        while ($this->db->next_record())
          {
            // Get this companions information
-           if($companion_table_entry != "") { $companion_table_entry .= "&nbsp;/&nbsp;"; }
+           if($companion_table_entry != "") { $companion_table_entry .= "<td>&nbsp;/&nbsp;</td>"; }
            $companionship = $this->db->f('companionship');
            $elder_id = $this->db->f('elder');
            $aaronic_id = $this->db->f('aaronic');
-           if($elder_id) { $name = $elders[$elder_id]; }
-           else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
-           $companion_table_entry .= "$name";
+           if($elder_id) {
+             $name = $elders[$elder_id];
+             $phone = $elder_phone[$elder_id];
+           }
+           else if($aaronic_id) {
+             $name = $aaronic[$aaronic_id]['name'];
+             $phone = $aaronic[$aaronic_id]['phone'];
+           }
+           $companion_table_entry .= "<td title=\"$phone\"><b>$name</b></td>";
          }
-       $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><b>$companion_table_entry</b><hr></td></tr>";
+       $table_data.= "<tr bgcolor=#d3dce3><td colspan=20><table><tr>$companion_table_entry</tr></table><hr></td></tr>";
        
        // Get the names of the families assigned this home teaching companionship
        $sql = "SELECT * from eq_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];
@@ -852,6 +872,7 @@ class eq
        {
          $elder_id[$i] = $this->db->f('elder');
          $elder_name[$i] = $this->db->f('name');
+         $elder_phone[$elder_id[$i]] = $this->db->f('phone');
          $i++;
        }
       array_multisort($elder_name, $elder_id);
@@ -866,6 +887,7 @@ class eq
        {
          $aaronic_id = $this->db->f('aaronic');
          $aaronic[$aaronic_id]['name'] = $this->db->f('name');
+         $aaronic[$aaronic_id]['phone'] = $this->db->f('phone');
        }
       
       $total_companionships = 0;
@@ -911,6 +933,8 @@ class eq
           }
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
+         $comp = $unique_companionships[$j]['companionship'];
+         for($m=$num_months; $m >= 0; $m--) { $ppi_recorded[$comp][$m] = 0; }
          while ($this->db->next_record())
            {
              // Get this companions information
@@ -918,23 +942,26 @@ class eq
              $companionship = $this->db->f('companionship');
              $elder_id = $this->db->f('elder');
              $aaronic_id = $this->db->f('aaronic');
-             if($elder_id) { $name = $elders[$elder_id]; }
-             else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; }
+             if($elder_id) {
+               $name = $elders[$elder_id];
+               $phone = $elder_phone[$elder_id];
+             }
+             else if($aaronic_id) {
+               $name = $aaronic[$aaronic_id]['name'];
+               $phone = $aaronic[$aaronic_id]['phone'];
+             }
              $link_data['menuaction'] = 'eq.eq.ppi_update';
              $link_data['companionship'] = $companionship;
              $link_data['interviewer'] = $supervisor;
              $link_data['elder'] = $elder_id;
+             $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;
              $link_data['ppi'] = '';
              $link_data['eqpresppi'] = $eqpresppi;
              $link_data['action'] = 'add';
              $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
-             if($aaronic_id == 0) {
-               $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td><a href=$link>$name</a></td>";
-             } else {
-               $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$name</td>";
-             }
-             
+             $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
+
              // Find out how many times PPIs were performed in the past $num_months for this Elder
              $header_row="<th width=$comp_width><font size=-2>Companionship</th>";
              for($m=$num_months; $m >= 0; $m--) {
@@ -942,7 +969,7 @@ class eq
                  $year = date('Y') - $m;
                  $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
                  $sql = "SELECT * FROM eq_ppi WHERE date > '$year_start' AND date < '$year_end' ".
-                        "AND elder=" . $elder_id . " AND eqpresppi=1";
+                        "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=1";
                  $this->db2->query($sql,__LINE__,__FILE__);
                  $header_row .= "<th width=150><font size=-2>$year</th>"; 
                }
@@ -952,17 +979,20 @@ class eq
                  $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01";
                  $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31";
                  $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
-                        "AND elder=" . $elder_id . " AND eqpresppi=0";
+                        "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=0";
                  $this->db2->query($sql,__LINE__,__FILE__);
                  $header_row .= "<th width=$ppi_width><font size=-2>$month</th>";
                }
                if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
                if($this->db2->next_record()) {
-                 $ppis[$m]++; $total_ppis[$m]++;
+                 if(!$ppi_recorded[$companionship][$m]) {
+                   $ppis[$m]++; $total_ppis[$m]++; $ppi_recorded[$companionship][$m]=1;
+                 }
                  $link_data['menuaction'] = 'eq.eq.ppi_update';
                  $link_data['companionship'] = $companionship;
                  $link_data['interviewer'] = $this->db2->f('interviewer');
                  $link_data['elder'] = $elder_id;
+                 $link_data['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;
                  $link_data['ppi'] = $this->db2->f('ppi');
                  $link_data['eqpresppi'] = $eqpresppi;
@@ -972,12 +1002,7 @@ class eq
                  $month = $date_array[1];
                  $day   = $date_array[2];
                  $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
-
-                 if($aaronic_id == 0) {
-                   $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif"><br>'.$month.'-'.$day.'</a></td>';
-                 } else {
-                   $table_data .= '<td align=center><img src="checkmark.gif"></td>';
-                 }
+                 $table_data .= '<td align=center><a href='.$link.'><img src="checkmark.gif"><br>'.$month.'-'.$day.'</a></td>';
                }
                else { $table_data .= "<td>&nbsp;</td>"; }
              }
@@ -1083,10 +1108,11 @@ class eq
       $name = get_var('name',array('GET','POST'));
       $ppi = get_var('ppi',array('GET','POST'));
       $elder = get_var('elder',array('GET','POST'));
+      $aaronic = get_var('aaronic',array('GET','POST'));
       $date = get_var('date',array('GET','POST'));
       $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())
@@ -1113,6 +1139,7 @@ class eq
                           "   ppi='" . $ppi . "'" .
                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
+                       ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                      ", eqpresppi='" . $eqpresppi . "'" .
@@ -1124,8 +1151,8 @@ class eq
       if($action == 'insert')
        {
          $notes = $this->db->db_addslashes(get_var('notes',array('POST')));
-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,date,notes,eqpresppi) "
-                          . "VALUES ('" . $interviewer . "','" . $elder . "','"
+         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+                          . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
          $this->ppi_view();
          return false;
@@ -1138,6 +1165,7 @@ class eq
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
+         $this->t->set_var('aaronic',$aaronic);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
          $this->t->set_var('eqpresppi',$eqpresppi);
@@ -1156,6 +1184,7 @@ class eq
          $this->t->set_var('name',$name);
          $this->t->set_var('interviewer', $this->db->f('interviewer'));
          $this->t->set_var('elder',$this->db->f('elder'));
+         $this->t->set_var('aaronic',$this->db->f('aaronic'));
          $this->t->set_var('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));
          $this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
@@ -1694,6 +1723,14 @@ class eq
       $this->save_sessiondata();       
     }
 
+  function dir_view()
+    {
+      $this->t->set_file(array('form' => 'dir_view.tpl'));
+      
+      $this->t->pfp('out','form');
+      $this->save_sessiondata();   
+    }
+  
 }
 
 ?>
phpgroupware module for managing the administrative tasks of an Elders Quorum