From: Owen Leonard Date: Wed, 15 Sep 2010 06:01:00 +0000 (-0600) Subject: remove eqpres from tc_presidency table - just used the president field instead -... X-Git-Tag: release_1_0_0~42 X-Git-Url: http://git.pippins.net/embedvideo/images/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/calendar-win2k-cold-1.css?a=commitdiff_plain;h=a7dc2d93b41c38fb9d80f7547a06706e3904e8ab;p=eq%2F.git remove eqpres from tc_presidency table - just used the president field instead - need to enhance it to include all presidency members depending on new config file setting --- diff --git a/bin/upgrade_4_0_to_5_0 b/bin/upgrade_4_0_to_5_0 index c27fa3a..085fa1e 100755 --- a/bin/upgrade_4_0_to_5_0 +++ b/bin/upgrade_4_0_to_5_0 @@ -147,6 +147,10 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n"; $sth = $dbh->prepare("ALTER TABLE `tc_presidency` CHANGE `elder` `indiv` INT(16)"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; +# Remove eqpres field from tc_presidency +$sth = $dbh->prepare("ALTER TABLE `tc_presidency` DROP `eqpres`"); +$sth->execute or die "-E- DB error: $DBI::errstr\n"; + # Rename eq_visit table to tc_visit $sth = $dbh->prepare("RENAME TABLE `eq_visit` TO `tc_visit`"); $sth->execute or die "-E- DB error: $DBI::errstr\n"; diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 79e286b..031d19f 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -2138,7 +2138,7 @@ class tc $appt_table_data = ""; // Find out what the EQ Presidency ID is - $sql = "SELECT * FROM tc_presidency where eqpres=1 and valid=1"; + $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { $presidency_name = $this->db->f('name'); @@ -4070,13 +4070,10 @@ class tc $president = $entry['president']; $counselor = $entry['counselor']; $secretary = $entry['secretary']; - $eqpresidency = $entry['eqpresidency']; - // Set the individual id to 0 for EQ Presidency tagged entry - if($eqpresidency == 1) { $indiv="0"; } - // Re-look up the individual name for the ID if we aren't an EQ Presidency tagged entry - else { $name = $indiv2name[$indiv]; } + // look up the individual name for the ID + $name = $indiv2name[$indiv]; //print "id=$id indiv=$indiv name=$name email=$email district=$district president=$president "; - //print "counselor=$counselor secretary=$secretary eqpres=$eqpresidency
"; + //print "counselor=$counselor secretary=$secretary
"; if(($indiv > 0) || ($name != "")) { if($id < $this->max_presidency_members) { @@ -4089,15 +4086,14 @@ class tc " ,president='" . $president . "'" . " ,counselor='" . $counselor . "'" . " ,secretary='" . $secretary . "'" . - " ,eqpres='" . $eqpresidency . "'" . " WHERE presidency=" . $id,__LINE__,__FILE__); } else { //print "Adding New Entry
"; $this->db2->query("INSERT INTO tc_presidency (presidency,indiv,district,name," . - "email,president,counselor,secretary,eqpres,valid) " . + "email,president,counselor,secretary,valid) " . "VALUES (NULL,'" . $indiv . "','" . $district . "','" . $name . "','" . $email . "','" . $president . "','" . - $counselor . "','" . $secretary . "','" . $eqpres . "','1'" . + $counselor . "','" . $secretary . "','1'" . ")",__LINE__,__FILE__); } } else { @@ -4156,7 +4152,7 @@ class tc $sql = "SELECT * FROM tc_presidency where valid=1"; $this->db->query($sql,__LINE__,__FILE__); $table_data = ""; - $header_row = "IndividualEmailDistrictPresidentCounselorSecretaryPresidency"; + $header_row = "IndividualEmailDistrictPresidentCounselorSecretary"; while ($this->db->next_record()) { // Extract the data for each presidency record $id = $this->db->f('presidency'); @@ -4167,7 +4163,6 @@ class tc $president = $this->db->f('president'); $counselor = $this->db->f('counselor'); $secretary = $this->db->f('secretary'); - $eqpresidency = $this->db->f('eqpres'); // Create the forms needed in the table $table_data .= ""; @@ -4231,12 +4226,6 @@ class tc else { $table_data .= ''; } $table_data.=''; - // Presidency - $table_data.= ''; - // End of ROW $table_data .= "\n"; $tr_color = $this->nextmatchs->alternate_row_color($tr_color); @@ -4284,10 +4273,6 @@ class tc $table_data.= ''; - // Presidency - $table_data.= ''; // End of ROW $table_data .= "\n"; $tr_color = $this->nextmatchs->alternate_row_color($tr_color); diff --git a/sql/tc.sql b/sql/tc.sql index f7cea23..5d2ba99 100644 --- a/sql/tc.sql +++ b/sql/tc.sql @@ -176,7 +176,6 @@ CREATE TABLE `tc_presidency` ( `president` tinyint(1) default '0', `counselor` tinyint(1) default '0', `secretary` tinyint(1) default '0', - `eqpres` tinyint(1) default '0', `valid` tinyint(1) default '1', KEY `presidency` (`presidency`), KEY `indiv` (`indiv`)