From: Owen Leonard Date: Sat, 11 Sep 2010 18:04:21 +0000 (-0600) Subject: started changing app name to 3rd, changing file names to not have eq in them X-Git-Tag: release_1_0_0~58 X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/%22%22.%24thumbnail.%22/.%24link.?a=commitdiff_plain;h=abf09ae712c55d6e251ffd4a89dc63faa64b971a;p=eq%2F.git started changing app name to 3rd, changing file names to not have eq in them changed 3rd_elder to 3rd_indivi, removed as many references to elder as I could removed more instances of 'EQ' --- diff --git a/3rd.spec b/3rd.spec index a1e16b6..ead87f5 100644 --- a/3rd.spec +++ b/3rd.spec @@ -12,7 +12,7 @@ %define httpdroot /home/httpd/html/phpgroupware %define packaging 1 -Summary: Tools for Managing an Elders Quorum app for phpGroupWare. +Summary: Tools for Managing a Priesthood Quorum app for phpGroupWare. Name: %{packagename} Version: %{version} Release: %{packaging} @@ -27,7 +27,7 @@ requires: phpgroupware >= 0.9.10 AutoReq: 0 %description -This is an Elders Quorum Presidency Application. +This is an Priesthood Quorum Presidency Application. %prep %setup -n %{phpgwdirname} diff --git a/bin/import_ward_data b/bin/import_ward_data index 13e6a0e..b42a755 100755 --- a/bin/import_ward_data +++ b/bin/import_ward_data @@ -163,11 +163,11 @@ sub update_3rd_aaronic_table $sth->finish(); } -# 3RD_ELDER +# 3RD_INDIV #+-------------+------------------+------+-----+---------+----------------+ #| Field | Type | Null | Key | Default | Extra | #+-------------+------------------+------+-----+---------+----------------+ -#| elder | int(16) unsigned | | PRI | NULL | auto_increment | +#| indiv | int(16) unsigned | | PRI | NULL | auto_increment | #| indiv_id | int(16) unsigned | | | NULL | | #| name | varchar(60) | YES | | NULL | | #| phone | varchar(12) | YES | | NULL | | @@ -180,12 +180,12 @@ sub update_3rd_aaronic_table #| attending | tinyint(1) | YES | | 0 | | #| valid | tinyint(1) | YES | | NULL | | #+-------------+------------------+------+-----+---------+----------------+ -sub update_3rd_elder_table +sub update_3rd_indiv_table { - print "\n-> Updating 3rd_elder table\n"; + print "\n-> Updating 3rd_indiv table\n"; # Set all records to be invalid. Only mark them as valid if they appear on the new list. - $sth = $dbh->prepare("update 3rd_elder set valid=0"); + $sth = $dbh->prepare("update 3rd_indiv set valid=0"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; foreach $index (keys %membership_data) @@ -214,7 +214,7 @@ sub update_3rd_elder_table } $id = $membership_data{$index}{'Indiv ID'}; - $elder_name = $membership_data{$index}{'Preferred Name'}; + $indiv_name = $membership_data{$index}{'Preferred Name'}; $phone = $membership_data{$index}{'Household Phone'}; $priesthood = $membership_data{$index}{'Priesthood'}; $organization = $organization_by_id{$id}; @@ -226,40 +226,40 @@ sub update_3rd_elder_table ) { $attending = 1; } if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "$areacode-$1"; } if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; } - $email = $membership_data{$index}{'Individual E-mail'}; + $email = $membership_data{$index}{'indiv E-mail'}; if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; } - $sth = $dbh->prepare("select * from 3rd_elder where name='$elder_name'"); + $sth = $dbh->prepare("select * from 3rd_indiv where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; my @data = (); while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); } my $rows = scalar @data; 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 3rd_elder values (NULL,'$id','$elder_name','$phone','$email','$priesthood','n','1','','1','',$attending,1)"); + # No existing records found for this indiv, make a new entry + print " Adding new indiv: $indiv_name\n"; + $sth = $dbh->prepare("insert into 3rd_indiv values (NULL,'$id','$indiv_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 = $dbh->prepare("update 3rd_elder set valid=1 where name='$elder_name'"); + # An existing record was found for this indiv, update it + print " Updating existing indiv: $indiv_name\n"; + $sth = $dbh->prepare("update 3rd_indiv set valid=1 where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; if($phone ne "") { - $sth = $dbh->prepare("update 3rd_elder set phone='$phone' where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set phone='$phone' where name='$indiv_name'"); } else { - $sth = $dbh->prepare("update 3rd_elder set phone=NULL where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set phone=NULL where name='$indiv_name'"); } $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update 3rd_elder set attending='$attending' where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set attending='$attending' where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update 3rd_elder set indiv_id='$id' where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set indiv_id='$id' where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update 3rd_elder set priesthood='$priesthood' where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set priesthood='$priesthood' where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update 3rd_elder set email='$email' where name='$elder_name'"); + $sth = $dbh->prepare("update 3rd_indiv set email='$email' where name='$indiv_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } else { # More than one record was found. Error! This shouldn't happen. - print " -E- More than one record found ($rows) for Elder: $elder_name\n"; + print " -E- More than one record found ($rows) for indiv: $indiv_name\n"; } } } @@ -328,10 +328,10 @@ sub update_3rd_district_table while($sqlhashref = $sth->fetchrow_hashref) { $supervisor_name = $sqlhashref->{name}; $district = $sqlhashref->{district}; - $sth2 = $dbh->prepare("select * from 3rd_elder where name='$supervisor_name'"); + $sth2 = $dbh->prepare("select * from 3rd_indiv where name='$supervisor_name'"); $sth2->execute or die "-E- DB error: $DBI::errstr\n"; $sqlhashref2 = $sth2->fetchrow_hashref; - $supervisor_id = $sqlhashref2->{elder}; + $supervisor_id = $sqlhashref2->{indiv}; $sth2->finish(); $sth2 = $dbh->prepare("update 3rd_district set supervisor='$supervisor_id' where district='$district'"); $sth2->execute or die "-E- DB error: $DBI::errstr\n"; @@ -345,7 +345,7 @@ sub update_3rd_district_table #| Field | Type | Null | Key | Default | Extra | #+---------------+------------------+------+-----+---------+-------+ #| companionship | int(16) unsigned | | | 0 | | -#| elder | int(16) unsigned | YES | | NULL | | +#| indiv | int(16) unsigned | YES | | NULL | | #| aaronic | int(16) unsigned | YES | | NULL | | #| district | int(16) unsigned | YES | | NULL | | #| valid | tinyint(1) | YES | | NULL | | @@ -367,47 +367,47 @@ sub update_3rd_companionship_table foreach $key (keys %$hashref) { if($key =~ /Quorum/i && $hometeaching_data{$index}{$key} =~ /Elders/i) { foreach $field ("Home Teacher 1","Home Teacher 2") { - $elder_name = $hometeaching_data{$index}{$field}; - if($elder_name eq "") { next; } - $sth2 = $dbh->prepare("select * from 3rd_elder where name='$elder_name'"); + $indiv_name = $hometeaching_data{$index}{$field}; + if($indiv_name eq "") { next; } + $sth2 = $dbh->prepare("select * from 3rd_indiv where name='$indiv_name'"); $sth2->execute or die "-E- DB error: $DBI::errstr\n"; $sqlhashref2 = $sth2->fetchrow_hashref; - $elder = $sqlhashref2->{elder}; + $indiv = $sqlhashref2->{indiv}; $aaronic = "NULL"; - if($elder eq "") { - $sth2 = $dbh->prepare("select * from 3rd_aaronic where name='$elder_name'"); + if($indiv eq "") { + $sth2 = $dbh->prepare("select * from 3rd_aaronic where name='$indiv_name'"); $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 3rd_elder or 3rd_aaronic tables\n"; next; } + $indiv = "NULL"; + if($aaronic eq "") { print "-W- Unable to find $indiv_name in 3rd_indiv or 3rd_aaronic tables\n"; next; } } $id = $hometeaching_data{$index}{'Comp ID'}; $district = $hometeaching_data{$index}{'HT District'}; - $sth = $dbh->prepare("select * from 3rd_companionship where elder='$elder' and aaronic='$aaronic' and companionship='$id'"); + $sth = $dbh->prepare("select * from 3rd_companionship where indiv='$indiv' 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); } my $rows = scalar @data; 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 3rd_companionship values ($id,'$elder','$aaronic','$district',1)"); + print " Adding Companion to companionship: $indiv_name -> $id\n"; + $sth = $dbh->prepare("insert into 3rd_companionship values ($id,'$indiv','$aaronic','$district',1)"); $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 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"; - $sth = $dbh->prepare("update 3rd_companionship set district='$district' where elder='$elder' and companionship='$id'"); + if($indiv ne "NULL") { + print " Updating Companionship with indiv: $indiv_name ($indiv) -> $id\n"; + $sth = $dbh->prepare("update 3rd_companionship set district='$district' where indiv='$indiv' and companionship='$id'"); $sth->execute or die "-E- DB error 'district': $DBI::errstr\n"; - $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 = $dbh->prepare("update 3rd_companionship set valid=1 where elder='$elder' and companionship='$id'"); + $sth = $dbh->prepare("update 3rd_companionship set indiv='$indiv' where indiv='$indiv' and companionship='$id'"); + $sth->execute or die "-E- DB error 'indiv': $DBI::errstr\n"; + $sth = $dbh->prepare("update 3rd_companionship set valid=1 where indiv='$indiv' 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"; + print " Updating Companionship with Aaronic: $indiv_name ($aaronic) -> $id\n"; $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 = $dbh->prepare("update 3rd_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'"); @@ -434,7 +434,7 @@ sub update_3rd_companionship_table #| hofh_id | int(16) unsigned | YES | | NULL | | #| name | varchar(30) | YES | | NULL | | #| name_id | varchar(30) | YES | | NULL | | -#| elder_id | int(16) unsigned | YES | | NULL | | +#| indiv_id | int(16) unsigned | YES | | NULL | | #| companionship | int(16) unsigned | YES | | NULL | | #| visit_pri | int(10) unsigned | YES | | 1 | | #| visit_notes | varchar(128) | YES | | NULL | | @@ -484,13 +484,13 @@ sub update_3rd_family_table print " -E- More than one record found ($rows) for family name: $family_name\n"; } - # Now update the elder_id field for this family - $sth = $dbh->prepare("select * from 3rd_elder WHERE name='$family_name'"); + # Now update the indiv_id field for this family + $sth = $dbh->prepare("select * from 3rd_indiv 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 = $dbh->prepare("update 3rd_family set elder_id=$elder_id where name_id='$name_id'"); + $indiv_id = $sqlhashref->{indiv}; + print " Updating family indiv_id: $family_name -> $indiv_id\n"; + $sth = $dbh->prepare("update 3rd_family set indiv_id=$indiv_id where name_id='$name_id'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } @@ -897,7 +897,7 @@ if($opt_s) { $dbh->disconnect(); exit; } # Now update the various eq DB tables &update_3rd_calling_table(); -&update_3rd_elder_table(); +&update_3rd_indiv_table(); &update_3rd_aaronic_table(); &update_3rd_district_table(); &update_3rd_companionship_table(); diff --git a/bin/upgrade_4_0_to_5_0 b/bin/upgrade_4_0_to_5_0 index da1e8da..7836351 100755 --- a/bin/upgrade_4_0_to_5_0 +++ b/bin/upgrade_4_0_to_5_0 @@ -27,6 +27,10 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_appointment` TO `3rd_appointment`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_appointment table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_appointment` CHANGE `elder` `indiv` INT(16)"); +$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"; @@ -35,6 +39,10 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_attendance` TO `3rd_attendance`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_attendance table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_attendance` CHANGE `elder` `indiv` INT(16)"); +$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"; @@ -47,22 +55,34 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_companionship` TO `3rd_companionship`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_companionship table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_companionship` CHANGE `elder` `indiv` INT(16)"); +$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`"); +# Rename eq_elder table to 3rd_indiv +$sth = $dbh->prepare("RENAME TABLE `eq_elder` TO `3rd_indiv`"); +$sth->execute or die "-E- DB error: $DBI::errstr\n"; + +# Add a new 'propective' field to the 3rd_indiv table +$sth = $dbh->prepare("ALTER TABLE `3rd_indiv` ADD `prospective` enum('y','n') NULL AFTER `priesthood`"); $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`"); +# Change elder field in 3rd_indiv table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_indiv` CHANGE `elder` `indiv` INT(16)"); $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"; +# Change elder_id field in 3rd_family table to indiv_id +$sth = $dbh->prepare("ALTER TABLE `3rd_family` CHANGE `elder_id` `indiv_id` INT(16)"); +$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"; @@ -71,10 +91,18 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_participation` TO `3rd_participation`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_participation table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_participation` CHANGE `elder` `indiv` INT(16)"); +$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 elder field in 3rd_interview table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_interview` CHANGE `elder` `indiv` INT(16)"); +$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"; @@ -95,6 +123,10 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_presidency` TO `3rd_presidency`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_presidency table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_presidency` CHANGE `elder` `indiv` INT(16)"); +$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"; @@ -119,6 +151,10 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("RENAME TABLE `eq_willingness` TO `3rd_willingness`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Change elder field in 3rd_willingness table to indiv +$sth = $dbh->prepare("ALTER TABLE `3rd_willingness` CHANGE `elder` `indiv` INT(16)"); +$sth->execute or die "-E- DB error: $DBI::errstr\n"; + print "-> Done!\n"; ################################################### diff --git a/doc/credits.txt b/doc/credits.txt index 8b62ccd..e57fdcc 100644 --- a/doc/credits.txt +++ b/doc/credits.txt @@ -5,7 +5,7 @@ Alan Pippin v1.0, 19 July 2005 - Credits for Elders Quorum app + Credits for 3rd Counselor app _________________________________________________________________ Credits diff --git a/doc/install.txt b/doc/install.txt index 284da64..badc43c 100644 --- a/doc/install.txt +++ b/doc/install.txt @@ -1,11 +1,11 @@ -Elders Quorum Installation Guide +3rd Counselor Installation Guide Alan Pippin v1.0, 05 Jan 2008 - Steps for installing Elders Quroum app + Steps for installing 3rd Counselor app _________________________________________________________________ Getting and Installing @@ -13,10 +13,12 @@ Getting and Installing Downloading Can be downloaded from: - https://eq.pippins.net/eq.zip + http://github.com/apippin/3rd/downloads It can also be obtained via the GIT revision control system by pulling from here: - http://git.pippins.net/eq/.git + (ssh) git@github.com:apippin/3rd.git + (http) https://owenleonard@github.com/apippin/3rd.git + (git - read-only) git://github.com/apippin/3rd.git Dependencies @@ -28,36 +30,36 @@ Dependencies Installing - 1) Download the eq.tar file and extract it or GIT pull the archive into + 1) Download the tgz or zip file and extract it or GIT pull the archive into your base phpgroupware directory (like /usr/share/phpgroupware/). - 2) Setup the mysql table structures for the EQ application: - mysql -u -p < eq/sql/eq.sql + 2) Setup the mysql table structures for the 3rd Counselor application: + mysql -u -p < 3rd/sql/3rd.sql 3) Point your browser to: http://www.yourdomain.com/phpgroupware/setup The setup prog will autodetect this application. From there you will need to assign this app to the users you want to have be able to use it. Enable it for each user by going to Site Admin -> User Accounts -> -> edit - Make sure the "eq" application has a checkmark next to it under "Permissions this user has" + Make sure the "3rd" application has a checkmark next to it under "Permissions this user has" 4) Copy the setup/db_config to setup/db_config.local and change the values in .local appropriately. Check for syntax errors by running eq/bin/check_config_syntax - 5) Copy the setup/eq_config to setup/eq_config.local and change the values in .local appropriately. + 5) Copy the setup/3rd_config to setup/3rd_config.local and change the values in .local appropriately. Make sure you update the path locations for your specific installation locations: upload_target_path & application_path - Check for syntax errors by running eq/bin/check_config_syntax - 6) Try to run eq/bin/import_ward_data & parse_ward_data scripts from the commandline + Check for syntax errors by running 3rd/bin/check_config_syntax + 6) Try to run 3rd/bin/import_ward_data & parse_ward_data scripts from the commandline to check for any missing perl library dependencies and mysql connection. Just run them without command line args. Install the right perl modules until the scripts run without any errors. 7) A graphical representation of the mysql schema used by this application can - be found here: eq/sql/eq.jpg + be found here: 3rd/sql/3rd.jpg 8) Run mls/mlstrimmer.py or MLSFileTrimmer.exe to trim down the csv files and combine them into a zip file. If you run mls/mlstrimmer.py, you'll need to point it to mls/windowsGUI/MLSFileTrimmer/MLSRequiredFields.xml. If you choose to not use EQ\ Prospective\ Elders.mls or Home\ Teacher\ per\ Companionship.mls, you'll need to remove them from MLSRequiredFields.xml (probably best to just comment them out in case you decide to use them later) - 8) Click on the Admin tool in the EQ app to import your initial set of ward data - obtained from MLS into the EQ application. - 9) Click on the Admin tool and update the EQ Presidency Table appropriately. + 8) Click on the Admin tool in the 3rd Counselor app to import your initial set of ward data + obtained from MLS. + 9) Click on the Admin tool and update the Presidency Table appropriately. The most important thing at this point is to get your district leaders added for each district you have in your quorum. 10) I highly recommend installing phpmyadmin to view/edit/debug mysql tables related to this tool. @@ -67,7 +69,7 @@ Requirements The following csv files must be obtained from MLS (or a stripped down version of each csv with the fields indicated must be manually created). These files should be placed in 1 .zip file and uploaded to the application via the Admin - section of the EQ Tools application. + section of the application. Membership.csv: Preferred Name diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index 2c53def..2b16e7a 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -70,10 +70,10 @@ class eq function eq() { - if(file_exists("setup/eq_config.local")) { - include("setup/eq_config.local"); + if(file_exists("setup/3rd_config.local")) { + include("setup/3rd_config.local"); } else { - include("setup/eq_config"); + include("setup/3rd_config"); } $this->script_path = "$this->application_path"."/bin"; @@ -95,7 +95,7 @@ class eq mondayFirst : false, weekNumbers : false'; - $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools - The 3rd Counselor'; + $GLOBALS['phpgw_info']['flags']['app_header'] = 'The 3rd Counselor'; $GLOBALS['phpgw']->common->phpgw_header(); $this->current_day = `date '+%d'`; @@ -202,22 +202,22 @@ class eq $i++; } - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); - // Make an array mapping elder_ids to elder_names - for($i=0; $i < count($elder_id); $i++) { - $id = $elder_id[$i]; - $elders[$id] = $elder_name[$i]; + // Make an array mapping indiv_ids to indiv_names + for($i=0; $i < count($indiv_id); $i++) { + $id = $indiv_id[$i]; + $indivs[$id] = $indiv_name[$i]; } $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC"; @@ -261,11 +261,11 @@ class eq // Get this companions information if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); - $elder_id = $this->db->f('elder'); + $indiv_id = $this->db->f('indiv'); $aaronic_id = $this->db->f('aaronic'); - if($elder_id) { - $name = $elders[$elder_id]; - $phone = $elder_phone[$elder_id]; + if($indiv_id) { + $name = $indivs[$indiv_id]; + $phone = $indiv_phone[$indiv_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; @@ -454,22 +454,22 @@ class eq return false; } - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); - // Make an array mapping elder_ids to elder_names - for($i=0; $i < count($elder_id); $i++) { - $id = $elder_id[$i]; - $elders[$id] = $elder_name[$i]; + // Make an array mapping indiv_ids to indiv_names + for($i=0; $i < count($indiv_id); $i++) { + $id = $indiv_id[$i]; + $indivs[$id] = $indiv_name[$i]; } $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC"; @@ -505,11 +505,11 @@ class eq // Get this companions information if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); - $elder_id = $this->db->f('elder'); + $indiv_id = $this->db->f('indiv'); $aaronic_id = $this->db->f('aaronic'); - if($elder_id) { - $name = $elders[$elder_id]; - $phone = $elder_phone[$elder_id]; + if($indiv_id) { + $name = $indivs[$indiv_id]; + $phone = $indiv_phone[$indiv_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; @@ -709,7 +709,7 @@ class eq $this->t->set_var('lang_edit','Edit'); $this->t->set_var('cal_date',$this->db->f('date')); - // Now find out which elders participated in this activity + // Now find out which indivs participated in this activity $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(); @@ -717,13 +717,13 @@ class eq $i = 0; while ($this->db->next_record()) { - $part_list[$i]['elder'] = $this->db->f('elder'); + $part_list[$i]['indiv'] = $this->db->f('indiv'); $i++; } for ($i=0; $i < count($part_list); $i++) { - $sql = "SELECT * FROM 3rd_elder WHERE elder=" . $part_list[$i]['elder']; + $sql = "SELECT * FROM 3rd_indiv WHERE indiv=" . $part_list[$i]['indiv']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $names[$i] = $this->db->f('name'); @@ -732,7 +732,7 @@ class eq for ($i=0; $i < count($names); $i++) { //$this->nextmatchs->template_alternate_row_color(&$this->t); - $this->t->set_var('elder_name',$names[$i]); + $this->t->set_var('indiv_name',$names[$i]); if(($i+1) % 3 == 0) { $this->t->set_var('table_sep',""); } else { $this->t->set_var('table_sep',""); } if(($i) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); } @@ -746,7 +746,7 @@ class eq function act_update() { $this->t->set_file(array('form' => 'act_update.tpl')); - $this->t->set_block('form','elder_list','list'); + $this->t->set_block('form','indiv_list','list'); $this->t->set_block('form','add','addhandle'); $this->t->set_block('form','edit','edithandle'); $this->t->set_var('lang_done','Done'); @@ -766,16 +766,16 @@ class eq ", notes='" . $activity['notes'] . "'" . " WHERE activity=" . $activity['activity'],__LINE__,__FILE__); - // Delete all the elders who have particiapted in this activity + // Delete all the individuals who have particiapted in this activity $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 individuals who are checked as having participated in this activity + $indivs = get_var('indiv_name',array('POST')); + if(is_array($indivs)) { // Only do the foreach loop if we have a valid array of indivs to work with + foreach ($indivs as $indiv) { - $this->db->query("INSERT INTO 3rd_participation (elder,activity) " - . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); + $this->db->query("INSERT INTO 3rd_participation (indiv,activity) " + . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__); } } @@ -800,11 +800,11 @@ class eq $activity['activity'] = $this->db->f('activity'); } - $elders = get_var('elder_name',array('POST')); - foreach ($elders as $elder) + $indivs = get_var('indiv_name',array('POST')); + foreach ($indivs as $indiv) { - $this->db->query("INSERT INTO 3rd_participation (elder,activity) " - . "VALUES (" . $elder . ",". $activity['activity'] . ")",__LINE__,__FILE__); + $this->db->query("INSERT INTO 3rd_participation (indiv,activity) " + . "VALUES (" . $indiv . ",". $activity['activity'] . ")",__LINE__,__FILE__); } $this->act_list(); @@ -864,36 +864,36 @@ class eq $assignment_data.=''; $this->t->set_var('assignment_data',$assignment_data); - // Create elder selection boxes - $sql = "SELECT * FROM 3rd_elder"; + // Create individual selection boxes + $sql = "SELECT * FROM 3rd_indiv"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { if($this->db->f('valid') == 1 || $action != 'add') { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); - $elder_valid[$i] = $this->db->f('valid'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_valid[$i] = $this->db->f('valid'); $i++; } } - array_multisort($elder_name, $elder_id, $elder_valid); + array_multisort($indiv_name, $indiv_id, $indiv_valid); $j=0; - for ($i=0; $i < count($elder_id); $i++) + for ($i=0; $i < count($indiv_id); $i++) { //$this->nextmatchs->template_alternate_row_color(&$this->t); - $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND elder=" . $elder_id[$i]; + $sql = "SELECT * FROM 3rd_participation where activity=". $activity['activity'] . " AND indiv=" . $indiv_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; } - if($checked || $elder_valid[$i] == 1) { - $this->t->set_var('elder_name',$elder_name[$i]); - $this->t->set_var('elder',$elder_id[$i]); + if($checked || $indiv_valid[$i] == 1) { + $this->t->set_var('indiv_name',$indiv_name[$i]); + $this->t->set_var('indiv',$indiv_id[$i]); if(($j+1) % 3 == 0) { $this->t->set_var('table_sep',""); } else { $this->t->set_var('table_sep',""); } if(($j) % 3 == 0) { $this->nextmatchs->template_alternate_row_color(&$this->t); } - $this->t->fp('list','elder_list',True); + $this->t->fp('list','indiv_list',True); $j++; } } @@ -1034,18 +1034,18 @@ class eq { $this->t->set_file(array('par_view_t' => 'par_view.tpl')); $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','indiv_list','list2'); - $sql = "SELECT * FROM 3rd_elder where valid=1"; + $sql = "SELECT * FROM 3rd_indiv where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); $sql = "SELECT * FROM 3rd_activity ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1071,8 +1071,8 @@ class eq $i++; } - $elder_width=300; $part_width=25; $assignment_width=50; - $total_width=$elder_width+$part_width; + $indiv_width=300; $part_width=25; $assignment_width=50; + $total_width=$indiv_width+$part_width; for ($i=0; $i < count($assignment_list); $i++) { $this->t->set_var('assignment_name',$assignment_list[$i]['name']); $this->t->set_var('assignment_code',$assignment_list[$i]['code']); @@ -1080,17 +1080,17 @@ class eq $total_width += $assignment_width; } - for ($i=0; $i < count($elder_id); $i++) { + for ($i=0; $i < count($indiv_id); $i++) { $participated=0; $part_table = ''; $this->nextmatchs->template_alternate_row_color(&$this->t); - $this->t->set_var('elder_name',$elder_name[$i]); + $this->t->set_var('indiv_name',$indiv_name[$i]); for ($j=0; $j < count($assignment_list); $j++) { $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 3rd_participation where " . " activity=" . $activity_list[$k]['activity'] - . " AND elder=" . $elder_id[$i]; + . " AND indiv=" . $indiv_id[$i]; $this->db->query($sql,__LINE__,__FILE__); while($this->db->next_record()) { if($activity_list[$k]['date'] > $date) { @@ -1113,10 +1113,10 @@ class eq if($participated) { $part_table .= ''.$participated.''; } else { $part_table .= ' '; } $this->t->set_var('part_table',$part_table); - $this->t->fp('list2','elder_list',True); + $this->t->fp('list2','indiv_list',True); } $this->t->set_var('total_width',$total_width); - $this->t->set_var('elder_width',$elder_width); + $this->t->set_var('indiv_width',$indiv_width); $this->t->set_var('part_width',$part_width); $this->t->set_var('act_width',$act_width); $this->t->pfp('out','par_view_t'); @@ -1127,10 +1127,10 @@ class eq { $this->t->set_file(array('willing_view_t' => 'willing_view.tpl')); $this->t->set_block('willing_view_t','header_list','list1'); - $this->t->set_block('willing_view_t','elder_list','list2'); + $this->t->set_block('willing_view_t','indiv_list','list2'); $this->t->set_var('lang_filter','Filter'); - $this->t->set_var('lang_filter_unwilling','Filter out unwilling Elders:'); + $this->t->set_var('lang_filter_unwilling','Filter out unwilling individuals:'); $filter_unwilling = get_var('filter_unwilling',array('POST')); $this->t->set_var('filter_unwilling',$filter_unwilling); @@ -1146,17 +1146,17 @@ class eq } $this->t->set_var('filter_input',$filter_input); - $sql = "SELECT * FROM 3rd_elder where valid=1"; + $sql = "SELECT * FROM 3rd_indiv where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); $sql = "SELECT * FROM 3rd_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1182,8 +1182,8 @@ class eq $i++; } - $elder_width=275; $willing_width=40; $assignment_width=50; - $total_width=$elder_width+$willing_width; + $indiv_width=275; $willing_width=40; $assignment_width=50; + $total_width=$indiv_width+$willing_width; for ($i=0; $i < count($assignment_list); $i++) { $this->t->set_var('assignment_name',$assignment_list[$i]['name']); @@ -1193,17 +1193,17 @@ class eq $total_willing[$i] = 0; } - for ($i=0; $i < count($elder_id); $i++) { - $willing_table = ''; $elder_willing=0; - $this->t->set_var('elder_name',$elder_name[$i]); - $this->t->set_var('elder_phone',$elder_phone[$elder_id[$i]]); - $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&elder_id=' - . $elder_id[$i] . '&action=' . 'edit')); + for ($i=0; $i < count($indiv_id); $i++) { + $willing_table = ''; $indiv_willing=0; + $this->t->set_var('indiv_name',$indiv_name[$i]); + $this->t->set_var('indiv_phone',$indiv_phone[$indiv_id[$i]]); + $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_update&indiv_id=' + . $indiv_id[$i] . '&action=' . 'edit')); for ($j=0; $j < count($assignment_list); $j++) { $found_willingness=0; $sql = "SELECT * FROM 3rd_willingness where " . " assignment=" . $assignment_list[$j]['assignment'] - . " AND elder=" . $elder_id[$i]; + . " AND indiv=" . $indiv_id[$i]; $this->db->query($sql,__LINE__,__FILE__); while($this->db->next_record()) { $found_willingness=1; @@ -1217,7 +1217,7 @@ class eq $date = $this->db2->f('date'); $sql = "SELECT * FROM 3rd_participation where " . " activity=" . $activity - . " AND elder=". $elder_id[$i]; + . " AND indiv=". $indiv_id[$i]; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { $date_part = $date; @@ -1226,25 +1226,25 @@ class eq if($this->db->f('willing') == 'y') { $total_willing[$j]++; - $elder_willing=1; + $indiv_willing=1; $willing_table .= '
'.$date_part.''; } else if($this->db->f('willing') == 'n') { $willing_table .= ''; } else { - $elder_willing=1; + $indiv_willing=1; $willing_table .= " "; } } if(!$found_willingness) { - $elder_willing=1; + $indiv_willing=1; $willing_table .= " "; } } - if(($elder_willing == 1) || ($filter_unwilling == 'n')) { + if(($indiv_willing == 1) || ($filter_unwilling == 'n')) { $this->t->set_var('willing_table',$willing_table); - $this->t->fp('list2','elder_list',True); + $this->t->fp('list2','indiv_list',True); $this->nextmatchs->template_alternate_row_color(&$this->t); } } @@ -1256,7 +1256,7 @@ class eq $this->t->set_var('stat_table',$stat_table); $this->t->set_var('total_width',$total_width); - $this->t->set_var('elder_width',$elder_width); + $this->t->set_var('indiv_width',$indiv_width); $this->t->set_var('willing_width',$willing_width); $this->t->pfp('out','willing_view_t'); $this->save_sessiondata(); @@ -1272,8 +1272,8 @@ class eq $this->t->set_block('willing_update_t','assignment_list','list'); $this->t->set_block('willing_update_t','save','savehandle'); - $elder_id = get_var('elder_id',array('GET','POST')); - $this->t->set_var('elder_id',$elder_id); + $indiv_id = get_var('indiv_id',array('GET','POST')); + $this->t->set_var('indiv_id',$indiv_id); $action = get_var('action',array('GET','POST')); $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.willing_view')); @@ -1283,19 +1283,19 @@ class eq if($action == 'save') { - // Delete all the previous willingness entries for this elder - $this->db->query("DELETE from 3rd_willingness where elder=" . $elder_id ,__LINE__,__FILE__); + // Delete all the previous willingness entries for this individual + $this->db->query("DELETE from 3rd_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__); - // Now, add the assignment willingness that is checked for this elder + // Now, add the assignment willingness that is checked for this individual $new_data = get_var('willingness',array('POST')); foreach ($new_data as $data) { $data_array = explode("/",$data); $assignment = $data_array[0]; $willing = $data_array[1]; - //print "elder_id: $elder_id assignment: $assignment willing: $willing
"; - $this->db->query("INSERT INTO 3rd_willingness (elder,assignment,willing) " - . "VALUES (" . $elder_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__); + //print "indiv_id: $indiv_id assignment: $assignment willing: $willing
"; + $this->db->query("INSERT INTO 3rd_willingness (indiv,assignment,willing) " + . "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__); } $this->willing_view(); return false; @@ -1304,12 +1304,12 @@ class eq $assignment_width=300; $willing_width=25; $table_width=$assignment_width + $willing_width; $table_data=""; - // Find out the elder's name - $sql = "SELECT * FROM 3rd_elder WHERE elder=".$elder_id." AND valid=1"; + // Find out the individual's name + $sql = "SELECT * FROM 3rd_indiv WHERE indiv=".$indiv_id." AND valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { - $elder_name = $this->db->f('name'); - $this->t->set_var('elder_name',$elder_name); + $indiv_name = $this->db->f('name'); + $this->t->set_var('indiv_name',$indiv_name); } // Select all the assignments @@ -1326,7 +1326,7 @@ class eq $table_data.="$assignment_name"; $header_row="AssignmentsWillingness"; - $sql = "SELECT * FROM 3rd_willingness WHERE elder=".$elder_id." AND assignment=".$assignment; + $sql = "SELECT * FROM 3rd_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment; $this->db2->query($sql,__LINE__,__FILE__); $value = $assignment; @@ -1385,7 +1385,7 @@ class eq function ppi_sched() { $this->t->set_file(array('ppi_sched_t' => 'ppi_sched.tpl')); - $this->t->set_block('ppi_sched_t','elder_list','elderlist'); + $this->t->set_block('ppi_sched_t','indiv_list','indivlist'); $this->t->set_block('ppi_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); @@ -1401,9 +1401,9 @@ class eq $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched&action=save')); $this->t->set_var('title','Yearly PPI Scheduler'); - $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20; - $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $ppi_date_width; - $header_row = "Elder Name"; + $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $ppi_date_width=20; + $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $ppi_date_width; + $header_row = "individual Name"; $header_row.= "Phone"; $header_row.= "Priority"; $header_row.= "Last PPI"; @@ -1419,12 +1419,12 @@ class eq $president_name = $this->db->f('name'); $president_name_array = explode(",",$president_name); $president_last_name = $president_name_array[0]; - $president_id = $this->db->f('elder'); + $president_id = $this->db->f('indiv'); $presidency_id = $this->db->f('presidency'); - $interviewer = $this->db->f('elder'); + $interviewer = $this->db->f('indiv'); $district_number = '*'; $district_name = $president_name; - $sql = "SELECT * FROM 3rd_elder where elder='$president_id'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$president_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_id = $this->db2->f('indiv_id'); @@ -1435,7 +1435,7 @@ class eq $president_address = $this->db2->f('address'); } } else { - print "

-E- Unable to locate EQ President in 3rd_presidency table

"; + print "

-E- Unable to locate President in 3rd_presidency table

"; return; } @@ -1446,19 +1446,19 @@ class eq if($new_data != "") { foreach ($new_data as $entry) { - $elder = $entry['elder']; + $indiv = $entry['indiv']; $appointment = $entry['appointment']; $location = $entry['location']; if($location == "") { $location = "$president_last_name"." home ($president_address)"; } - if($elder == 0) { $location = ""; } + if($indiv == 0) { $location = ""; } //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'"; + $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'"; $this->db->query($sql,__LINE__,__FILE__); if(!$this->db->next_record()) { // Perform database save actions here $this->db->query("UPDATE 3rd_appointment set " . - " elder='" . $elder . "'" . + " indiv='" . $indiv . "'" . ",location='" . $location . "'" . " WHERE appointment=" . $appointment,__LINE__,__FILE__); // Email the appointment @@ -1473,14 +1473,14 @@ class eq foreach ($new_data as $entry) { $ppi_notes = $entry['notes']; - $elder_id = $entry['elder_id']; + $indiv_id = $entry['indiv_id']; $ppi_pri = $entry['pri']; // Perform database save actions here - $this->db->query("UPDATE 3rd_elder set " . + $this->db->query("UPDATE 3rd_indiv set " . " ppi_notes='" . $ppi_notes . "'" . ",ppi_pri='" . $ppi_pri . "'" . - " WHERE elder=" . $elder_id,__LINE__,__FILE__); + " WHERE indiv=" . $indiv_id,__LINE__,__FILE__); } @@ -1488,34 +1488,34 @@ class eq //Header('Location: ' . $take_me_to_url); } - // create the elder id -> elder name mapping - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC"; + // create the individual id -> individual name mapping + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; - $elder_id = NULL; - $elder_name = NULL; + $indiv_id = NULL; + $indiv_name = NULL; while ($this->db->next_record()) { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); // APPOINTMENT TABLE - $date_width=250; $time_width=100; $elder_width=200; $location_width=100; - $appt_table_width=$date_width + $time_width + $elder_width + $location_width; + $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; + $appt_table_width=$date_width + $time_width + $indiv_width + $location_width; $appt_header_row = "Date"; $appt_header_row.= "Time"; - $appt_header_row.= "Elder"; + $appt_header_row.= "indiv"; $appt_header_row.= "Location"; $appt_table_data = ""; - $total_elders=0; $elders_with_yearly_ppi=0; + $total_indivs=0; $indivs_with_yearly_ppi=0; // Display a scheduling table for the EQ President $table_data=""; $appt_table_data=""; - $table_title = "District ".$district_number.": ".$district_name.": All Elders with Yearly PPI Not Completed"; + $table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed"; $appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots"; $this->t->set_var('table_title',$table_title); $this->t->set_var('appt_table_title',$appt_table_title); @@ -1527,9 +1527,9 @@ class eq while ($this->db->next_record()) { $appointment = $this->db->f('appointment'); - $elder = $this->db->f('elder'); + $indiv = $this->db->f('indiv'); $location = $this->db->f('location'); - if(($location == "") && ($elder > 0)) { $location = "$president_last_name"." home ($president_address)"; } + if(($location == "") && ($indiv > 0)) { $location = "$president_last_name"." home ($president_address)"; } $date = $this->db->f('date'); $date_array = explode("-",$date); @@ -1544,12 +1544,12 @@ class eq $appt_table_data.= "$day_string"; $appt_table_data.= "$time_string"; - $appt_table_data.= ''; $appt_table_data.= ''; - for ($i=0; $i < count($elder_id); $i++) { - $id = $elder_id[$i]; - $name = $elder_name[$i]; - if($elder_id[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } + for ($i=0; $i < count($indiv_id); $i++) { + $id = $indiv_id[$i]; + $name = $indiv_name[$i]; + if($indiv_id[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } $appt_table_data.= ''; } $appt_table_data.=''; @@ -1568,43 +1568,43 @@ class eq $this->t->set_var('appt_table_width',$appt_table_width); // PPI SCHEDULING TABLE - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY ppi_pri ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY ppi_pri ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; - $elder_id = NULL; + $indiv_id = NULL; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); - $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri'); - $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri'); + $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes'); $i++; - $total_elders++; + $total_indivs++; } - $max = count($elder_id); + $max = count($indiv_id); for($i=0; $i < $max; $i++) { - $id = $elder_id[$i]; - $name = $elder_name[$i]; - $phone = $elder_phone[$id]; - $ppi_pri = $elder_ppi_pri[$id]; - $ppi_notes = $elder_ppi_notes[$id]; + $id = $indiv_id[$i]; + $name = $indiv_name[$i]; + $phone = $indiv_phone[$id]; + $ppi_pri = $indiv_ppi_pri[$id]; + $ppi_notes = $indiv_ppi_notes[$id]; - // If this elder has had a yearly PPI this year, don't show him on the schedule list + // If this individual 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 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ". - "AND elder=" . $id . " AND interview_type='ppi'"; + "AND indiv=" . $id . " AND interview_type='ppi'"; $this->db2->query($sql,__LINE__,__FILE__); if(!$this->db2->next_record()) { - $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $id . " AND interview_type='ppi' ORDER BY date DESC"; + $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $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['indiv'] = $id; $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['interview_type'] = 1; @@ -1626,20 +1626,20 @@ class eq $table_data.= ''; $table_data.= "$date"; $table_data.= ''; - $table_data.= ''; - $table_data.= ''; + $table_data.= ''; + $table_data.= ''; $table_data.= ''; $table_data.= ''; } else { $link_data['menuaction'] = 'eq.eq.ppi_update'; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['elder'] = $this->db2->f('elder'); + $link_data['indiv'] = $this->db2->f('indiv'); $link_data['name'] = $name; $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++; + $indivs_with_yearly_ppi++; $date = $this->db2->f('date'); $ppi_notes = $this->db2->f('notes'); if(strlen($ppi_notes) > 40) { $ppi_notes = substr($ppi_notes,0,40) . "..."; } @@ -1651,11 +1651,11 @@ class eq $completed_data.= "$ppi_notes"; $completed_data.= ''; } - } // End for Elders Loop + } // End for individuals Loop $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Elder Name"; + $completed_header_row = "Individual Name"; $completed_header_row.= "Phone"; $completed_header_row.= "Date"; $completed_header_row.= "PPI Notes"; @@ -1666,16 +1666,16 @@ class eq $this->t->set_var('completed_header_row',$completed_header_row); $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); - $this->t->fp('elderlist','elder_list',True); + $this->t->fp('indivlist','indiv_list',True); - $elders_width=300; $totals_width=100; - $totals_table_width=$elders_width + $totals_width; - $totals_header_row = "Elders"; + $indivs_width=300; $totals_width=100; + $totals_table_width=$indivs_width + $totals_width; + $totals_header_row = "Individuals"; $totals_header_row.= "$year"; $totals_data.= ""; - $totals_data.= "Total Elders with yearly PPIs completed:"; - $totals_data.= "$elders_with_yearly_ppi / $total_elders"; - $percent = ceil(($elders_with_yearly_ppi / $total_elders)*100); + $totals_data.= "Total Individuals with yearly PPIs completed:"; + $totals_data.= "$indivs_with_yearly_ppi / $total_indivs"; + $percent = ceil(($indivs_with_yearly_ppi / $total_indivs)*100); $tr_color = $this->nextmatchs->alternate_row_color($tr_color); $this->t->set_var('tr_color',$tr_color); $totals_data.= ""; @@ -1695,7 +1695,7 @@ class eq function int_sched() { $this->t->set_file(array('int_sched_t' => 'int_sched.tpl')); - $this->t->set_block('int_sched_t','elder_list','elderlist'); + $this->t->set_block('int_sched_t','indiv_list','indivlist'); $this->t->set_block('int_sched_t','appt_list','apptlist'); $action = get_var('action',array('GET','POST')); @@ -1711,9 +1711,9 @@ class eq $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.int_sched&action=save')); $this->t->set_var('title','Hometeaching Interviews Scheduler'); - $elder_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20; - $table_width=$elder_width + $phone_width + $pri_width + $notes_width + $int_date_width; - $header_row = "Elder Name"; + $indiv_width=500; $phone_width=25; $pri_width=10; $notes_width=128; $int_date_width=20; + $table_width=$indiv_width + $phone_width + $pri_width + $notes_width + $int_date_width; + $header_row = "individual Name"; $header_row.= "Phone"; $header_row.= "Priority"; $header_row.= "Last Interview"; @@ -1729,20 +1729,20 @@ class eq if($month >= 10 && $month <= 12) { $quarter_start=$year."-10-01"; $quarter_end=$nextyear."-01-01"; } //print "year: $year month: $month quarter_start: $quarter_start quarter_end: $quarter_end
"; - // create the elder id -> elder name mapping - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY name ASC"; + // create the individual id -> individual name mapping + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; - $elder_id_data = NULL; - $elder_name_data = NULL; + $indiv_id_data = NULL; + $indiv_name_data = NULL; while ($this->db->next_record()) { - $elder_name_data[$i] = $this->db->f('name'); - $elder_id_data[$i] = $this->db->f('elder'); - $elderid2name[$elder_id_data[$i]] = $elder_name_data[$i]; + $indiv_name_data[$i] = $this->db->f('name'); + $indiv_id_data[$i] = $this->db->f('indiv'); + $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i]; $i++; } - array_multisort($elder_name_data, $elder_id_data); + array_multisort($indiv_name_data, $indiv_id_data); if($action == 'save') { @@ -1751,14 +1751,14 @@ class eq if($new_data != "") { foreach ($new_data as $entry) { - $elder = $entry['elder']; + $indiv = $entry['indiv']; $appointment = $entry['appointment']; $location = $entry['location']; if($location == "") { $supervisor = $entry['supervisor']; - $supervisor_array = explode(",", $elderid2name[$supervisor]); + $supervisor_array = explode(",", $individ2name[$supervisor]); $supervisor_last_name = $supervisor_array[0]; - $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$supervisor'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_id = $this->db2->f('indiv_id'); @@ -1770,16 +1770,16 @@ class eq } $location = "$supervisor_last_name"." home ($supervisor_address)"; } - if($elder == 0) { $location = ""; } + if($indiv == 0) { $location = ""; } - //print "elder: $elder appointment: $appointment
"; + //print "indiv: $indiv appointment: $appointment
"; //Only perform a database update if we have made a change to this appointment - $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and elder='$elder' and location='$location'"; + $sql = "SELECT * FROM 3rd_appointment where appointment='$appointment' and indiv='$indiv' and location='$location'"; $this->db->query($sql,__LINE__,__FILE__); if(!$this->db->next_record()) { // Perform database save actions here $this->db->query("UPDATE 3rd_appointment set " . - " elder='" . $elder . "'" . + " indiv='" . $indiv . "'" . ",location='" . $location . "'" . " WHERE appointment=" . $appointment,__LINE__,__FILE__); @@ -1794,17 +1794,17 @@ class eq foreach ($new_data as $entry) { $int_notes = $entry['notes']; - $elder_id = $entry['elder_id']; - $elder_name = $entry['elder_name']; + $indiv_id = $entry['indiv_id']; + $indiv_name = $entry['indiv_name']; $int_pri = $entry['pri']; $aaronic = $entry['aaronic']; - //print "int_notes: $int_notes elder_name: $elder_name aaronic: $aaronic
"; + //print "int_notes: $int_notes indiv_name: $indiv_name aaronic: $aaronic
"; if($aaronic == 0) { // Perform database save actions here - $this->db->query("UPDATE 3rd_elder set " . + $this->db->query("UPDATE 3rd_indiv set " . " int_notes='" . $int_notes . "'" . ",int_pri='" . $int_pri . "'" . - " WHERE elder=" . $elder_id,__LINE__,__FILE__); + " WHERE indiv=" . $indiv_id,__LINE__,__FILE__); } } @@ -1833,11 +1833,11 @@ class eq // APPOINTMENT TABLE $district = 1; - $date_width=250; $time_width=100; $elder_width=200; $location_width=100; - $appt_table_width=$date_width + $time_width + $elder_width + $location_width; + $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; + $appt_table_width=$date_width + $time_width + $indiv_width + $location_width; $appt_header_row = "Date"; $appt_header_row.= "Time"; - $appt_header_row.= "Elder"; + $appt_header_row.= "Individual"; $appt_header_row.= "Location"; $appt_table_data = ""; @@ -1851,7 +1851,7 @@ class eq $supervisor = $districts[$d]['supervisor']; $supervisor_array = explode(",", $supervisor); $supervisor_last_name = $supervisor_array[0]; - $sql = "SELECT * FROM 3rd_elder where elder='$supervisor'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$supervisor'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_id = $this->db2->f('indiv_id'); @@ -1862,7 +1862,7 @@ class eq $supervisor_address = $this->db2->f('address'); } $location = "$supervisor_last_name"." home ($supervisor_address)"; - $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Elders with Interviews Not Completed"; + $table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": All Individuals with Interviews Not Completed"; $appt_table_title = "District ".$districts[$d]['district'].": ".$districts[$d]['name'].": Interview Appointment Slots"; $this->t->set_var('table_title',$table_title); $this->t->set_var('appt_table_title',$appt_table_title); @@ -1874,9 +1874,9 @@ class eq while ($this->db->next_record()) { $appointment = $this->db->f('appointment'); - $elder = $this->db->f('elder'); + $indiv = $this->db->f('indiv'); $location = $this->db->f('location'); - if(($location == "") && ($elder > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; } + if(($location == "") && ($indiv > 0)) { $location = "$supervisor_last_name"." home ($supervisor_address)"; } $date = $this->db->f('date'); $date_array = explode("-",$date); @@ -1891,12 +1891,12 @@ class eq $appt_table_data.= "$day_string"; $appt_table_data.= "$time_string"; - $appt_table_data.= ''; $appt_table_data.= ''; - for ($i=0; $i < count($elder_id_data); $i++) { - $id = $elder_id_data[$i]; - $name = $elder_name_data[$i]; - if($elder_id_data[$i] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } + for ($i=0; $i < count($indiv_id_data); $i++) { + $id = $indiv_id_data[$i]; + $name = $indiv_name_data[$i]; + if($indiv_id_data[$i] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } $appt_table_data.= ''; } $appt_table_data.=''; @@ -1941,38 +1941,38 @@ class eq while ($this->db->next_record()) { // Get this companions information - $elder_id = $this->db->f('elder'); + $indiv_id = $this->db->f('indiv'); $aaronic_id = $this->db->f('aaronic'); - $sql = "SELECT * FROM 3rd_elder where elder=$elder_id"; + $sql = "SELECT * FROM 3rd_indiv where indiv=$indiv_id"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $elder_id = $this->db2->f('elder'); - $elder_name = $this->db2->f('name'); - $elder_phone[$elder_id] = $this->db2->f('phone'); - $elder_int_pri[$elder_id] = $this->db2->f('int_pri'); - $elder_int_notes[$elder_id] = $this->db2->f('int_notes'); - $elder_aaronic = 0; + $indiv_id = $this->db2->f('indiv'); + $indiv_name = $this->db2->f('name'); + $indiv_phone[$indiv_id] = $this->db2->f('phone'); + $indiv_int_pri[$indiv_id] = $this->db2->f('int_pri'); + $indiv_int_notes[$indiv_id] = $this->db2->f('int_notes'); + $indiv_aaronic = 0; } else { $sql = "SELECT * FROM 3rd_aaronic where aaronic=$aaronic_id"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $elder_id = $this->db2->f('aaronic'); - $elder_name = $this->db2->f('name'); - $elder_phone[$elder_id] = $this->db2->f('phone'); - $elder_aaronic = 1; + $indiv_id = $this->db2->f('aaronic'); + $indiv_name = $this->db2->f('name'); + $indiv_phone[$indiv_id] = $this->db2->f('phone'); + $indiv_aaronic = 1; } } - $id = $elder_id; - $name = $elder_name; - $phone = $elder_phone[$id]; - $int_pri = $elder_int_pri[$id]; - $int_notes = $elder_int_notes[$id]; - $aaronic = $elder_aaronic; + $id = $indiv_id; + $name = $indiv_name; + $phone = $indiv_phone[$id]; + $int_pri = $indiv_int_pri[$id]; + $int_notes = $indiv_int_notes[$id]; + $aaronic = $indiv_aaronic; // If the companionship has already had its quarterly interview, // Skip the other companion in the companionship. @@ -1991,15 +1991,15 @@ class eq // If this companionship has had a hometeaching interview this quarter, don't show them on the schedule list $sql = "SELECT * FROM 3rd_interview WHERE date >= '$quarter_start' AND date < '$quarter_end' ". - "AND elder=" . $id; + "AND indiv=" . $id; $this->db2->query($sql,__LINE__,__FILE__); if(!$this->db2->next_record()) { - $sql = "SELECT * FROM 3rd_interview WHERE elder=" . $id . " ORDER BY date DESC"; + $sql = "SELECT * FROM 3rd_interview WHERE indiv=" . $id . " ORDER BY date DESC"; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { $date = $this->db3->f('date'); } else { $date = ""; } $link_data['menuaction'] = 'eq.eq.int_update'; - $link_data['elder'] = $id; + $link_data['indiv'] = $id; $link_data['aaronic'] = 0; $link_data['name'] = $name; $link_data['interview'] = ''; @@ -2022,8 +2022,8 @@ class eq if($aaronic == 0) { $table_data.= ''; } - $table_data.= ''; - $table_data.= ''; + $table_data.= ''; + $table_data.= ''; $table_data.= ''; $table_data.= ''; $table_data.= ''."\n"; @@ -2031,7 +2031,7 @@ class eq } else { $link_data['menuaction'] = 'eq.eq.int_update'; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['elder'] = $this->db2->f('elder'); + $link_data['indiv'] = $this->db2->f('indiv'); $link_data['aaronic'] = $this->db2->f('aaronic'); $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); @@ -2053,7 +2053,7 @@ class eq $name_width=175; $phone_width=100; $date_width=100; $notes_width=300; $completed_table_width=$name_width + $phone_width + $date_width + $notes_width; - $completed_header_row = "Elder Name"; + $completed_header_row = "Individual Name"; $completed_header_row.= "Phone"; $completed_header_row.= "Date"; $completed_header_row.= "Interview Notes"; @@ -2064,14 +2064,14 @@ class eq $this->t->set_var('completed_header_row',$completed_header_row); $this->t->set_var('completed_table_width',$completed_table_width); $this->t->set_var('completed',$completed_data); - $this->t->fp('elderlist','elder_list',True); + $this->t->fp('indivlist','indiv_list',True); } // End for each district loop - $elders_width=300; $totals_width=100; - $totals_table_width=$elders_width + $totals_width; - $totals_header_row = "Elders"; + $indivs_width=300; $totals_width=100; + $totals_table_width=$indivs_width + $totals_width; + $totals_header_row = "Individuals"; $totals_header_row.= "$year"; $totals_data.= ""; $totals_data.= "Total Companionships with interviews completed:"; @@ -2110,7 +2110,7 @@ class eq $this->t->set_var('schedule_vis_link_title','Schedule Yearly Visits'); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.vis_sched&action=save')); - $this->t->set_var('title','EQ Presidency Yearly Visit Scheduler'); + $this->t->set_var('title','Presidency Yearly Visit Scheduler'); $family_width=500; $phone_width=40; $pri_width=10; $notes_width=128; $visit_date_width=20; $table_width=$family_width + $phone_width + $pri_width + $notes_width + $visit_date_width; @@ -2124,7 +2124,7 @@ class eq $year = date('Y'); // create the family id -> family name mapping - $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $family_id = NULL; @@ -2212,7 +2212,7 @@ class eq $presidency_name = $this->db->f('name'); $presidency_id = $this->db->f('presidency'); } else { - print "

-E- Unable to locate EQ Presidency in 3rd_presidency table

"; + print "

-E- Unable to locate Presidency in 3rd_presidency table

"; return; } @@ -2268,7 +2268,7 @@ class eq // VISIT SCHEDULING TABLE - $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY visit_pri ASC"; + $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY visit_pri ASC"; $this->db->query($sql,__LINE__,__FILE__); $total_families=0; $families_with_yearly_visit=0; @@ -2434,34 +2434,34 @@ class eq $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $president_name = $this->db->f('name'); - $interviewer = $this->db->f('elder'); + $interviewer = $this->db->f('indiv'); $interview_type = 'ppi'; } else { - print "

-E- Unable to locate EQ President in 3rd_presidency table

"; + print "

-E- Unable to locate President in 3rd_presidency table

"; return; } $this->t->set_var('district_number','*'); $this->t->set_var('district_name',$president_name); - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); - $elder_ppi_pri[$elder_id[$i]] = $this->db->f('ppi_pri'); - $elder_ppi_notes[$elder_id[$i]] = $this->db->f('ppi_notes'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_ppi_pri[$indiv_id[$i]] = $this->db->f('ppi_pri'); + $indiv_ppi_notes[$indiv_id[$i]] = $this->db->f('ppi_notes'); $i++; } - $total_elders=$i; - array_multisort($elder_name, $elder_id); - //var_dump($elder_name); print "

"; var_dump($elder_id); + $total_indivs=$i; + array_multisort($indiv_name, $indiv_id); + //var_dump($indiv_name); print "

"; var_dump($indiv_id); - $header_row="Elder Name"; + $header_row="Individual Name"; - $elder_width=400; $ppi_width=75; $table_width=$elder_width + $num_months*$ppi_width; + $indiv_width=400; $ppi_width=75; $table_width=$indiv_width + $num_months*$ppi_width; $table_data=""; for($m=$num_months; $m >= 0; $m--) { $year = date('Y') - $m; @@ -2469,14 +2469,14 @@ class eq $ppis[$m] = 0; } - for ($j=0; $j < count($elder_id); $j++) { - $id = $elder_id[$j]; - $name = $elder_name[$j]; - $phone = $elder_phone[$id]; + for ($j=0; $j < count($indiv_id); $j++) { + $id = $indiv_id[$j]; + $name = $indiv_name[$j]; + $phone = $indiv_phone[$id]; $link_data['menuaction'] = 'eq.eq.ppi_update'; $link_data['interviewer'] = $interviewer; - $link_data['elder'] = $id; + $link_data['indiv'] = $id; $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['interview_type'] = $interview_type; @@ -2485,12 +2485,12 @@ class eq $this->nextmatchs->template_alternate_row_color(&$this->t); $table_data.= "$name"; - // Find out how many times PPIs were performed in the past $num_months for this Elder + // Find out how many times PPIs were performed in the past $num_months for this individual 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 3rd_interview WHERE date > '$year_start' AND date < '$year_end' ". - "AND elder=" . $id . " AND interview_type='ppi'"; + "AND indiv=" . $id . " AND interview_type='ppi'"; $this->db2->query($sql,__LINE__,__FILE__); if(!$total_ppis[$m]) { $total_ppis[$m] = 0; } @@ -2499,7 +2499,7 @@ class eq $link_data['menuaction'] = 'eq.eq.ppi_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['elder'] = $id; + $link_data['indiv'] = $id; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); $link_data['interview_type'] = $interview_type; @@ -2517,9 +2517,9 @@ class eq } $table_data .= "
"; - $stat_data = "$total_elders Elders
PPI Totals:"; + $stat_data = "$total_indivs Individuals
PPI Totals:"; for($m=$num_months; $m >=0; $m--) { - $percent = ceil(($ppis[$m] / $total_elders)*100); + $percent = ceil(($ppis[$m] / $total_indivs)*100); $stat_data .= "$ppis[$m]
$percent%"; } $stat_data .= ""; @@ -2548,7 +2548,7 @@ class eq $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); $interview = get_var('interview',array('GET','POST')); - $elder = get_var('elder',array('GET','POST')); + $indiv = get_var('indiv',array('GET','POST')); $aaronic = get_var('aaronic',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); @@ -2558,9 +2558,9 @@ class eq $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { - $elder = $this->db2->f('elder'); + $indiv = $this->db2->f('indiv'); $interviewer_name = $this->db2->f('name'); - if($elder == $interviewer) { + if($indiv == $interviewer) { $this->t->set_var('interviewer',$interviewer . ' selected'); } else { $this->t->set_var('interviewer',$interviewer); @@ -2576,7 +2576,7 @@ class eq $this->db->query("UPDATE 3rd_interview set " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", elder='" . $elder . "'" . + ", indiv='" . $indiv . "'" . ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . @@ -2589,8 +2589,8 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" + $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) " + . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','" . $date . "','" . $notes . "','" . $interview_type ."')",__LINE__,__FILE__); $this->ppi_view(); return false; @@ -2602,7 +2602,7 @@ class eq $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('indiv',$indiv); $this->t->set_var('date',''); $this->t->set_var('notes',''); $this->t->set_var('interview_type',$interview_type); @@ -2621,7 +2621,7 @@ class eq $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('indiv',$this->db->f('indiv')); $this->t->set_var('date',$this->db->f('date')); $this->t->set_var('notes',$this->db->f('notes')); $this->t->set_var('interview_type',$this->db->f('interview_type')); @@ -2703,20 +2703,20 @@ class eq $i++; } - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); $i++; } - array_multisort($elder_name, $elder_id); - for($i=0; $i < count($elder_id); $i++) { - $id = $elder_id[$i]; - $elders[$id] = $elder_name[$i]; + array_multisort($indiv_name, $indiv_id); + for($i=0; $i < count($indiv_id); $i++) { + $id = $indiv_id[$i]; + $indivs[$id] = $indiv_name[$i]; } $sql = "SELECT * FROM 3rd_aaronic where valid=1 ORDER BY aaronic ASC"; @@ -2746,7 +2746,7 @@ class eq } $comp_width=250; $int_width=75; $table_width=$comp_width + $num_months*$int_width; - $table_data=""; $num_companionships = $j; $num_elders = 0; + $table_data=""; $num_companionships = $j; $num_indivs = 0; 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 @@ -2759,13 +2759,13 @@ class eq while ($this->db->next_record()) { // Get this companions information - $num_elders++; + $num_indivs++; $companionship = $this->db->f('companionship'); - $elder_id = $this->db->f('elder'); + $indiv_id = $this->db->f('indiv'); $aaronic_id = $this->db->f('aaronic'); - if($elder_id) { - $name = $elders[$elder_id]; - $phone = $elder_phone[$elder_id]; + if($indiv_id) { + $name = $indivs[$indiv_id]; + $phone = $indiv_phone[$indiv_id]; } else if($aaronic_id) { $name = $aaronic[$aaronic_id]['name']; @@ -2774,7 +2774,7 @@ class eq $link_data['menuaction'] = 'eq.eq.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $supervisor; - $link_data['elder'] = $elder_id; + $link_data['indiv'] = $indiv_id; $link_data['aaronic'] = $aaronic_id; $link_data['name'] = $name; $link_data['interview'] = ''; @@ -2782,7 +2782,7 @@ class eq $link = $GLOBALS['phpgw']->link('/eq/index.php',$link_data); $table_data.= "$name"; - // Find out how many times Interviews were performed in the past $num_months for this Elder + // Find out how many times Interviews were performed in the past $num_months for this individual $header_row="Companionship"; for($m=$num_months; $m >= 0; $m--) { $month = $current_month - $m; @@ -2793,7 +2793,7 @@ class eq $month_end = "$year"."-"."$month"."-"."31"; $month = "$month"."/"."$year"; $sql = "SELECT * FROM 3rd_interview WHERE date >= '$month_start' AND date <= '$month_end' ". - "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id; + "AND indiv=" . $indiv_id . " AND aaronic=" . $aaronic_id; $this->db2->query($sql,__LINE__,__FILE__); $header_row .= "$month"; @@ -2805,7 +2805,7 @@ class eq $link_data['menuaction'] = 'eq.eq.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['elder'] = $elder_id; + $link_data['indiv'] = $indiv_id; $link_data['aaronic'] = $aaronic_id; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); @@ -2885,7 +2885,7 @@ class eq $interviewer = get_var('interviewer',array('GET','POST')); $name = get_var('name',array('GET','POST')); $interview = get_var('interview',array('GET','POST')); - $elder = get_var('elder',array('GET','POST')); + $indiv = get_var('indiv',array('GET','POST')); $aaronic = get_var('aaronic',array('GET','POST')); $date = get_var('date',array('GET','POST')); $notes = get_var('notes',array('GET','POST')); @@ -2895,9 +2895,9 @@ class eq $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { - $elder = $this->db2->f('elder'); + $indiv = $this->db2->f('indiv'); $interviewer_name = $this->db2->f('name'); - if($elder == $interviewer) { + if($indiv == $interviewer) { $this->t->set_var('interviewer',$interviewer . ' selected'); } else { $this->t->set_var('interviewer',$interviewer); @@ -2912,7 +2912,7 @@ class eq $this->db->query("UPDATE 3rd_interview set " . " interview='" . $interview . "'" . ", interviewer='" . $interviewer . "'" . - ", elder='" . $elder . "'" . + ", indiv='" . $indiv . "'" . ", aaronic='" . $aaronic . "'" . ", date='" . $date . "'" . ", notes='" . $notes . "'" . @@ -2925,8 +2925,8 @@ class eq if($action == 'insert') { $notes = get_var('notes',array('POST')); - $this->db->query("INSERT INTO 3rd_interview (interviewer,elder,aaronic,date,notes,interview_type) " - . "VALUES ('" . $interviewer . "','" . $elder . "','" . $aaronic . "','" + $this->db->query("INSERT INTO 3rd_interview (interviewer,indiv,aaronic,date,notes,interview_type) " + . "VALUES ('" . $interviewer . "','" . $indiv . "','" . $aaronic . "','" . $date . "','" . $notes ."','" . $interview_type . "')",__LINE__,__FILE__); $this->int_view(); return false; @@ -2938,7 +2938,7 @@ class eq $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('indiv',$indiv); $this->t->set_var('aaronic',$aaronic); $this->t->set_var('date',''); $this->t->set_var('notes',''); @@ -2956,7 +2956,7 @@ class eq $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('indiv',$this->db->f('indiv')); $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')); @@ -3215,7 +3215,7 @@ class eq $this->t->set_block('att_view_t','month_list','list1'); $this->t->set_block('att_view_t','header_list','list2'); - $this->t->set_block('att_view_t','elder_list','list3'); + $this->t->set_block('att_view_t','indiv_list','list3'); $this->t->set_var('linkurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view')); $num_quarters = get_var('num_quarters',array('GET','POST')); @@ -3232,16 +3232,16 @@ class eq 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 3rd_elder where valid=1"; + $sql = "SELECT * FROM 3rd_indiv where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); // Create a list of sunday dates for a window of 3 months back and current month $i=0; @@ -3268,7 +3268,7 @@ class eq if($found_sunday) { $i++; $found_sunday=0; } } - $total_elders = count($elder_id); + $total_indivs = count($indiv_id); $old_month=$sunday_list[0]['month']; $span=0; for ($i=0; $i < count($sunday_list); $i++) { $date = $sunday_list[$i]['date']; @@ -3292,10 +3292,10 @@ class eq $this->t->fp('list1','month_list',True); } $span++; } - $this->t->set_var('total_elders',$total_elders); + $this->t->set_var('total_indivs',$total_indivs); $this->t->set_var('header_row',$header_row); - $elder_width=200; $att_width=25; $total_width=$elder_width; + $indiv_width=200; $att_width=25; $total_width=$indiv_width; for ($i=0; $i < count($sunday_list); $i++) { $link_data['menuaction'] = 'eq.eq.att_update'; $link_data['month'] = $sunday_list[$i]['month']; @@ -3313,17 +3313,17 @@ class eq $attendance[$monthnum[$sunday_list[$i]['month']]]=0; } - for ($i=0; $i < count($elder_id); $i++) { + for ($i=0; $i < count($indiv_id); $i++) { $att_table = ""; $this->nextmatchs->template_alternate_row_color(&$this->t); - $this->t->set_var('elder_name',$elder_name[$i]); - #print "checking for elder: " . $elder_id[$i] . "
"; + $this->t->set_var('indiv_name',$indiv_name[$i]); + #print "checking for indiv: " . $indiv_id[$i] . "
"; for ($j=0; $j < count($sunday_list); $j++) { #print "checking for date: " . $sunday_list[$j]['date'] . "
"; #print "SELECT * FROM 3rd_attendance WHERE date='" - # . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i] . "
"; + # . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . "
"; $sql = "SELECT * FROM 3rd_attendance WHERE date='" - . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i]; + . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i]; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $cur_month = $sunday_list[$j]['month']; @@ -3337,10 +3337,10 @@ class eq } } $this->t->set_var('att_table',$att_table); - $this->t->fp('list3','elder_list',True); + $this->t->fp('list3','indiv_list',True); } $this->t->set_var('total_width',$total_width); - $this->t->set_var('elder_width',$elder_width); + $this->t->set_var('indiv_width',$indiv_width); $this->t->set_var('att_width',$att_width); # Now calculate attendance for these months @@ -3354,17 +3354,17 @@ class eq foreach($attendance as $att => $value) { $total_attended = $attendance[$att]; $ave_total_attended += $attendance[$att]; $num_months++; - $percent = ceil(($total_attended / $total_elders)*100); + $percent = ceil(($total_attended / $total_indivs)*100); $attendance_str.="$total_attended ($percent%)"; - $total_nonattended = $total_elders - $total_attended; - $percent = ceil(($total_nonattended / $total_elders)*100); + $total_nonattended = $total_indivs - $total_attended; + $percent = ceil(($total_nonattended / $total_indivs)*100); $nonattendance_str.="$total_nonattended ($percent%)"; $total_attended = ceil(($ave_total_attended / $num_months)); - $percent = ceil(($total_attended / $total_elders)*100); + $percent = ceil(($total_attended / $total_indivs)*100); $aveattendance_str .= "$total_attended ($percent%)"; - $total_attended = $total_elders - ceil(($ave_total_attended / $num_months)); - $percent = ceil(($total_attended / $total_elders)*100); + $total_attended = $total_indivs - ceil(($ave_total_attended / $num_months)); + $percent = ceil(($total_attended / $total_indivs)*100); $avenonattendance_str .= "$total_attended ($percent%)"; } @@ -3388,7 +3388,7 @@ class eq $this->t->set_block('form','month_list','list1'); $this->t->set_block('form','header_list','list2'); - $this->t->set_block('form','elder_list','list3'); + $this->t->set_block('form','indiv_list','list3'); $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.att_view')); @@ -3400,7 +3400,7 @@ class eq if($action == 'save_month' || $action == 'save_day') { - $new_data = get_var('elders_attended',array('POST')); + $new_data = get_var('indivs_attended',array('POST')); $month = $monthnum[$month]; if($month < 10) { $month = "0" . $month; } if($action == 'save_month') { @@ -3414,27 +3414,27 @@ class eq foreach ($new_data as $data) { $data_array = explode("-",$data); - $elder = $data_array[0]; + $indiv = $data_array[0]; $date = "$data_array[1]-$data_array[2]-$data_array[3]"; - $this->db->query("INSERT INTO 3rd_attendance (elder,date) " - . "VALUES (" . $elder . ",'". $date . "')",__LINE__,__FILE__); + $this->db->query("INSERT INTO 3rd_attendance (indiv,date) " + . "VALUES (" . $indiv . ",'". $date . "')",__LINE__,__FILE__); } $this->att_view(); return false; } - $sql = "SELECT * FROM 3rd_elder where valid=1"; + $sql = "SELECT * FROM 3rd_indiv where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_name[$i] = $this->db->f('name'); - $elder_id[$i] = $this->db->f('elder'); - $elder_attending[$elder_id[$i]] = $this->db->f('attending'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_attending[$indiv_id[$i]] = $this->db->f('attending'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); if($action == 'update_month') { @@ -3466,7 +3466,7 @@ class eq $this->t->set_var('month',$sunday_list[$i-1]['month']); $this->t->set_var('year',$sunday_list[$i-1]['year']); $this->t->fp('list1','month_list',True); - $elder_width=200; $att_width=25; $total_width=$elder_width; + $indiv_width=200; $att_width=25; $total_width=$indiv_width; for ($i=0; $i < count($sunday_list); $i++) { $link_data['menuaction'] = 'eq.eq.att_update'; $link_data['month'] = $sunday_list[$i]['month']; @@ -3498,25 +3498,25 @@ class eq $this->t->fp('list2','header_list',True); } - for ($i=0; $i < count($elder_id); $i++) { + for ($i=0; $i < count($indiv_id); $i++) { $att_table = ""; $this->nextmatchs->template_alternate_row_color(&$this->t); - $this->t->set_var('elder_name',$elder_name[$i]); + $this->t->set_var('indiv_name',$indiv_name[$i]); for ($j=0; $j < count($sunday_list); $j++) { $sql = "SELECT * FROM 3rd_attendance WHERE date='" - . $sunday_list[$j]['date'] . "' AND elder=" . $elder_id[$i]; + . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i]; $this->db->query($sql,__LINE__,__FILE__); - $value = $elder_id[$i] . "-" . $sunday_list[$j]['date']; + $value = $indiv_id[$i] . "-" . $sunday_list[$j]['date']; if($this->db->next_record()) { - $att_table .= ''; - } else if($elder_attending[$elder_id[$i]] == 1) { - $att_table .= ''; + $att_table .= ''; + } else if($indiv_attending[$indiv_id[$i]] == 1) { + $att_table .= ''; } else { - $att_table .= ''; + $att_table .= ''; } } $this->t->set_var('att_table',$att_table); - $this->t->fp('list3','elder_list',True); + $this->t->fp('list3','indiv_list',True); } $this->t->set_var('lang_done', 'Cancel'); @@ -3637,7 +3637,7 @@ class eq $action = get_var('action',array('GET','POST')); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.schedule&action=save')); - $this->t->set_var('title','EQ Scheduling Tool'); + $this->t->set_var('title','Scheduling Tool'); $this->t->set_var('lang_save','Save Schedule'); $this->t->set_var('lang_reset','Cancel'); @@ -3651,11 +3651,11 @@ class eq $this->t->set_var('schedule_ppi_link',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ppi_sched')); $this->t->set_var('schedule_ppi_link_title','Schedule Yearly PPIs'); - $date_width=150; $time_width=220; $elder_width=170; $family_width=180; $location_width=100; - $table_width=$date_width + $time_width + $elder_width + $family_width + $location_width; + $date_width=150; $time_width=220; $indiv_width=170; $family_width=180; $location_width=100; + $table_width=$date_width + $time_width + $indiv_width + $family_width + $location_width; $header_row = "Date"; $header_row.= "Time"; - $header_row.= "Elder"; + $header_row.= "individual"; $header_row.= "Family"; $header_row.= "Location"; $table_data = ""; @@ -3667,13 +3667,13 @@ class eq { $presidency_data[$i]['id'] = $this->db->f('presidency'); $presidency_data[$i]['name'] = $this->db->f('name'); - $presidency_data[$i]['elder'] = $this->db->f('elder'); + $presidency_data[$i]['indiv'] = $this->db->f('indiv'); $presidency2name[$presidency_data[$i]['id']] = $presidency_data[$i]['name']; - $presidency2elder[$presidency_data[$i]['id']] = $presidency_data[$i]['elder']; + $presidency2indiv[$presidency_data[$i]['id']] = $presidency_data[$i]['indiv']; $i++; } - $sql = "SELECT * FROM 3rd_family where valid=1 and elder_id != 0 ORDER BY name ASC"; + $sql = "SELECT * FROM 3rd_family where valid=1 and indiv_id != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) @@ -3704,7 +3704,7 @@ class eq $hour = $entry['hour']; $minute = $entry['minute']; $pm = $entry['pm']; - $elder = $entry['elder']; + $indiv = $entry['indiv']; $family = $entry['family']; $location = $entry['location']; if($pm) { $hour = $hour + 12; } @@ -3719,10 +3719,10 @@ class eq $family_address = $familyid2address[$family]; $location = "$family_last_name"." home ($family_address)"; } - else if($elder > 0) { + else if($indiv > 0) { $supervisor_name_array = explode(",",$presidency2name[$presidency]); $supervisor_last_name = $supervisor_name_array[0]; - $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$presidency2indiv[$presidency]'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_id = $this->db2->f('indiv_id'); @@ -3736,14 +3736,14 @@ class eq } } - // Zero out the family or elder if date = NULL + // Zero out the family or individual if date = NULL if($date == "") { - $elder = 0; + $indiv = 0; $family = 0; $location = ""; } - if(($elder == 0) && ($family == 0)) { $location = ""; } + if(($indiv == 0) && ($family == 0)) { $location = ""; } // Update an existing appointment if($appointment < $this->max_appointments) @@ -3752,7 +3752,7 @@ class eq $sql = "SELECT * FROM 3rd_appointment where " . "appointment='$appointment'" . " and presidency='$presidency'" . - " and elder='$elder'" . + " and indiv='$indiv'" . " and family='$family'" . " and date='$date'" . " and time='$time'" . @@ -3763,7 +3763,7 @@ class eq $old_time = $this->db->f('time'); $this->db2->query("UPDATE 3rd_appointment set" . " family=" . $family . - " ,elder=" . $elder . + " ,indiv=" . $indiv . " ,date='" . $date . "'" . " ,time='" . $time . "'" . " ,location='" . $location . "'" . @@ -3778,15 +3778,15 @@ class eq // Add a new appointment else if(($appointment >= $this->max_appointments) && ($date != "") && ($time != "")) { - //print "adding entry: appt=$appointment date: $date time: $time elder: $elder family: $family
"; - $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,elder,date,time,location,uid) " - . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $elder . "','" + //print "adding entry: appt=$appointment date: $date time: $time indiv: $indiv family: $family
"; + $this->db2->query("INSERT INTO 3rd_appointment (appointment,presidency,family,indiv,date,time,location,uid) " + . "VALUES (NULL,'" . $presidency . "','" . $family . "','" . $indiv . "','" . $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 3rd_appointment where " . - "elder='$elder'" . + "indiv='$indiv'" . " and family='$family'" . " and presidency='$presidency'" . " and date='$date'" . @@ -3796,7 +3796,7 @@ class eq $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { // Email the appointment if warranted - if(($date != "") && ($time != "") && (($elder > 0) || $family > 0)) { + if(($date != "") && ($time != "") && (($indiv > 0) || $family > 0)) { $this->email_appt($this->db3->f('appointment')); } } @@ -3808,21 +3808,21 @@ class eq //Header('Location: ' . $take_me_to_url); } - $sql = "SELECT * FROM 3rd_elder where valid=1 ORDER BY elder ASC"; + $sql = "SELECT * FROM 3rd_indiv where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $elder_id[$i] = $this->db->f('elder'); - $elder_name[$i] = $this->db->f('name'); - $elder_phone[$elder_id[$i]] = $this->db->f('phone'); + $indiv_id[$i] = $this->db->f('indiv'); + $indiv_name[$i] = $this->db->f('name'); + $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); $i++; } - array_multisort($elder_name, $elder_id); + array_multisort($indiv_name, $indiv_id); for ($i=0; $i < count($presidency_data); $i++) { $presidency = $presidency_data[$i]['id']; - $interviewer = $presidency_data[$i]['elder']; + $interviewer = $presidency_data[$i]['indiv']; $name = $presidency_data[$i]['name']; $this->t->set_var('presidency_name',$name); $table_data=""; @@ -3835,7 +3835,7 @@ class eq while ($this->db->next_record()) { $appointment = $this->db->f('appointment'); - $elder = $this->db->f('elder'); + $indiv = $this->db->f('indiv'); $family = $this->db->f('family'); $location = $this->db->f('location'); @@ -3846,10 +3846,10 @@ class eq $family_address = $familyid2address[$family]; $location = "$family_last_name"." home ($family_address)"; } - else if($elder > 0) { + else if($indiv > 0) { $supervisor_name_array = explode(",",$presidency2name[$presidency]); $supervisor_last_name = $supervisor_name_array[0]; - $sql = "SELECT * FROM 3rd_elder where elder='$presidency2elder[$presidency]'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$presidency2indiv[$presidency]'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_id = $this->db2->f('indiv_id'); @@ -3888,13 +3888,13 @@ class eq $table_data .= $this->get_time_selection_form($hour, $minute, $pm, $presidency, $appointment); $table_data.= ""; - // Elder drop down list (for PPIs) - $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($elder_id); $j++) { - $id = $elder_id[$j]; - $name = $elder_name[$j]; - if($elder_id[$j] == $elder) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } + for ($j=0; $j < count($indiv_id); $j++) { + $id = $indiv_id[$j]; + $name = $indiv_name[$j]; + if($indiv_id[$j] == $indiv) { $selected[$id] = 'selected="selected"'; } else { $selected[$id] = ''; } $table_data.= ''; } $table_data.=''; @@ -3902,7 +3902,7 @@ class eq // Family drop down list (for Visits) $table_data.= ''; + // individual drop down list + $table_data.= ''; @@ -3950,7 +3950,7 @@ class eq // Family drop down list $table_data.= ''; - // Elder + // individual if($eqpresidency == 0) { - $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($elder_id); $j++) { - $tmp_id = $elder_id[$j]; - $name = $elder_name[$j]; - if($elder_id[$j] == $elder) { $eldername = $name; $selected = 'selected="selected"'; } else { $selected = ''; } + for ($j=0; $j < count($indiv_id); $j++) { + $tmp_id = $indiv_id[$j]; + $name = $indiv_name[$j]; + if($indiv_id[$j] == $indiv) { $indivname = $name; $selected = 'selected="selected"'; } else { $selected = ''; } $table_data.= ''; } $table_data.=''; - $table_data.=''; + $table_data.=''; } else { - $table_data.= ''; - $table_data.= ''; + $table_data.= ''; + $table_data.= ''; } // Email Address @@ -4324,7 +4324,7 @@ class eq else { $table_data .= ''; } $table_data.=''; - // EQ Presidency + // Presidency $table_data.= ''; - // Elder - $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($elder_id); $j++) { - $tmp_id = $elder_id[$j]; - $name = $elder_name[$j]; + for ($j=0; $j < count($indiv_id); $j++) { + $tmp_id = $indiv_id[$j]; + $name = $indiv_name[$j]; $table_data.= ''; } $table_data.=''; @@ -4373,7 +4373,7 @@ class eq $table_data.= ''; - // EQ Presidency + // Presidency $table_data.= ''; @@ -4403,8 +4403,8 @@ class eq $location = $this->db->f('location'); $interviewer = ""; $email = ""; - $elder = $this->db->f('elder'); - $elder_name = ""; + $indiv = $this->db->f('indiv'); + $indiv_name = ""; $family = $this->db->f('family'); $family_name = ""; $appt_name = ""; @@ -4434,13 +4434,13 @@ class eq // Set the email address of the interviewer $from = $email; - if($elder > 0) { - $sql = "SELECT * FROM 3rd_elder where elder='$elder'"; + if($indiv > 0) { + $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $elder_name = $this->db2->f('name'); + $indiv_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); - $appt_name = $elder_name . " Interview"; + $appt_name = $indiv_name . " Interview"; $duration = $this->default_ppi_appt_duration * 60; } } @@ -4451,9 +4451,9 @@ class eq if($this->db2->next_record()) { $family_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); - $elder_id = $this->db2->f('elder_id'); + $indiv_id = $this->db2->f('indiv_id'); $appt_name = $family_name . " Family Visit"; - $sql = "SELECT * FROM 3rd_elder where elder='$elder_id'"; + $sql = "SELECT * FROM 3rd_indiv where indiv='$indiv_id'"; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { $phone = $this->db3->f('phone'); diff --git a/inc/functions.inc.php b/inc/functions.inc.php index 525213b..d4e9d22 100644 --- a/inc/functions.inc.php +++ b/inc/functions.inc.php @@ -1,6 +1,6 @@ $GLOBALS['phpgw']->link('/eq/preferences.php'), +// 'Preferences' => $GLOBALS['phpgw']->link('/3rd/preferences.php'), // 'Grant Access' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname), // 'Edit categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True') ); diff --git a/index.php b/index.php index cd7662c..9da48c9 100644 --- a/index.php +++ b/index.php @@ -13,7 +13,7 @@ $GLOBALS['phpgw_info']['flags'] = array ( - 'currentapp' => 'eq', + 'currentapp' => '3rd', 'noheader' => True, 'nonavbar' => True ); @@ -29,7 +29,7 @@ } else { - $app = 'eq'; + $app = '3rd'; $class = 'eq'; $invalid_data = True; } diff --git a/setup/3rd_config b/setup/3rd_config new file mode 100644 index 0000000..fb2c716 --- /dev/null +++ b/setup/3rd_config @@ -0,0 +1,63 @@ +upload_target_path = "/home/users/pres/3rd_data"; + +// The full path to the installation location of this module +$this->application_path = "/usr/share/phpgroupware/3rdCounselor"; + +// The full path to the unzip application +$this->unzip_path = "/usr/bin/unzip"; + +// Use drop down lists when specifying times in the scheduling tools. +// If set to 0, free form text fields for the hour and minutes will be used instead. +// If set to 1, drop down lists will be used for the hour and minute fields +$this->time_drop_down_lists = 1; + +// Frequency of hometeaching interview stats in months +// This number must evenly divide 12. +// Examples: Monthly=1 Quarterly=3 Yearly=12 +$this->monthly_hometeaching_interview_stats = 3; + +// Specify the minute interval increment to use in the time drop down lists +$this->time_drop_down_list_inc = 15; + +// The default visit appointment duration in minutes +$this->default_visit_appt_duration = 45; + +// The default ppi appointment duration in minutes +$this->default_ppi_appt_duration = 30; + +// The default number of months of hometeaching history to show +$this->default_ht_num_months = 3; + +// The default number of months of ppi history to show +$this->default_ppi_num_months = 3; + +// The default number of years of ppi history to show +$this->default_ppi_num_years = 0; + +// The default number of quarters of hometeaching interviews to show +$this->default_int_num_quarters = 1; + +// The default number of years of hometeaching interviews to show +$this->default_int_num_years = 0; + +// The default number of quarters of attendance to show +$this->default_att_num_quarters = 1; + +// The default nubmer of years of visits to show +$this->default_vis_num_years = 1; + +// The maximum number of districts you will ever need to create +$this->max_num_districts = 4; + +?> diff --git a/setup/db_config b/setup/db_config index 085075f..9cef5a4 100644 --- a/setup/db_config +++ b/setup/db_config @@ -1,5 +1,5 @@ ################################################################################ -# This is a perl module included by the perl scripts for this EQ application. +# This is a perl module included by the perl scripts for this 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. diff --git a/setup/eq_config b/setup/eq_config deleted file mode 100644 index fb2c716..0000000 --- a/setup/eq_config +++ /dev/null @@ -1,63 +0,0 @@ -upload_target_path = "/home/users/pres/3rd_data"; - -// The full path to the installation location of this module -$this->application_path = "/usr/share/phpgroupware/3rdCounselor"; - -// The full path to the unzip application -$this->unzip_path = "/usr/bin/unzip"; - -// Use drop down lists when specifying times in the scheduling tools. -// If set to 0, free form text fields for the hour and minutes will be used instead. -// If set to 1, drop down lists will be used for the hour and minute fields -$this->time_drop_down_lists = 1; - -// Frequency of hometeaching interview stats in months -// This number must evenly divide 12. -// Examples: Monthly=1 Quarterly=3 Yearly=12 -$this->monthly_hometeaching_interview_stats = 3; - -// Specify the minute interval increment to use in the time drop down lists -$this->time_drop_down_list_inc = 15; - -// The default visit appointment duration in minutes -$this->default_visit_appt_duration = 45; - -// The default ppi appointment duration in minutes -$this->default_ppi_appt_duration = 30; - -// The default number of months of hometeaching history to show -$this->default_ht_num_months = 3; - -// The default number of months of ppi history to show -$this->default_ppi_num_months = 3; - -// The default number of years of ppi history to show -$this->default_ppi_num_years = 0; - -// The default number of quarters of hometeaching interviews to show -$this->default_int_num_quarters = 1; - -// The default number of years of hometeaching interviews to show -$this->default_int_num_years = 0; - -// The default number of quarters of attendance to show -$this->default_att_num_quarters = 1; - -// The default nubmer of years of visits to show -$this->default_vis_num_years = 1; - -// The maximum number of districts you will ever need to create -$this->max_num_districts = 4; - -?> diff --git a/setup/setup.inc.php b/setup/setup.inc.php index 9c64406..3db28ab 100644 --- a/setup/setup.inc.php +++ b/setup/setup.inc.php @@ -12,8 +12,8 @@ /* $Id: setup.inc.php,v 1.9.4.2 2004/03/07 02:14:23 skwashd Exp $ */ /* Basic information about this app */ - $setup_info['eq']['name'] = 'eq'; - $setup_info['eq']['title'] = 'Elders Quorum Tools'; + $setup_info['eq']['name'] = '3rd'; + $setup_info['eq']['title'] = '3rd Counselor'; $setup_info['eq']['version'] = '0.2.0'; $setup_info['eq']['app_order'] = 8; $setup_info['eq']['enable'] = 1; @@ -22,7 +22,7 @@ $setup_info['eq']['author'] = 'Alan J. Pippin'; $setup_info['eq']['license'] = 'GPL'; $setup_info['eq']['description'] = - 'This app provides tools to help manage an Elders Quorum'; + 'This app provides tools to help manage a Priesthood Quorum'; $setup_info['eq']['note'] = 'This was created for the Miramont Ward.'; $setup_info['eq']['maintainer'] = 'Alan J. Pippin'; diff --git a/sql/3rd.jpg b/sql/3rd.jpg index 2ed2a42..4a398e5 100644 Binary files a/sql/3rd.jpg and b/sql/3rd.jpg differ diff --git a/sql/3rd.sql b/sql/3rd.sql index 7febfe4..7de171d 100644 --- a/sql/3rd.sql +++ b/sql/3rd.sql @@ -43,7 +43,7 @@ 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', + `indiv` 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, @@ -74,9 +74,9 @@ UNLOCK TABLES; -- Table structure for table `3rd_attendance` -- CREATE TABLE `3rd_attendance` ( - `elder` int(16) unsigned NOT NULL default '0', + `indiv` int(16) unsigned NOT NULL default '0', `date` date default NULL, - KEY `elder` (`elder`) + KEY `indiv` (`indiv`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- @@ -111,7 +111,7 @@ CREATE TABLE `3rd_child` ( CREATE TABLE `3rd_companionship` ( `companionship` int(16) unsigned NOT NULL default '0', - `elder` int(16) unsigned NOT NULL default '0', + `indiv` 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, @@ -130,10 +130,10 @@ CREATE TABLE `3rd_district` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- --- Table structure for table `3rd_elder` +-- Table structure for table `3rd_indiv` -- -CREATE TABLE `3rd_elder` ( - `elder` int(16) unsigned NOT NULL auto_increment, +CREATE TABLE `3rd_indiv` ( + `indiv` int(16) unsigned NOT NULL auto_increment, `indiv_id` int(16) unsigned NOT NULL, `name` varchar(60) default NULL, `phone` varchar(12) default NULL, @@ -146,7 +146,7 @@ CREATE TABLE `3rd_elder` ( `int_notes` varchar(128) default NULL, `attending` tinyint(1) default '0', `valid` tinyint(1) default NULL, - PRIMARY KEY (`elder`) + PRIMARY KEY (`indiv`) ) ENGINE=MyISAM AUTO_INCREMENT=105 DEFAULT CHARSET=latin1; -- @@ -157,7 +157,7 @@ CREATE TABLE `3rd_family` ( `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', + `indiv_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, @@ -184,9 +184,9 @@ CREATE TABLE `3rd_parent` ( -- Table structure for table `3rd_participation` -- CREATE TABLE `3rd_participation` ( - `elder` int(16) unsigned NOT NULL default '0', + `indiv` int(16) unsigned NOT NULL default '0', `activity` int(16) unsigned default NULL, - UNIQUE KEY `activity_ndx` (`elder`,`activity`) + UNIQUE KEY `activity_ndx` (`indiv`,`activity`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- @@ -195,7 +195,7 @@ CREATE TABLE `3rd_participation` ( CREATE TABLE `3rd_interview` ( `interview` int(16) unsigned NOT NULL auto_increment, `interviewer` int(16) unsigned default NULL, - `elder` int(16) unsigned default NULL, + `indiv` int(16) unsigned default NULL, `aaronic` int(16) unsigned NOT NULL default '0', `date` date default NULL, `notes` text, @@ -209,7 +209,7 @@ CREATE TABLE `3rd_interview` ( -- CREATE TABLE `3rd_presidency` ( `presidency` int(16) unsigned NOT NULL auto_increment, - `elder` int(16) unsigned NOT NULL default '0', + `indiv` int(16) unsigned NOT NULL default '0', `district` int(16) unsigned default '0', `name` varchar(60) NOT NULL, `email` varchar(60) NOT NULL, @@ -219,7 +219,7 @@ CREATE TABLE `3rd_presidency` ( `eqpres` tinyint(1) default '0', `valid` tinyint(1) default '1', KEY `presidency` (`presidency`), - KEY `elder` (`elder`) + KEY `indiv` (`indiv`) ) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; -- @@ -242,8 +242,8 @@ CREATE TABLE `3rd_visit` ( -- Table structure for table `3rd_willingness` -- CREATE TABLE `3rd_willingness` ( - `elder` int(16) unsigned NOT NULL, + `indiv` int(16) unsigned NOT NULL, `assignment` int(16) unsigned NOT NULL, `willing` enum('y','n','') NOT NULL, - KEY `elder` (`elder`,`assignment`) + KEY `indiv` (`indiv`,`assignment`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; diff --git a/sql/schema.dot b/sql/schema.dot index 16530d4..8435656 100644 --- a/sql/schema.dot +++ b/sql/schema.dot @@ -3,15 +3,15 @@ digraph schema { rankdir = "LR" ]; family [ - label = " family|| companionship| name_id| hofh_id| elder_id| visit_pri| visit_notes| valid" + label = " family|| hofh_id| name| name_id| indiv_id| companionship| visit_pri| visit_notes| valid" shape = "record" ]; - elder [ - label = " elder|| name|

phone| email| priesthood| prospective| ppi_pri| ppi_notes| int_pri| int_notes| attending| valid" + indiv [ + label = " indiv|| indiv_id| name|

phone| email| priesthood| prospective| ppi_pri| ppi_notes| int_pri| int_notes| attending| valid" shape = "record" ]; companionship [ - label = " companionship|| elder| aaronic| district| valid" + label = " companionship|| indiv| aaronic| district| valid" shape = "record" ]; visit [ @@ -19,7 +19,7 @@ digraph schema { shape = "record" ]; interview [ - label = " interview|| interviewer| elder| aaronic| date| notes| interview_type" + label = " interview|| interviewer| indiv| aaronic| date| notes| interview_type" shape = "record" ]; activity [ @@ -27,15 +27,15 @@ digraph schema { shape = "record" ]; participation [ - label = "participation|| elder| activity" + label = "participation|| indiv| activity" shape = "record" ]; attendance [ - label = "attendance|| elder| date" + label = "attendance|| indiv| date" shape = "record" ]; child [ - label = " child|| family| indiv_id| name| birthday| valid" + label = " child|| family| name| birthday| indiv_id| valid" shape = "record" ]; parent [ @@ -47,7 +47,7 @@ digraph schema { shape = "record" ]; appointment [ - label = " appointment||

presidency| family| elder | date| time| uid" + label = " appointment||

presidency| family| indiv | date| time| location| uid" shape = "record" ]; assignment [ @@ -63,42 +63,42 @@ digraph schema { shape = "record" ]; presidency [ - label = "

presidency|| elder| district| name| email| president| counselor| secreatary| valid" + label = "

presidency|| indiv| district| name| email| president| counselor| secreatary| valid" shape = "record" ]; willingness [ - label = " elder|| assignment| willing" + label = " indiv|| assignment| willing" shape = "record" ]; family:c -> companionship:c - companionship:e -> elder:e + companionship:i -> indiv:i companionship:a -> aaronic:a - appointment:e -> elder:e + appointment:i -> indiv:i appointment:f -> family:f - interview:e -> elder:e - interview:i -> elder:e + interview:il -> indiv:i + interview:i -> indiv:i interview:a -> aaronic:a - presidency:e -> elder:e + presidency:i -> indiv:i presidency:d -> district:d - willingness:e -> elder:e + willingness:i -> indiv:i willingness:a -> assignment:a activity:s -> assignment:a visit:c -> companionship:c visit:f -> family:f - visit:c1 -> presidency:e - visit:c2 -> presidency:e + visit:c1 -> presidency:i + visit:c2 -> presidency:i - participation:e -> elder:e + participation:i -> indiv:i participation:a -> activity:a - attendance:e -> elder:e + attendance:i -> indiv:i child:f -> family:f parent:f -> family:f diff --git a/templates/default/act_update.tpl b/templates/default/act_update.tpl index 2fc4dde..4550f00 100644 --- a/templates/default/act_update.tpl +++ b/templates/default/act_update.tpl @@ -23,11 +23,11 @@ - + - -
Elders Attending
Individuals Attending
{elder_name}{table_sep} - + + {indiv_name}{table_sep} +
diff --git a/templates/default/act_view.tpl b/templates/default/act_view.tpl index fe91407..9d3b1c7 100644 --- a/templates/default/act_view.tpl +++ b/templates/default/act_view.tpl @@ -26,10 +26,10 @@ - + -
Elders Attending
Individuals Attending
{elder_name}{table_sep} + {indiv_name}{table_sep}
diff --git a/templates/default/att_update.tpl b/templates/default/att_update.tpl index 7ee403a..2719796 100644 --- a/templates/default/att_update.tpl +++ b/templates/default/att_update.tpl @@ -6,11 +6,11 @@ - +
Elder Attendance TableAttendance Table

- Note: All Elders serving in the EQ Presidency, Young Men, Sunday School, or Primary + Note: All individuals serving in the EQ Presidency, Young Men, Sunday School, or Primary
have been automarked as attending. Feel free to adjust this accordingly.
@@ -21,15 +21,15 @@ - + - - {att_table} - + + {att_table} +
ElderIndividual {day}
{elder_name}
{indiv_name}
diff --git a/templates/default/att_view.tpl b/templates/default/att_view.tpl index 523afdc..f7a4ea9 100644 --- a/templates/default/att_view.tpl +++ b/templates/default/att_view.tpl @@ -2,7 +2,7 @@

- +
Elder Attendance TableAttendance Table

@@ -30,36 +30,36 @@ - Elder + Individual {day} - - {elder_name}{att_table} - + + {indiv_name}{att_table} +
- {header_row} + {header_row} - + {attendance} - + {nonattendance} - + {aveattendance} - + {avenonattendance}
{total_elders} Total Elders
{total_indivs} Total Individuals
Elders Attending:Individuals Attending:
Elders Not Attending:Individuals Not Attending:
Average Elders Attending:Average Individuals Attending:
Average Elders Not Attending:Average Individuals Not Attending:
diff --git a/templates/default/int_sched.tpl b/templates/default/int_sched.tpl index b8b3ded..2fc2415 100644 --- a/templates/default/int_sched.tpl +++ b/templates/default/int_sched.tpl @@ -12,7 +12,7 @@

- +
@@ -57,12 +57,12 @@
- +
{completed_header_row} diff --git a/templates/default/int_update.tpl b/templates/default/int_update.tpl index cfaaf4c..1613f75 100644 --- a/templates/default/int_update.tpl +++ b/templates/default/int_update.tpl @@ -3,7 +3,7 @@
- +
- All Elders with Interviews Completed + All Individuals with Interviews Completed
diff --git a/templates/default/par_view.tpl b/templates/default/par_view.tpl index 37a7625..ebf9a2c 100644 --- a/templates/default/par_view.tpl +++ b/templates/default/par_view.tpl @@ -2,24 +2,24 @@
- +
Elder Participation TableParticipation Table

- This table shows how many times each Elder has participated in each assignment and when they last did so. + This table shows how many times each individual has participated in each assignment and when they last did so.
- + - - {part_table} - + + {part_table} +
Elder
Individual
{assignment_name}
Participated
{elder_name}
{indiv_name}
diff --git a/templates/default/ppi_sched.tpl b/templates/default/ppi_sched.tpl index a130178..432a1dc 100644 --- a/templates/default/ppi_sched.tpl +++ b/templates/default/ppi_sched.tpl @@ -12,7 +12,7 @@

- +
@@ -57,12 +57,12 @@
- +
{completed_header_row} diff --git a/templates/default/ppi_update.tpl b/templates/default/ppi_update.tpl index 0c58979..e83394f 100644 --- a/templates/default/ppi_update.tpl +++ b/templates/default/ppi_update.tpl @@ -3,7 +3,7 @@
- +
- All Elders with Yearly PPI Completed + All Individuals with Yearly PPI Completed
diff --git a/templates/default/schedule.tpl b/templates/default/schedule.tpl index 358cc3a..2e1880f 100644 --- a/templates/default/schedule.tpl +++ b/templates/default/schedule.tpl @@ -23,7 +23,7 @@ {header_row} {table_data} - +
Note: Choose an Elder or Family per slot. A blank Date will delete the slot. If the Location is left blank, it will be autofilled for you.
Note: Choose an Individual or Family per slot. A blank Date will delete the slot. If the Location is left blank, it will be autofilled for you.
diff --git a/templates/default/vis_sched.tpl b/templates/default/vis_sched.tpl index 7b6431f..2a61e3e 100644 --- a/templates/default/vis_sched.tpl +++ b/templates/default/vis_sched.tpl @@ -42,7 +42,7 @@ {header_row} @@ -64,7 +64,7 @@
- All Elders with Yearly Visit Not Completed + All Families with Yearly Visit Not Completed
{completed_header_row} @@ -75,7 +75,7 @@
- All Elders with Yearly Visit Completed + All Families with Yearly Visit Completed
{totals_header_row} diff --git a/templates/default/willing_update.tpl b/templates/default/willing_update.tpl index 3cf6eee..5bf9458 100644 --- a/templates/default/willing_update.tpl +++ b/templates/default/willing_update.tpl @@ -1,6 +1,6 @@
- +
- Total EQ Presidency Yearly Visits + Total Presidency Yearly Visits
@@ -13,7 +13,7 @@
{header_row} diff --git a/templates/default/willing_view.tpl b/templates/default/willing_view.tpl index 4ae6566..2c50379 100644 --- a/templates/default/willing_view.tpl +++ b/templates/default/willing_view.tpl @@ -2,7 +2,7 @@
- Elder: {elder_name} + Individual: {indiv_name}
- +
Elder Willingness to Serve TableWillingness to Serve Table
@@ -18,19 +18,19 @@
- This table shows what assignments each Elder is willing to fulfill, and when they last did so. + This table shows what assignments each individual is willing to fulfill, and when they last did so.
- + - - {willing_table} - + + {willing_table} + {stat_table}
Elder
Individual
{assignment_name}
{elder_name}
{indiv_name}