fix some filtering of visit data like families to visit so they only list the ones...

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

diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php
index 4b072ca0ba0c28fde0589e6ac13fdbb3fbbd9af7..2a7310975746abfcf381838cfcde17e37f1455d9 100644 (file)
--- a/inc/class.tc.inc.php
+++ b/inc/class.tc.inc.php
@@ -1540,7 +1540,7 @@ class tc
 
       // PPI SCHEDULING TABLE
       // TODO:  changed this so it picks the quorum dynamically
-      $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY ppi_pri ASC";
+      $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY ppi_pri ASC, name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       
       $i=0; 
@@ -1703,7 +1703,7 @@ class tc
 
       // create the individual id -> individual name mapping
       // TODO:  changed this so it picks the quorum dynamically
-      $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $indiv_id_data = NULL;
@@ -1715,6 +1715,21 @@ class tc
          $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
          $i++;
        }
+      // add any YM that are home teachers
+      $sql = "SELECT * FROM tc_companionship where valid=1";
+      $this->db->query($sql,__LINE__,__FILE__);
+      while ($this->db->next_record())
+      {
+         $tmp_indiv_id = $this->db->f('indiv');
+          $sql = "Select * FROM tc_indiv where indiv='$tmp_indiv_id' and steward='' and valid=1";
+          $this->db2->query($sql,__LINE__,__FILE__);
+          while ($this->db2->next_record()) {
+             $indiv_name_data[$i] = $this->db2->f('name');
+             $indiv_id_data[$i] = $this->db2->f('indiv');
+             $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i];
+             $i++;
+         }
+      }
       array_multisort($indiv_name_data, $indiv_id_data);
 
       if($action == 'save')
@@ -2070,7 +2085,7 @@ class tc
       $year = date('Y');
 
       // create the family id -> family name mapping
-      $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 ORDER BY name ASC";
+      $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $family_id = NULL;
@@ -2214,7 +2229,7 @@ class tc
 
       
       // VISIT SCHEDULING TABLE
-      $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 ORDER BY visit_pri ASC";
+      $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0  and companionship != 0 ORDER BY visit_pri ASC, name ASC";
       $this->db->query($sql,__LINE__,__FILE__);
 
       $total_families=0; $families_with_yearly_visit=0;