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 3582c2f930fc51edad9b9352511946ae44b41c7f..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')
@@ -1900,8 +1915,7 @@ class tc
       $i=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
        // Select all the companions from each companionship
-       $sql = "SELECT * FROM tc_companionship where valid=1 and ".
-          "companionship=". $unique_companionships[$j]['companionship'];
+       $sql = "SELECT * FROM tc_companionship where valid=1 and companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        $k=0; $int_completed=0;
        $comp = $unique_companionships[$j]['companionship'];
@@ -1913,14 +1927,16 @@ class tc
              // Get this companions information
              $indiv_id = $this->db->f('indiv');
             
-             $sql = "SELECT * FROM tc_indiv where indiv=$indiv_id";
+             $sql = "SELECT * FROM tc_indiv where indiv='$indiv_id'";
              $this->db2->query($sql,__LINE__,__FILE__);        
-             $indiv_id = $this->db2->f('indiv');
-             $indiv_name = $this->db2->f('name');
-             $indiv_phone[$indiv_id] = $this->db2->f('phone');
-             $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri');
-             $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes');
-
+             if($this->db2->next_record())
+             {
+                     $indiv_id = $this->db2->f('indiv');
+                     $indiv_name = $this->db2->f('name');
+                     $indiv_phone[$indiv_id] = $this->db2->f('phone');
+                     $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri');
+                     $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes');
+             }
              $id = $indiv_id;
              $name = $indiv_name;
              $phone = $indiv_phone[$id];
@@ -1943,12 +1959,11 @@ class tc
              }
              
              // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
-             $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
-                "AND indiv=" . $id;
+             $sql = "SELECT * FROM tc_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' AND indiv='$id'";
              $this->db2->query($sql,__LINE__,__FILE__);
              
              if(!$this->db2->next_record()) {
-               $sql = "SELECT * FROM tc_interview WHERE indiv=" . $id . " ORDER BY date DESC";
+               $sql = "SELECT * FROM tc_interview WHERE indiv='$id' ORDER BY date DESC";
                $this->db3->query($sql,__LINE__,__FILE__);
                if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
                $link_data['menuaction'] = 'tc.tc.int_update';
@@ -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;