database changes

 - changed tables to start with 3rd_ instead of eq_
 - added prospective flag to 3rd_elder table
 - added visit_type, companion1, companion2 fields to 3rd_visit table
 - changed 3rd_ppi table to 3rd_interview
 - "converted" eqpresppi field to interview_type (enumeration) in 3rd_interview table
 - changed ppi field to interview in 3rd_interview table

more changes

asdf

again

diff --git a/3rd.spec b/3rd.spec
new file mode 100644 (file)
index 0000000..a1e16b6
--- /dev/null
+++ b/3rd.spec
@@ -0,0 +1,56 @@
+%define packagename eq
+%define phpgwdirname eq
+%define version 0.0.1.000
+
+# This is for Mandrake RPMS 
+# (move these below the RedHat ones for Mandrake RPMs)
+%define httpdroot  /var/www/html/phpgroupware
+%define packaging 1mdk
+
+# This is for RedHat RPMS
+# (move these below the Mandrake ones for RedHat RPMs)
+%define httpdroot  /home/httpd/html/phpgroupware
+%define packaging 1
+
+Summary: Tools for Managing an Elders Quorum app for phpGroupWare. 
+Name: %{packagename}
+Version: %{version}
+Release: %{packaging}
+Copyright: GPL
+Group: Web/Database
+URL: http://www.phpgroupware.org/apps/eq/
+Source0: ftp://ftp.sourceforge.net/pub/sourceforge/phpgroupware/%{packagename}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{packagename}-buildroot
+Prefix: %{httpdroot}
+Buildarch: noarch
+requires: phpgroupware >= 0.9.10
+AutoReq: 0
+
+%description
+This is an Elders Quorum Presidency Application.
+
+%prep
+%setup -n %{phpgwdirname}
+
+%build
+# no build required
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{prefix}/%{phpgwdirname}
+cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{phpgwdirname}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+
+%postun
+
+%files
+%{prefix}/%{phpgwdirname}
+
+%changelog
+- EQ App Update
+
+# end of file

diff --git a/bin/check_config_syntax b/bin/check_config_syntax
index 246dc3835e3a63b004e9917f4be223984cdc004c..d5f303d52b89196dd816a067fd9a735689385182 100755 (executable)
--- a/bin/check_config_syntax
+++ b/bin/check_config_syntax
@@ -2,5 +2,5 @@
 
 perl ../setup/db_config
 [ $? == 0 ] && echo "No syntax errors detected in ../setup/db_config"
 
 perl ../setup/db_config
 [ $? == 0 ] && echo "No syntax errors detected in ../setup/db_config"

-php -l ../setup/eq_config
+php -l ../setup/3rd_config

 
 

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 2b22197357de0f08a0a920f3c2cc488acebb8b26..13e6a0e86ab3ebc436c14c28fb7b2013fb1cc563 100755 (executable)
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -102,7 +102,7 @@ sub print_hash
 
 ######################################################################
 
 
 ######################################################################
 

-# EQ_AARONIC
+# 3RD_AARONIC

 #+-------+--------------------+------+-----+---------+-------+
 #| Field | Type               | Null | Key | Default | Extra |
 #+-------+--------------------+------+-----+---------+-------+
 #+-------+--------------------+------+-----+---------+-------+
 #| Field | Type               | Null | Key | Default | Extra |
 #+-------+--------------------+------+-----+---------+-------+


@@ -112,12 +112,12 @@ sub print_hash
 #| email   | varchar(120)     | YES  |     | NULL    |       |
 #| valid   | tinyint(1)       | YES  |     | NULL    |       |
 #+-------+--------------------+------+-----+---------+-------+
 #| email   | varchar(120)     | YES  |     | NULL    |       |
 #| valid   | tinyint(1)       | YES  |     | NULL    |       |
 #+-------+--------------------+------+-----+---------+-------+

-sub update_eq_aaronic_table
+sub update_3rd_aaronic_table

 {
 {

-    print "\n-> Updating eq_aaronic table\n";
+    print "\n-> Updating 3rd_aaronic table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.

-    $sth = $dbh->prepare("update eq_aaronic set valid=0");
+    $sth = $dbh->prepare("update 3rd_aaronic set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)


@@ -134,7 +134,7 @@ sub update_eq_aaronic_table
                if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
                $email = $membership_data{$index}{'Individual E-mail'};
                if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
                if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
                $email = $membership_data{$index}{'Individual E-mail'};
                if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }

-               $sth = $dbh->prepare("select * from eq_aaronic where name='$aaronic_name'");
+               $sth = $dbh->prepare("select * from 3rd_aaronic where name='$aaronic_name'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -142,16 +142,16 @@ sub update_eq_aaronic_table
                if($rows == 0) {
                    # No existing records found for this aaronic, make a new entry
                    print "   Adding new Aaronic: $aaronic_name\n";
                if($rows == 0) {
                    # No existing records found for this aaronic, make a new entry
                    print "   Adding new Aaronic: $aaronic_name\n";

-                   $sth = $dbh->prepare("insert into eq_aaronic values (NULL,'$aaronic_name','$phone','$email',1)");
+                   $sth = $dbh->prepare("insert into 3rd_aaronic values (NULL,'$aaronic_name','$phone','$email',1)");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this aaronic, update it, mark it valid!
                    print "   Updating existing aaronic: $aaronic_name\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this aaronic, update it, mark it valid!
                    print "   Updating existing aaronic: $aaronic_name\n";

-                   $sth = $dbh->prepare("update eq_aaronic set phone='$phone' where name='$aaronic_name'");
+                   $sth = $dbh->prepare("update 3rd_aaronic set phone='$phone' where name='$aaronic_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_aaronic set email='$email' where name='$aaronic_name'");
+                   $sth = $dbh->prepare("update 3rd_aaronic set email='$email' where name='$aaronic_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_aaronic set valid=1 where name='$aaronic_name'");
+                   $sth = $dbh->prepare("update 3rd_aaronic set valid=1 where name='$aaronic_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.


@@ -163,7 +163,7 @@ sub update_eq_aaronic_table
     $sth->finish();
 }
 
     $sth->finish();
 }
 

-# EQ_ELDER
+# 3RD_ELDER

 #+-------------+------------------+------+-----+---------+----------------+
 #| Field       | Type             | Null | Key | Default | Extra          |
 #+-------------+------------------+------+-----+---------+----------------+
 #+-------------+------------------+------+-----+---------+----------------+
 #| Field       | Type             | Null | Key | Default | Extra          |
 #+-------------+------------------+------+-----+---------+----------------+


@@ -180,12 +180,12 @@ sub update_eq_aaronic_table
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+

-sub update_eq_elder_table
+sub update_3rd_elder_table

 {
 {

-    print "\n-> Updating eq_elder table\n";
+    print "\n-> Updating 3rd_elder table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.

-    $sth = $dbh->prepare("update eq_elder set valid=0");
+    $sth = $dbh->prepare("update 3rd_elder set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)


@@ -228,7 +228,7 @@ sub update_eq_elder_table
                if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
                $email = $membership_data{$index}{'Individual E-mail'};
                if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
                if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
                $email = $membership_data{$index}{'Individual E-mail'};
                if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }

-               $sth = $dbh->prepare("select * from eq_elder where name='$elder_name'");
+               $sth = $dbh->prepare("select * from 3rd_elder where name='$elder_name'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -236,26 +236,26 @@ sub update_eq_elder_table
                if($rows == 0) {
                    # No existing records found for this elder, make a new entry
                    print "   Adding new Elder: $elder_name\n";
                if($rows == 0) {
                    # No existing records found for this elder, make a new entry
                    print "   Adding new Elder: $elder_name\n";

-                   $sth = $dbh->prepare("insert into eq_elder values (NULL,'$id','$elder_name','$phone','$email','$priesthood','1','','1','',$attending,1)");
+                   $sth = $dbh->prepare("insert into 3rd_elder values (NULL,'$id','$elder_name','$phone','$email','$priesthood','n','1','','1','',$attending,1)");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this elder, update it
                    print "   Updating existing Elder: $elder_name\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this elder, update it
                    print "   Updating existing Elder: $elder_name\n";

-                   $sth = $dbh->prepare("update eq_elder set valid=1 where name='$elder_name'");
+                   $sth = $dbh->prepare("update 3rd_elder set valid=1 where name='$elder_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    if($phone ne "") { 
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    if($phone ne "") { 

-                       $sth = $dbh->prepare("update eq_elder set phone='$phone' where name='$elder_name'");
+                       $sth = $dbh->prepare("update 3rd_elder set phone='$phone' where name='$elder_name'");

                    } else {
                    } else {

-                       $sth = $dbh->prepare("update eq_elder set phone=NULL where name='$elder_name'");
+                       $sth = $dbh->prepare("update 3rd_elder set phone=NULL where name='$elder_name'");

                    }
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    }
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_elder set attending='$attending' where name='$elder_name'");
+                   $sth = $dbh->prepare("update 3rd_elder set attending='$attending' where name='$elder_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_elder set indiv_id='$id' where name='$elder_name'");
+                   $sth = $dbh->prepare("update 3rd_elder set indiv_id='$id' where name='$elder_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_elder set priesthood='$priesthood' where name='$elder_name'");
+                   $sth = $dbh->prepare("update 3rd_elder set priesthood='$priesthood' where name='$elder_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_elder set email='$email' where name='$elder_name'");
+                   $sth = $dbh->prepare("update 3rd_elder set email='$email' where name='$elder_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.


@@ -267,7 +267,7 @@ sub update_eq_elder_table
     $sth->finish();
 }
 
     $sth->finish();
 }
 

-# EQ_CALLING
+# 3RD_CALLING

 #+--------------+------------------+------+-----+---------+-------+
 #| Field        | Type             | Null | Key | Default | Extra |
 #+--------------+------------------+------+-----+---------+-------+
 #+--------------+------------------+------+-----+---------+-------+
 #| Field        | Type             | Null | Key | Default | Extra |
 #+--------------+------------------+------+-----+---------+-------+


@@ -278,16 +278,16 @@ sub update_eq_elder_table
 #| sequence     | int(16) unsigned | YES  |     | NULL    |       |
 #| sustained    | date             | YES  |     | NULL    |       |
 #+--------------+------------------+------+-----+---------+-------+
 #| sequence     | int(16) unsigned | YES  |     | NULL    |       |
 #| sustained    | date             | YES  |     | NULL    |       |
 #+--------------+------------------+------+-----+---------+-------+

-sub update_eq_calling_table()
+sub update_3rd_calling_table()

 {
 {

-    print "\n-> Updating eq_calling table\n";
+    print "\n-> Updating 3rd_calling table\n";

 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
     
     # Delete all records from the calling table. We have no history to
     # save here. Just re-populate with the latest calling information.
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
     
     # Delete all records from the calling table. We have no history to
     # save here. Just re-populate with the latest calling information.

-    $sth = $dbh->prepare("delete from eq_calling ");
+    $sth = $dbh->prepare("delete from 3rd_calling ");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %organization_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %organization_data)


@@ -304,12 +304,12 @@ sub update_eq_calling_table()
        $sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
        if($name eq "") { next; }
        print "   Adding new Calling: $name -> $position\n";
        $sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
        if($name eq "") { next; }
        print "   Adding new Calling: $name -> $position\n";

-       $sth = $dbh->prepare("insert into eq_calling values ('$indiv_id','$name','$organization','$position','$sequence','$month $year')");
+       $sth = $dbh->prepare("insert into 3rd_calling values ('$indiv_id','$name','$organization','$position','$sequence','$month $year')");

        $sth->execute or die "-E- DB error: $DBI::errstr\n";
     }
 }
 
        $sth->execute or die "-E- DB error: $DBI::errstr\n";
     }
 }
 

-# EQ_DISTRICT
+# 3RD_DISTRICT

 #+------------+------------------+------+-----+---------+-------+
 #| Field      | Type             | Null | Key | Default | Extra |
 #+------------+------------------+------+-----+---------+-------+
 #+------------+------------------+------+-----+---------+-------+
 #| Field      | Type             | Null | Key | Default | Extra |
 #+------------+------------------+------+-----+---------+-------+


@@ -318,29 +318,29 @@ sub update_eq_calling_table()
 #| supervisor | int(16) unsigned | YES  |     | NULL    |       |
 #| valid      | tinyint(1)       | YES  |     | NULL    |       |
 #+------------+------------------+------+-----+---------+-------+
 #| supervisor | int(16) unsigned | YES  |     | NULL    |       |
 #| valid      | tinyint(1)       | YES  |     | NULL    |       |
 #+------------+------------------+------+-----+---------+-------+

-sub update_eq_district_table
+sub update_3rd_district_table

 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.

-    print "\n-> Updating eq_district table\n";
-    $sth = $dbh->prepare("select * from eq_district");
+    print "\n-> Updating 3rd_district table\n";
+    $sth = $dbh->prepare("select * from 3rd_district");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
        $supervisor_name = $sqlhashref->{name};
        $district = $sqlhashref->{district};
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
        $supervisor_name = $sqlhashref->{name};
        $district = $sqlhashref->{district};

-       $sth2 = $dbh->prepare("select * from eq_elder where name='$supervisor_name'");
+       $sth2 = $dbh->prepare("select * from 3rd_elder where name='$supervisor_name'");

        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sqlhashref2 = $sth2->fetchrow_hashref;
        $supervisor_id = $sqlhashref2->{elder};
        $sth2->finish();
        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sqlhashref2 = $sth2->fetchrow_hashref;
        $supervisor_id = $sqlhashref2->{elder};
        $sth2->finish();

-       $sth2 = $dbh->prepare("update eq_district set supervisor='$supervisor_id' where district='$district'");
+       $sth2 = $dbh->prepare("update 3rd_district set supervisor='$supervisor_id' where district='$district'");

        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sth2->finish();
     }
     $sth->finish();
 }
 
        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sth2->finish();
     }
     $sth->finish();
 }
 

-# EQ_COMPANIONSHIP
+# 3RD_COMPANIONSHIP

 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+
 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+


@@ -350,15 +350,15 @@ sub update_eq_district_table
 #| district      | int(16) unsigned | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
 #| district      | int(16) unsigned | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+

-sub update_eq_companionship_table
+sub update_3rd_companionship_table

 {
 {

-    print "\n-> Updating eq_companionship table\n";
+    print "\n-> Updating 3rd_companionship table\n";

 
     # First, mark all existing companionships as invalid in case they have been dissolved
 
     # First, mark all existing companionships as invalid in case they have been dissolved

-    $sth = $dbh->prepare("update eq_companionship set valid=0");
+    $sth = $dbh->prepare("update 3rd_companionship set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     # Second, mark all the aaronic invalid. We'll only mark the ones as valid that are assigned to hometeach
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     # Second, mark all the aaronic invalid. We'll only mark the ones as valid that are assigned to hometeach

-    $sth = $dbh->prepare("update eq_aaronic set valid=0");
+    $sth = $dbh->prepare("update 3rd_aaronic set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %hometeaching_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %hometeaching_data)


@@ -369,22 +369,22 @@ sub update_eq_companionship_table
                foreach $field ("Home Teacher 1","Home Teacher 2") {
                    $elder_name = $hometeaching_data{$index}{$field};
                    if($elder_name eq "") { next; }
                foreach $field ("Home Teacher 1","Home Teacher 2") {
                    $elder_name = $hometeaching_data{$index}{$field};
                    if($elder_name eq "") { next; }

-                   $sth2 = $dbh->prepare("select * from eq_elder where name='$elder_name'");
+                   $sth2 = $dbh->prepare("select * from 3rd_elder where name='$elder_name'");

                    $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                    $sqlhashref2 = $sth2->fetchrow_hashref;
                    $elder = $sqlhashref2->{elder};
                    $aaronic = "NULL";
                    if($elder eq "") {
                    $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                    $sqlhashref2 = $sth2->fetchrow_hashref;
                    $elder = $sqlhashref2->{elder};
                    $aaronic = "NULL";
                    if($elder eq "") {

-                       $sth2 = $dbh->prepare("select * from eq_aaronic where name='$elder_name'");
+                       $sth2 = $dbh->prepare("select * from 3rd_aaronic where name='$elder_name'");

                        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                        $sqlhashref2 = $sth2->fetchrow_hashref;
                        $aaronic = $sqlhashref2->{aaronic};
                        $elder = "NULL";
                        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                        $sqlhashref2 = $sth2->fetchrow_hashref;
                        $aaronic = $sqlhashref2->{aaronic};
                        $elder = "NULL";

-                       if($aaronic eq "") { print "-W- Unable to find $elder_name in eq_elder or eq_aaronic tables\n"; next; }
+                       if($aaronic eq "") { print "-W- Unable to find $elder_name in 3rd_elder or 3rd_aaronic tables\n"; next; }

                    } 
                    $id = $hometeaching_data{$index}{'Comp ID'};
                    $district = $hometeaching_data{$index}{'HT District'};
                    } 
                    $id = $hometeaching_data{$index}{'Comp ID'};
                    $district = $hometeaching_data{$index}{'HT District'};

-                   $sth = $dbh->prepare("select * from eq_companionship where elder='$elder' and aaronic='$aaronic' and companionship='$id'");
+                   $sth = $dbh->prepare("select * from 3rd_companionship where elder='$elder' and aaronic='$aaronic' and companionship='$id'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    my @data = ();
                    while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    my @data = ();
                    while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -392,29 +392,29 @@ sub update_eq_companionship_table
                    if($rows == 0) {
                        # No existing records found for this companionship, make a new entry
                        print "   Adding Companion to companionship: $elder_name -> $id\n";
                    if($rows == 0) {
                        # No existing records found for this companionship, make a new entry
                        print "   Adding Companion to companionship: $elder_name -> $id\n";

-                       $sth = $dbh->prepare("insert into eq_companionship values ($id,'$elder','$aaronic','$district',1)");
+                       $sth = $dbh->prepare("insert into 3rd_companionship values ($id,'$elder','$aaronic','$district',1)");

                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    } else {
                        # An existing companionship was found for this companionship, update it
                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    } else {
                        # An existing companionship was found for this companionship, update it

-                       $sth2 = $dbh->prepare("select * from eq_companionship where district='$district' and companionship='$id'");
+                       $sth2 = $dbh->prepare("select * from 3rd_companionship where district='$district' and companionship='$id'");

                        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                        if($elder ne "NULL") {
                            print "   Updating Companionship with Elder: $elder_name ($elder) -> $id\n";
                        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                        if($elder ne "NULL") {
                            print "   Updating Companionship with Elder: $elder_name ($elder) -> $id\n";

-                           $sth = $dbh->prepare("update eq_companionship set district='$district' where elder='$elder' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set district='$district' where elder='$elder' and companionship='$id'");

                            $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";
                            $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";

-                           $sth = $dbh->prepare("update eq_companionship set elder='$elder' where elder='$elder' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set elder='$elder' where elder='$elder' and companionship='$id'");

                            $sth->execute or die "-E- DB error 'elder': $DBI::errstr\n";
                            $sth->execute or die "-E- DB error 'elder': $DBI::errstr\n";

-                           $sth = $dbh->prepare("update eq_companionship set valid=1 where elder='$elder' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set valid=1 where elder='$elder' and companionship='$id'");

                            $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
                        } else {
                            print "   Updating Companionship with Aaronic: $elder_name ($aaronic) -> $id\n";
                            $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
                        } else {
                            print "   Updating Companionship with Aaronic: $elder_name ($aaronic) -> $id\n";

-                           $sth = $dbh->prepare("update eq_companionship set district='$district' where aaronic='$aaronic' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set district='$district' where aaronic='$aaronic' and companionship='$id'");

                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                           $sth = $dbh->prepare("update eq_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'");

                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                           $sth = $dbh->prepare("update eq_companionship set valid=1 where aaronic='$aaronic' and companionship='$id'");
+                           $sth = $dbh->prepare("update 3rd_companionship set valid=1 where aaronic='$aaronic' and companionship='$id'");

                            $sth->execute or die "-E- DB error: $DBI::errstr\n";                            
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";                            

-                           $sth = $dbh->prepare("update eq_aaronic set valid=1 where aaronic='$aaronic'");
+                           $sth = $dbh->prepare("update 3rd_aaronic set valid=1 where aaronic='$aaronic'");

                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        }
                    }
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        }
                    }


@@ -426,7 +426,7 @@ sub update_eq_companionship_table
     }
 }
 
     }
 }
 

-# EQ_FAMILY
+# 3RD_FAMILY

 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+
 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+


@@ -440,14 +440,14 @@ sub update_eq_companionship_table
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+

-sub update_eq_family_table
+sub update_3rd_family_table

 {
 {

-    print "\n-> Updating eq_family table\n";
+    print "\n-> Updating 3rd_family table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.

-    $sth = $dbh->prepare("update eq_family set valid=0");
+    $sth = $dbh->prepare("update 3rd_family set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     $sth->execute or die "-E- DB error: $DBI::errstr\n";

-    $sth = $dbh->prepare("update eq_family set companionship=0");
+    $sth = $dbh->prepare("update 3rd_family set companionship=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)


@@ -461,7 +461,7 @@ sub update_eq_family_table
                $name_id = uc($family_name);
 
                # Find out how many families match this family's name
                $name_id = uc($family_name);
 
                # Find out how many families match this family's name

-               $sth = $dbh->prepare("select * from eq_family where name_id='$name_id'");
+               $sth = $dbh->prepare("select * from 3rd_family where name_id='$name_id'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -470,14 +470,14 @@ sub update_eq_family_table
                if($rows == 0) {
                    # No existing records found for this family, make a new entry
                    print "   Adding new Family: $family_name\n";
                if($rows == 0) {
                    # No existing records found for this family, make a new entry
                    print "   Adding new Family: $family_name\n";

-                   $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0','0','1','',1)");
+                   $sth = $dbh->prepare("insert into 3rd_family values (NULL,$id,'$family_name','$name_id','0','0','1','',1)");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this family, update it
                    print "   Updating existing family: $family_name\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this family, update it
                    print "   Updating existing family: $family_name\n";

-                   $sth = $dbh->prepare("update eq_family set hofh_id=$id where name_id='$name_id'");
+                   $sth = $dbh->prepare("update 3rd_family set hofh_id=$id where name_id='$name_id'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_family set valid=1 where name_id='$name_id'");
+                   $sth = $dbh->prepare("update 3rd_family set valid=1 where name_id='$name_id'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.


@@ -485,12 +485,12 @@ sub update_eq_family_table
                }
 
                 # Now update the elder_id field for this family
                }
 
                 # Now update the elder_id field for this family

-               $sth = $dbh->prepare("select * from eq_elder WHERE name='$family_name'");
+               $sth = $dbh->prepare("select * from 3rd_elder WHERE name='$family_name'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                while($sqlhashref = $sth->fetchrow_hashref) {
                    $elder_id = $sqlhashref->{elder};
                    print "   Updating family elder_id: $family_name -> $elder_id\n";
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                while($sqlhashref = $sth->fetchrow_hashref) {
                    $elder_id = $sqlhashref->{elder};
                    print "   Updating family elder_id: $family_name -> $elder_id\n";

-                   $sth = $dbh->prepare("update eq_family set elder_id=$elder_id where name_id='$name_id'");
+                   $sth = $dbh->prepare("update 3rd_family set elder_id=$elder_id where name_id='$name_id'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                }
                
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                }
                


@@ -514,7 +514,7 @@ sub update_eq_family_table
                        {
                            print "   Updating hometeaching assignment for $family_name family\n";
                            $companionship = $hometeaching_data{$index}{'Comp ID'};
                        {
                            print "   Updating hometeaching assignment for $family_name family\n";
                            $companionship = $hometeaching_data{$index}{'Comp ID'};

-                           $sth = $dbh->prepare("update eq_family set companionship='$companionship' where name_id='$name_id'");
+                           $sth = $dbh->prepare("update 3rd_family set companionship='$companionship' where name_id='$name_id'");

                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        }
                    }
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        }
                    }


@@ -525,7 +525,7 @@ sub update_eq_family_table
     }
 }
 
     }
 }
 

-# EQ_PARENT
+# 3RD_PARENT

 #+----------+------------------+------+-----+---------+-------+
 #| Field    | Type             | Null | Key | Default | Extra |
 #+----------+------------------+------+-----+---------+-------+
 #+----------+------------------+------+-----+---------+-------+
 #| Field    | Type             | Null | Key | Default | Extra |
 #+----------+------------------+------+-----+---------+-------+


@@ -538,12 +538,12 @@ sub update_eq_family_table
 #| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
 #| valid    | tinyint(1)       | YES  |     | NULL    |       |
 #+----------+------------------+------+-----+---------+-------+
 #| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
 #| valid    | tinyint(1)       | YES  |     | NULL    |       |
 #+----------+------------------+------+-----+---------+-------+

-sub update_eq_parent_table
+sub update_3rd_parent_table

 {
 {

-    print "\n-> Updating eq_parent table\n";
+    print "\n-> Updating 3rd_parent table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.

-    $sth = $dbh->prepare("update eq_parent set valid=0");
+    $sth = $dbh->prepare("update 3rd_parent set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)


@@ -570,7 +570,7 @@ sub update_eq_parent_table
                }
 
                # Find the family id for this parent's HofH_ID.
                }
 
                # Find the family id for this parent's HofH_ID.

-               $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1");
+               $sth = $dbh->prepare("select * from 3rd_family where hofh_id='$hofh_id' and valid=1");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }


@@ -579,7 +579,7 @@ sub update_eq_parent_table
                else { $family_id = 0; }
                
                # Find out how many parents match this parent's name
                else { $family_id = 0; }
                
                # Find out how many parents match this parent's name

-               $sth = $dbh->prepare("select * from eq_parent where name='$parent_name'");
+               $sth = $dbh->prepare("select * from 3rd_parent where name='$parent_name'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -588,22 +588,22 @@ sub update_eq_parent_table
                if($rows == 0 && $family_rows > 0) {
                    # No existing records found for this parent, make a new entry
                    print "   Adding new Parent: $parent_name\n";
                if($rows == 0 && $family_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','$phone','$address','$id',1)");
+                   $sth = $dbh->prepare("insert into 3rd_parent values (NULL,$family_id,'$parent_name','$year-$month-$day','$phone','$address','$id',1)");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1 && $family_rows > 0) {
                    # An existing record was found for this parent, update it
                    print "   Updating existing parent: $parent_name\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1 && $family_rows > 0) {
                    # An existing record was found for this parent, update it
                    print "   Updating existing parent: $parent_name\n";

-                   $sth = $dbh->prepare("update eq_parent set family='$family_id' where name='$parent_name'");
+                   $sth = $dbh->prepare("update 3rd_parent set family='$family_id' where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $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 = $dbh->prepare("update 3rd_parent set birthday='$year-$month-$day' where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_parent set phone='$phone' where name='$parent_name'");
+                   $sth = $dbh->prepare("update 3rd_parent set phone='$phone' where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_parent set address='$address' where name='$parent_name'");
+                   $sth = $dbh->prepare("update 3rd_parent set address='$address' where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_parent set valid=1 where name='$parent_name'");
+                   $sth = $dbh->prepare("update 3rd_parent set valid=1 where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_parent set indiv_id='$id' where name='$parent_name'");
+                   $sth = $dbh->prepare("update 3rd_parent set indiv_id='$id' where name='$parent_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows > 1) {
                    # More than one record was found. Error! This shouldn't happen.
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows > 1) {
                    # More than one record was found. Error! This shouldn't happen.


@@ -617,7 +617,7 @@ sub update_eq_parent_table
     }
 }
 
     }
 }
 

-# EQ_CHILD
+# 3RD_CHILD

 #+----------+------------------+------+-----+---------+-------+
 #| Field    | Type             | Null | Key | Default | Extra |
 #+----------+------------------+------+-----+---------+-------+
 #+----------+------------------+------+-----+---------+-------+
 #| Field    | Type             | Null | Key | Default | Extra |
 #+----------+------------------+------+-----+---------+-------+


@@ -628,12 +628,12 @@ sub update_eq_parent_table
 #| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
 #| valid    | tinyint(1)       | YES  |     | NULL    |       |
 #+----------+------------------+------+-----+---------+-------+
 #| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
 #| valid    | tinyint(1)       | YES  |     | NULL    |       |
 #+----------+------------------+------+-----+---------+-------+

-sub update_eq_child_table
+sub update_3rd_child_table

 {
 {

-    print "\n-> Updating eq_child table\n";
+    print "\n-> Updating 3rd_child table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.

-    $sth = $dbh->prepare("update eq_child set valid=0");
+    $sth = $dbh->prepare("update 3rd_child set valid=0");

     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)


@@ -649,7 +649,7 @@ sub update_eq_child_table
                $hofh_id = $membership_data{$index}{'HofH ID'};
 
                # Find the family id for this child's HofH_ID.
                $hofh_id = $membership_data{$index}{'HofH ID'};
 
                # Find the family id for this child's HofH_ID.

-               $sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1");
+               $sth = $dbh->prepare("select * from 3rd_family where hofh_id='$hofh_id' and valid=1");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }


@@ -658,7 +658,7 @@ sub update_eq_child_table
                else { $family_id = 0; }
                
                # Find out how many children have the same name for the same family
                else { $family_id = 0; }
                
                # Find out how many children have the same name for the same family

-               $sth = $dbh->prepare("select * from eq_child where name='$child_name'");
+               $sth = $dbh->prepare("select * from 3rd_child where name='$child_name'");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }


@@ -667,18 +667,18 @@ sub update_eq_child_table
                if($rows == 0 && $family_rows > 0) {
                    # No existing records found for this child, make a new entry
                    print "   Adding new Child: $child_name\n";
                if($rows == 0 && $family_rows > 0) {
                    # No existing records found for this child, make a new entry
                    print "   Adding new Child: $child_name\n";

-                   $sth = $dbh->prepare("insert into eq_child values (NULL,$family_id,'$child_name','$year-$month-$day','$id',1)");
+                   $sth = $dbh->prepare("insert into 3rd_child values (NULL,$family_id,'$child_name','$year-$month-$day','$id',1)");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1 && $family_rows > 0) {
                    # An existing record was found for this child, update it
                    print "   Updating existing child: $child_name\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1 && $family_rows > 0) {
                    # An existing record was found for this child, update it
                    print "   Updating existing child: $child_name\n";

-                   $sth = $dbh->prepare("update eq_child set family='$family_id' where name='$child_name'");
+                   $sth = $dbh->prepare("update 3rd_child set family='$family_id' where name='$child_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_child set birthday='$year-$month-$day' where name='$child_name'");
+                   $sth = $dbh->prepare("update 3rd_child set birthday='$year-$month-$day' where name='$child_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_child set valid=1 where name='$child_name'");
+                   $sth = $dbh->prepare("update 3rd_child set valid=1 where name='$child_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";

-                   $sth = $dbh->prepare("update eq_child set indiv_id='$id' where name='$child_name'");
+                   $sth = $dbh->prepare("update 3rd_child set indiv_id='$id' where name='$child_name'");

                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.


@@ -690,7 +690,7 @@ sub update_eq_child_table
     }
 }
 
     }
 }
 

-# EQ_VISIT
+# 3RD_VISIT

 #+----------------+------------------+------+-----+---------+-------+
 #| Field          | Type             | Null | Key | Default | Extra |
 #+----------------+------------------+------+-----+---------+-------+
 #+----------------+------------------+------+-----+---------+-------+
 #| Field          | Type             | Null | Key | Default | Extra |
 #+----------------+------------------+------+-----+---------+-------+


@@ -701,9 +701,9 @@ sub update_eq_child_table
 #| notes          | varchar(128)     | YES  |     | NULL    |       |
 #| visited        | varchar(1)       | YES  |     | NULL    |       |
 #+----------------+------------------+------+-----+---------+-------+
 #| notes          | varchar(128)     | YES  |     | NULL    |       |
 #| visited        | varchar(1)       | YES  |     | NULL    |       |
 #+----------------+------------------+------+-----+---------+-------+

-sub update_eq_visit_table
+sub update_3rd_visit_table

 {
 {

-       print "\n-> updating eq_visit table\n";
+       print "\n-> updating 3rd_visit table\n";

        
        my $month_header_retrieved = 0;
        my $month_header;
        
        my $month_header_retrieved = 0;
        my $month_header;


@@ -720,8 +720,8 @@ sub update_eq_visit_table
                $family_name = $hometeaching_stats_data{$index}{"Preferred Name"};
                print "   Updating visit data: $family_name\n";
 
                $family_name = $hometeaching_stats_data{$index}{"Preferred Name"};
                print "   Updating visit data: $family_name\n";
 

-               # get family id from eq_family
-               $sth = $dbh->prepare("select * from eq_family where name=\"$family_name\" and valid=1");
+               # get family id from 3rd_family
+               $sth = $dbh->prepare("select * from 3rd_family where name=\"$family_name\" and valid=1");

                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }


@@ -769,8 +769,8 @@ sub update_eq_visit_table
                        #print "$visit_date\n";
                        my $importing_status = $visit_status{$history[$i]};
                        #print "importing_status = $importing_status\n";
                        #print "$visit_date\n";
                        my $importing_status = $visit_status{$history[$i]};
                        #print "importing_status = $importing_status\n";

-                       #print "select * from eq_visit where family=$family_id and companionship=$comp_id and date='$visit_date'\n";
-                       $sth = $dbh->prepare("select * from eq_visit where family=$family_id and companionship=$comp_id and date='$visit_date'");
+                       #print "select * from 3rd_visit where family=$family_id and companionship=$comp_id and date='$visit_date'\n";
+                       $sth = $dbh->prepare("select * from 3rd_visit where family=$family_id and companionship=$comp_id and date='$visit_date'");

                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        my @visit_data = ();
                        while($sqlhashref = $sth->fetchrow_hashref) { push(@visit_data, $sqlhashref); }
                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        my @visit_data = ();
                        while($sqlhashref = $sth->fetchrow_hashref) { push(@visit_data, $sqlhashref); }


@@ -778,18 +778,18 @@ sub update_eq_visit_table
                        if($visit_rows > 0) { 
                                my $visited = $visit_data[0]->{'visited'}; 
                                #print "visited = $visited\n";
                        if($visit_rows > 0) { 
                                my $visited = $visit_data[0]->{'visited'}; 
                                #print "visited = $visited\n";

-                               # update visit if data is different in eq_visit
+                               # update visit if data is different in 3rd_visit

                                if ($visited ne $importing_status)
                                {
                                        #print "importing_status = $importing_status\n";
                                if ($visited ne $importing_status)
                                {
                                        #print "importing_status = $importing_status\n";

-                                       $sth = $dbh->prepare("update eq_visit set visited='$importing_status' where family='$family_id' and date='$visit_date' and companionship='$comp_id'");
+                                       $sth = $dbh->prepare("update 3rd_visit set visited='$importing_status' where family='$family_id' and date='$visit_date' and companionship='$comp_id'");

                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        } else {
                                if ($importing_status ne '')
                                {
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        } else {
                                if ($importing_status ne '')
                                {

-                                       # add visit if it doesn't exist in eq_visit
-                                       $sth = $dbh->prepare("insert into eq_visit values (NULL, '$family_id', '$comp_id', '$visit_date', '', '$importing_status')");
+                                       # add visit if it doesn't exist in 3rd_visit
+                                       $sth = $dbh->prepare("insert into 3rd_visit values (NULL, '$family_id', '$comp_id', '', '', '$visit_date', '', '$importing_status', 'hometeaching')");

                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        }
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        }


@@ -896,15 +896,15 @@ if($opt_v) {
 if($opt_s) { $dbh->disconnect(); exit; }
 
 # Now update the various eq DB tables
 if($opt_s) { $dbh->disconnect(); exit; }
 
 # Now update the various eq DB tables

-&update_eq_calling_table();
-&update_eq_elder_table();
-&update_eq_aaronic_table();
-&update_eq_district_table();
-&update_eq_companionship_table();
-&update_eq_family_table();
-&update_eq_parent_table();
-&update_eq_child_table();
-&update_eq_visit_table();
+&update_3rd_calling_table();
+&update_3rd_elder_table();
+&update_3rd_aaronic_table();
+&update_3rd_district_table();
+&update_3rd_companionship_table();
+&update_3rd_family_table();
+&update_3rd_parent_table();
+&update_3rd_child_table();
+&update_3rd_visit_table();

 
 print "\n-> Import Successful! DONE...\n";
 
 
 print "\n-> Import Successful! DONE...\n";
 

diff --git a/bin/upgrade_4_0_to_5_0 b/bin/upgrade_4_0_to_5_0
new file mode 100755 (executable)
index 0000000..da1e8da
--- /dev/null
+++ b/bin/upgrade_4_0_to_5_0
@@ -0,0 +1,129 @@
+#!/usr/bin/perl
+
+use DBI;
+use Getopt::Std;
+
+$mydir = `cd \$(dirname $0) 2>/dev/null; pwd`; chomp($mydir);
+unshift @INC,("$mydir/../setup");
+if( -f "$mydir/../setup/db_config.local") { require "db_config.local"; }
+else { require "db_config"; }
+
+###################################################
+# Connect to the database
+$dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$dbpass,{
+    AutoCommit=>0,
+    PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;
+###################################################
+
+# Rename eq_aaronic table to 3rd_aaronic
+$sth = $dbh->prepare("RENAME TABLE `eq_aaronic` TO `3rd_aaronic`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_activity table to 3rd_activity
+$sth = $dbh->prepare("RENAME TABLE `eq_activity` TO `3rd_activity`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_appointment table to 3rd_appointment
+$sth = $dbh->prepare("RENAME TABLE `eq_appointment` TO `3rd_appointment`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_assignment table to 3rd_assignment
+$sth = $dbh->prepare("RENAME TABLE `eq_assignment` TO `3rd_assignment`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_attendance table to 3rd_attendance
+$sth = $dbh->prepare("RENAME TABLE `eq_attendance` TO `3rd_attendance`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_calling table to 3rd_calling
+$sth = $dbh->prepare("RENAME TABLE `eq_calling` TO `3rd_calling`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_child table to 3rd_child
+$sth = $dbh->prepare("RENAME TABLE `eq_child` TO `3rd_child`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_companionship table to 3rd_companionship
+$sth = $dbh->prepare("RENAME TABLE `eq_companionship` TO `3rd_companionship`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_district table to 3rd_district
+$sth = $dbh->prepare("RENAME TABLE `eq_district` TO `3rd_district`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_elder table to 3rd_elder
+$sth = $dbh->prepare("RENAME TABLE `eq_elder` TO `3rd_elder`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'propective' field to the 3rd_elder table
+$sth = $dbh->prepare("ALTER TABLE `3rd_elder` ADD `prospective` enum('y','n') NULL AFTER `priesthood`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_family table to 3rd_family
+$sth = $dbh->prepare("RENAME TABLE `eq_family` TO `3rd_family`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_parent table to 3rd_parent
+$sth = $dbh->prepare("RENAME TABLE `eq_parent` TO `3rd_parent`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_participation table to 3rd_participation
+$sth = $dbh->prepare("RENAME TABLE `eq_participation` TO `3rd_participation`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_ppi table to 3rd_interview
+$sth = $dbh->prepare("RENAME TABLE `eq_ppi` TO `3rd_interview`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Change ppi field in 3rd_interview table to interview
+$sth = $dbh->prepare("ALTER TABLE `3rd_interview` CHANGE `ppi` `interview` INT(16)");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'interview_type' column to the 3rd_interview table
+$sth = $dbh->prepare("ALTER TABLE `3rd_interview` ADD `interview_type` enum('hti','ppi') NOT NULL DEFAULT 'hti' AFTER `eqpresppi`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# set all interviews to be ppi's if eqpresppi is 1
+$sth = $dbh->prepare("UPDATE 3rd_interview SET interview_type='ppi' WHERE eqpresppi='1'");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# remove 'eqpresppi' from 3rd_interview
+$sth = $dbh->prepare("ALTER TABLE `3rd_interview` DROP `eqpresppi`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_presidency table to 3rd_presidency
+$sth = $dbh->prepare("RENAME TABLE `eq_presidency` TO `3rd_presidency`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_visit table to 3rd_visit
+$sth = $dbh->prepare("RENAME TABLE `eq_visit` TO `3rd_visit`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'companion1' column to the 3rd_visit table
+$sth = $dbh->prepare("ALTER TABLE `3rd_visit` ADD `companion1` INT( 16 ) NULL AFTER `companionship`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'companion2' column to the 3rd_visit table
+$sth = $dbh->prepare("ALTER TABLE `3rd_visit` ADD `companion2` INT( 16 ) NULL AFTER `companion1`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'visit_type' column to the 3rd_visit table
+$sth = $dbh->prepare("ALTER TABLE `3rd_visit` ADD `visit_type` enum('presidency','hometeaching') NOT NULL DEFAULT 'hometeaching' AFTER `visited`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# set all visits currently marked as companionship=0 with "type" "presidency" and all other visits should set to "hometeaching".
+$sth = $dbh->prepare("update 3rd_visit set visit_type='presidency' where companionship='0'");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Rename eq_willingness table to 3rd_willingness
+$sth = $dbh->prepare("RENAME TABLE `eq_willingness` TO `3rd_willingness`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+print "-> Done!\n";
+
+###################################################
+# Disconnect from the database
+$dbh->disconnect();
+###################################################
+
+

diff --git a/eq.spec b/eq.spec
deleted file mode 100644 (file)
index a1e16b6..0000000
--- a/eq.spec
+++ /dev/null
@@ -1,56 +0,0 @@
-%define packagename eq
-%define phpgwdirname eq
-%define version 0.0.1.000
-
-# This is for Mandrake RPMS 
-# (move these below the RedHat ones for Mandrake RPMs)
-%define httpdroot  /var/www/html/phpgroupware
-%define packaging 1mdk
-
-# This is for RedHat RPMS
-# (move these below the Mandrake ones for RedHat RPMs)
-%define httpdroot  /home/httpd/html/phpgroupware
-%define packaging 1
-
-Summary: Tools for Managing an Elders Quorum app for phpGroupWare. 
-Name: %{packagename}
-Version: %{version}
-Release: %{packaging}
-Copyright: GPL
-Group: Web/Database
-URL: http://www.phpgroupware.org/apps/eq/
-Source0: ftp://ftp.sourceforge.net/pub/sourceforge/phpgroupware/%{packagename}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{packagename}-buildroot
-Prefix: %{httpdroot}
-Buildarch: noarch
-requires: phpgroupware >= 0.9.10
-AutoReq: 0
-
-%description
-This is an Elders Quorum Presidency Application.
-
-%prep
-%setup -n %{phpgwdirname}
-
-%build
-# no build required
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{prefix}/%{phpgwdirname}
-cp -aRf * $RPM_BUILD_ROOT%{prefix}/%{phpgwdirname}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-
-%postun
-
-%files
-%{prefix}/%{phpgwdirname}
-
-%changelog
-- EQ App Update
-
-# end of file

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index 921c142ca88a4bcadc5858172d4bba5ba75b21fb..2c53def85f89b6bc3f2b096dac6fc36556b5b32a 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -116,11 +116,11 @@ class eq
 
   function display_app_header()
     {
 
   function display_app_header()
     {

-      $this->t->set_file(array('eq_header' => 'header.tpl'));
+      $this->t->set_file(array('3rd_header' => 'header.tpl'));

       
       

-      if (isset($phpgw_info['user']['preferences']['eq']['eq_font']))
+      if (isset($phpgw_info['user']['preferences']['eq']['3rd_font']))

        {
        {

-         $font = $phpgw_info['user']['preferences']['eq']['eq_font'];
+         $font = $phpgw_info['user']['preferences']['eq']['3rd_font'];

        }
       else
        {
        }
       else
        {


@@ -172,7 +172,7 @@ class eq
       $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_email','Email');
                
       $this->t->set_var('link_email',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_email','Email');
                

-      $this->t->pparse('out','eq_header');
+      $this->t->pparse('out','3rd_header');

     }
 
   function ht_view()
     }
 
   function ht_view()


@@ -191,7 +191,7 @@ class eq
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
       $this->t->set_var('title','Hometeaching'); 
       
       $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view'));
       $this->t->set_var('title','Hometeaching'); 
       

-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -202,7 +202,7 @@ class eq
          $i++;
        }
 
          $i++;
        }
 

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -220,7 +220,7 @@ class eq
           $elders[$id] = $elder_name[$i];
       }      
 
           $elders[$id] = $elder_name[$i];
       }      
 

-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {


@@ -237,7 +237,7 @@ class eq
        $supervisor = $districts[$i]['supervisor'];
                
        // Select all the unique companionship numbers for this district
        $supervisor = $districts[$i]['supervisor'];
                
        // Select all the unique companionship numbers for this district

-       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+       $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$i]['district'];

        $this->db->query($sql,__LINE__,__FILE__);
        $j=0; $unique_companionships = '';
        while ($this->db->next_record())
        $this->db->query($sql,__LINE__,__FILE__);
        $j=0; $unique_companionships = '';
        while ($this->db->next_record())


@@ -252,7 +252,7 @@ class eq
        for ($j=0; $j < count($unique_companionships); $j++) {
          $companion_table_entry = "";
          // Select all the companions in each companionship
        for ($j=0; $j < count($unique_companionships); $j++) {
          $companion_table_entry = "";
          // Select all the companions in each companionship

-         $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+         $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".

                 "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
 
                 "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
 


@@ -276,7 +276,7 @@ class eq
          $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
          $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'];
+         $sql = "SELECT * from 3rd_family where valid=1 AND companionship=".$unique_companionships[$j]['companionship'];

          $sql = $sql . " ORDER BY name ASC";
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
          $sql = $sql . " ORDER BY name ASC";
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;


@@ -303,14 +303,14 @@ class eq
                // " AND companionship=" . $unique_companionships[$j]['companionship'].
 
                // First check to see if the currently assigned companionship has visited them
                // " AND companionship=" . $unique_companionships[$j]['companionship'].
 
                // First check to see if the currently assigned companionship has visited them

-               $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+               $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".

                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
                $query_id = $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->num_rows($query_id) == 0) {
                  // We did not find any visits made by the currently assigned companionship,
                  // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
                $query_id = $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->num_rows($query_id) == 0) {
                  // We did not find any visits made by the currently assigned companionship,
                  // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)

-                 $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+                 $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".

                     " AND companionship!=0".
                     " AND family=". $family_id;
                  $query_id = $this->db2->query($sql,__LINE__,__FILE__);
                     " AND companionship!=0".
                     " AND family=". $family_id;
                  $query_id = $this->db2->query($sql,__LINE__,__FILE__);


@@ -415,7 +415,7 @@ class eq
       if($action == 'save')
        {
          // Get a list of all the companionships in this district
       if($action == 'save')
        {
          // Get a list of all the companionships in this district

-         $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+         $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;

          $this->db->query($sql,__LINE__,__FILE__);
          $j=0; $unique_companionships = '';
          while ($this->db->next_record())
          $this->db->query($sql,__LINE__,__FILE__);
          $j=0; $unique_companionships = '';
          while ($this->db->next_record())


@@ -426,9 +426,9 @@ class eq
          for ($j=0; $j < count($unique_companionships); $j++)
            {
              //$comp=$unique_companionships[$j]['companionship'];
          for ($j=0; $j < count($unique_companionships); $j++)
            {
              //$comp=$unique_companionships[$j]['companionship'];

-             //print "deleting from eq_visit where companionship=$comp and date=$date and district=$district<br>";
+             //print "deleting from 3rd_visit where companionship=$comp and date=$date and district=$district<br>";

              // Delete all the visits that have taken place for all families for this companionsthip for this month
              // Delete all the visits that have taken place for all families for this companionsthip for this month

-             $this->db->query("DELETE from eq_visit where companionship=" . $unique_companionships[$j]['companionship'] .
+             $this->db->query("DELETE from 3rd_visit where companionship=" . $unique_companionships[$j]['companionship'] .

                               " AND " . "date='" . $date . "'",__LINE__,__FILE__);
            }
 
                               " AND " . "date='" . $date . "'",__LINE__,__FILE__);
            }
 


@@ -446,7 +446,7 @@ class eq
                 $visited = $data_array[3];
                 if($visited == "") { $visited = $data_array[4]; }
                 //print "family_id: $family_id companionship: $companionship date: $date visited: $visited<br>";
                 $visited = $data_array[3];
                 if($visited == "") { $visited = $data_array[4]; }
                 //print "family_id: $family_id companionship: $companionship date: $date visited: $visited<br>";

-                $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes,visited) "
+                $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes,visited) "

                                  . "VALUES (" . $family_id .",". $companionship .",'". $date ."','','". $visited ."')",__LINE__,__FILE__);
               }
           }
                                  . "VALUES (" . $family_id .",". $companionship .",'". $date ."','','". $visited ."')",__LINE__,__FILE__);
               }
           }


@@ -454,7 +454,7 @@ class eq
          return false;
        }
       
          return false;
        }
       

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -472,7 +472,7 @@ class eq
           $elders[$id] = $elder_name[$i];
       }      
 
           $elders[$id] = $elder_name[$i];
       }      
 

-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {


@@ -482,7 +482,7 @@ class eq
        }
       
       // Select all the unique companionship numbers for this district
        }
       
       // Select all the unique companionship numbers for this district

-      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $district;
+      $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $district;

       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships = '';
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships = '';
       while ($this->db->next_record())


@@ -496,7 +496,7 @@ class eq
       for ($j=0; $j < count($unique_companionships); $j++) {
        $companion_table_entry = "";
        // Select all the companions in each companionship
       for ($j=0; $j < count($unique_companionships); $j++) {
        $companion_table_entry = "";
        // Select all the companions in each companionship

-       $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+       $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".

               "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        
               "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        


@@ -520,7 +520,7 @@ class eq
        $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
        $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'];
+       $sql = "SELECT * from 3rd_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())
        $sql = $sql . " ORDER BY name ASC";
        $this->db->query($sql,__LINE__,__FILE__);
        while ($this->db->next_record())


@@ -533,14 +533,14 @@ class eq
            $header_row="<th width=$comp_width><font size=-2>Families</th>";
 
            // First check to see if the currently assigned companionship has visited them
            $header_row="<th width=$comp_width><font size=-2>Families</th>";
 
            // First check to see if the currently assigned companionship has visited them

-           $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+           $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".

                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
            $query_id = $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->num_rows($query_id) == 0) {
              // We did not find any visits made by the currently assigned companionship,
              // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)
                   " AND companionship=".$unique_companionships[$j]['companionship'].
                   " AND family=". $family_id;
            $query_id = $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->num_rows($query_id) == 0) {
              // We did not find any visits made by the currently assigned companionship,
              // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit)

-             $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ".
+             $sql = "SELECT * FROM 3rd_visit WHERE date >= '$month_start' AND date <= '$month_end' ".

                   " AND companionship!=0".
                   " AND family=". $family_id;
              $query_id = $this->db2->query($sql,__LINE__,__FILE__);
                   " AND companionship!=0".
                   " AND family=". $family_id;
              $query_id = $this->db2->query($sql,__LINE__,__FILE__);


@@ -616,7 +616,7 @@ class eq
       $this->t->set_var('lang_date','Date');
       $this->t->set_var('lang_notes','Description');
       
       $this->t->set_var('lang_date','Date');
       $this->t->set_var('lang_notes','Description');
       

-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -628,7 +628,7 @@ class eq
          $activity_list[$i]['date']  = $this->db->f('date');
          $activity_list[$i]['notes']  = $this->db->f('notes');
 
          $activity_list[$i]['date']  = $this->db->f('date');
          $activity_list[$i]['notes']  = $this->db->f('notes');
 

-         $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";
+         $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $activity_list[$i]['assignment'] . "'";

          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record())
            {
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record())
            {


@@ -677,14 +677,14 @@ class eq
       $this->t->set_file(array('act_view_t' => 'act_view.tpl'));
       $this->t->set_block('act_view_t','part_list','list');
       
       $this->t->set_file(array('act_view_t' => 'act_view.tpl'));
       $this->t->set_block('act_view_t','part_list','list');
       

-      $sql = "SELECT * FROM eq_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+      $sql = "SELECT * FROM 3rd_activity WHERE activity=" . intval(get_var('activity',array('GET','POST')));

       $this->db->query($sql,__LINE__,__FILE__);
       $this->db->next_record();
       $this->t->set_var('assignment', $this->db->f('assignment'));
       $this->t->set_var('date', $this->db->f('date'));
       $this->t->set_var('notes', $this->db->f('notes'));
       
       $this->db->query($sql,__LINE__,__FILE__);
       $this->db->next_record();
       $this->t->set_var('assignment', $this->db->f('assignment'));
       $this->t->set_var('date', $this->db->f('date'));
       $this->t->set_var('notes', $this->db->f('notes'));
       

-      $sql = "SELECT * FROM eq_assignment WHERE assignment='" . $this->db->f('assignment') . "'";
+      $sql = "SELECT * FROM 3rd_assignment WHERE assignment='" . $this->db->f('assignment') . "'";

       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record())
        {
       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record())
        {


@@ -710,7 +710,7 @@ class eq
       $this->t->set_var('cal_date',$this->db->f('date'));
       
       // Now find out which elders participated in this activity
       $this->t->set_var('cal_date',$this->db->f('date'));
       
       // Now find out which elders participated in this activity

-      $sql = "SELECT * FROM eq_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));
+      $sql = "SELECT * FROM 3rd_participation WHERE activity=" . intval(get_var('activity',array('GET','POST')));

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -723,7 +723,7 @@ class eq
       
       for ($i=0; $i < count($part_list); $i++)
        {
       
       for ($i=0; $i < count($part_list); $i++)
        {

-         $sql = "SELECT * FROM eq_elder WHERE elder=" . $part_list[$i]['elder'];
+         $sql = "SELECT * FROM 3rd_elder WHERE elder=" . $part_list[$i]['elder'];

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $names[$i] = $this->db->f('name');
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $names[$i] = $this->db->f('name');


@@ -760,21 +760,21 @@ class eq
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));

-         $this->db->query("UPDATE eq_activity set " .
+         $this->db->query("UPDATE 3rd_activity set " .

                           "   assignment='" . $activity['assignment'] .
                           "', date='" . $activity['date'] . "'" .
                           ", notes='" . $activity['notes'] . "'" .
                           " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
 
          // Delete all the elders who have particiapted in this activity
                           "   assignment='" . $activity['assignment'] .
                           "', date='" . $activity['date'] . "'" .
                           ", notes='" . $activity['notes'] . "'" .
                           " WHERE activity=" . $activity['activity'],__LINE__,__FILE__);
 
          // Delete all the elders who have particiapted in this activity

-         $this->db->query("DELETE from eq_participation where activity=".$activity['activity'],__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_participation where activity=".$activity['activity'],__LINE__,__FILE__);

          
          // Re-add the elders who are checked as having participated in this activity
          $elders = get_var('elder_name',array('POST'));
          if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with
            foreach ($elders as $elder)
              {
          
          // Re-add the elders who are checked as having participated in this activity
          $elders = get_var('elder_name',array('POST'));
          if(is_array($elders)) { // Only do the foreach loop if we have a valid array of elders to work with
            foreach ($elders as $elder)
              {

-               $this->db->query("INSERT INTO eq_participation (elder,activity) "
+               $this->db->query("INSERT INTO 3rd_participation (elder,activity) "

                                 . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
              }
          }
                                 . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
              }
          }


@@ -788,11 +788,11 @@ class eq
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));
          $activity['assignment'] = get_var('assignment',array('POST'));
          $activity['date'] = get_var('date',array('POST'));
          $activity['notes']= get_var('notes',array('POST'));

-         $this->db->query("INSERT INTO eq_activity (assignment,date,notes) "
+         $this->db->query("INSERT INTO 3rd_activity (assignment,date,notes) "

                           . "VALUES ('" . $activity['assignment'] . "','"
                           . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
 
                           . "VALUES ('" . $activity['assignment'] . "','"
                           . $activity['date'] . "','" . $activity['notes'] . "')",__LINE__,__FILE__);
 

-         $sql = "SELECT * FROM eq_activity WHERE assignment='".$activity['assignment']."' "
+         $sql = "SELECT * FROM 3rd_activity WHERE assignment='".$activity['assignment']."' "

             . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
             . " AND date='".$activity['date']."' AND notes='".$activity['notes']."'";
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {


@@ -803,7 +803,7 @@ class eq
          $elders = get_var('elder_name',array('POST'));
          foreach ($elders as $elder)
            {
          $elders = get_var('elder_name',array('POST'));
          foreach ($elders as $elder)
            {

-             $this->db->query("INSERT INTO eq_participation (elder,activity) "
+             $this->db->query("INSERT INTO 3rd_participation (elder,activity) "

                               . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
            }
          
                               . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__);
            }
          


@@ -826,7 +826,7 @@ class eq
 
       if($action == 'edit')
        {
 
       if($action == 'edit')
        {

-         $sql = "SELECT * FROM eq_activity WHERE activity=" . $activity['activity'];
+         $sql = "SELECT * FROM 3rd_activity WHERE activity=" . $activity['activity'];

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('cal_date',$this->jscal->input('date',$this->db->f('date'),'','','','','',$this->cal_options));


@@ -842,7 +842,7 @@ class eq
        }
 
       // Create the assignments drop-down list
        }
 
       // Create the assignments drop-down list

-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i = 0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i = 0;
       while ($this->db->next_record())


@@ -865,7 +865,7 @@ class eq
       $this->t->set_var('assignment_data',$assignment_data);
       
       // Create elder selection boxes
       $this->t->set_var('assignment_data',$assignment_data);
       
       // Create elder selection boxes

-      $sql = "SELECT * FROM eq_elder";
+      $sql = "SELECT * FROM 3rd_elder";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -883,7 +883,7 @@ class eq
       for ($i=0; $i < count($elder_id); $i++)
        {
          //$this->nextmatchs->template_alternate_row_color(&$this->t);
       for ($i=0; $i < count($elder_id); $i++)
        {
          //$this->nextmatchs->template_alternate_row_color(&$this->t);

-         $sql = "SELECT * FROM eq_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i];
+         $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i];

          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) { $this->t->set_var('checked','checked'); $checked=1; }
          else { $this->t->set_var('checked',''); $checked=0; }
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) { $this->t->set_var('checked','checked'); $checked=1; }
          else { $this->t->set_var('checked',''); $checked=0; }


@@ -919,7 +919,7 @@ class eq
       $this->t->set_var('lang_name','Assignment Name');
       $this->t->set_var('lang_code','Code');
       
       $this->t->set_var('lang_name','Assignment Name');
       $this->t->set_var('lang_code','Code');
       

-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -972,7 +972,7 @@ class eq
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));

-         $this->db->query("UPDATE eq_assignment set " .
+         $this->db->query("UPDATE 3rd_assignment set " .

                           "  name='" . $assignment['name'] . "'" .
                           ", code='" . $assignment['code'] . "'" .
                           " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);
                           "  name='" . $assignment['name'] . "'" .
                           ", code='" . $assignment['code'] . "'" .
                           " WHERE assignment=" . $assignment['assignment'],__LINE__,__FILE__);


@@ -985,7 +985,7 @@ class eq
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));
        {
          $assignment['name'] = get_var('name',array('POST'));
          $assignment['code'] = get_var('code',array('POST'));

-         $this->db->query("INSERT INTO eq_assignment (name,code) "
+         $this->db->query("INSERT INTO 3rd_assignment (name,code) "

                           . "VALUES ('" . $assignment['name'] . "','"
                           . $assignment['code'] . "')",__LINE__,__FILE__);
          $this->assign_view();
                           . "VALUES ('" . $assignment['name'] . "','"
                           . $assignment['code'] . "')",__LINE__,__FILE__);
          $this->assign_view();


@@ -1005,7 +1005,7 @@ class eq
 
       if($action == 'edit')
        {
 
       if($action == 'edit')
        {

-         $sql = "SELECT * FROM eq_assignment WHERE assignment=" . $assignment['assignment'];
+         $sql = "SELECT * FROM 3rd_assignment WHERE assignment=" . $assignment['assignment'];

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('name', $this->db->f('name'));
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('name', $this->db->f('name'));


@@ -1036,7 +1036,7 @@ class eq
       $this->t->set_block('par_view_t','header_list','list1');
       $this->t->set_block('par_view_t','elder_list','list2');
 
       $this->t->set_block('par_view_t','header_list','list1');
       $this->t->set_block('par_view_t','elder_list','list2');
 

-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_elder where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -1047,7 +1047,7 @@ class eq
        }
       array_multisort($elder_name, $elder_id);
 
        }
       array_multisort($elder_name, $elder_id);
 

-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -1060,7 +1060,7 @@ class eq
          $i++;
        }
 
          $i++;
        }
 

-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())


@@ -1088,7 +1088,7 @@ class eq
          $date = "0000-00-00"; $checkmark=0; $num_matches=0;
          for ($k=0; $k < count($activity_list); $k++) {
            if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { 
          $date = "0000-00-00"; $checkmark=0; $num_matches=0;
          for ($k=0; $k < count($activity_list); $k++) {
            if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { 

-             $sql = "SELECT * FROM eq_participation where "
+             $sql = "SELECT * FROM 3rd_participation where "

                 . " activity=" . $activity_list[$k]['activity']
                 . " AND elder=" . $elder_id[$i];
              $this->db->query($sql,__LINE__,__FILE__);
                 . " activity=" . $activity_list[$k]['activity']
                 . " AND elder=" . $elder_id[$i];
              $this->db->query($sql,__LINE__,__FILE__);


@@ -1146,7 +1146,7 @@ class eq
       }
       $this->t->set_var('filter_input',$filter_input);
       
       }
       $this->t->set_var('filter_input',$filter_input);
       

-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_elder where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -1158,7 +1158,7 @@ class eq
        }
       array_multisort($elder_name, $elder_id);
 
        }
       array_multisort($elder_name, $elder_id);
 

-      $sql = "SELECT * FROM eq_assignment ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while($this->db->next_record())


@@ -1169,7 +1169,7 @@ class eq
          $i++;
        }
 
          $i++;
        }
 

-      $sql = "SELECT * FROM eq_activity ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -1201,21 +1201,21 @@ class eq
                                                            . $elder_id[$i] . '&action=' . 'edit'));
        for ($j=0; $j < count($assignment_list); $j++) {
          $found_willingness=0; 
                                                            . $elder_id[$i] . '&action=' . 'edit'));
        for ($j=0; $j < count($assignment_list); $j++) {
          $found_willingness=0; 

-         $sql = "SELECT * FROM eq_willingness where "
+         $sql = "SELECT * FROM 3rd_willingness where "

             . " assignment=" . $assignment_list[$j]['assignment']
             . " AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          while($this->db->next_record()) {
            $found_willingness=1;
            $date_part="";
             . " assignment=" . $assignment_list[$j]['assignment']
             . " AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          while($this->db->next_record()) {
            $found_willingness=1;
            $date_part="";

-           $sql = "SELECT * FROM eq_activity where "
+           $sql = "SELECT * FROM 3rd_activity where "

               . " assignment=". $assignment_list[$j]['assignment']
               . " ORDER by date DESC";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $activity = $this->db2->f('activity');
              $date = $this->db2->f('date');
               . " assignment=". $assignment_list[$j]['assignment']
               . " ORDER by date DESC";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $activity = $this->db2->f('activity');
              $date = $this->db2->f('date');

-             $sql = "SELECT * FROM eq_participation where "
+             $sql = "SELECT * FROM 3rd_participation where "

                 . " activity=" . $activity
                 . " AND elder=". $elder_id[$i];
              $this->db3->query($sql,__LINE__,__FILE__);
                 . " activity=" . $activity
                 . " AND elder=". $elder_id[$i];
              $this->db3->query($sql,__LINE__,__FILE__);


@@ -1284,7 +1284,7 @@ class eq
       if($action == 'save')
        {
          // Delete all the previous willingness entries for this elder
       if($action == 'save')
        {
          // Delete all the previous willingness entries for this elder

-         $this->db->query("DELETE from eq_willingness where elder=" . $elder_id ,__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_willingness where elder=" . $elder_id ,__LINE__,__FILE__);

              
          // Now, add the assignment willingness that is checked for this elder
          $new_data = get_var('willingness',array('POST'));
              
          // Now, add the assignment willingness that is checked for this elder
          $new_data = get_var('willingness',array('POST'));


@@ -1294,7 +1294,7 @@ class eq
              $assignment = $data_array[0];
              $willing = $data_array[1];
              //print "elder_id: $elder_id assignment: $assignment willing: $willing<br>";
              $assignment = $data_array[0];
              $willing = $data_array[1];
              //print "elder_id: $elder_id assignment: $assignment willing: $willing<br>";

-             $this->db->query("INSERT INTO eq_willingness (elder,assignment,willing) "
+             $this->db->query("INSERT INTO 3rd_willingness (elder,assignment,willing) "

                               . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
            }      
          $this->willing_view();
                               . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__);
            }      
          $this->willing_view();


@@ -1305,7 +1305,7 @@ class eq
       $table_data=""; 
 
       // Find out the elder's name
       $table_data=""; 
 
       // Find out the elder's name

-      $sql = "SELECT * FROM eq_elder WHERE elder=".$elder_id." AND valid=1";
+      $sql = "SELECT * FROM 3rd_elder WHERE elder=".$elder_id." AND valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $elder_name = $this->db->f('name');
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $elder_name = $this->db->f('name');


@@ -1313,7 +1313,7 @@ class eq
       }
       
       // Select all the assignments
       }
       
       // Select all the assignments

-      $sql = "SELECT * FROM eq_assignment ORDER by name ASC";
+      $sql = "SELECT * FROM 3rd_assignment ORDER by name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       
       while ($this->db->next_record())


@@ -1326,7 +1326,7 @@ class eq
          $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$assignment_name</td>";
          
          $header_row="<th width=$comp_width><font size=-2>Assignments</th><th>Willingness</th>";
          $table_data.="<tr bgcolor=". $this->t->get_var('tr_color') ."><td>$assignment_name</td>";
          
          $header_row="<th width=$comp_width><font size=-2>Assignments</th><th>Willingness</th>";

-         $sql = "SELECT * FROM eq_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;
+         $sql = "SELECT * FROM 3rd_willingness WHERE elder=".$elder_id." AND assignment=".$assignment;

          $this->db2->query($sql,__LINE__,__FILE__);
          $value = $assignment;
             
          $this->db2->query($sql,__LINE__,__FILE__);
          $value = $assignment;
             


@@ -1413,7 +1413,7 @@ class eq
       $year = date('Y');
 
       // Get the EQ President
       $year = date('Y');
 
       // Get the EQ President

-      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');


@@ -1424,18 +1424,18 @@ class eq
        $interviewer = $this->db->f('elder');
        $district_number = '*';
        $district_name = $president_name;
        $interviewer = $this->db->f('elder');
        $district_number = '*';
        $district_name = $president_name;

-       $sql = "SELECT * FROM eq_elder where elder='$president_id'";
+       $sql = "SELECT * FROM 3rd_elder where elder='$president_id'";

        $this->db2->query($sql,__LINE__,__FILE__);
        if($this->db2->next_record()) {
          $indiv_id = $this->db2->f('indiv_id');
        }
        $this->db2->query($sql,__LINE__,__FILE__);
        if($this->db2->next_record()) {
          $indiv_id = $this->db2->f('indiv_id');
        }

-       $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+       $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";

        $this->db2->query($sql,__LINE__,__FILE__);
        if($this->db2->next_record()) {
          $president_address = $this->db2->f('address');
        }
       } else {
        $this->db2->query($sql,__LINE__,__FILE__);
        if($this->db2->next_record()) {
          $president_address = $this->db2->f('address');
        }
       } else {

-       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate EQ President in 3rd_presidency table</h3></font></hr>";

        return;
       }
 
        return;
       }
 


@@ -1453,11 +1453,11 @@ class eq
                if($elder == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment
                if($elder == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment

-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'";

                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here

-                 $this->db->query("UPDATE eq_appointment set " .
+                 $this->db->query("UPDATE 3rd_appointment set " .

                                   " elder='" . $elder . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                                   " elder='" . $elder . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);


@@ -1477,7 +1477,7 @@ class eq
             $ppi_pri = $entry['pri'];
             
             // Perform database save actions here
             $ppi_pri = $entry['pri'];
             
             // Perform database save actions here

-            $this->db->query("UPDATE eq_elder set " .
+            $this->db->query("UPDATE 3rd_elder set " .

                              " ppi_notes='" . $ppi_notes . "'" .
                              ",ppi_pri='" . $ppi_pri . "'" .
                              " WHERE elder=" . $elder_id,__LINE__,__FILE__);
                              " ppi_notes='" . $ppi_notes . "'" .
                              ",ppi_pri='" . $ppi_pri . "'" .
                              " WHERE elder=" . $elder_id,__LINE__,__FILE__);


@@ -1489,7 +1489,7 @@ class eq
        }
       
       // create the elder id -> elder name mapping
        }
       
       // create the elder id -> elder name mapping

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $elder_id = NULL;
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $elder_id = NULL;


@@ -1521,7 +1521,7 @@ class eq
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments

-      $sql = "SELECT * FROM eq_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=".$presidency_id." and date>=CURDATE() ORDER BY date ASC, time ASC";

       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())


@@ -1568,7 +1568,7 @@ class eq
       $this->t->set_var('appt_table_width',$appt_table_width);
 
       // PPI SCHEDULING TABLE
       $this->t->set_var('appt_table_width',$appt_table_width);
 
       // PPI SCHEDULING TABLE

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY ppi_pri ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY ppi_pri ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       
       $i=0; 
       $this->db->query($sql,__LINE__,__FILE__);
       
       $i=0; 


@@ -1595,19 +1595,19 @@ class eq
 
          // If this elder has had a yearly PPI this year, don't show him on the schedule list
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
 
          // If this elder has had a yearly PPI this year, don't show him on the schedule list
          $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=" . $id . " AND eqpresppi=1";
+         $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND elder=" . $id . " AND interview_type='ppi'";

          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {

-           $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " AND eqpresppi=1 ORDER BY date DESC";
+           $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $id . " AND interview_type='ppi' ORDER BY date DESC";

            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.ppi_update';
            $link_data['elder'] = $id;
            $link_data['name'] = $name;
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.ppi_update';
            $link_data['elder'] = $id;
            $link_data['name'] = $name;

-           $link_data['ppi'] = '';
-           $link_data['eqpresppi'] = 1;
+           $link_data['interview'] = '';
+           $link_data['interview_type'] = 1;

            $link_data['action'] = 'add';
            $link_data['interviewer'] = $interviewer;
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
            $link_data['action'] = 'add';
            $link_data['interviewer'] = $interviewer;
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);


@@ -1635,8 +1635,8 @@ class eq
            $link_data['interviewer'] = $this->db2->f('interviewer');
            $link_data['elder'] = $this->db2->f('elder');
            $link_data['name'] = $name;
            $link_data['interviewer'] = $this->db2->f('interviewer');
            $link_data['elder'] = $this->db2->f('elder');
            $link_data['name'] = $name;

-           $link_data['ppi'] = $this->db2->f('ppi');
-           $link_data['eqpresppi'] = $this->db2->f('eqpresppi');
+           $link_data['interview'] = $this->db2->f('interview');
+           $link_data['interview_type'] = $this->db2->f('interview_type');

            $link_data['action'] = 'view';
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
            $elders_with_yearly_ppi++;
            $link_data['action'] = 'view';
            $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
            $elders_with_yearly_ppi++;


@@ -1730,7 +1730,7 @@ class eq
       //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
 
       // create the elder id -> elder name mapping
       //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end<br>";
 
       // create the elder id -> elder name mapping

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $elder_id_data = NULL;
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $elder_id_data = NULL;


@@ -1758,12 +1758,12 @@ class eq
                  $supervisor = $entry['supervisor'];
                  $supervisor_array = explode(",", $elderid2name[$supervisor]);
                  $supervisor_last_name = $supervisor_array[0];
                  $supervisor = $entry['supervisor'];
                  $supervisor_array = explode(",", $elderid2name[$supervisor]);
                  $supervisor_last_name = $supervisor_array[0];

-                 $sql = "SELECT * FROM eq_elder where elder='$supervisor'";
+                 $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'";

                  $this->db2->query($sql,__LINE__,__FILE__);
                  if($this->db2->next_record()) {
                    $indiv_id = $this->db2->f('indiv_id');
                  }
                  $this->db2->query($sql,__LINE__,__FILE__);
                  if($this->db2->next_record()) {
                    $indiv_id = $this->db2->f('indiv_id');
                  }

-                 $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+                 $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";

                  $this->db2->query($sql,__LINE__,__FILE__);
                  if($this->db2->next_record()) {
                    $supervisor_address = $this->db2->f('address');
                  $this->db2->query($sql,__LINE__,__FILE__);
                  if($this->db2->next_record()) {
                    $supervisor_address = $this->db2->f('address');


@@ -1774,11 +1774,11 @@ class eq
                
                //print "elder: $elder appointment: $appointment <br>";
                //Only perform a database update if we have made a change to this appointment
                
                //print "elder: $elder appointment: $appointment <br>";
                //Only perform a database update if we have made a change to this appointment

-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and elder='$elder' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'";

                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here

-                 $this->db->query("UPDATE eq_appointment set " .
+                 $this->db->query("UPDATE 3rd_appointment set " .

                                   " elder='" . $elder . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                                   " elder='" . $elder . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);


@@ -1801,7 +1801,7 @@ class eq
             //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
             if($aaronic == 0) { 
               // Perform database save actions here
             //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic <Br>";
             if($aaronic == 0) { 
               // Perform database save actions here

-              $this->db->query("UPDATE eq_elder set " .
+              $this->db->query("UPDATE 3rd_elder set " .

                                " int_notes='" . $int_notes . "'" .
                                ",int_pri='" . $int_pri . "'" .
                                " WHERE elder=" . $elder_id,__LINE__,__FILE__);
                                " int_notes='" . $int_notes . "'" .
                                ",int_pri='" . $int_pri . "'" .
                                " WHERE elder=" . $elder_id,__LINE__,__FILE__);


@@ -1814,7 +1814,7 @@ class eq
        }
 
       // Get the Districts
        }
 
       // Get the Districts

-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -1823,7 +1823,7 @@ class eq
          $districts[$i]['district'] = $this->db->f('district');
          $districts[$i]['name'] = $this->db->f('name');
          $districts[$i]['supervisor'] = $this->db->f('supervisor');
          $districts[$i]['district'] = $this->db->f('district');
          $districts[$i]['name'] = $this->db->f('name');
          $districts[$i]['supervisor'] = $this->db->f('supervisor');

-         $sql = "SELECT * FROM eq_presidency where district=$district and valid=1";
+         $sql = "SELECT * FROM 3rd_presidency where district=$district and valid=1";

          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $districts[$i]['presidency'] = $this->db2->f('presidency');
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $districts[$i]['presidency'] = $this->db2->f('presidency');


@@ -1851,12 +1851,12 @@ class eq
       $supervisor = $districts[$d]['supervisor'];
       $supervisor_array = explode(",", $supervisor);
       $supervisor_last_name = $supervisor_array[0];
       $supervisor = $districts[$d]['supervisor'];
       $supervisor_array = explode(",", $supervisor);
       $supervisor_last_name = $supervisor_array[0];

-      $sql = "SELECT * FROM eq_elder where elder='$supervisor'";
+      $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'";

       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record()) {
        $indiv_id = $this->db2->f('indiv_id');
       }
       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record()) {
        $indiv_id = $this->db2->f('indiv_id');
       }

-      $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+      $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";

       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record()) {
        $supervisor_address = $this->db2->f('address');
       $this->db2->query($sql,__LINE__,__FILE__);
       if($this->db2->next_record()) {
        $supervisor_address = $this->db2->f('address');


@@ -1868,7 +1868,7 @@ class eq
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments
       $this->t->set_var('appt_table_title',$appt_table_title);
       
       // query the database for all the appointments

-      $sql = "SELECT * FROM eq_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=".$districts[$d]['presidency']." and date>=CURDATE() ORDER BY date ASC, time ASC";

       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())


@@ -1918,7 +1918,7 @@ class eq
       // INTERVIEW SCHEDULING TABLE
       
       // Select all the unique companionship numbers for this district
       // INTERVIEW SCHEDULING TABLE
       
       // Select all the unique companionship numbers for this district

-      $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$d]['district'];
+      $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$d]['district'];

       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships = '';
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $j=0; $unique_companionships = '';
       while ($this->db->next_record())


@@ -1930,7 +1930,7 @@ class eq
       $i=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
        // Select all the companions from each companionship
       $i=0;
       for ($j=0; $j < count($unique_companionships); $j++) {
        // Select all the companions from each companionship

-       $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+       $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".

           "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        $k=0; $int_completed=0;
           "companionship=". $unique_companionships[$j]['companionship'];
        $this->db->query($sql,__LINE__,__FILE__);
        $k=0; $int_completed=0;


@@ -1944,7 +1944,7 @@ class eq
              $elder_id = $this->db->f('elder');
              $aaronic_id = $this->db->f('aaronic');
             
              $elder_id = $this->db->f('elder');
              $aaronic_id = $this->db->f('aaronic');
             

-             $sql = "SELECT * FROM eq_elder where elder=$elder_id";
+             $sql = "SELECT * FROM 3rd_elder where elder=$elder_id";

              $this->db2->query($sql,__LINE__,__FILE__);        
              if($this->db2->next_record())
                {
              $this->db2->query($sql,__LINE__,__FILE__);        
              if($this->db2->next_record())
                {


@@ -1956,7 +1956,7 @@ class eq
                  $elder_aaronic = 0;
                }
              else {
                  $elder_aaronic = 0;
                }
              else {

-               $sql = "SELECT * FROM eq_aaronic where aaronic=$aaronic_id";
+               $sql = "SELECT * FROM 3rd_aaronic where aaronic=$aaronic_id";

                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record())
                  {
                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record())
                  {


@@ -1990,19 +1990,19 @@ class eq
              }
              
              // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list
              }
              
              // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list

-             $sql = "SELECT * FROM eq_ppi WHERE date >= '$quarter_start' AND date < '$quarter_end' ".
+             $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ".

                 "AND elder=" . $id;
              $this->db2->query($sql,__LINE__,__FILE__);
              
              if(!$this->db2->next_record()) {
                 "AND elder=" . $id;
              $this->db2->query($sql,__LINE__,__FILE__);
              
              if(!$this->db2->next_record()) {

-               $sql = "SELECT * FROM eq_ppi WHERE elder=" . $id . " ORDER BY date DESC";
+               $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $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'] = 'eq.eq.int_update';
                $link_data['elder'] = $id;
                $link_data['aaronic'] = 0;
                $link_data['name'] = $name;
                $this->db3->query($sql,__LINE__,__FILE__);
                if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; }
                $link_data['menuaction'] = 'eq.eq.int_update';
                $link_data['elder'] = $id;
                $link_data['aaronic'] = 0;
                $link_data['name'] = $name;

-               $link_data['ppi'] = '';
+               $link_data['interview'] = '';

                $link_data['action'] = 'add';
                $link_data['interviewer'] = $districts[$d]['supervisor'];
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
                $link_data['action'] = 'add';
                $link_data['interviewer'] = $districts[$d]['supervisor'];
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);


@@ -2034,7 +2034,7 @@ class eq
                $link_data['elder'] = $this->db2->f('elder');
                $link_data['aaronic'] = $this->db2->f('aaronic');
                $link_data['name'] = $name;
                $link_data['elder'] = $this->db2->f('elder');
                $link_data['aaronic'] = $this->db2->f('aaronic');
                $link_data['name'] = $name;

-               $link_data['ppi'] = $this->db2->f('ppi');
+               $link_data['interview'] = $this->db2->f('interview');

                $link_data['action'] = 'view';
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
                $comps_with_quarterly_int++;
                $link_data['action'] = 'view';
                $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);    
                $comps_with_quarterly_int++;


@@ -2124,7 +2124,7 @@ class eq
       $year = date('Y');
 
       // create the family id -> family name mapping
       $year = date('Y');
 
       // create the family id -> family name mapping

-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $family_id = NULL;
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       $family_id = NULL;


@@ -2133,7 +2133,7 @@ class eq
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];

-         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";

          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');


@@ -2161,11 +2161,11 @@ class eq
                if($family == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment
                if($family == 0) { $location = ""; }
                
                //Only perform a database update if we have made a change to this appointment

-               $sql = "SELECT * FROM eq_appointment where appointment='$appointment' and family='$family' and location='$location'";
+               $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and family='$family' and location='$location'";

                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here
                $this->db->query($sql,__LINE__,__FILE__);
                if(!$this->db->next_record()) {
                  // Perform database save actions here

-                 $this->db->query("UPDATE eq_appointment set " .
+                 $this->db->query("UPDATE 3rd_appointment set " .

                                   " family='" . $family . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);
                                   " family='" . $family . "'" .
                                   ",location='" . $location . "'" .
                                   " WHERE appointment=" . $appointment,__LINE__,__FILE__);


@@ -2185,7 +2185,7 @@ class eq
             $visit_pri = $entry['pri'];
             
             // Perform database save actions here
             $visit_pri = $entry['pri'];
             
             // Perform database save actions here

-            $this->db->query("UPDATE eq_family set " .
+            $this->db->query("UPDATE 3rd_family set " .

                              " visit_notes='" . $visit_notes . "'" .
                              ",visit_pri='" . $visit_pri . "'" .
                              " WHERE family=" . $family,__LINE__,__FILE__);
                              " visit_notes='" . $visit_notes . "'" .
                              ",visit_pri='" . $visit_pri . "'" .
                              " WHERE family=" . $family,__LINE__,__FILE__);


@@ -2206,18 +2206,18 @@ class eq
       $appt_table_data = ""; 
 
       // Find out what the EQ Presidency ID is
       $appt_table_data = ""; 
 
       // Find out what the EQ Presidency ID is

-      $sql = "SELECT * FROM eq_presidency where eqpres=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where eqpres=1 and valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $presidency_name = $this->db->f('name');
        $presidency_id = $this->db->f('presidency');
       } else {
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $presidency_name = $this->db->f('name');
        $presidency_id = $this->db->f('presidency');
       } else {

-       print "<hr><font color=red><h3>-E- Unable to locate EQ Presidency in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate EQ Presidency in 3rd_presidency table</h3></font></hr>";

        return;
       }
             
       // query the database for all the appointments
        return;
       }
             
       // query the database for all the appointments

-      $sql = "SELECT * FROM eq_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";
+      $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency_id and date>=CURDATE() ORDER BY date ASC, time ASC";

       $this->db->query($sql,__LINE__,__FILE__);
 
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
 
       while ($this->db->next_record())


@@ -2268,7 +2268,7 @@ class eq
 
       
       // VISIT SCHEDULING TABLE
 
       
       // VISIT SCHEDULING TABLE

-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC";

       $this->db->query($sql,__LINE__,__FILE__);
 
       $total_families=0; $families_with_yearly_visit=0;
       $this->db->query($sql,__LINE__,__FILE__);
 
       $total_families=0; $families_with_yearly_visit=0;


@@ -2290,7 +2290,7 @@ class eq
          $total_families++;
        }
 
          $total_families++;
        }
 

-      $sql = "SELECT * FROM eq_parent where valid=1";
+      $sql = "SELECT * FROM 3rd_parent where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {


@@ -2310,12 +2310,12 @@ class eq
 
          // If this family has had a yearly visit this year, don't show them on the schedule list
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
 
          // If this family has had a yearly visit this year, don't show them on the schedule list
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";

-         $sql = "SELECT * FROM eq_visit WHERE date > '$year_start' AND date < '$year_end' ".
+         $sql = "SELECT * FROM 3rd_visit WHERE date > '$year_start' AND date < '$year_end' ".

             "AND family=" . $id . " AND companionship=0";
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {
             "AND family=" . $id . " AND companionship=0";
          $this->db2->query($sql,__LINE__,__FILE__);
          
          if(!$this->db2->next_record()) {

-           $sql = "SELECT * FROM eq_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";
+           $sql = "SELECT * FROM 3rd_visit WHERE family=" . $id . " AND companionship=0 ORDER BY date DESC";

            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.vis_update';
            $this->db->query($sql,__LINE__,__FILE__);
            if($this->db->next_record()) { $date = $this->db->f('date'); } else { $date = ""; }
            $link_data['menuaction'] = 'eq.eq.vis_update';


@@ -2430,20 +2430,20 @@ class eq
       if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
       else { $this->t->set_var('lang_num_months','Years of History'); }        
 
       if($num_months == 1) { $this->t->set_var('lang_num_months','Year of History'); }
       else { $this->t->set_var('lang_num_months','Years of History'); }        
 

-      $sql = "SELECT * FROM eq_presidency where president=1 and valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where president=1 and valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');
        $interviewer = $this->db->f('elder');
       $this->db->query($sql,__LINE__,__FILE__);
       if($this->db->next_record()) {
        $president_name = $this->db->f('name');
        $interviewer = $this->db->f('elder');

-       $eqpresppi = 1;
+       $interview_type = 'ppi';

       } else {
       } else {

-       print "<hr><font color=red><h3>-E- Unable to locate EQ President in eq_presidency table</h3></font></hr>";
+       print "<hr><font color=red><h3>-E- Unable to locate EQ President in 3rd_presidency table</h3></font></hr>";

        return;
       }
       $this->t->set_var('district_number','*');
       $this->t->set_var('district_name',$president_name);
 
        return;
       }
       $this->t->set_var('district_number','*');
       $this->t->set_var('district_name',$president_name);
 

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -2478,8 +2478,8 @@ class eq
        $link_data['interviewer'] = $interviewer;
        $link_data['elder'] = $id;
        $link_data['name'] = $name;
        $link_data['interviewer'] = $interviewer;
        $link_data['elder'] = $id;
        $link_data['name'] = $name;

-       $link_data['ppi'] = '';
-       $link_data['eqpresppi'] = $eqpresppi;
+       $link_data['interview'] = '';
+       $link_data['interview_type'] = $interview_type;

        $link_data['action'] = 'add';
        $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
        $this->nextmatchs->template_alternate_row_color(&$this->t);
        $link_data['action'] = 'add';
        $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
        $this->nextmatchs->template_alternate_row_color(&$this->t);


@@ -2489,8 +2489,8 @@ class eq
        for($m=$num_months; $m >= 0; $m--) {
          $year = date('Y') - $m;
          $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
        for($m=$num_months; $m >= 0; $m--) {
          $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=" . $id . " AND eqpresppi=1";
+         $sql = "SELECT * FROM 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ".
+            "AND elder=" . $id . " AND interview_type='ppi'";

          $this->db2->query($sql,__LINE__,__FILE__);
                  
          if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }
          $this->db2->query($sql,__LINE__,__FILE__);
                  
          if(!$total_ppis[$m]) { $total_ppis[$m] = 0; }


@@ -2501,8 +2501,8 @@ class eq
            $link_data['interviewer'] = $this->db2->f('interviewer');
            $link_data['elder'] = $id;
            $link_data['name'] = $name;
            $link_data['interviewer'] = $this->db2->f('interviewer');
            $link_data['elder'] = $id;
            $link_data['name'] = $name;

-           $link_data['ppi'] = $this->db2->f('ppi');
-           $link_data['eqpresppi'] = $eqpresppi;
+           $link_data['interview'] = $this->db2->f('interview');
+           $link_data['interview_type'] = $interview_type;

            $link_data['action'] = 'view';
            $date = $this->db2->f('date');
            $date_array = explode("-",$date);
            $link_data['action'] = 'view';
            $date = $this->db2->f('date');
            $date_array = explode("-",$date);


@@ -2547,14 +2547,14 @@ class eq
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));

-      $ppi = get_var('ppi',array('GET','POST'));
+      $interview = get_var('interview',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'));
       $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'));
+      $interview_type = get_var('interview_type',array('GET','POST'));

      
      

-      $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1)";

       $this->db2->query($sql,__LINE__,__FILE__);
       while ($this->db2->next_record())
       {
       $this->db2->query($sql,__LINE__,__FILE__);
       while ($this->db2->next_record())
       {


@@ -2566,22 +2566,22 @@ class eq
          $this->t->set_var('interviewer',$interviewer);
        }
         $this->t->set_var('interviewer_name',$interviewer_name);
          $this->t->set_var('interviewer',$interviewer);
        }
         $this->t->set_var('interviewer_name',$interviewer_name);

-        $this->t->set_var('eqpresppi_checked','');
+        $this->t->set_var('interview_type_checked','');

         $this->t->fp('int_list','interviewer_list',True);
       }
     
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
         $this->t->fp('int_list','interviewer_list',True);
       }
     
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("UPDATE eq_ppi set " .
-                          "   ppi='" . $ppi . "'" .
+         $this->db->query("UPDATE 3rd_interview set " .
+                    "   interview='" . $interview . "'" .

                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .

-                     ", eqpresppi='" . $eqpresppi . "'" .
-                          " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+                ", interview_type='" . $interview_type . "'" .
+                          " WHERE interview=" . $interview,__LINE__,__FILE__);

          $this->ppi_view();
          return false;
        }
          $this->ppi_view();
          return false;
        }


@@ -2589,9 +2589,9 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+         $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) "

                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"

-                          . $date . "','" . $notes . "','" . $eqpresppi  ."')",__LINE__,__FILE__);
+                          . $date . "','" . $notes . "','" . $interview_type  ."')",__LINE__,__FILE__);

          $this->ppi_view();
          return false;
        }
          $this->ppi_view();
          return false;
        }


@@ -2599,33 +2599,33 @@ class eq
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));

-         $this->t->set_var('ppi', '');
+         $this->t->set_var('interview', '');

          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
          $this->t->set_var('date','');
          $this->t->set_var('notes','');

-         $this->t->set_var('eqpresppi',$eqpresppi);
-         $this->t->set_var('eqpresppi_checked','checked');
+         $this->t->set_var('interview_type',$interview_type);
+         $this->t->set_var('interview_type_checked','checked');

          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New PPI');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New PPI');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'insert'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'insert'));

        }
 
       if($action == 'edit' || $action == 'view')
        {
        }
 
       if($action == 'edit' || $action == 'view')
        {

-         $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+         $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();

-         $this->t->set_var('ppi',$ppi);
+         $this->t->set_var('interview',$interview);

          $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('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));
          $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('date',$this->db->f('date'));
          $this->t->set_var('notes',$this->db->f('notes'));

-         $this->t->set_var('eqpresppi',$this->db->f('eqpresppi'));
-         if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+         $this->t->set_var('interview_type',$this->db->f('interview_type'));
+         if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }

        }
       
       if($action == 'edit')
        }
       
       if($action == 'edit')


@@ -2633,8 +2633,8 @@ class eq
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing PPI');
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing PPI');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'save'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'save'));

        }
 
       if($action == 'view')
        }
 
       if($action == 'view')


@@ -2645,8 +2645,8 @@ class eq
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing PPI');
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing PPI');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&ppi='
-                                                               . $ppi . '&action=' . 'edit'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_update&interview='
+                                                               . $interview . '&action=' . 'edit'));

        }
       
       $this->t->set_var('lang_reset','Clear Form');
        }
       
       $this->t->set_var('lang_reset','Clear Form');


@@ -2692,7 +2692,7 @@ class eq
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 

-      $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC";
+      $sql = "SELECT * FROM 3rd_district where valid=1 ORDER BY district ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -2703,7 +2703,7 @@ class eq
          $i++;
        }
 
          $i++;
        }
 

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -2719,7 +2719,7 @@ class eq
           $elders[$id] = $elder_name[$i];
       }      
 
           $elders[$id] = $elder_name[$i];
       }      
 

-      $sql = "SELECT * FROM eq_aaronic where valid=1 ORDER BY aaronic ASC";
+      $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {
       $this->db->query($sql,__LINE__,__FILE__);
       while ($this->db->next_record())
        {


@@ -2736,7 +2736,7 @@ class eq
        $supervisor = $districts[$i]['supervisor'];
                
        // Select all the unique companionship numbers for this district
        $supervisor = $districts[$i]['supervisor'];
                
        // Select all the unique companionship numbers for this district

-       $sql = "SELECT distinct companionship FROM eq_companionship where valid=1 and district=". $districts[$i]['district'];
+       $sql = "SELECT distinct companionship FROM 3rd_companionship where valid=1 and district=". $districts[$i]['district'];

        $this->db->query($sql,__LINE__,__FILE__);
        $j=0; $unique_companionships = '';
        while ($this->db->next_record())
        $this->db->query($sql,__LINE__,__FILE__);
        $j=0; $unique_companionships = '';
        while ($this->db->next_record())


@@ -2750,7 +2750,7 @@ class eq
        for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
        for ($j=0; $j < count($unique_companionships); $j++) {
          // Select all the companions in each companionship
        for($m=$num_months; $m >= 0; $m--) { $ints[$m] = 0; }
        for ($j=0; $j < count($unique_companionships); $j++) {
          // Select all the companions in each companionship

-         $sql = "SELECT * FROM eq_companionship where valid=1 and ".
+         $sql = "SELECT * FROM 3rd_companionship where valid=1 and ".

             "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;
             "companionship=". $unique_companionships[$j]['companionship'];
          $this->db->query($sql,__LINE__,__FILE__);
          $k=0;


@@ -2777,7 +2777,7 @@ class eq
              $link_data['elder'] = $elder_id;
              $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;
              $link_data['elder'] = $elder_id;
              $link_data['aaronic'] = $aaronic_id;
              $link_data['name'] = $name;

-             $link_data['ppi'] = '';
+             $link_data['interview'] = '';

              $link_data['action'] = 'add';
              $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
              $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";
              $link_data['action'] = 'add';
              $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data);
              $table_data.= "<tr bgcolor=". $this->t->get_var('tr_color') ."><td title=\"$phone\"><a href=$link>$name</a></td>";


@@ -2792,7 +2792,7 @@ class eq
                $month_start = "$year"."-"."$month"."-"."01";
                $month_end = "$year"."-"."$month"."-"."31";
                $month = "$month"."/"."$year";
                $month_start = "$year"."-"."$month"."-"."01";
                $month_end = "$year"."-"."$month"."-"."31";
                $month = "$month"."/"."$year";

-               $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ".
+               $sql = "SELECT * FROM 3rd_interview WHERE date >= '$month_start' AND date <= '$month_end' ".

                   "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
                $this->db2->query($sql,__LINE__,__FILE__);
                $header_row .= "<th width=$int_width><font size=-2>$month</th>";
                   "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id;
                $this->db2->query($sql,__LINE__,__FILE__);
                $header_row .= "<th width=$int_width><font size=-2>$month</th>";


@@ -2808,7 +2808,7 @@ class eq
                  $link_data['elder'] = $elder_id;
                  $link_data['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;
                  $link_data['elder'] = $elder_id;
                  $link_data['aaronic'] = $aaronic_id;
                  $link_data['name'] = $name;

-                 $link_data['ppi'] = $this->db2->f('ppi');
+                 $link_data['interview'] = $this->db2->f('interview');

                  $link_data['action'] = 'view';
                  $date = $this->db2->f('date');
                  $date_array = explode("-",$date);
                  $link_data['action'] = 'view';
                  $date = $this->db2->f('date');
                  $date_array = explode("-",$date);


@@ -2878,20 +2878,20 @@ class eq
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
       $this->t->set_var('readonly','');
       $this->t->set_var('disabled','');
       $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_view'));
       $this->t->set_var('readonly','');
       $this->t->set_var('disabled','');

-      $this->t->set_var('eqpresppi_checked','');
+      $this->t->set_var('interview_type_checked','');

       
       $action = get_var('action',array('GET','POST'));
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));
       
       $action = get_var('action',array('GET','POST'));
       $companionship = get_var('companionship',array('GET','POST'));
       $interviewer = get_var('interviewer',array('GET','POST'));      
       $name = get_var('name',array('GET','POST'));

-      $ppi = get_var('ppi',array('GET','POST'));
+      $interview = get_var('interview',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'));
       $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'));
+      $interview_type = get_var('interview_type',array('GET','POST'));

 
 

-      $sql = "SELECT * FROM eq_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1 and (president=1 or counselor=1 or secretary=1 or district!=0)";

       $this->db2->query($sql,__LINE__,__FILE__);
       while ($this->db2->next_record())
       {
       $this->db2->query($sql,__LINE__,__FILE__);
       while ($this->db2->next_record())
       {


@@ -2909,15 +2909,15 @@ class eq
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("UPDATE eq_ppi set " .
-                          "   ppi='" . $ppi . "'" .
+         $this->db->query("UPDATE 3rd_interview set " .
+                    "   interview='" . $interview . "'" .

                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                    ", interviewer='" . $interviewer . "'" .
                          ", elder='" . $elder . "'" .
                        ", aaronic='" . $aaronic . "'" .
                           ", date='" . $date . "'" .
                          ", notes='" . $notes . "'" .

-                     ", eqpresppi='" . $eqpresppi . "'" .
-                          " WHERE ppi=" . $ppi,__LINE__,__FILE__);
+                ", interview_type='" . $interview_type . "'" .
+                          " WHERE interview=" . $interview,__LINE__,__FILE__);

          $this->int_view();
          return false;
        }
          $this->int_view();
          return false;
        }


@@ -2925,9 +2925,9 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("INSERT INTO eq_ppi (interviewer,elder,aaronic,date,notes,eqpresppi) "
+         $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) "

                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"
                           . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','"

-                          . $date . "','" . $notes ."','" . $eqpresppi . "')",__LINE__,__FILE__);
+                          . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__);

          $this->int_view();
          return false;
        }
          $this->int_view();
          return false;
        }


@@ -2935,7 +2935,7 @@ class eq
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));
       if($action == 'add')
        {
          $this->t->set_var('cal_date',$this->jscal->input('date','','','','','','',$this->cal_options));

-         $this->t->set_var('ppi', '');
+         $this->t->set_var('interview', '');

          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);
          $this->t->set_var('interviewer', $interviewer);
          $this->t->set_var('name',$name);
          $this->t->set_var('elder',$elder);


@@ -2944,23 +2944,23 @@ class eq
          $this->t->set_var('notes','');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New Interview');
          $this->t->set_var('notes','');
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Adding New Interview');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'insert'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'insert'));

        }
 
       if($action == 'edit' || $action == 'view')
        {
        }
 
       if($action == 'edit' || $action == 'view')
        {

-         $sql = "SELECT * FROM eq_ppi WHERE ppi=".$ppi;
+         $sql = "SELECT * FROM 3rd_interview WHERE interview=".$interview;

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();

-         $this->t->set_var('ppi',$ppi);
+         $this->t->set_var('interview',$interview);

          $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('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'));

-         if($this->db->f('eqpresppi') == 1) { $this->t->set_var('eqpresppi_checked','checked'); }
+         if($this->db->f('interview_type') == 1) { $this->t->set_var('interview_type_checked','checked'); }

        }
       
       if($action == 'edit')
        }
       
       if($action == 'edit')


@@ -2968,8 +2968,8 @@ class eq
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing Interview');
          $this->t->set_var('cal_date',$this->jscal->input('date',$date,'','','','','',$this->cal_options));
          $this->t->set_var('lang_done','Cancel');
          $this->t->set_var('lang_action','Editing Interview');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'save'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'save'));

        }
 
       if($action == 'view')
        }
 
       if($action == 'view')


@@ -2980,8 +2980,8 @@ class eq
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing Interview');
          $this->t->set_var('disabled','DISABLED');
          $this->t->set_var('lang_done','Done');
          $this->t->set_var('lang_action','Viewing Interview');

-         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&ppi='
-                                                               . $ppi . '&action=' . 'edit'));
+         $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_update&interview='
+                                                               . $interview . '&action=' . 'edit'));

        }
       
       $this->t->set_var('lang_reset','Clear Form');
        }
       
       $this->t->set_var('lang_reset','Clear Form');


@@ -3025,7 +3025,7 @@ class eq
       $year = date('Y') - $num_years + 1;
       $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
       
       $year = date('Y') - $num_years + 1;
       $year_start = $year - 1 . "-12-31"; $year_end = $year + 1 . "-01-01";
       

-      $sql = "SELECT * FROM eq_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";
+      $sql = "SELECT * FROM 3rd_visit WHERE companionship=0 and date > '$year_start' ORDER BY date DESC";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -3042,7 +3042,7 @@ class eq
        {         
          $this->nextmatchs->template_alternate_row_color(&$this->t);
 
        {         
          $this->nextmatchs->template_alternate_row_color(&$this->t);
 

-         $sql = "SELECT * FROM eq_family WHERE family=".$visit_list[$i]['family'];
+         $sql = "SELECT * FROM 3rd_family WHERE family=".$visit_list[$i]['family'];

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
                  
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
                  


@@ -3070,7 +3070,7 @@ class eq
        }
 
       // List the families that are available to record a visit against
        }
 
       // List the families that are available to record a visit against

-      $sql = "SELECT * FROM eq_family WHERE valid=1";
+      $sql = "SELECT * FROM 3rd_family WHERE valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 
       $this->db->query($sql,__LINE__,__FILE__);
       $total_records = $this->db->num_rows();
 


@@ -3124,7 +3124,7 @@ class eq
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));
       if($action == 'save')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("UPDATE eq_visit set " .
+         $this->db->query("UPDATE 3rd_visit set " .

                           "  date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                           " WHERE visit=" . $visit,__LINE__,__FILE__);
                           "  date='" . $date . "'" .
                          ", notes='" . $notes . "'" .
                           " WHERE visit=" . $visit,__LINE__,__FILE__);


@@ -3135,7 +3135,7 @@ class eq
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));
       if($action == 'insert')
        {
          $notes = get_var('notes',array('POST'));

-         $this->db->query("INSERT INTO eq_visit (family,companionship,date,notes) "
+         $this->db->query("INSERT INTO 3rd_visit (family,companionship,date,notes) "

                           . "VALUES ('" . $family . "','" . $companionship . "','"
                           . $date . "','" . $notes . "')",__LINE__,__FILE__);
          $this->vis_view();
                           . "VALUES ('" . $family . "','" . $companionship . "','"
                           . $date . "','" . $notes . "')",__LINE__,__FILE__);
          $this->vis_view();


@@ -3158,7 +3158,7 @@ class eq
 
       if($action == 'edit' || $action == 'view')
        {
 
       if($action == 'edit' || $action == 'view')
        {

-         $sql = "SELECT * FROM eq_visit WHERE visit=".$visit;
+         $sql = "SELECT * FROM 3rd_visit WHERE visit=".$visit;

          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('visit',$visit);
          $this->db->query($sql,__LINE__,__FILE__);
          $this->db->next_record();
          $this->t->set_var('visit',$visit);


@@ -3232,7 +3232,7 @@ class eq
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 
       else if($current_month >= 7 && $current_month <= 9) { $current_month=9; }
       else if($current_month >= 10 && $current_month <= 12) { $current_month=12; }
 

-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_elder where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3320,9 +3320,9 @@ class eq
        #print "checking for elder: " . $elder_id[$i] . "<br>";
        for ($j=0; $j < count($sunday_list); $j++) {
          #print "checking for date: " .  $sunday_list[$j]['date'] . "<br>";
        #print "checking for elder: " . $elder_id[$i] . "<br>";
        for ($j=0; $j < count($sunday_list); $j++) {
          #print "checking for date: " .  $sunday_list[$j]['date'] . "<br>";

-         #print "SELECT * FROM eq_attendance WHERE date='"
+         #print "SELECT * FROM 3rd_attendance WHERE date='"

          #  . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . "<br>";
          #  . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . "<br>";

-         $sql = "SELECT * FROM eq_attendance WHERE date='"
+         $sql = "SELECT * FROM 3rd_attendance WHERE date='"

             . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {
             . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          if($this->db->next_record()) {


@@ -3404,11 +3404,11 @@ class eq
           $month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
 
           if($action == 'save_month') {        
           $month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; }
 
           if($action == 'save_month') {        

-             $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);
+             $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-%'",__LINE__,__FILE__);

           }
 
           if($action == 'save_day') {        
           }
 
           if($action == 'save_day') {        

-             $this->db->query("DELETE from eq_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);
+             $this->db->query("DELETE from 3rd_attendance where date LIKE '".$year."-".$month."-".$day."'",__LINE__,__FILE__);

           }   
 
           foreach ($new_data as $data)
           }   
 
           foreach ($new_data as $data)


@@ -3416,7 +3416,7 @@ class eq
              $data_array = explode("-",$data);
              $elder = $data_array[0];
              $date  = "$data_array[1]-$data_array[2]-$data_array[3]";        
              $data_array = explode("-",$data);
              $elder = $data_array[0];
              $date  = "$data_array[1]-$data_array[2]-$data_array[3]";        

-             $this->db->query("INSERT INTO eq_attendance (elder,date) "
+             $this->db->query("INSERT INTO 3rd_attendance (elder,date) "

                               . "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__);
           }
        
                               . "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__);
           }
        


@@ -3424,7 +3424,7 @@ class eq
         return false;    
        }
 
         return false;    
        }
 

-      $sql = "SELECT * FROM eq_elder where valid=1";
+      $sql = "SELECT * FROM 3rd_elder where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3503,7 +3503,7 @@ class eq
        $this->nextmatchs->template_alternate_row_color(&$this->t);
        $this->t->set_var('elder_name',$elder_name[$i]);
        for ($j=0; $j < count($sunday_list); $j++) {
        $this->nextmatchs->template_alternate_row_color(&$this->t);
        $this->t->set_var('elder_name',$elder_name[$i]);
        for ($j=0; $j < count($sunday_list); $j++) {

-         $sql = "SELECT * FROM eq_attendance WHERE date='"
+         $sql = "SELECT * FROM 3rd_attendance WHERE date='"

             . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          $value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];
             . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i];
          $this->db->query($sql,__LINE__,__FILE__);
          $value = $elder_id[$i] . "-" . $sunday_list[$j]['date'];


@@ -3534,7 +3534,7 @@ class eq
       $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
       $this->t->set_block('dir_view_t','dir_list','list');
       
       $this->t->set_file(array('dir_view_t' => 'dir_view.tpl'));
       $this->t->set_block('dir_view_t','dir_list','list');
       

-      $sql = "SELECT * FROM eq_parent where valid=1 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_parent where valid=1 ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3570,7 +3570,7 @@ class eq
       $this->t->set_block('org_view_t','org_list','list2');
 
       # Display a list ordered alphabetically
       $this->t->set_block('org_view_t','org_list','list2');
 
       # Display a list ordered alphabetically

-      $sql = "SELECT * FROM eq_calling ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_calling ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3598,7 +3598,7 @@ class eq
       }
 
       # Display a list ordered by organization
       }
 
       # Display a list ordered by organization

-      $sql = "SELECT * FROM eq_calling ORDER BY sequence ASC";
+      $sql = "SELECT * FROM 3rd_calling ORDER BY sequence ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3660,7 +3660,7 @@ class eq
       $header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $table_data = "";
 
       $header_row.= "<th width=$location_width><font size=-2>Location</th>";
       $table_data = "";
 

-      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3673,7 +3673,7 @@ class eq
          $i++;
        }
       
          $i++;
        }
       

-      $sql = "SELECT * FROM eq_family where valid=1 and elder_id != 0 ORDER BY name ASC";
+      $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3681,7 +3681,7 @@ class eq
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];
          $family_id[$i] = $this->db->f('family');
          $family_name[$i] = $this->db->f('name');
          $familyid2name[$family_id[$i]] = $family_name[$i];

-         $sql = "SELECT * FROM eq_parent where family='$family_id[$i]'";
+         $sql = "SELECT * FROM 3rd_parent where family='$family_id[$i]'";

          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $familyid2address[$family_id[$i]] = $this->db2->f('address');


@@ -3722,12 +3722,12 @@ class eq
                   else if($elder > 0) {
                     $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                     $supervisor_last_name = $supervisor_name_array[0];
                   else if($elder > 0) {
                     $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                     $supervisor_last_name = $supervisor_name_array[0];

-                    $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+                    $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";

                     $this->db2->query($sql,__LINE__,__FILE__);
                     if($this->db2->next_record()) {
                       $indiv_id = $this->db2->f('indiv_id');
                     }
                     $this->db2->query($sql,__LINE__,__FILE__);
                     if($this->db2->next_record()) {
                       $indiv_id = $this->db2->f('indiv_id');
                     }

-                    $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+                    $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";

                     $this->db2->query($sql,__LINE__,__FILE__);
                     if($this->db2->next_record()) {
                       $supervisor_address = $this->db2->f('address');
                     $this->db2->query($sql,__LINE__,__FILE__);
                     if($this->db2->next_record()) {
                       $supervisor_address = $this->db2->f('address');


@@ -3749,7 +3749,7 @@ class eq
                 if($appointment < $this->max_appointments)
                   {
                     //Only perform a database update if we have made a change to this appointment
                 if($appointment < $this->max_appointments)
                   {
                     //Only perform a database update if we have made a change to this appointment

-                    $sql = "SELECT * FROM eq_appointment where " .
+                    $sql = "SELECT * FROM 3rd_appointment where " .

                        "appointment='$appointment'" .
                        " and presidency='$presidency'" .
                        " and elder='$elder'" .
                        "appointment='$appointment'" .
                        " and presidency='$presidency'" .
                        " and elder='$elder'" .


@@ -3761,7 +3761,7 @@ class eq
                     if(!$this->db->next_record()) {
                       $old_date = $this->db->f('date');
                       $old_time = $this->db->f('time');
                     if(!$this->db->next_record()) {
                       $old_date = $this->db->f('date');
                       $old_time = $this->db->f('time');

-                      $this->db2->query("UPDATE eq_appointment set" .
+                      $this->db2->query("UPDATE 3rd_appointment set" .

                                        " family=" . $family . 
                                        " ,elder=" . $elder . 
                                        " ,date='" . $date . "'" .
                                        " family=" . $family . 
                                        " ,elder=" . $elder . 
                                        " ,date='" . $date . "'" .


@@ -3779,13 +3779,13 @@ class eq
                 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
                     //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";
                 else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != ""))
                   {
                     //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family<br>";

-                    $this->db2->query("INSERT INTO eq_appointment (appointment,presidency,family,elder,date,time,location,uid) "
+                    $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,elder,date,time,location,uid) "

                           . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','"
                           . $date . "','" . $time  . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
 
                     // Now reselect this entry from the database to see if we need
                     // to send an appointment out for it.
                           . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','"
                           . $date . "','" . $time  . "','" . $location . "','" . $uid ."')",__LINE__,__FILE__);
 
                     // Now reselect this entry from the database to see if we need
                     // to send an appointment out for it.

-                    $sql = "SELECT * FROM eq_appointment where " .
+                    $sql = "SELECT * FROM 3rd_appointment where " .

                        "elder='$elder'" .
                        " and family='$family'" .
                        " and presidency='$presidency'" .
                        "elder='$elder'" .
                        " and family='$family'" .
                        " and presidency='$presidency'" .


@@ -3808,7 +3808,7 @@ class eq
          //Header('Location: ' . $take_me_to_url);
        }
       
          //Header('Location: ' . $take_me_to_url);
        }
       

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -3828,7 +3828,7 @@ class eq
        $table_data="";
        
        // query the database for all the appointments
        $table_data="";
        
        // query the database for all the appointments

-       $sql = "SELECT * FROM eq_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";
+       $sql = "SELECT * FROM 3rd_appointment where presidency=$presidency and date>=CURDATE() ORDER BY date ASC, time ASC";

        $this->db->query($sql,__LINE__,__FILE__);
 
        // Prefill any existing appointment slots
        $this->db->query($sql,__LINE__,__FILE__);
 
        // Prefill any existing appointment slots


@@ -3849,12 +3849,12 @@ class eq
              else if($elder > 0) {
                $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                $supervisor_last_name = $supervisor_name_array[0];
              else if($elder > 0) {
                $supervisor_name_array = explode(",",$presidency2name[$presidency]);
                $supervisor_last_name = $supervisor_name_array[0];

-               $sql = "SELECT * FROM eq_elder where elder='$presidency2elder[$presidency]'";
+               $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'";

                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record()) {
                  $indiv_id = $this->db2->f('indiv_id');
                }
                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record()) {
                  $indiv_id = $this->db2->f('indiv_id');
                }

-               $sql = "SELECT * FROM eq_parent where indiv_id='$indiv_id'";
+               $sql = "SELECT * FROM 3rd_parent where indiv_id='$indiv_id'";

                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record()) {
                  $supervisor_address = $this->db2->f('address');
                $this->db2->query($sql,__LINE__,__FILE__);
                if($this->db2->next_record()) {
                  $supervisor_address = $this->db2->f('address');


@@ -4026,7 +4026,7 @@ class eq
 
       $this->t->pfp('out','admin_t');
 
 
       $this->t->pfp('out','admin_t');
 

-      $sql = "SELECT * FROM eq_elder where valid=1 ORDER BY elder ASC";
+      $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC";

       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
       $i=0;
       while ($this->db->next_record())


@@ -4178,7 +4178,7 @@ class eq
             if(($elder > 0) || ($name != "")) {
               if($id < $this->max_presidency_members) {
                 //print "Updating Existing Entry<br>";
             if(($elder > 0) || ($name != "")) {
               if($id < $this->max_presidency_members) {
                 //print "Updating Existing Entry<br>";

-                $this->db2->query("UPDATE eq_presidency set" .
+                $this->db2->query("UPDATE 3rd_presidency set" .

                                   " elder=" . $elder . 
                                   " ,district=" . $district . 
                                   " ,name='" . $name . "'" .
                                   " elder=" . $elder . 
                                   " ,district=" . $district . 
                                   " ,name='" . $name . "'" .


@@ -4191,7 +4191,7 @@ class eq
                 
               } else {
                 //print "Adding New Entry<br>";
                 
               } else {
                 //print "Adding New Entry<br>";

-                $this->db2->query("INSERT INTO eq_presidency (presidency,elder,district,name,"
+                $this->db2->query("INSERT INTO 3rd_presidency (presidency,elder,district,name,"

                                   . "email,president,counselor,secretary,eqpres,valid) "
                                   . "VALUES (NULL,'" . $elder . "','" . $district . "','"
                                   . $name . "','" . $email . "','" . $president  . "','"
                                   . "email,president,counselor,secretary,eqpres,valid) "
                                   . "VALUES (NULL,'" . $elder . "','" . $district . "','"
                                   . $name . "','" . $email . "','" . $president  . "','"


@@ -4203,25 +4203,25 @@ class eq
             }
           }
 
             }
           }
 

-         // Now update the eq_district table appropriately
+         // Now update the 3rd_district table appropriately

          
          // Delete all the previous district entries from the table
          
          // Delete all the previous district entries from the table

-         $this->db->query("DELETE from eq_district where valid=1",__LINE__,__FILE__);
-         $this->db->query("DELETE from eq_district where valid=0",__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_district where valid=1",__LINE__,__FILE__);
+         $this->db->query("DELETE from 3rd_district where valid=0",__LINE__,__FILE__);

 
          // Always add a "District 0" assigned to the High Priests Group
          $district = 0;
          $name = "High Priests";
          $elder = 0;
          $valid = 0;
 
          // Always add a "District 0" assigned to the High Priests Group
          $district = 0;
          $name = "High Priests";
          $elder = 0;
          $valid = 0;

-         $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+         $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "

                            . "VALUES ('" . $district . "','" . $name . "','"
                            . $elder . "','" . $valid . "'"
                            .")",__LINE__,__FILE__);
          
          
                            . "VALUES ('" . $district . "','" . $name . "','"
                            . $elder . "','" . $valid . "'"
                            .")",__LINE__,__FILE__);
          
          

-         // Requery the eq_presidency table
-         $sql = "SELECT * FROM eq_presidency where valid=1";
+         // Requery the 3rd_presidency table
+         $sql = "SELECT * FROM 3rd_presidency where valid=1";

          $this->db->query($sql,__LINE__,__FILE__);
          while ($this->db->next_record())
            {
          $this->db->query($sql,__LINE__,__FILE__);
          while ($this->db->next_record())
            {


@@ -4235,7 +4235,7 @@ class eq
 
              // If we have a valid district, add it to the district table
              if($district > 0) {
 
              // If we have a valid district, add it to the district table
              if($district > 0) {

-               $this->db2->query("INSERT INTO eq_district (district,name,supervisor,valid) "
+               $this->db2->query("INSERT INTO 3rd_district (district,name,supervisor,valid) "

                                  . "VALUES ('" . $district . "','" . $name . "','"
                                  . $elder . "','" . $valid . "'"
                                  .")",__LINE__,__FILE__);
                                  . "VALUES ('" . $district . "','" . $name . "','"
                                  . $elder . "','" . $valid . "'"
                                  .")",__LINE__,__FILE__);


@@ -4254,7 +4254,7 @@ class eq
 
       // Now save off the data needed for an EQ Presidency Table Update
       
 
       // Now save off the data needed for an EQ Presidency Table Update
       

-      $sql = "SELECT * FROM eq_presidency where valid=1";
+      $sql = "SELECT * FROM 3rd_presidency where valid=1";

       $this->db->query($sql,__LINE__,__FILE__);
       $table_data = "";
       $header_row = "<th>Elder</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>EQ Presidency</th>";
       $this->db->query($sql,__LINE__,__FILE__);
       $table_data = "";
       $header_row = "<th>Elder</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>EQ Presidency</th>";


@@ -4393,7 +4393,7 @@ class eq
     {
       //print "Emailing notification of appointment: $appointment <br>";
 
     {
       //print "Emailing notification of appointment: $appointment <br>";
 

-      $sql = "SELECT * FROM eq_appointment where appointment='$appointment'";
+      $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment'";

       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())
       $this->db->query($sql,__LINE__,__FILE__);
        
       while ($this->db->next_record())


@@ -4424,7 +4424,7 @@ class eq
          $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
          $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
          
          $dtstart = gmdate("Ymd"."\T"."His"."\Z", mktime($hour,$minute,$seconds,$month,$day,$year));
          $dtstartstr = date("l, F d, o g:i A", mktime($hour,$minute,$seconds,$month,$day,$year));
          

-         $sql = "SELECT * FROM eq_presidency where presidency='$presidency'";
+         $sql = "SELECT * FROM 3rd_presidency where presidency='$presidency'";

          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $email = $this->db2->f('email');
          $this->db2->query($sql,__LINE__,__FILE__);
          if($this->db2->next_record()) {
            $email = $this->db2->f('email');


@@ -4435,7 +4435,7 @@ class eq
          $from = $email;
 
          if($elder > 0) { 
          $from = $email;
 
          if($elder > 0) { 

-           $sql = "SELECT * FROM eq_elder where elder='$elder'";
+           $sql = "SELECT * FROM 3rd_elder where elder='$elder'";

            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $elder_name = $this->db2->f('name');
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $elder_name = $this->db2->f('name');


@@ -4446,14 +4446,14 @@ class eq
          }
 
          if($family > 0) { 
          }
 
          if($family > 0) { 

-           $sql = "SELECT * FROM eq_family where family='$family'";
+           $sql = "SELECT * FROM 3rd_family where family='$family'";

            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $family_name = $this->db2->f('name');
              $phone = $this->db2->f('phone');
              $elder_id = $this->db2->f('elder_id');
              $appt_name = $family_name . " Family Visit";
            $this->db2->query($sql,__LINE__,__FILE__);
            if($this->db2->next_record()) {
              $family_name = $this->db2->f('name');
              $phone = $this->db2->f('phone');
              $elder_id = $this->db2->f('elder_id');
              $appt_name = $family_name . " Family Visit";

-             $sql = "SELECT * FROM eq_elder where elder='$elder_id'";
+             $sql = "SELECT * FROM 3rd_elder where elder='$elder_id'";

              $this->db3->query($sql,__LINE__,__FILE__);
              if($this->db3->next_record()) {
                $phone = $this->db3->f('phone');
              $this->db3->query($sql,__LINE__,__FILE__);
              if($this->db3->next_record()) {
                $phone = $this->db3->f('phone');


@@ -4474,7 +4474,7 @@ class eq
            $uid = rand() . rand(); // Generate a random identifier for this appointment
            $subject = "Created: $appt_name";
            
            $uid = rand() . rand(); // Generate a random identifier for this appointment
            $subject = "Created: $appt_name";
            

-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .

                             " uid=" . $uid . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
 
                             " uid=" . $uid . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
 


@@ -4488,7 +4488,7 @@ class eq
            print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
            $subject = "Canceled: $appt_date $appt_time";
            
            print "Sent deleted appointment to " . $interviewer . " at " . $email . " for " . $appt_date . " " . $appt_time . "<br>";
            $subject = "Canceled: $appt_date $appt_time";
            

-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .

                             " uid=0" . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
            
                             " uid=0" . 
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
            


@@ -4506,7 +4506,7 @@ class eq
                                  $dtend, $date, $location, $subject, $subject, $uid);
            
            $uid = rand() . rand(); // Generate a random identifier for this appointment
                                  $dtend, $date, $location, $subject, $subject, $uid);
            
            $uid = rand() . rand(); // Generate a random identifier for this appointment

-           $this->db->query("UPDATE eq_appointment set" .
+           $this->db->query("UPDATE 3rd_appointment set" .

                             " uid=" . $uid .
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
            
                             " uid=" . $uid .
                             " WHERE appointment=" . $appointment,__LINE__,__FILE__);
            

diff --git a/setup/eq_config b/setup/eq_config
index ac79e2798007b7ecdd939c9ef5997f7777066b1b..fb2c716588416664153e0a7cc35f8926ef6f57b5 100644 (file)
--- a/setup/eq_config
+++ b/setup/eq_config
@@ -1,7 +1,7 @@
 <?php
 
 ///////////////////////////////////////////////////////////////////////////////////
 <?php
 
 ///////////////////////////////////////////////////////////////////////////////////

-// This is a configuration/preferences file for your EQ application.
+// This is a configuration/preferences file for your 3rd Counselor application.

 // You must modify these values to match your system configuration.
 // Save the resulting file as "db_config.local" in this setup dir.
 // This will prevent your settings from being overwritten by future code updates.
 // You must modify these values to match your system configuration.
 // Save the resulting file as "db_config.local" in this setup dir.
 // This will prevent your settings from being overwritten by future code updates.


@@ -9,10 +9,10 @@
 
 // The full path to a directory readable and writable by your webserver user
 // that will be used to dump the MLS data uploaded via the web interface to.
 
 // The full path to a directory readable and writable by your webserver user
 // that will be used to dump the MLS data uploaded via the web interface to.

-$this->upload_target_path = "/home/users/eqpres/eq_data";
+$this->upload_target_path = "/home/users/pres/3rd_data";

 
 // The full path to the installation location of this module
 
 // The full path to the installation location of this module

-$this->application_path = "/usr/share/phpgroupware/eq";
+$this->application_path = "/usr/share/phpgroupware/3rdCounselor";

 
 // The full path to the unzip application
 $this->unzip_path = "/usr/bin/unzip";
 
 // The full path to the unzip application
 $this->unzip_path = "/usr/bin/unzip";

diff --git a/sql/3rd.jpg b/sql/3rd.jpg
new file mode 100644 (file)
index 0000000..2781f04
Binary files /dev/null and b/sql/3rd.jpg differ

diff --git a/sql/3rd.sql b/sql/3rd.sql
new file mode 100644 (file)
index 0000000..7febfe4
--- /dev/null
+++ b/sql/3rd.sql
@@ -0,0 +1,249 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: phpgroupware
+-- ------------------------------------------------------
+
+--
+-- Current Database: `phpgroupware`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `phpgroupware` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `phpgroupware`;
+
+--
+-- Table structure for table `3rd_aaronic`
+--
+CREATE TABLE `3rd_aaronic` (
+  `aaronic` int(16) unsigned NOT NULL auto_increment,
+  `name` varchar(60) default NULL,
+  `phone` varchar(12) default NULL,
+  `email` varchar(120) default NULL,
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`aaronic`)
+) ENGINE=MyISAM AUTO_INCREMENT=92 DEFAULT CHARSET=latin1;
+
+
+--
+-- Table structure for table `3rd_activity`
+--
+CREATE TABLE `3rd_activity` (
+  `activity` int(16) unsigned NOT NULL auto_increment,
+  `assignment` int(16) unsigned NOT NULL,
+  `date` date default NULL,
+  `notes` text,
+  PRIMARY KEY  (`activity`),
+  KEY `assignment` (`assignment`)
+) ENGINE=MyISAM AUTO_INCREMENT=33 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_appointment`
+--
+CREATE TABLE `3rd_appointment` (
+  `appointment` int(16) unsigned NOT NULL auto_increment,
+  `presidency` int(16) unsigned NOT NULL default '0',
+  `family` int(16) unsigned default '0',
+  `elder` int(16) unsigned default '0',
+  `date` date NOT NULL default '0000-00-00',
+  `time` time NOT NULL default '00:00:00',
+  `location` varchar(120) default NULL,
+  `uid` bigint(64) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`appointment`)
+) ENGINE=MyISAM AUTO_INCREMENT=132 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_assignment`
+--
+CREATE TABLE `3rd_assignment` (
+  `assignment` int(12) unsigned NOT NULL auto_increment,
+  `name` varchar(60) NOT NULL,
+  `code` varchar(12) default NULL,
+  PRIMARY KEY  (`assignment`)
+) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `3rd_assignment`
+--
+LOCK TABLES `3rd_assignment` WRITE;
+/*!40000 ALTER TABLE `3rd_assignment` DISABLE KEYS */;
+INSERT INTO `3rd_assignment` (`assignment`, `name`, `code`) VALUES (1,'Enrichment Night Babysitting','RS'),(2,'Building Lockup','LU'),(3,'Building Cleaning Coordinator','CC'),(4,'Missionary Splits','MS'),(5,'Stake Farm','SF'),(6,'Loveland Kitchen','LK'),(7,'Moves','MV'),(8,'Temple Kitchen & Laundary','TKL'),(9,'Temple Sealings','TS'),(10,'Temple Initatories','TI');
+/*!40000 ALTER TABLE `3rd_assignment` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `3rd_attendance`
+--
+CREATE TABLE `3rd_attendance` (
+  `elder` int(16) unsigned NOT NULL default '0',
+  `date` date default NULL,
+  KEY `elder` (`elder`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_calling`
+--
+CREATE TABLE `3rd_calling` (
+  `indiv_id` int(16) unsigned default NULL,
+  `name` varchar(30) default NULL,
+  `organization` varchar(30) default NULL,
+  `position` varchar(30) default NULL,
+  `sequence` int(16) unsigned default NULL,
+  `sustained` varchar(30) default NULL,
+  KEY `indiv_id` (`indiv_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_child`
+--
+CREATE TABLE `3rd_child` (
+  `child` int(16) unsigned NOT NULL auto_increment,
+  `family` int(16) unsigned default NULL,
+  `name` varchar(30) default NULL,
+  `birthday` date default NULL,
+  `indiv_id` int(16) unsigned default NULL,
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`child`)
+) ENGINE=MyISAM AUTO_INCREMENT=260 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_companionship`
+--
+
+CREATE TABLE `3rd_companionship` (
+  `companionship` int(16) unsigned NOT NULL default '0',
+  `elder` int(16) unsigned NOT NULL default '0',
+  `aaronic` int(16) unsigned NOT NULL default '0',
+  `district` int(16) unsigned default NULL,
+  `valid` tinyint(1) default NULL,
+  KEY `companionship` (`companionship`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_district`
+--
+CREATE TABLE `3rd_district` (
+  `district` int(16) unsigned NOT NULL default '0',
+  `name` varchar(30) default NULL,
+  `supervisor` int(16) unsigned default NULL,
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`district`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_elder`
+--
+CREATE TABLE `3rd_elder` (
+  `elder` int(16) unsigned NOT NULL auto_increment,
+  `indiv_id` int(16) unsigned NOT NULL,
+  `name` varchar(60) default NULL,
+  `phone` varchar(12) default NULL,
+  `email` varchar(120) default NULL,
+  `priesthood` enum('High Priest','Elder','Priest','Teacher','Deacon','Unordained') DEFAULT NULL,
+  `prospective` enum('y','n') DEFAULT 'n',
+  `ppi_pri` int(10) unsigned NOT NULL default '1',
+  `ppi_notes` varchar(128) default NULL,
+  `int_pri` int(10) unsigned default '1',
+  `int_notes` varchar(128) default NULL,
+  `attending` tinyint(1) default '0',
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`elder`)
+) ENGINE=MyISAM AUTO_INCREMENT=105 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_family`
+--
+CREATE TABLE `3rd_family` (
+  `family` int(16) unsigned NOT NULL auto_increment,
+  `hofh_id` int(16) unsigned NOT NULL default '0',
+  `name` varchar(30) NOT NULL default '',
+  `name_id` varchar(30) NOT NULL default '',
+  `elder_id` int(16) unsigned default '0',
+  `companionship` int(16) unsigned default NULL,
+  `visit_pri` int(10) unsigned default '1',
+  `visit_notes` varchar(128) default NULL,
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`family`)
+) ENGINE=MyISAM AUTO_INCREMENT=277 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_parent`
+--
+CREATE TABLE `3rd_parent` (
+  `parent` int(16) unsigned NOT NULL auto_increment,
+  `family` int(16) unsigned default NULL,
+  `name` varchar(30) default NULL,
+  `birthday` date default NULL,
+  `phone` varchar(12) default NULL,
+  `address` varchar(255) default NULL,
+  `indiv_id` int(16) unsigned default NULL,
+  `valid` tinyint(1) default NULL,
+  PRIMARY KEY  (`parent`)
+) ENGINE=MyISAM AUTO_INCREMENT=396 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_participation`
+--
+CREATE TABLE `3rd_participation` (
+  `elder` int(16) unsigned NOT NULL default '0',
+  `activity` int(16) unsigned default NULL,
+  UNIQUE KEY `activity_ndx` (`elder`,`activity`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_interview`
+--
+CREATE TABLE `3rd_interview` (
+  `interview` int(16) unsigned NOT NULL auto_increment,
+  `interviewer` int(16) unsigned default NULL,
+  `elder` int(16) unsigned default NULL,
+  `aaronic` int(16) unsigned NOT NULL default '0',
+  `date` date default NULL,
+  `notes` text,
+  `interview_type` enum('hti','ppi') NOT NULL DEFAULT 'hti',
+  PRIMARY KEY  (`ppi`)
+) ENGINE=MyISAM AUTO_INCREMENT=248 DEFAULT CHARSET=latin1;
+
+
+--
+-- Table structure for table `3rd_presidency`
+--
+CREATE TABLE `3rd_presidency` (
+  `presidency` int(16) unsigned NOT NULL auto_increment,
+  `elder` int(16) unsigned NOT NULL default '0',
+  `district` int(16) unsigned default '0',
+  `name` varchar(60) NOT NULL,
+  `email` varchar(60) NOT NULL,
+  `president` tinyint(1) default '0',
+  `counselor` tinyint(1) default '0',
+  `secretary` tinyint(1) default '0',
+  `eqpres` tinyint(1) default '0',
+  `valid` tinyint(1) default '1',
+  KEY `presidency` (`presidency`),
+  KEY `elder` (`elder`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_visit`
+--
+CREATE TABLE `3rd_visit` (
+  `visit` int(16) unsigned NOT NULL auto_increment,
+  `family` int(16) unsigned default NULL,
+  `companionship` int(16) unsigned default NULL,
+  `companion1` int(16) unsigned default NULL,
+  `companion2` int(16) unsigned default NULL,
+  `date` date default NULL,
+  `notes` text,
+  `visited` enum('y','n','') default NULL,
+  `visit_type` enum('presidency','hometeaching') not null default 'hometeaching',
+  PRIMARY KEY  (`visit`)
+) ENGINE=MyISAM AUTO_INCREMENT=9513 DEFAULT CHARSET=latin1;
+
+--
+-- Table structure for table `3rd_willingness`
+--
+CREATE TABLE `3rd_willingness` (
+  `elder` int(16) unsigned NOT NULL,
+  `assignment` int(16) unsigned NOT NULL,
+  `willing` enum('y','n','') NOT NULL,
+  KEY `elder` (`elder`,`assignment`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;

diff --git a/sql/dot.cmd b/sql/dot.cmd
index 9bd21b911c12d1c0763aa1d5a5d5b536e5457193..44306b1fa40a41ae010d4cd2ca66638c347f4726 100755 (executable)
--- a/sql/dot.cmd
+++ b/sql/dot.cmd
@@ -1 +1 @@
-dot -Tjpg -o eq.jpg schema.dot 
+dot -Tjpg -o 3rd.jpg schema.dot 

diff --git a/sql/eq.jpg b/sql/eq.jpg
deleted file mode 100644 (file)
index 2781f04..0000000
Binary files a/sql/eq.jpg and /dev/null differ

diff --git a/sql/eq.sql b/sql/eq.sql
deleted file mode 100644 (file)
index 8106541..0000000
--- a/sql/eq.sql
+++ /dev/null
@@ -1,245 +0,0 @@
--- MySQL dump 10.11
---
--- Host: localhost    Database: phpgroupware
--- ------------------------------------------------------
-
---
--- Current Database: `phpgroupware`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `phpgroupware` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `phpgroupware`;
-
---
--- Table structure for table `eq_aaronic`
---
-CREATE TABLE `eq_aaronic` (
-  `aaronic` int(16) unsigned NOT NULL auto_increment,
-  `name` varchar(60) default NULL,
-  `phone` varchar(12) default NULL,
-  `email` varchar(120) default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`aaronic`)
-) ENGINE=MyISAM AUTO_INCREMENT=92 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `eq_activity`
---
-CREATE TABLE `eq_activity` (
-  `activity` int(16) unsigned NOT NULL auto_increment,
-  `assignment` int(16) unsigned NOT NULL,
-  `date` date default NULL,
-  `notes` text,
-  PRIMARY KEY  (`activity`),
-  KEY `assignment` (`assignment`)
-) ENGINE=MyISAM AUTO_INCREMENT=33 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_appointment`
---
-CREATE TABLE `eq_appointment` (
-  `appointment` int(16) unsigned NOT NULL auto_increment,
-  `presidency` int(16) unsigned NOT NULL default '0',
-  `family` int(16) unsigned default '0',
-  `elder` int(16) unsigned default '0',
-  `date` date NOT NULL default '0000-00-00',
-  `time` time NOT NULL default '00:00:00',
-  `location` varchar(120) default NULL,
-  `uid` bigint(64) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`appointment`)
-) ENGINE=MyISAM AUTO_INCREMENT=132 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_assignment`
---
-CREATE TABLE `eq_assignment` (
-  `assignment` int(12) unsigned NOT NULL auto_increment,
-  `name` varchar(60) NOT NULL,
-  `code` varchar(12) default NULL,
-  PRIMARY KEY  (`assignment`)
-) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `eq_assignment`
---
-LOCK TABLES `eq_assignment` WRITE;
-/*!40000 ALTER TABLE `eq_assignment` DISABLE KEYS */;
-INSERT INTO `eq_assignment` (`assignment`, `name`, `code`) VALUES (1,'Enrichment Night Babysitting','RS'),(2,'Building Lockup','LU'),(3,'Building Cleaning Coordinator','CC'),(4,'Missionary Splits','MS'),(5,'Stake Farm','SF'),(6,'Loveland Kitchen','LK'),(7,'Moves','MV'),(8,'Temple Kitchen & Laundary','TKL'),(9,'Temple Sealings','TS'),(10,'Temple Initatories','TI');
-/*!40000 ALTER TABLE `eq_assignment` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eq_attendance`
---
-CREATE TABLE `eq_attendance` (
-  `elder` int(16) unsigned NOT NULL default '0',
-  `date` date default NULL,
-  KEY `elder` (`elder`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_calling`
---
-CREATE TABLE `eq_calling` (
-  `indiv_id` int(16) unsigned default NULL,
-  `name` varchar(30) default NULL,
-  `organization` varchar(30) default NULL,
-  `position` varchar(30) default NULL,
-  `sequence` int(16) unsigned default NULL,
-  `sustained` varchar(30) default NULL,
-  KEY `indiv_id` (`indiv_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_child`
---
-CREATE TABLE `eq_child` (
-  `child` int(16) unsigned NOT NULL auto_increment,
-  `family` int(16) unsigned default NULL,
-  `name` varchar(30) default NULL,
-  `birthday` date default NULL,
-  `indiv_id` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`child`)
-) ENGINE=MyISAM AUTO_INCREMENT=260 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_companionship`
---
-
-CREATE TABLE `eq_companionship` (
-  `companionship` int(16) unsigned NOT NULL default '0',
-  `elder` int(16) unsigned NOT NULL default '0',
-  `aaronic` int(16) unsigned NOT NULL default '0',
-  `district` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  KEY `companionship` (`companionship`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_district`
---
-CREATE TABLE `eq_district` (
-  `district` int(16) unsigned NOT NULL default '0',
-  `name` varchar(30) default NULL,
-  `supervisor` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`district`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_elder`
---
-CREATE TABLE `eq_elder` (
-  `elder` int(16) unsigned NOT NULL auto_increment,
-  `indiv_id` int(16) unsigned NOT NULL,
-  `name` varchar(60) default NULL,
-  `phone` varchar(12) default NULL,
-  `email` varchar(120) default NULL,
-  `priesthood` enum('High Priest','Elder','Priest','Teacher','Deacon','Unordained') DEFAULT NULL,
-  `ppi_pri` int(10) unsigned NOT NULL default '1',
-  `ppi_notes` varchar(128) default NULL,
-  `int_pri` int(10) unsigned default '1',
-  `int_notes` varchar(128) default NULL,
-  `attending` tinyint(1) default '0',
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`elder`)
-) ENGINE=MyISAM AUTO_INCREMENT=105 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_family`
---
-CREATE TABLE `eq_family` (
-  `family` int(16) unsigned NOT NULL auto_increment,
-  `hofh_id` int(16) unsigned NOT NULL default '0',
-  `name` varchar(30) NOT NULL default '',
-  `name_id` varchar(30) NOT NULL default '',
-  `elder_id` int(16) unsigned default '0',
-  `companionship` int(16) unsigned default NULL,
-  `visit_pri` int(10) unsigned default '1',
-  `visit_notes` varchar(128) default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`family`)
-) ENGINE=MyISAM AUTO_INCREMENT=277 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_parent`
---
-CREATE TABLE `eq_parent` (
-  `parent` int(16) unsigned NOT NULL auto_increment,
-  `family` int(16) unsigned default NULL,
-  `name` varchar(30) default NULL,
-  `birthday` date default NULL,
-  `phone` varchar(12) default NULL,
-  `address` varchar(255) default NULL,
-  `indiv_id` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`parent`)
-) ENGINE=MyISAM AUTO_INCREMENT=396 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_participation`
---
-CREATE TABLE `eq_participation` (
-  `elder` int(16) unsigned NOT NULL default '0',
-  `activity` int(16) unsigned default NULL,
-  UNIQUE KEY `activity_ndx` (`elder`,`activity`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_ppi`
---
-CREATE TABLE `eq_ppi` (
-  `ppi` int(16) unsigned NOT NULL auto_increment,
-  `interviewer` int(16) unsigned default NULL,
-  `elder` int(16) unsigned default NULL,
-  `aaronic` int(16) unsigned NOT NULL default '0',
-  `date` date default NULL,
-  `notes` text,
-  `eqpresppi` tinyint(1) default '0',
-  PRIMARY KEY  (`ppi`)
-) ENGINE=MyISAM AUTO_INCREMENT=248 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `eq_presidency`
---
-CREATE TABLE `eq_presidency` (
-  `presidency` int(16) unsigned NOT NULL auto_increment,
-  `elder` int(16) unsigned NOT NULL default '0',
-  `district` int(16) unsigned default '0',
-  `name` varchar(60) NOT NULL,
-  `email` varchar(60) NOT NULL,
-  `president` tinyint(1) default '0',
-  `counselor` tinyint(1) default '0',
-  `secretary` tinyint(1) default '0',
-  `eqpres` tinyint(1) default '0',
-  `valid` tinyint(1) default '1',
-  KEY `presidency` (`presidency`),
-  KEY `elder` (`elder`)
-) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_visit`
---
-CREATE TABLE `eq_visit` (
-  `visit` int(16) unsigned NOT NULL auto_increment,
-  `family` int(16) unsigned default NULL,
-  `companionship` int(16) unsigned default NULL,
-  `date` date default NULL,
-  `notes` text,
-  `visited` enum('y','n','') default NULL,
-  PRIMARY KEY  (`visit`)
-) ENGINE=MyISAM AUTO_INCREMENT=9513 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `eq_willingness`
---
-CREATE TABLE `eq_willingness` (
-  `elder` int(16) unsigned NOT NULL,
-  `assignment` int(16) unsigned NOT NULL,
-  `willing` enum('y','n','') NOT NULL,
-  KEY `elder` (`elder`,`assignment`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;

diff --git a/sql/schema.dot b/sql/schema.dot
index 641e87501de54fa1247c628cd14f01b0d6e5abad..6c3999a5127d853a832593348fc7b8ab27ea7283 100644 (file)
--- a/sql/schema.dot
+++ b/sql/schema.dot
@@ -7,7 +7,7 @@ digraph schema {
     shape = "record"
   ];
   elder   [
     shape = "record"
   ];
   elder   [

-    label = "<e> elder||<n> name|<p> phone|<em> email|<po> priesthood|<pp> ppi_pri|<t> ppi_notes|<ip> int_pri|<in> int_notes|<a> attending|<v> valid"
+    label = "<e> elder||<n> name|<p> phone|<em> email|<po> priesthood|<pr> prospective|<pp> ppi_pri|<t> ppi_notes|<ip> int_pri|<in> int_notes|<a> attending|<v> valid"

     shape = "record"
   ];
   companionship   [
     shape = "record"
   ];
   companionship   [


@@ -15,11 +15,11 @@ digraph schema {
     shape = "record"
   ];
   visit   [
     shape = "record"
   ];
   visit   [

-    label = "<v> visit||<f> family|<c> companionship|<t> date|<n> notes|<v> visited"
+    label = "<v> visit||<f> family|<c> companionship|<c1> companion1|<c2> companion2|<t> date|<n> notes|<v> visited|<vt> visit_type"

     shape = "record"
   ];
     shape = "record"
   ];

-  ppi   [
-    label = "<p> ppi||<i> interviewer|<e> elder|<t> date|<n> notes|<p> eqpresppi"
+  interview   [
+    label = "<in> interview||<i> interviewer|<e> elder|<a> aaronic|<t> date|<n> notes|<it> interview_type"

     shape = "record"
   ];
   activity   [
     shape = "record"
   ];
   activity   [


@@ -62,10 +62,6 @@ digraph schema {
     label = "<d> district||<n> name|<s> supervisor|<v> valid"
     shape = "record"
   ];
     label = "<d> district||<n> name|<s> supervisor|<v> valid"
     shape = "record"
   ];

-  interview     [
-    label = "<i> interview||<in> interviewer|<e> elder|<a> aaronic|<d> date|<n> notes"
-    shape = "record"
-  ];

   presidency    [
     label = "<p> presidency||<e> elder|<d> district|<n> name|<em> email|<pr> president|<cn> counselor|<sec> secreatary|<v> valid"
     shape = "record"
   presidency    [
     label = "<p> presidency||<e> elder|<d> district|<n> name|<em> email|<pr> president|<cn> counselor|<sec> secreatary|<v> valid"
     shape = "record"


@@ -83,7 +79,7 @@ digraph schema {
   appointment:f   -> family:f
 
   interview:e     -> elder:e
   appointment:f   -> family:f
 
   interview:e     -> elder:e

-  interview:in    -> elder:e
+  interview:i     -> elder:e

   interview:a     -> aaronic:a
 
   presidency:e    -> elder:e
   interview:a     -> aaronic:a
 
   presidency:e    -> elder:e


@@ -97,9 +93,6 @@ digraph schema {
   visit:c         -> companionship:c
   visit:f         -> family:f
 
   visit:c         -> companionship:c
   visit:f         -> family:f
 

-  ppi:i           -> elder:e
-  ppi:e           -> elder:e
-

   participation:e -> elder:e
   participation:a -> activity:a
 
   participation:e -> elder:e
   participation:a -> activity:a