arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,342 Commits 9 Branches 6 Tags 30 MiB
fc503f505c
Commit Graph

220 Commits

Author SHA1 Message Date
james
af47f30aeb Fix special award nominations to work with "-1" special award (i dont want to nomiiated for special awradsa) 2011-03-04 19:21:30 +00:00
james
cbfd66bb28 add numstudents API to the project object 
also add a unique constraint on the user_roles table (user_id,role_id)
 2011-03-04 01:05:15 +00:00
james
d0702e9dc1 Add participant_fields and participant_required_fields 2011-03-03 17:37:56 +00:00
james
0e45df5df8 Add page_text's for participant and teacher invite only 2011-03-02 06:41:14 +00:00
james
1bc55cf742 Add two missing emails (for teachers and participants) 2011-03-02 06:26:33 +00:00
jacob
2ec08b64d9 Adding additional student fields to the users table 
Added name confirmation to the api in api/user/displayname/get and pi/user/displayname/confirm
 2011-02-24 17:44:12 +00:00
jacob
6c0e0cb0ca Added emergency contact info as an array member of the user object. 
Updated register_participants_emergencycontact.php to link emergency contacts directly to the users, and allow multiple emergency contacts for a single user.
Added the users_id field to the emergencycontact table, allowing that direct link.
 2011-02-22 20:52:54 +00:00
jacob
3745d8cfd9 Added api functionality for creating and saving projects 2011-02-17 22:04:47 +00:00
jacob
dfb54ec9df Added date of birth, food requriements, t-shirt size and medical alert info to the users table as student fields 2011-02-16 19:08:58 +00:00
jacob
39f53e4168 Added teacher abillity to add/remove students 
Updated the user_save to output more meaningful errors
Updates on 'questions' and 'pagetext' tables to change the 0 conference ID to -1, matching the -1 year
 2010-11-29 22:54:12 +00:00
james
46b39f81e0 Add copyoriginal, copyparent, and notes(currently unused) to conferences table 
Add code in create conference and copy conference to set copyoriginal and copyparent
Add missing json_decode to API (we expect ALL arrays being POSTED to be json encoded)
 2010-11-25 20:45:44 +00:00
jacob
8f255f4eb8 Added an icon for conference management. Added fields in the config for teachers 2010-11-18 22:46:46 +00:00
jacob
e730a5ab05 Added the rollover for the fiscal year, and removed the rollover for the fair year 2010-11-18 16:38:12 +00:00
jacob
00f380483b Rewrote the installation script to deal with conferences 
Writing UI components to create conferences from within the user interface - still buggy
 2010-11-10 23:05:24 +00:00
jacob
a3b72f7aa3 Altering tables projectdivisions, projectsubdivisions, and projectcategories, changing their primary keys from (year, id) to (conferences_id, id) 2010-11-10 19:25:46 +00:00
jacob
769d5ee969 A quick fix. The award_awards_table had the conferences_id set to 0 where the year was -1. Modified it to match. 2010-11-05 17:48:19 +00:00
jacob
1c1a0673c3 Adding conferences_id to the last two tables that need it 2010-11-02 16:24:04 +00:00
jacob
21261a99af Many updates of queries, switching from usage of FAIRYEAR to conference_id. 2010-11-01 15:24:59 +00:00
jacob
b9bcb127a6 Updated these tables to include the conference id: 
award_awards
	award_prizes
	award_types
	award_awards_projectcategories
	award_awards_projectdivisions
	winners
	students
	projects
	registrations

Also modified all code that uses those tables to work with the conference id
instead of the year, with the exception of these files:
	communication.inc.php
	reports_students.inc.php
	rerollprizes.php
	remote.php
The "rerollprizes.php" probably doesn't matter, having been a one-time usage
file anyway.  The others will need to be modified in the future to correctly
use the conference id instead of the year.
 2010-10-20 21:58:26 +00:00
jacob
01d70abf74 Added teacher interface in olympics 
UI touch ups
 2010-10-14 17:51:56 +00:00
jacob
4a3ea7dba9 Changed the scienceolympic judge settings to a generic activity selection tab (replacing so_judge_other.php with activities.php) 
Altered use of schedule_users_availability_link.  It no longer distinguishes by role.
 2010-10-14 15:26:47 +00:00
james
e55a6f901a fix schedule display boxes to be the same for FF/IE/Chrome 
Add min/max judges/volunteers/teams
Add defaults
Update science olympic tab display
Add Teams/Volunteers/Judges status to admin schedule view
 2010-10-14 15:11:52 +00:00
jacob
8e4306ae3b Updated volunteer preferences to work with the new interface and with the new conference id system 2010-10-14 14:10:49 +00:00
jacob
9229b1665b Added user settings config for science olympic judges 2010-10-13 21:01:01 +00:00
jacob
f0d1578ac3 Added generic "account" password recovery 2010-10-12 16:49:38 +00:00
james
eb1012f7c5 Oops, also bump the DB version so it runs the new updates 2010-10-05 19:45:05 +00:00
james
64a0432c55 Add account registration and email address confirmation 2010-09-27 19:13:56 +00:00
james
bce4bdb2b2 Change "pageid" and "NAV_PAGE_ID" to "navident" and "NAV_IDENT" and add the field to the database 
Add schedule class details to "new" theme
 2010-09-23 21:09:04 +00:00
james
69234c1657 Update rolestasks to be conference-type specific 
Add a  'new' theme for TUAG to start implementing
 2010-08-20 17:40:11 +00:00
james
2c7e23b276 Fix some user/account bugs 
Start fixing the schoolstudents page (it now adds users, but it doesnt re-load them or edit htem or delete them)
 2010-07-27 19:06:36 +00:00
jacob
fa69916607 Adding conferences_id fields to judges tables. Will later drop the year fields 2010-07-15 21:18:36 +00:00
jacob
a403202786 Updates to work with new user system. Also updated the committees_link table fieldname to use "accounts_id" instead of "users_uid" and updated code accordingly. 2010-07-14 21:04:50 +00:00
dave
80537e75f2 Add a field so we can record email->username linkage 2010-07-14 18:57:00 +00:00
james
d5912ac1e8 Start un-breaking all the broken UI navigation 2010-07-13 21:23:39 +00:00
justin
45e1e79072 make showing the winners link optional 2010-07-13 20:18:50 +00:00
dave
1be2301844 Add an oid field to confrences so we know which conferences are the same 
year after year.. we should probably keep the "year" column there too..
it's easier to query that than querying the config variables to find all
the years taht the conference was active (needed for ceremony script and
report generation)
 2010-07-13 05:20:37 +00:00
dave
ccf1b9c453 Fix an update bug. The code needs to be run to set the conference ID 
before we can build a UNIQUE index on the conference id.
 2010-07-13 04:25:00 +00:00
dave
56987c174a update db version 2010-07-13 03:30:10 +00:00
justin
7b90784828 add support to link to fair website 2010-07-11 14:46:44 +00:00
jacob
887610f5e3 Added script for copying/converting user data into the new format, populating the accounts and user_roles table 
Modified user.inc and user_login to handle authentication on the new accounts table
 2010-07-06 15:32:26 +00:00
jacob
07f76fdac8 Addded a pendingemail field to the accounts table 2010-06-24 14:45:51 +00:00
jacob
1743beb14e Populating the roles table, add "superuser" field to the accounts table 2010-06-23 20:45:12 +00:00
jacob
55b5080575 Added new databases for user/role management 2010-06-23 19:45:33 +00:00
james
4faa4b8dc4 Migrate all dates to use conferences ONLY, instead of dual conference/FAIRYEAR setup 2010-06-23 16:06:01 +00:00
james
b7f3274543 Massive overhaul of the configuration variables 
- split into system variables and conference variables
- rely on conference_id instead of year
 2010-06-22 21:32:03 +00:00
jacob
964a855275 DB table for linking users to teams in events 2010-06-22 14:53:08 +00:00
james
6c4a54fe94 Create science fair conferences for all past years that the system knows about 
Also add a temporary year field to the conferences table, to make migration easier (easier to find a conference id for a given science fair year)
 2010-06-17 20:03:45 +00:00
james
56b5e8269a add defaults for min/max team size and number of teams to each event 
pull those defaults when creating a new scheduled event
show registered teams when viewing an event as an admin
 2010-06-17 15:06:11 +00:00
jacob
f1a43a9cec DB updates that I forgot to include with my last commit 2010-06-17 14:02:30 +00:00
jacob
7e749f0295 Added conferences_id to the so_teams table and updated corresponding code accordingly 
Partially implemented student manager under school dashboard for science olypmics
 2010-06-16 15:16:25 +00:00