From 7509f5f7c19620b7e6c8902fa1345ce2557da722 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 7 Jun 2005 20:30:38 +0000 Subject: [PATCH] hmm there was a duplicate of all the config options for some reason in the full.7 - remove those dups! also add the provinces to full/update 7 --- db/db.full.7.sql | 36 ++++++++++++++---------------------- db/db.update.7.sql | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/db/db.full.7.sql b/db/db.full.7.sql index 8e21143..117bf38 100644 --- a/db/db.full.7.sql +++ b/db/db.full.7.sql @@ -733,28 +733,6 @@ CREATE TABLE `winners` ( UNIQUE KEY `awards_prizes_id` (`awards_prizes_id`,`projects_id`,`year`) ) TYPE=MyISAM; -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('fairname', '', 'Name of the fair', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('default_language', 'en', 'The default language if no language has yet been specified', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('minstudentsperproject', '1', 'The minimum number of students that can work on a project (usually 1)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxstudentsperproject', '2', 'The maximum number of students that can work on a project (Usually 2)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('mingrade', '7', 'The minimum school grade that can enter a project', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxgrade', '12', 'The maximum school grade that can enter a project', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('minage', '10', 'The minimum age of the students', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxage', '21', 'The maximum age of the students', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxmentorsperproject', '5', 'The maximum number of mentors that can help with a project', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('minmentorsperproject', '0', 'The minimum number of mentors that can help with a project (usually 0)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('usedivisionselector', 'yes', 'Specify whether to use the division selector flowchart questions to help decide on the division (yes/no)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('minjudgeage', '21', 'The minimum age that a person must be in order to be a judge.', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxjudgeage', '100', 'The maximum age that a person can be in order to be a judge', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('participant_student_foodreq', 'yes', 'Ask for students special food requirements (yes/no). Should be yes if you plan on providing lunch', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('regfee', '', 'Registration Fee', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('regfee_per', 'student', 'Registration fee is per student, or per project? (student/project)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('project_num_format', 'CDN', 'C=Category, D=Divison, N=2 digit Number', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('committee_publiclayout', ' nametitleemail', 'The layout (html table row) used to display the committee members on the public committee page', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('judges_password_expiry_days', '365', 'Judges passwords expire and they are forced to choose a new one after this many days. (0 for no expiry)', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('maxspecialawardsperproject', '7', 'The maximum number of self-nominated special awards a project can sign-up for', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('specialawardnomination', 'date', 'Self nominations for special awards are due either with registration or on a specific date. (date|registration). If "date" is used, it must be configured under "Important Dates" section.', -1); -INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('fairmanageremail', '', 'The email address of the ''fair manager''. Any important emails etc generated by the system will be sent here', -1); INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('fairname', '', 'Name of the fair', -1); INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('default_language', 'en', 'The default language if no language has yet been specified', -1); INSERT INTO `config` (`var`, `val`, `description`, `year`) VALUES ('minstudentsperproject', '1', 'The minimum number of students that can work on a project (usually 1)', -1); @@ -789,3 +767,17 @@ INSERT INTO `dates` (`date`, `name`, `description`, `year`) VALUES ('', 'specawa INSERT INTO `languages` (`lang`, `langname`, `active`) VALUES ('en', 'English', 'Y'); INSERT INTO `languages` (`lang`, `langname`, `active`) VALUES ('fr', 'Français', 'Y'); + +INSERT INTO `provinces` (`code`, `province`) VALUES ('AB', 'Alberta'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('BC', 'British Columbia'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('MB', 'Manitoba'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NB', 'New Brunswick'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NF', 'Newfoundland and Labrador'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NT', 'Northwest Territories'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NS', 'Nova Scotia'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NU', 'Nunavut'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('ON', 'Ontario'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('PE', 'Prince Edward Island'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('QC', 'Québec'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('SK', 'Saskatchewan'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('YK', 'Yukon Territory'); diff --git a/db/db.update.7.sql b/db/db.update.7.sql index df827f3..2e56898 100644 --- a/db/db.update.7.sql +++ b/db/db.update.7.sql @@ -31,3 +31,17 @@ INSERT INTO `dates` (`date`, `name`, `description`, `year`) VALUES ('', 'specawa INSERT INTO `dates` (`date`, `name`, `description`, `year`) VALUES ('', 'specawardregclose', 'Special Awards self-nomination closes', -1); INSERT INTO `languages` (`lang`, `langname`, `active`) VALUES ('en', 'English', 'Y'); INSERT INTO `languages` (`lang`, `langname`, `active`) VALUES ('fr', 'Français', 'Y'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('AB', 'Alberta'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('BC', 'British Columbia'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('MB', 'Manitoba'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NB', 'New Brunswick'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NF', 'Newfoundland and Labrador'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NT', 'Northwest Territories'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NS', 'Nova Scotia'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('NU', 'Nunavut'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('ON', 'Ontario'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('PE', 'Prince Edward Island'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('QC', 'Québec'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('SK', 'Saskatchewan'); +INSERT INTO `provinces` (`code`, `province`) VALUES ('YK', 'Yukon Territory'); +