Added new phone and address field to eq_parent table.

Added new header for online ward directory.
Updated parsing script to fill phone & address fields.

diff --git a/import_ward_data b/import_ward_data
index 6a1e121ed9acd45c1f1d77dcb4cc1c24eb12ad1d..2c95e99ef64990d521fb19236fc7ed5f2bafbd18 100755 (executable)
--- a/import_ward_data
+++ b/import_ward_data
@@ -399,6 +399,13 @@ sub update_eq_parent_table
                $birthday = $membership_data{$index}{'Birth'};
                $birthday =~ /(\d+) (\S+) (\d+)/; $day=$1; $month=$monthname2num{$2}; $year=$3;
                $hofh_id = $membership_data{$index}{'HofH ID'};
+               $phone = $membership_data{$index}{'Phone 1'};
+               if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "970-$1"; }
+               if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
+               $address = $membership_data{$index}{'Street 1'};
+               if($membership_data{$index}{'Street 2'} ne "") { 
+                   $address .= " " . $membership_data{$index}{'Street 2'};
+               }
 
                # Find the family id for this parent's HofH_ID.
                $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id'");
@@ -416,7 +423,7 @@ sub update_eq_parent_table
                if($rows == 0) {
                    # No existing records found for this parent, make a new entry
                    print "   Adding new Parent: $parent_name\n";
-                   $sth = $dbh->prepare("insert into eq_parent values (NULL,$family_id,'$parent_name','$year-$month-$day',1)");
+                   $sth = $dbh->prepare("insert into eq_parent values (NULL,$family_id,'$parent_name','$year-$month-$day','$phone','$address',1)");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this parent, update it
@@ -425,6 +432,10 @@ sub update_eq_parent_table
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth = $dbh->prepare("update eq_parent set birthday='$year-$month-$day' where name='$parent_name'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                   $sth = $dbh->prepare("update eq_parent set phone='$phone' where name='$parent_name'");
+                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                   $sth = $dbh->prepare("update eq_parent set address='$address' where name='$parent_name'");
+                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth = $dbh->prepare("update eq_parent set valid=1 where name='$parent_name'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
            } else {

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 737306148f4acec3f3e593be403d2504171de504..fbf82aabc95218eb70a17c473a5d24168d667558 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');
     }
@@ -1700,6 +1704,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();   
+    }
+  
 }
 
 ?>

diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index ca6d7cdbc46a5c6a6c64ab955bc585037dd18a71..4a624a1f345cd320f27bc37a9b484087ac6aba37 100644 (file)
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -21,6 +21,9 @@
                                         
                                          
                                         <a href="{link_attendance}">{lang_attendance}</a>
+                                       &nbsp;
+                                        &nbsp;
+                                        <a href="{link_dir}">{lang_dir}</a>
                                        </b></font></td>
 
                        </tr>