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

371 Commits

Author SHA1 Message Date
dennis
ce35d4ccee Changes by Dennis. Required to provide for a clean install on Windows server ISPs (also my Windows xp workstation with PHP and mySQL). There should be NO changes to functionality. 2011-02-10 14:46: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
e9f46edb0e Added code for inviting users, access to it through the api 2010-11-23 20:58:38 +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
941b5e127f Quick correction on automatic e-mail 2010-10-12 18:00:17 +00:00
jacob
f0d1578ac3 Added generic "account" password recovery 2010-10-12 16:49:38 +00:00
james
e7222337f7 Fix a typo 2010-10-05 19:45:28 +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
4f42407073 migrate categories/divisions/subdivisions from FAIRYEAR to conferences_id 
rename API call /config to /config/variables
update API with /config members for divisions/subdivisions/categories
 2010-10-05 19:43:30 +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
70d359c15b PHP 5.3 DEPRECATED split() so, convert all split()'s to explode()'s 2010-09-10 19:38:56 +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
james
b3ce18ca0c Fix one small issue with db update 204 
Allow logging in if the user isnt in the conference (just go to the user_account page for now, i guess eventually it'll need to go to a "register for the conference" page
Some fixes and updates to the menu/navigation, still not perfect, btu getting there
 2010-07-21 15:14:32 +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
jacob
82bdfdbd10 Fixes for issue with record id's 2010-07-14 18:30:04 +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
jacob
6eab783fb6 Fixed an omission in the script - user ID's were not being updated in the users table to point to the appropriate record in the accounts table 2010-07-13 20:07:06 +00:00
jacob
a1455b30b6 Three small fixes: 
1) Needed to include deleted records that were getting omitted
2) typo in debug output
3) "users" records with a year of 0 get deleted after the corresponding "accounts" record is created
 2010-07-13 17:01:50 +00:00
james
282c2599ce Put update 196 back in after dave somehow removed it?! 2010-07-13 13:40:44 +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
8d1c6e1cd4 Add an option to bypass the actual db version update write to the 
database, so for testing the same update can be applied over and over
without needing to update the db.
 2010-07-13 03:30:14 +00:00
dave
56987c174a update db version 2010-07-13 03:30:10 +00:00
dave
f5618851dd Remvoe old db update 2010-07-13 03:30:09 +00:00
dave
61a9d73835 Move db updates to 197 2010-07-13 03:30:07 +00:00
dave
801d2580be Add config/admin roles and conversion script 2010-07-13 03:30:06 +00:00
dave
2e17685fc2 More fields for hte account 2010-07-13 03:30:05 +00:00
dave
514c1f12b9 Move my 196 update to 198. Add conferences_id migration to users table 2010-07-13 03:30:04 +00:00
dave
68737a68b7 Move 196 upfdate to 198. I have a big 196 already committeed to my 
local tree, and james is working on 197.
 2010-07-13 03:30:02 +00:00
justin
7b90784828 add support to link to fair website 2010-07-11 14:46:44 +00:00
jacob
2aa8e3805a quick patch 2010-07-06 17:50:52 +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