Fixed HT apps to sort families under a companionship in alphabetical order.

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

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 0512ca0c74d492a201e542759d9edafefd8c81ca..aa604813f5caea63353973e289acd3d4093c6bc4 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -43,10 +43,10 @@ class eq
  
   function eq()
     {
-      $this->default_ht_num_months = 1;
-      $this->default_ppi_num_months = 1;
+      $this->default_ht_num_months = 3;
+      $this->default_ppi_num_months = 3;
       $this->default_ppi_num_years = 0;
-      $this->default_att_num_months = 1;
+      $this->default_att_num_months = 3;
       
       $this->db                = $GLOBALS['phpgw']->db;
       $this->db2       = $this->db;
@@ -216,6 +216,7 @@ class eq
          
          // 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'];
+         $sql = $sql . " ORDER BY name ASC";
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
          while ($this->db->next_record())
@@ -328,7 +329,7 @@ class eq
       if($action == 'save')
        {
          // Get a list of all the companionships in 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;
          while ($this->db->next_record())
@@ -344,7 +345,9 @@ class eq
              // companionship. This will lead to duplicate visits being entered for an older
              // month for the same family, making it impossible to change the past history once
              // a family is reassigned. However, you will be able to view the history just fine.
-             
+
+             //$comp=$unique_companionships[$j]['companionship'];
+             //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district<br>";
              // Delete all the visits that have taken place for all families for this month
              $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
                               " AND " . "date='" . $date . "'",__LINE__,__FILE__);
@@ -439,6 +442,7 @@ class eq
        
        // 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'];
+       $sql = $sql . " ORDER BY name ASC";
        $this->db->query($sql,__LINE__,__FILE__);
        while ($this->db->next_record())
          {
@@ -905,7 +909,7 @@ class eq
                
        // Select all the unique companionship numbers for this district
        if($eqpresppi == 1) { 
-         $sql = "SELECT distinct companionship FROM eq_companionship";
+         $sql = "SELECT distinct companionship FROM eq_companionship where valid=1";
        } 
        else {
          $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
@@ -1725,9 +1729,35 @@ class eq
 
   function dir_view()
     {
-      $this->t->set_file(array('form' => 'dir_view.tpl'));
+      $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
+      $this->t->set_block('dir_view_t','dir_list','list');
       
-      $this->t->pfp('out','form');
+      $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+      $this->db->query($sql,__LINE__,__FILE__);
+      $i=0;
+      while ($this->db->next_record())
+       {
+         $parent[$i]['id'] = $this->db->f('parent');
+         $parent[$i]['name'] = $this->db->f('name');
+         $parent[$i]['phone'] = $this->db->f('phone');
+         $parent[$i]['address'] = $this->db->f('address');
+         $i++;
+       }   
+      
+      for ($i=0; $i < count($parent); $i++) 
+      {
+        $name = $parent[$i]['name'];
+       $phone = $parent[$i]['phone'];
+       $address = $parent[$i]['address'];
+       $this->t->set_var('name', $name);
+       $this->t->set_var('address', $address);
+       $this->t->set_var('phone', $phone);
+        $tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+        $this->t->set_var('tr_color',$tr_color);
+       $this->t->fp('list','dir_list',True);
+       //print "$phone $name $address<br>";
+      }
+      $this->t->pfp('out','dir_view_t');
       $this->save_sessiondata();   
     }