X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=sql%2Ftc.sql;h=5d2ba996d4f5a906bebc539c952486baaca88275;hb=c2126b4823045fd8915a51c9f0f38ca103a15731;hp=8cbfdb2ea954cf0eedcb6b7c3d04730dbc5a0ab5;hpb=e72d7ba6537f5e438dedd252ae8cd0b0f0ec08d8;p=eq%2F.git

diff --git a/sql/tc.sql b/sql/tc.sql
index 8cbfdb2..5d2ba99 100644
--- a/sql/tc.sql
+++ b/sql/tc.sql
@@ -11,19 +11,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `phpgroupware` /*!40100 DEFAULT CHARACT
 
 USE `phpgroupware`;
 
---
--- Table structure for table `tc_aaronic`
---
-CREATE TABLE `tc_aaronic` (
-  `aaronic` int(16) unsigned NOT NULL auto_increment,
-  `name` varchar(60) default NULL,
-  `phone` varchar(12) default NULL,
-  `email` varchar(120) default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`aaronic`)
-) ENGINE=MyISAM AUTO_INCREMENT=92 DEFAULT CHARSET=latin1;
-
-
 --
 -- Table structure for table `tc_activity`
 --
@@ -92,19 +79,6 @@ CREATE TABLE `tc_calling` (
   KEY `indiv_id` (`indiv_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
---
--- Table structure for table `tc_child`
---
-CREATE TABLE `tc_child` (
-  `child` int(16) unsigned NOT NULL auto_increment,
-  `family` int(16) unsigned default NULL,
-  `name` varchar(30) default NULL,
-  `birthday` date default NULL,
-  `indiv_id` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`child`)
-) ENGINE=MyISAM AUTO_INCREMENT=260 DEFAULT CHARSET=latin1;
-
 --
 -- Table structure for table `tc_companionship`
 --
@@ -112,7 +86,6 @@ CREATE TABLE `tc_child` (
 CREATE TABLE `tc_companionship` (
   `companionship` int(16) unsigned NOT NULL default '0',
   `indiv` int(16) unsigned NOT NULL default '0',
-  `aaronic` int(16) unsigned NOT NULL default '0',
   `district` int(16) unsigned default NULL,
   `valid` tinyint(1) default NULL,
   KEY `companionship` (`companionship`)
@@ -136,10 +109,13 @@ CREATE TABLE `tc_indiv` (
   `indiv` int(16) unsigned NOT NULL auto_increment,
   `indiv_id` int(16) unsigned NOT NULL,
   `name` varchar(60) default NULL,
+  `address` varchar(255) default NULL,
   `phone` varchar(12) default NULL,
   `email` varchar(120) default NULL,
+  `family` int(16) unsigned default NULL,
+  `hh_position` enum('Head of Household','Spouse','Other') DEFAULT 'Other',
   `priesthood` enum('High Priest','Elder','Priest','Teacher','Deacon','Unordained') DEFAULT NULL,
-  `prospective` enum('y','n') DEFAULT 'n',
+  `steward` enum('High Priest','Elder') DEFAULT NULL,
   `ppi_pri` int(10) unsigned NOT NULL default '1',
   `ppi_notes` varchar(128) default NULL,
   `int_pri` int(10) unsigned default '1',
@@ -165,21 +141,6 @@ CREATE TABLE `tc_family` (
   PRIMARY KEY  (`family`)
 ) ENGINE=MyISAM AUTO_INCREMENT=277 DEFAULT CHARSET=latin1;
 
---
--- Table structure for table `tc_parent`
---
-CREATE TABLE `tc_parent` (
-  `parent` int(16) unsigned NOT NULL auto_increment,
-  `family` int(16) unsigned default NULL,
-  `name` varchar(30) default NULL,
-  `birthday` date default NULL,
-  `phone` varchar(12) default NULL,
-  `address` varchar(255) default NULL,
-  `indiv_id` int(16) unsigned default NULL,
-  `valid` tinyint(1) default NULL,
-  PRIMARY KEY  (`parent`)
-) ENGINE=MyISAM AUTO_INCREMENT=396 DEFAULT CHARSET=latin1;
-
 --
 -- Table structure for table `tc_participation`
 --
@@ -196,7 +157,6 @@ CREATE TABLE `tc_interview` (
   `interview` int(16) unsigned NOT NULL auto_increment,
   `interviewer` int(16) unsigned default NULL,
   `indiv` int(16) unsigned default NULL,
-  `aaronic` int(16) unsigned NOT NULL default '0',
   `date` date default NULL,
   `notes` text,
   `interview_type` enum('hti','ppi') NOT NULL DEFAULT 'hti',
@@ -216,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`)