From a7dc2d93b41c38fb9d80f7547a06706e3904e8ab Mon Sep 17 00:00:00 2001
From: Owen Leonard <owen@balawis.leonard.fam>
Date: Wed, 15 Sep 2010 00:01:00 -0600
Subject: [PATCH] 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

---
 bin/upgrade_4_0_to_5_0 |  4 ++++
 inc/class.tc.inc.php   | 29 +++++++----------------------
 sql/tc.sql             |  1 -
 3 files changed, 11 insertions(+), 23 deletions(-)

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<br>";
+				//print "counselor=$counselor secretary=$secretary<br>";
 
 				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<br>";
 						$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 = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th><th>Presidency</th>";
+		$header_row = "<th>Individual</th><th>Email</th><th>District</th><th>President</th><th>Counselor</th><th>Secretary</th>";
 		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 .= "<tr bgcolor=". $this->t->get_var('tr_color') .">";
@@ -4231,12 +4226,6 @@ class tc
 			else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
 			$table_data.='</select></td>';
 
-			// Presidency
-			$table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
-			if($eqpresidency == 1) { $table_data .= '<option value=0>0</option><option value=1 selected="selected">1</option>'; }
-			else { $table_data .= '<option value=0 selected="selected">0</option><option value=1>1</option>'; }
-			$table_data.='</select></td>';
-
 			// End of ROW
 			$table_data .= "</tr>\n";
 			$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -4284,10 +4273,6 @@ class tc
 		$table_data.= '<td align=center><select name="eqpres['.$id.'][secretary]">';
 		$table_data.= '<option value=0>0</option><option value=1>1</option>';
 		$table_data.='</select></td>';
-		// Presidency
-		$table_data.= '<td align=center><select name="eqpres['.$id.'][eqpresidency]">';
-		$table_data.= '<option value=0>0</option><option value=1>1</option>';
-		$table_data.='</select></td>';
 		// End of ROW
 		$table_data .= "</tr>\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`)
-- 
2.34.1