X-Git-Url: http://git.pippins.net/embedvideo/.git/static/static/git-favicon.png?a=blobdiff_plain;f=bin%2Fimport_ward_data;h=e1590b8752f40be924a1acc69f60bfca240f7155;hb=b11651e0a8a0ebad0df09753b8f3ddd0eb305ff0;hp=c61f2a60dabef58cd351fb2982aeb6ecea8c8ef8;hpb=fdecb762c7a40331b9315299e673425c783d9150;p=eq%2F.git

diff --git a/bin/import_ward_data b/bin/import_ward_data
index c61f2a6..e1590b8 100755
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -138,22 +138,19 @@ 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/) ||
 		   ($organization =~ /Sunday School/) ||
 		   ($organization =~ /Primary/)
-		   ) { $attending = 1; }
+		  ) { $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}{'indiv E-mail'};
@@ -230,6 +227,7 @@ sub update_tc_calling_table()
 		$name =~ s/\'/\\'/g; #'
 		$organization = $organization_data{$index}{'Organization'};
 		$organization_by_name{$name} = $organization;
+		$indiv_id = $organization_data{$index}{'Indiv ID'};
 		$organization_by_id{$indiv_id} = $organization;
 		$position = $organization_data{$index}{'Position'};
 		$sustained = $organization_data{$index}{'Sustained'};
@@ -450,7 +448,7 @@ sub update_tc_visit_table
 		#print "$month_header\n";
 		#print $hometeaching_stats_data{$index}{$month_header};
 		#print "\n";
-		foreach $i (reverse(0..$#history)) {
+		foreach $i (reverse(0..$#history-1)) {
 			# went back a calendar year, decrement $data_year
 			if ($months{$data_months[$i]} > $data_month)
 			{
@@ -553,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};
@@ -571,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};
@@ -590,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};