Added the $default_stewardship variable and put it to use

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 6fbb96b3ba1e7400a251c92c2b6f546ca583a60d..68ee95d2d60ced3d2bd1a40a0a8227b5f7482be8 100755 (executable)
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -138,16 +138,13 @@ sub update_tc_individual_table
                $phone = $membership_data{$index}{'Household Phone'};
                $priesthood = $membership_data{$index}{'Priesthood'};
                $hhposition = $membership_data{$index}{'HH Position'};
-               $steward = ""; # This will be set later
-               # Default to the "Elders" quorum if the Organization data per member isn't available
-               # Only add "Elders" to the quorum since we don't have any other data availalbe to us to make a call
-               # TODO: make steward flexible with a setting in the config file 
-               if((! -e "$datadir/Organization\ class\ per\ member.csv") && ($priesthood =~ /Elder/i)) { 
-                       $steward = "Elder";
-                       $organization = "Elders"; 
+               $steward = ""; # This will be set correctly in a later method
+               # Set the default stewardship if the "Organization data per member.csv" isn't available.
+               # Only validate priesthood holders that match the $default_stewardship since 
+               # we don't have any other data available to us to make this call if we don't have the report.
+               if((! -e "$datadir/Organization\ class\ per\ member.csv") && ($priesthood =~ /$default_stewardship/i)) { 
+                       $steward = "$default_stewardship";
                }
-               # Preferred method is to pull organization data from the csv file
-               else { $organization = $organization_by_id{$id}; }
                $attending = 0;
                if(($organization =~ /Elders/) ||
                   ($organization =~ /Young Men/) ||
@@ -554,8 +551,7 @@ sub update_tc_scheduling_priority_table
        print "\n-> Updating scheduling priority table\n";
        
        # individuals
-       # TODO: make steward flexible with a setting in the config file
-       $sth = $dbh->prepare("select * from tc_individual where steward='Elder' and valid=1");
+       $sth = $dbh->prepare("select * from tc_individual where steward='$default_stewardship' and valid=1");
        $sth->execute or die "-E- DB error: $DBI::errstr\n";
        while($sqlhashref = $sth->fetchrow_hashref) {
                $individual = $sqlhashref->{individual};
@@ -572,8 +568,7 @@ sub update_tc_scheduling_priority_table
        &remove_obsolete_scheduling_priority("tc_individual");
        
        # families
-       # TODO: make steward flexible with a setting in the config file
-       $sth = $dbh->prepare("select tf.scheduling_priority, tf.family from tc_family AS tf JOIN tc_individual AS ti ON tf.individual=ti.individual and ti.steward='Elder' and tf.valid=1");
+       $sth = $dbh->prepare("select tf.scheduling_priority, tf.family from tc_family AS tf JOIN tc_individual AS ti ON tf.individual=ti.individual and ti.steward='$default_stewardship' and tf.valid=1");
        $sth->execute or die "-E- DB error: $DBI::errstr\n";
        while($sqlhashref = $sth->fetchrow_hashref) {
                $family = $sqlhashref->{family};
@@ -591,8 +586,7 @@ sub update_tc_scheduling_priority_table
        &remove_obsolete_scheduling_priority("tc_family");
        
        # companionships
-       # TODO: make steward flexible with a setting in the config file
-       $sth = $dbh->prepare("select tc.individual, tc.scheduling_priority from tc_companionship AS tc JOIN tc_individual AS ti ON tc.individual=ti.individual and (ti.steward='Elder' or ti.steward='') and tc.valid=1");
+       $sth = $dbh->prepare("select tc.individual, tc.scheduling_priority from tc_companionship AS tc JOIN tc_individual AS ti ON tc.individual=ti.individual and (ti.steward='$default_stewardship' or ti.steward='') and tc.valid=1");
        $sth->execute or die "-E- DB error: $DBI::errstr\n";
        while($sqlhashref = $sth->fetchrow_hashref) {
                $individual = $sqlhashref->{individual};

diff --git a/setup/db_config b/setup/db_config
index 0036f13cf3d8d90f02e3713472d8c751e24d41a5..0f1aa7b34e9e5ac1b990fdee395116579a190c5e 100644 (file)
--- a/setup/db_config
+++ b/setup/db_config
@@ -5,12 +5,22 @@
 # This will prevent your settings from being overwritten by future code updates.
 ################################################################################
 
+# Database variables/settings/configuration
 $dbname = "phpgroupware";
 $dbhost = "192.168.0.4"; # This can be an IP address or name
 $dbport = 3306;
 $dbuser = "phpgroupware"; # This may require an additional '\@localhost'
 $dbpass = "phpgroupware";
 
+# Set a default area code to add to the phone number if an area code is missing
 $areacode = "970";
+
+# Set the default visiting priority (1=highest 30=lowest)
 $default_visit_pri = 30;
+
+# Set the default interview priority (1=highest 30=lowest)
 $default_interview_pri = 30;
+
+# Set the default stewardship: "High Priest" or "Elder"
+$default_stewardship = "Elder";
+