From: Owen Leonard Date: Fri, 17 Sep 2010 05:11:14 +0000 (-0600) Subject: changed indiv_id in tc_individual to mls_indiv_id, removed indiv_id fields in all... X-Git-Tag: release_1_0_0~37 X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/%7Badd%7D?a=commitdiff_plain;h=cdf97a969659bdd67bf33e61b5ccf7ae042938fd;p=eq%2F.git changed indiv_id in tc_individual to mls_indiv_id, removed indiv_id fields in all other tables --- diff --git a/bin/import_ward_data b/bin/import_ward_data index 57a7f51..97b3fa1 100755 --- a/bin/import_ward_data +++ b/bin/import_ward_data @@ -109,7 +109,7 @@ sub print_hash #| Field | Type | Null | Key | Default | Extra | #+-------------+------------------+------+-----+---------+----------------+ #| indiv | int(16) unsigned | | PRI | NULL | auto_increment | -#| indiv_id | int(16) unsigned | | | NULL | | +#| mls_indiv_id| int(16) unsigned | | | NULL | | #| name | varchar(60) | YES | | NULL | | #| phone | varchar(12) | YES | | NULL | | #| email | varchar(120) | YES | | NULL | | @@ -121,12 +121,12 @@ sub print_hash #| attending | tinyint(1) | YES | | 0 | | #| valid | tinyint(1) | YES | | NULL | | #+-------------+------------------+------+-----+---------+----------------+ -sub update_tc_indiv_table +sub update_tc_individual_table { - print "\n-> Updating tc_indiv table\n"; + print "\n-> Updating tc_individual table\n"; # Set all records to be invalid. Only mark them as valid if they appear on the new list. - $sth = $dbh->prepare("update tc_indiv set valid=0"); + $sth = $dbh->prepare("update tc_individual set valid=0"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; foreach $index (keys %membership_data) @@ -152,7 +152,7 @@ sub update_tc_indiv_table if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; } $email = $membership_data{$index}{'indiv E-mail'}; if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; } - $sth = $dbh->prepare("select * from tc_indiv where name=\"$indiv_name\""); + $sth = $dbh->prepare("select * from tc_individual where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; my @data = (); while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); } @@ -160,34 +160,34 @@ sub update_tc_indiv_table if($rows == 0) { # No existing records found for this indiv, make a new entry print " Adding new indiv: $indiv_name\n"; - $sth = $dbh->prepare("insert into tc_indiv values (NULL,'$id',\"$indiv_name\",'$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)"); + $sth = $dbh->prepare("insert into tc_individual values (NULL,'$id',\"$indiv_name\",'$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } elsif($rows == 1) { # An existing record was found for this indiv, update it print " Updating existing indiv: $indiv_name\n"; - $sth = $dbh->prepare("update tc_indiv set valid=1 where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set valid=1 where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; if($phone ne "") { - $sth = $dbh->prepare("update tc_indiv set phone='$phone' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set phone='$phone' where name=\"$indiv_name\""); } else { - $sth = $dbh->prepare("update tc_indiv set phone=NULL where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set phone=NULL where name=\"$indiv_name\""); } $sth->execute or die "-E- DB error: $DBI::errstr\n"; if($address ne "") { - $sth = $dbh->prepare("update tc_indiv set address='$address' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set address='$address' where name=\"$indiv_name\""); } else { - $sth = $dbh->prepare("update tc_indiv set address=NULL where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set address=NULL where name=\"$indiv_name\""); } $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update tc_indiv set attending='$attending' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set attending='$attending' where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update tc_indiv set indiv_id='$id' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set mls_indiv_id='$id' where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update tc_indiv set priesthood='$priesthood' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set priesthood='$priesthood' where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update tc_indiv set email='$email' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set email='$email' where name=\"$indiv_name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; - $sth = $dbh->prepare("update tc_indiv set hh_position='$hhposition' where name=\"$indiv_name\""); + $sth = $dbh->prepare("update tc_individual set hh_position='$hhposition' 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. @@ -258,7 +258,7 @@ sub update_tc_district_table while($sqlhashref = $sth->fetchrow_hashref) { $supervisor_name = $sqlhashref->{name}; $district = $sqlhashref->{district}; - $sth2 = $dbh->prepare("select * from tc_indiv where name='$supervisor_name'"); + $sth2 = $dbh->prepare("select * from tc_individual where name='$supervisor_name'"); $sth2->execute or die "-E- DB error: $DBI::errstr\n"; $sqlhashref2 = $sth2->fetchrow_hashref; $supervisor_id = $sqlhashref2->{indiv}; @@ -295,7 +295,7 @@ sub update_tc_companionship_table foreach $field ("Home Teacher 1","Home Teacher 2") { $indiv_name = $hometeaching_data{$index}{$field}; if($indiv_name eq "") { next; } - $sth2 = $dbh->prepare("select * from tc_indiv where name='$indiv_name'"); + $sth2 = $dbh->prepare("select * from tc_individual where name='$indiv_name'"); $sth2->execute or die "-E- DB error: $DBI::errstr\n"; $sqlhashref2 = $sth2->fetchrow_hashref; $indiv = $sqlhashref2->{indiv}; @@ -339,7 +339,7 @@ sub update_tc_companionship_table #| hofh_id | int(16) unsigned | YES | | NULL | | #| name | varchar(30) | YES | | NULL | | #| name_id | varchar(30) | YES | | NULL | | -#| indiv_id | int(16) unsigned | YES | | NULL | | +#| individual | int(16) unsigned | YES | | NULL | | #| companionship | int(16) unsigned | YES | | NULL | | #| visit_pri | int(10) unsigned | YES | | 1 | | #| visit_notes | varchar(128) | YES | | NULL | | @@ -389,13 +389,13 @@ sub update_tc_family_table print " -E- More than one record found ($rows) for family name: $family_name\n"; } - # Now update the indiv_id field for this family - $sth = $dbh->prepare("select * from tc_indiv WHERE name='$family_name'"); + # Now update the individual field for this family + $sth = $dbh->prepare("select * from tc_individual WHERE name='$family_name'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; while($sqlhashref = $sth->fetchrow_hashref) { - $indiv_id = $sqlhashref->{indiv}; - print " Updating family indiv_id: $family_name -> $indiv_id\n"; - $sth = $dbh->prepare("update tc_family set indiv_id=$indiv_id where name_id='$name_id'"); + $individual = $sqlhashref->{indiv}; + print " Updating family individual: $family_name -> $individual\n"; + $sth = $dbh->prepare("update tc_family set individual=$individual where name_id='$name_id'"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } @@ -546,7 +546,7 @@ sub check_for_changed_ids foreach $oldindex (keys %$oldhashref) { - $indiv_id = $oldhashref->{$oldindex}{'Indiv ID'}; + $mls_indiv_id = $oldhashref->{$oldindex}{'Indiv ID'}; $hofh_id = $oldhashref->{$oldindex}{'HofH ID'}; $full_name = $oldhashref->{$oldindex}{'Full Name'}; $hh_position = $oldhashref->{$oldindex}{'HH Position'}; @@ -555,9 +555,9 @@ sub check_for_changed_ids foreach $newindex (keys %$newhashref) { if($newhashref->{$newindex}{'Full Name'} eq $full_name && - $indiv_id != $newhashref->{$newindex}{'Indiv ID'}) + $mls_indiv_id != $newhashref->{$newindex}{'Indiv ID'}) { - print "-W- Indiv ID for $full_name changed from $indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n"; + print "-W- Indiv ID for $full_name changed from $mls_indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n"; $found_problem = 1; } @@ -573,9 +573,9 @@ sub check_for_changed_ids return $found_problem; } -sub update_family_in_tc_indiv_table +sub update_family_in_tc_individual_table { - print "\n-> Updating family info in tc_indiv table\n"; + print "\n-> Updating family info in tc_individual table\n"; foreach $index (keys %membership_data) { @@ -596,8 +596,8 @@ sub update_family_in_tc_indiv_table print " Updating family data for: $name\n"; - # write the family id to the individual's data in tc_indiv - $sth = $dbh->prepare("update tc_indiv set family='$family_id' where name=\"$name\""); + # write the family id to the individual's data in tc_individual + $sth = $dbh->prepare("update tc_individual set family='$family_id' where name=\"$name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } else { $family_id = 0; @@ -607,7 +607,7 @@ sub update_family_in_tc_indiv_table sub update_organization_class_data { - print "\n-> Updating organization class info in tc_indiv table\n"; + print "\n-> Updating organization class info in tc_individual table\n"; foreach $index (keys %organization_class_data) { @@ -617,12 +617,12 @@ sub update_organization_class_data if ($org_class =~ m/Elder/i) { #print " $name: Elder\n"; - $sth = $dbh->prepare("update tc_indiv set steward='Elder' where name=\"$name\""); + $sth = $dbh->prepare("update tc_individual set steward='Elder' where name=\"$name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } if ($org_class =~ m/High Priest/i) { #print " $name: High Priest\n"; - $sth = $dbh->prepare("update tc_indiv set steward='High Priest' where name=\"$name\""); + $sth = $dbh->prepare("update tc_individual set steward='High Priest' where name=\"$name\""); $sth->execute or die "-E- DB error: $DBI::errstr\n"; } } @@ -692,12 +692,12 @@ if($opt_s) { $dbh->disconnect(); exit; } # Now update the various eq DB tables &update_tc_calling_table(); -&update_tc_indiv_table(); +&update_tc_individual_table(); &update_tc_district_table(); &update_tc_companionship_table(); &update_tc_family_table(); &update_tc_visit_table(); -&update_family_in_tc_indiv_table(); +&update_family_in_tc_individual_table(); &update_organization_class_data(); print "\n-> Import Successful! DONE...\n"; diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index fd885ae..9f3e12c 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -200,20 +200,20 @@ class tc $i++; } - $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_name[$i] = $this->db->f('name'); - $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); - // Make an array mapping indiv_ids to indiv_names - for($i=0; $i < count($indiv_id); $i++) { - $id = $indiv_id[$i]; + // Make an array mapping individuals to indiv_names + for($i=0; $i < count($individual); $i++) { + $id = $individual[$i]; $indivs[$id] = $indiv_name[$i]; } @@ -250,9 +250,9 @@ class tc // Get this companions information if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); - $indiv_id = $this->db->f('indiv'); - $name = $indivs[$indiv_id]; - $phone = $indiv_phone[$indiv_id]; + $individual = $this->db->f('indiv'); + $name = $indivs[$individual]; + $phone = $indiv_phone[$individual]; $companion_table_entry .= "$name"; } $table_data.= "$companion_table_entry
"; @@ -427,20 +427,20 @@ class tc return false; } - $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_name[$i] = $this->db->f('name'); - $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); - // Make an array mapping indiv_ids to indiv_names - for($i=0; $i < count($indiv_id); $i++) { - $id = $indiv_id[$i]; + // Make an array mapping individuals to indiv_names + for($i=0; $i < count($individual); $i++) { + $id = $individual[$i]; $indivs[$id] = $indiv_name[$i]; } @@ -466,9 +466,9 @@ class tc // Get this companions information if($companion_table_entry != "") { $companion_table_entry .= " / "; } $companionship = $this->db->f('companionship'); - $indiv_id = $this->db->f('indiv'); - $name = $indivs[$indiv_id]; - $phone = $indiv_phone[$indiv_id]; + $individual = $this->db->f('indiv'); + $name = $indivs[$individual]; + $phone = $indiv_phone[$individual]; $companion_table_entry .= "$name"; } $table_data.= "$companion_table_entry
"; @@ -670,7 +670,7 @@ class tc } for ($i=0; $i < count($part_list); $i++) { - $sql = "SELECT * FROM tc_indiv WHERE indiv=" . $part_list[$i]['indiv']; + $sql = "SELECT * FROM tc_individual WHERE indiv=" . $part_list[$i]['indiv']; $this->db->query($sql,__LINE__,__FILE__); $this->db->next_record(); $names[$i] = $this->db->f('name'); @@ -812,23 +812,23 @@ class tc $this->t->set_var('assignment_data',$assignment_data); // Create individual selection boxes - $sql = "SELECT * FROM tc_indiv"; + $sql = "SELECT * FROM tc_individual"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { if($this->db->f('valid') == 1 || $action != 'add') { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_valid[$i] = $this->db->f('valid'); $i++; } } - array_multisort($indiv_name, $indiv_id, $indiv_valid); + array_multisort($indiv_name, $individual, $indiv_valid); $j=0; - for ($i=0; $i < count($indiv_id); $i++) { + for ($i=0; $i < count($individual); $i++) { //$this->nextmatchs->template_alternate_row_color(&$this->t); - $sql = "SELECT * FROM tc_participation where activity=". $activity['activity'] . " AND indiv=" . $indiv_id[$i]; + $sql = "SELECT * FROM tc_participation where activity=". $activity['activity'] . " AND indiv=" . $individual[$i]; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $this->t->set_var('checked','checked'); @@ -839,7 +839,7 @@ class tc } if($checked || $indiv_valid[$i] == 1) { $this->t->set_var('indiv_name',$indiv_name[$i]); - $this->t->set_var('indiv',$indiv_id[$i]); + $this->t->set_var('indiv',$individual[$i]); if(($j+1) % 3 == 0) { $this->t->set_var('table_sep',""); } else { @@ -984,15 +984,15 @@ class tc $this->t->set_block('par_view_t','indiv_list','list2'); // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); $sql = "SELECT * FROM tc_activity ORDER BY date DESC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1025,7 +1025,7 @@ class tc $total_width += $assignment_width; } - for ($i=0; $i < count($indiv_id); $i++) { + for ($i=0; $i < count($individual); $i++) { $participated=0; $part_table = ''; $this->nextmatchs->template_alternate_row_color(&$this->t); $this->t->set_var('indiv_name',$indiv_name[$i]); @@ -1035,7 +1035,7 @@ class tc if($assignment_list[$j]['assignment'] == $activity_list[$k]['assignment']) { $sql = "SELECT * FROM tc_participation where " . " activity=" . $activity_list[$k]['activity'] . - " AND indiv=" . $indiv_id[$i]; + " AND indiv=" . $individual[$i]; $this->db->query($sql,__LINE__,__FILE__); while($this->db->next_record()) { if($activity_list[$k]['date'] > $date) { @@ -1095,16 +1095,16 @@ class tc $this->t->set_var('filter_input',$filter_input); // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); - $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $individual[$i] = $this->db->f('indiv'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); $sql = "SELECT * FROM tc_assignment ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); @@ -1139,17 +1139,17 @@ class tc $total_willing[$i] = 0; } - for ($i=0; $i < count($indiv_id); $i++) { + for ($i=0; $i < count($individual); $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('/tc/index.php','menuaction=tc.tc.willing_update&indiv_id=' . - $indiv_id[$i] . '&action=' . 'edit')); + $this->t->set_var('indiv_phone',$indiv_phone[$individual[$i]]); + $this->t->set_var('editurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_update&individual=' . + $individual[$i] . '&action=' . 'edit')); for ($j=0; $j < count($assignment_list); $j++) { $found_willingness=0; $sql = "SELECT * FROM tc_willingness where " . " assignment=" . $assignment_list[$j]['assignment'] . - " AND indiv=" . $indiv_id[$i]; + " AND indiv=" . $individual[$i]; $this->db->query($sql,__LINE__,__FILE__); while($this->db->next_record()) { $found_willingness=1; @@ -1163,7 +1163,7 @@ class tc $date = $this->db2->f('date'); $sql = "SELECT * FROM tc_participation where " . " activity=" . $activity . - " AND indiv=". $indiv_id[$i]; + " AND indiv=". $individual[$i]; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { $date_part = $date; @@ -1216,8 +1216,8 @@ class tc $this->t->set_block('willing_update_t','assignment_list','list'); $this->t->set_block('willing_update_t','save','savehandle'); - $indiv_id = get_var('indiv_id',array('GET','POST')); - $this->t->set_var('indiv_id',$indiv_id); + $individual = get_var('individual',array('GET','POST')); + $this->t->set_var('individual',$individual); $action = get_var('action',array('GET','POST')); $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.willing_view')); @@ -1227,7 +1227,7 @@ class tc if($action == 'save') { // Delete all the previous willingness entries for this individual - $this->db->query("DELETE from tc_willingness where indiv=" . $indiv_id ,__LINE__,__FILE__); + $this->db->query("DELETE from tc_willingness where indiv=" . $individual ,__LINE__,__FILE__); // Now, add the assignment willingness that is checked for this individual $new_data = get_var('willingness',array('POST')); @@ -1235,9 +1235,9 @@ class tc $data_array = explode("/",$data); $assignment = $data_array[0]; $willing = $data_array[1]; - //print "indiv_id: $indiv_id assignment: $assignment willing: $willing
"; + //print "individual: $individual assignment: $assignment willing: $willing
"; $this->db->query("INSERT INTO tc_willingness (indiv,assignment,willing) " . - "VALUES (" . $indiv_id .",". $assignment .",'". $willing . "')",__LINE__,__FILE__); + "VALUES (" . $individual .",". $assignment .",'". $willing . "')",__LINE__,__FILE__); } $this->willing_view(); return false; @@ -1247,7 +1247,7 @@ class tc $table_data=""; // Find out the individual's name - $sql = "SELECT * FROM tc_indiv WHERE indiv=".$indiv_id." AND valid=1"; + $sql = "SELECT * FROM tc_individual WHERE indiv=".$individual." AND valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $indiv_name = $this->db->f('name'); @@ -1267,7 +1267,7 @@ class tc $table_data.="$assignment_name"; $header_row="AssignmentsWillingness"; - $sql = "SELECT * FROM tc_willingness WHERE indiv=".$indiv_id." AND assignment=".$assignment; + $sql = "SELECT * FROM tc_willingness WHERE indiv=".$individual." AND assignment=".$assignment; $this->db2->query($sql,__LINE__,__FILE__); $value = $assignment; @@ -1364,12 +1364,12 @@ class tc $interviewer = $this->db->f('indiv'); $district_number = '*'; $district_name = $president_name; - $sql = "SELECT * FROM tc_indiv where indiv='$president_id'"; + $sql = "SELECT * FROM tc_individual where indiv='$president_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $indiv_id = $this->db2->f('indiv_id'); + $mls_indiv_id = $this->db2->f('mls_indiv_id'); } - $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $president_address = $this->db2->f('address'); @@ -1409,14 +1409,14 @@ class tc $new_data = get_var('ppi_notes',array('POST')); foreach ($new_data as $entry) { $ppi_notes = $entry['notes']; - $indiv_id = $entry['indiv_id']; + $individual = $entry['individual']; $ppi_pri = $entry['pri']; // Perform database save actions here - $this->db->query("UPDATE tc_indiv set " . + $this->db->query("UPDATE tc_individual set " . " ppi_notes='" . $ppi_notes . "'" . ",ppi_pri='" . $ppi_pri . "'" . - " WHERE indiv=" . $indiv_id,__LINE__,__FILE__); + " WHERE indiv=" . $individual,__LINE__,__FILE__); } @@ -1426,17 +1426,17 @@ class tc // create the individual id -> individual name mapping // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where valid=1 and steward='Elder' ORDER BY name ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 and steward='Elder' ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; - $indiv_id = NULL; + $individual = NULL; $indiv_name = NULL; while ($this->db->next_record()) { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); // APPOINTMENT TABLE $date_width=250; $time_width=100; $indiv_width=200; $location_width=100; @@ -1481,10 +1481,10 @@ class tc $appt_table_data.= ''; $table_data.= "$date"; $table_data.= ''; - $table_data.= ''; + $table_data.= ''; $table_data.= ''; $table_data.= ''; $table_data.= ''; @@ -1678,32 +1678,32 @@ class tc // create the individual id -> individual name mapping // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY name ASC"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; - $indiv_id_data = NULL; + $individual_data = NULL; $indiv_name_data = NULL; while ($this->db->next_record()) { $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]; + $individual_data[$i] = $this->db->f('indiv'); + $individ2name[$individual_data[$i]] = $indiv_name_data[$i]; $i++; } // add any YM that are home teachers $sql = "SELECT * FROM tc_companionship where valid=1"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { - $tmp_indiv_id = $this->db->f('indiv'); - $sql = "Select * FROM tc_indiv where indiv='$tmp_indiv_id' and steward='' and valid=1"; + $tmp_individual = $this->db->f('indiv'); + $sql = "Select * FROM tc_individual where indiv='$tmp_individual' and steward='' and valid=1"; $this->db2->query($sql,__LINE__,__FILE__); while ($this->db2->next_record()) { $indiv_name_data[$i] = $this->db2->f('name'); - $indiv_id_data[$i] = $this->db2->f('indiv'); - $individ2name[$indiv_id_data[$i]] = $indiv_name_data[$i]; + $individual_data[$i] = $this->db2->f('indiv'); + $individ2name[$individual_data[$i]] = $indiv_name_data[$i]; $i++; } } - array_multisort($indiv_name_data, $indiv_id_data); + array_multisort($indiv_name_data, $individual_data); if($action == 'save') { // Save any changes made to the appointment table @@ -1717,12 +1717,12 @@ class tc $supervisor = $entry['supervisor']; $supervisor_array = explode(",", $individ2name[$supervisor]); $supervisor_last_name = $supervisor_array[0]; - $sql = "SELECT * FROM tc_indiv where indiv='$supervisor'"; + $sql = "SELECT * FROM tc_individual where indiv='$supervisor'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $indiv_id = $this->db2->f('indiv_id'); + $mls_indiv_id = $this->db2->f('mls_indiv_id'); } - $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $supervisor_address = $this->db2->f('address'); @@ -1751,15 +1751,15 @@ class tc $new_data = get_var('hti_notes',array('POST')); foreach ($new_data as $entry) { $hti_notes = $entry['notes']; - $indiv_id = $entry['indiv_id']; + $individual = $entry['individual']; $indiv_name = $entry['indiv_name']; $hti_pri = $entry['pri']; //print "hti_notes: $hti_notes indiv_name: $indiv_name
"; // Perform database save actions here - $this->db->query("UPDATE tc_indiv set " . + $this->db->query("UPDATE tc_individual set " . " hti_notes='" . $hti_notes . "'" . ",hti_pri='" . $hti_pri . "'" . - " WHERE indiv=" . $indiv_id,__LINE__,__FILE__); + " WHERE indiv=" . $individual,__LINE__,__FILE__); } $take_me_to_url = $GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.int_sched'); @@ -1803,12 +1803,12 @@ class tc $supervisor = $districts[$d]['supervisor']; $supervisor_array = explode(",", $supervisor); $supervisor_last_name = $supervisor_array[0]; - $sql = "SELECT * FROM tc_indiv where indiv='$supervisor'"; + $sql = "SELECT * FROM tc_individual where indiv='$supervisor'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $indiv_id = $this->db2->f('indiv_id'); + $mls_indiv_id = $this->db2->f('mls_indiv_id'); } - $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $supervisor_address = $this->db2->f('address'); @@ -1844,10 +1844,10 @@ class tc $appt_table_data.= ''; $table_data.= "$date"; $table_data.= ''; - $table_data.= ''; + $table_data.= ''; $table_data.= ''; $table_data.= ''; $table_data.= ''."\n"; @@ -2061,7 +2061,7 @@ class tc $year = date('Y'); // create the family id -> family name mapping - $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY name ASC"; + $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; $family_id = NULL; @@ -2069,7 +2069,7 @@ class tc $family_id[$i] = $this->db->f('family'); $family_name[$i] = $this->db->f('name'); $familyid2name[$family_id[$i]] = $family_name[$i]; - $sql = "SELECT * FROM tc_indiv where family='$family_id[$i]'"; + $sql = "SELECT * FROM tc_individual where family='$family_id[$i]'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $familyid2address[$family_id[$i]] = $this->db2->f('address'); @@ -2203,7 +2203,7 @@ class tc // VISIT SCHEDULING TABLE - $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC"; + $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 and companionship != 0 ORDER BY visit_pri ASC, name ASC"; $this->db->query($sql,__LINE__,__FILE__); $total_families=0; $families_with_yearly_visit=0; @@ -2224,7 +2224,7 @@ class tc $total_families++; } - $sql = "SELECT * FROM tc_indiv where valid=1"; + $sql = "SELECT * FROM tc_individual where valid=1"; $this->db->query($sql,__LINE__,__FILE__); while ($this->db->next_record()) { $family = $this->db->f('family'); @@ -2390,20 +2390,20 @@ class tc $this->t->set_var('district_name',$president_name); // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$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'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); + $indiv_ppi_pri[$individual[$i]] = $this->db->f('ppi_pri'); + $indiv_ppi_notes[$individual[$i]] = $this->db->f('ppi_notes'); $i++; } $total_indivs=$i; - array_multisort($indiv_name, $indiv_id); - //var_dump($indiv_name); print "

"; var_dump($indiv_id); + array_multisort($indiv_name, $individual); + //var_dump($indiv_name); print "

"; var_dump($individual); $header_row="Individual Name"; @@ -2415,8 +2415,8 @@ class tc $ppis[$m] = 0; } - for ($j=0; $j < count($indiv_id); $j++) { - $id = $indiv_id[$j]; + for ($j=0; $j < count($individual); $j++) { + $id = $individual[$j]; $name = $indiv_name[$j]; $phone = $indiv_phone[$id]; @@ -2643,18 +2643,18 @@ class tc $i++; } - $sql = "SELECT * FROM tc_indiv where valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_name[$i] = $this->db->f('name'); - $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); $i++; } - array_multisort($indiv_name, $indiv_id); - for($i=0; $i < count($indiv_id); $i++) { - $id = $indiv_id[$i]; + array_multisort($indiv_name, $individual); + for($i=0; $i < count($individual); $i++) { + $id = $individual[$i]; $indivs[$id] = $indiv_name[$i]; } @@ -2689,13 +2689,13 @@ class tc // Get this companions information $num_indivs++; $companionship = $this->db->f('companionship'); - $indiv_id = $this->db->f('indiv'); - $name = $indivs[$indiv_id]; - $phone = $indiv_phone[$indiv_id]; + $individual = $this->db->f('indiv'); + $name = $indivs[$individual]; + $phone = $indiv_phone[$individual]; $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $supervisor; - $link_data['indiv'] = $indiv_id; + $link_data['indiv'] = $individual; $link_data['name'] = $name; $link_data['interview'] = ''; $link_data['action'] = 'add'; @@ -2717,7 +2717,7 @@ class tc $month_end = "$year"."-"."$month"."-"."31"; $month = "$month"."/"."$year"; $sql = "SELECT * FROM tc_interview WHERE date >= '$month_start' AND date <= '$month_end' ". - "AND indiv=" . $indiv_id; + "AND indiv=" . $individual; $this->db2->query($sql,__LINE__,__FILE__); $header_row .= "$month"; @@ -2731,7 +2731,7 @@ class tc $link_data['menuaction'] = 'tc.tc.int_update'; $link_data['companionship'] = $companionship; $link_data['interviewer'] = $this->db2->f('interviewer'); - $link_data['indiv'] = $indiv_id; + $link_data['indiv'] = $individual; $link_data['name'] = $name; $link_data['interview'] = $this->db2->f('interview'); $link_data['action'] = 'view'; @@ -3154,15 +3154,15 @@ class tc else if($current_month >= 10 && $current_month <= 12) { $current_month=12; } // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); // Create a list of sunday dates for a window of 3 months back and current month $i=0; @@ -3188,7 +3188,7 @@ class tc if($found_sunday) { $i++; $found_sunday=0; } } - $total_indivs = count($indiv_id); + $total_indivs = count($individual); $old_month=$sunday_list[0]['month']; $span=0; for ($i=0; $i < count($sunday_list); $i++) { $date = $sunday_list[$i]['date']; @@ -3234,17 +3234,17 @@ class tc $attendance[$monthnum[$sunday_list[$i]['month']]]=0; } - for ($i=0; $i < count($indiv_id); $i++) { + for ($i=0; $i < count($individual); $i++) { $att_table = ""; $this->nextmatchs->template_alternate_row_color(&$this->t); $this->t->set_var('indiv_name',$indiv_name[$i]); - #print "checking for indiv: " . $indiv_id[$i] . "
"; + #print "checking for indiv: " . $individual[$i] . "
"; for ($j=0; $j < count($sunday_list); $j++) { #print "checking for date: " . $sunday_list[$j]['date'] . "
"; #print "SELECT * FROM tc_attendance WHERE date='" - # . $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i] . "
"; + # . $sunday_list[$j]['date'] . "' AND indiv=" . $individual[$i] . "
"; $sql = "SELECT * FROM tc_attendance WHERE date='" . - $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i]; + $sunday_list[$j]['date'] . "' AND indiv=" . $individual[$i]; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $cur_month = $sunday_list[$j]['month']; @@ -3344,16 +3344,16 @@ class tc } // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { $indiv_name[$i] = $this->db->f('name'); - $indiv_id[$i] = $this->db->f('indiv'); - $indiv_attending[$indiv_id[$i]] = $this->db->f('attending'); + $individual[$i] = $this->db->f('indiv'); + $indiv_attending[$individual[$i]] = $this->db->f('attending'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); if($action == 'update_month') { $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/tc/index.php','menuaction=tc.tc.att_update&action=save_month')); @@ -3414,18 +3414,18 @@ class tc $this->t->fp('list2','header_list',True); } - for ($i=0; $i < count($indiv_id); $i++) { + for ($i=0; $i < count($individual); $i++) { $att_table = ""; $this->nextmatchs->template_alternate_row_color(&$this->t); $this->t->set_var('indiv_name',$indiv_name[$i]); for ($j=0; $j < count($sunday_list); $j++) { $sql = "SELECT * FROM tc_attendance WHERE date='" . - $sunday_list[$j]['date'] . "' AND indiv=" . $indiv_id[$i]; + $sunday_list[$j]['date'] . "' AND indiv=" . $individual[$i]; $this->db->query($sql,__LINE__,__FILE__); - $value = $indiv_id[$i] . "-" . $sunday_list[$j]['date']; + $value = $individual[$i] . "-" . $sunday_list[$j]['date']; if($this->db->next_record()) { $att_table .= ''; - } else if($indiv_attending[$indiv_id[$i]] == 1) { + } else if($indiv_attending[$individual[$i]] == 1) { $att_table .= ''; } else { $att_table .= ''; @@ -3450,7 +3450,7 @@ class tc $this->t->set_file(array('dir_view_t' => 'dir_view.tpl')); $this->t->set_block('dir_view_t','dir_list','list'); - $sql = "SELECT * FROM tc_indiv where valid=1 and hh_position='Head of Household' ORDER BY name ASC"; + $sql = "SELECT * FROM tc_individual where valid=1 and hh_position='Head of Household' ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { @@ -3488,7 +3488,7 @@ class tc $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $calling[$i]['id'] = $this->db->f('indiv_id'); + $calling[$i]['id'] = $this->db->f('individual'); $calling[$i]['name'] = $this->db->f('name'); $calling[$i]['position'] = $this->db->f('position'); $calling[$i]['sustained'] = $this->db->f('sustained'); @@ -3514,7 +3514,7 @@ class tc $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $calling[$i]['id'] = $this->db->f('indiv_id'); + $calling[$i]['id'] = $this->db->f('individual'); $calling[$i]['name'] = $this->db->f('name'); $calling[$i]['position'] = $this->db->f('position'); $calling[$i]['sustained'] = $this->db->f('sustained'); @@ -3582,14 +3582,14 @@ class tc $i++; } - $sql = "SELECT * FROM tc_family where valid=1 and indiv_id != 0 ORDER BY name ASC"; + $sql = "SELECT * FROM tc_family where valid=1 and individual != 0 ORDER BY name ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { $family_id[$i] = $this->db->f('family'); $family_name[$i] = $this->db->f('name'); $familyid2name[$family_id[$i]] = $family_name[$i]; - $sql = "SELECT * FROM tc_indiv where family='$family_id[$i]' and hh_position='Head of Household'"; + $sql = "SELECT * FROM tc_individual where family='$family_id[$i]' and hh_position='Head of Household'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $familyid2address[$family_id[$i]] = $this->db2->f('address'); @@ -3626,12 +3626,12 @@ class tc } else if($indiv > 0) { $supervisor_name_array = explode(",",$presidency2name[$presidency]); $supervisor_last_name = $supervisor_name_array[0]; - $sql = "SELECT * FROM tc_indiv where indiv='$presidency2indiv[$presidency]'"; + $sql = "SELECT * FROM tc_individual where indiv='$presidency2indiv[$presidency]'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $indiv_id = $this->db2->f('indiv_id'); + $mls_indiv_id = $this->db2->f('mls_indiv_id'); } - $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $supervisor_address = $this->db2->f('address'); @@ -3713,16 +3713,16 @@ class tc } // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_name[$i] = $this->db->f('name'); - $indiv_phone[$indiv_id[$i]] = $this->db->f('phone'); + $indiv_phone[$individual[$i]] = $this->db->f('phone'); $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); for ($i=0; $i < count($presidency_data); $i++) { $presidency = $presidency_data[$i]['id']; @@ -3751,12 +3751,12 @@ class tc } else if($indiv > 0) { $supervisor_name_array = explode(",",$presidency2name[$presidency]); $supervisor_last_name = $supervisor_name_array[0]; - $sql = "SELECT * FROM tc_indiv where indiv='$presidency2indiv[$presidency]'"; + $sql = "SELECT * FROM tc_individual where indiv='$presidency2indiv[$presidency]'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { - $indiv_id = $this->db2->f('indiv_id'); + $mls_indiv_id = $this->db2->f('mls_indiv_id'); } - $sql = "SELECT * FROM tc_indiv where indiv_id='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where mls_indiv_id='$mls_indiv_id'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $supervisor_address = $this->db2->f('address'); @@ -3793,10 +3793,10 @@ class tc // individual drop down list (for PPIs) $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($indiv_id); $j++) { + for ($j=0; $j < count($individual); $j++) { $id = $family_id[$j]; $name = $family_name[$j]; if($family_id[$j] == $family) { @@ -3849,8 +3849,8 @@ class tc // individual drop down list $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($indiv_id); $j++) { + for ($j=0; $j < count($individual); $j++) { $id = $family_id[$j]; $name = $family_name[$j]; $table_data.= ''; @@ -3935,16 +3935,16 @@ class tc $this->t->pfp('out','admin_t'); // TODO: changed this so it picks the quorum dynamically - $sql = "SELECT * FROM tc_indiv where steward='Elder' and valid=1 ORDER BY indiv ASC"; + $sql = "SELECT * FROM tc_individual where steward='Elder' and valid=1 ORDER BY indiv ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; while ($this->db->next_record()) { - $indiv_id[$i] = $this->db->f('indiv'); + $individual[$i] = $this->db->f('indiv'); $indiv_name[$i] = $this->db->f('name'); - $indiv2name[$indiv_id[$i]] = $indiv_name[$i]; + $indiv2name[$individual[$i]] = $indiv_name[$i]; $i++; } - array_multisort($indiv_name, $indiv_id); + array_multisort($indiv_name, $individual); if($action == 'upload') { $target_path = $this->upload_target_path . '/' . basename( $_FILES['uploadedfile']['name']); @@ -4174,10 +4174,10 @@ class tc if($eqpresidency == 0) { $table_data.= ''; $table_data.= ''; - for ($j=0; $j < count($indiv_id); $j++) { - $tmp_id = $indiv_id[$j]; + for ($j=0; $j < count($individual); $j++) { + $tmp_id = $individual[$j]; $name = $indiv_name[$j]; $table_data.= ''; } @@ -4330,7 +4330,7 @@ class tc $from = $email; if($indiv > 0) { - $sql = "SELECT * FROM tc_indiv where indiv='$indiv'"; + $sql = "SELECT * FROM tc_individual where indiv='$indiv'"; $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->next_record()) { $indiv_name = $this->db2->f('name'); @@ -4346,9 +4346,9 @@ class tc if($this->db2->next_record()) { $family_name = $this->db2->f('name'); $phone = $this->db2->f('phone'); - $indiv_id = $this->db2->f('indiv_id'); + $individual = $this->db2->f('individual'); $appt_name = $family_name . " Family Visit"; - $sql = "SELECT * FROM tc_indiv where indiv='$indiv_id'"; + $sql = "SELECT * FROM tc_individual where indiv='$individual'"; $this->db3->query($sql,__LINE__,__FILE__); if($this->db3->next_record()) { $phone = $this->db3->f('phone'); diff --git a/sql/tc.sql b/sql/tc.sql index 2306721..1552367 100644 --- a/sql/tc.sql +++ b/sql/tc.sql @@ -105,9 +105,9 @@ CREATE TABLE `tc_district` ( -- -- Table structure for table `tc_indiv` -- -CREATE TABLE `tc_indiv` ( - `indiv` int(16) unsigned NOT NULL auto_increment, - `indiv_id` int(16) unsigned NOT NULL, +CREATE TABLE `tc_individual` ( + `individual` int(16) unsigned NOT NULL auto_increment, + `mls_indiv_id` int(16) unsigned NOT NULL, `name` varchar(60) default NULL, `address` varchar(255) default NULL, `phone` varchar(12) default NULL, @@ -133,7 +133,7 @@ CREATE TABLE `tc_family` ( `hofh_id` int(16) unsigned NOT NULL default '0', `name` varchar(30) NOT NULL default '', `name_id` varchar(30) NOT NULL default '', - `indiv_id` int(16) unsigned default '0', + `individual` int(16) unsigned default '0', `companionship` int(16) unsigned default NULL, `visit_pri` int(10) unsigned default '1', `visit_notes` varchar(128) default NULL, diff --git a/templates/default/willing_update.tpl b/templates/default/willing_update.tpl index 5bf9458..6970815 100644 --- a/templates/default/willing_update.tpl +++ b/templates/default/willing_update.tpl @@ -1,6 +1,6 @@
- +