arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,109 Commits 10 Branches 6 Tags 31 MiB
0ff766175b
Commit Graph

365 Commits

Author SHA1 Message Date
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
4f65058f59 Migrate config options theme and theme_icons from Global(FAIRYEAR) to Special(no fair year associated) 2010-06-17 20:56:03 +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
e1ef58f988 Oops fix my missing semicolon now 2010-06-17 15:14:36 +00:00
jacob
13bc1b3d9a D'OH 2010-06-17 15:11:59 +00:00
jacob
970ac57f21 syntax error in the earlier version 2010-06-17 15:11:04 +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
james
e5d9460d73 Add schedule view for school access, allow schools to register teams for events 2010-06-15 21:43:21 +00:00
james
1fa7139482 Add a title field and default it to the event name (lets them do things like "Compound Boggle #1" and "Compound Boggle #2" 
Add max team capacity editor and numbers to display
 2010-06-14 20:37:31 +00:00
jacob
c9ebee5c10 Forgot to update the code version on my last commit 2010-06-14 19:44:49 +00:00
jacob
f090e957c6 Modified events table to filter properly by event and handle URLs properly 
Slight change in tableeditor to allow it to properly filter a value of zero (not treating it as null)
 2010-06-14 19:43:10 +00:00
james
e98ec8751b add event types 
schedule shows event types in different colours
add tabs to schedule editor windor for each event type
forward port ENUM changes to tableeditor
fix bug in emit_minute_selector
 2010-06-14 19:25:49 +00:00
jacob
f116d9c5fc Added team management for SOIAB. Minor typo correction in conferences.php 2010-06-14 18:30:39 +00:00
james
76f1a79fe7 Oops, remove teh database name from the db update on create table 2010-06-11 20:27:53 +00:00
jacob
7d38b43cfc school management partially updated 2010-06-10 22:10:20 +00:00
jacob
5b7f7dca00 add specific character encoding 2010-06-10 20:37:49 +00:00
james
56ce08201a Add schedule database 2010-06-10 20:37:11 +00:00
jacob
4b95aebe8f Added an event editor 2010-06-10 19:50:49 +00:00
jacob
e0efe11f03 Added a command at the end to switch the character encoding for the entire database 2010-06-10 19:09:00 +00:00
james
0938342569 Always create new tables with UTF8 2010-06-10 18:36:10 +00:00
jacob
558a724e0e correcting field name 2010-06-10 18:25:26 +00:00
jacob
dab613b746 Added locations table and editor 2010-06-10 18:09:16 +00:00
james
fa56770b8a Recommit 175 FULL due to missing 174 php 2010-06-09 16:51:49 +00:00
dave
6049ce9edb Missing file, that's why it wasn't converting properly 2010-06-09 16:45:51 +00:00
james
4c9692682a added a line for catching "set" field type in the character set update 
created a full database dump in UTF-8 encoding for installer
 2010-06-09 15:41:50 +00:00
james
d5ed8a1fc4 Modified version of update 173 to handle special windows characters 2010-06-09 15:11:14 +00:00
dave
0567451a58 Implement fair name/logo as fields in a report instead of special 
options.  This way, the logo/fairname can be moved around and
resized.   Ensure those fields exist in each report.  Convert name/logo
preferences in all existing reports, and adjust the yloc/height of
existing fields to make way for the headers if they exist.
 2010-06-09 07:43:59 +00:00
jacob
a2239d84da Modifications to fix db update problems 2010-06-08 20:31:52 +00:00
dave
ce1d289a31 Convert labels to new format and millimeters. Drop now-unused columns 
"face" and "lines".
 2010-06-08 18:49:21 +00:00
jacob
6504d09886 Added updates for converting from Latin1 to utf8 character encoding 2010-06-04 20:23:59 +00:00
james
36024b63ca Sneak in one more update to 172 2010-06-03 19:29:31 +00:00
james
14308b5991 Start of adding 'conferences' and ability to switch between running conferences 2010-06-03 19:21:27 +00:00
james
8d6d653567 Add a new date 'judge schedule available' to specify when judge assignments and schedules become available to judges. When the chief judge is playing with the scheduler he doesnt want to have judges thinkign they are assigned to their final teams/projects/timeslots, so only make them available to judges after this date has passed. 
The default (as always) maintains old behaviour, so if this date is not explicitly set, it'll always show the schedule
 2010-04-06 14:29:50 +00:00
james
2f38386967 set enable_stats to 'no' for YSO 2010-03-30 17:03:58 +00:00
dave
a821cd3e3c typo 2010-03-25 04:36:47 +00:00
dave
8ee1f36f90 TCPDF support library and label generation code that uses TCPDF. All 
other stuff still works, this only adds on.  And on second thought, I
should probably disable the report type that would let someone use this.
 2010-03-25 04:27:33 +00:00
dave
217ce8e175 And finally, update the db, which resyncs my git to svn HEAD. :) 2010-03-02 22:55:51 +00:00
dave
af96e75f25 And finally the db file 2010-03-02 22:50:52 +00:00
dave
e9398f4895 UPdate code version 2010-03-02 22:50:51 +00:00
james
471b358f2f Aparently some emails use "webmaster@sfiab.ca" -- wipe that out as well to force them to set a proper from address or use the fair manager's email 2010-03-02 20:18:39 +00:00
dave
89547f902a Some fairs did a rollvoer before the NULL was fixed (I think it was 
fixed), and reset some award sources to 0 instead of NULL.
award_source_fairs_id can never be 0 anyway (unless someone edits the DB
manually), so just set them back to NULL so the existing code works.
 2010-02-22 18:45:57 +00:00
dave
15c9c5619a Database table for computing floor locations 2010-02-22 18:45:55 +00:00
james
74905273cc If anyones emails are still set to come from 'website@sfiab.ca' wipe that out, which will force it to default to the fair manager's email address when sending - we dont want anything coming from that address! 2010-02-18 16:13:36 +00:00
james
9499418eea Remove config->external award sources from CONFIG 
Remove award_sources table from database
Rename STO->YSO and YSF->YSC
 2010-02-12 16:48:45 +00:00
james
d8375c0c5f Add ability to cancel emails in the queue to be sent 2010-02-11 15:58:26 +00:00
james
5dcbc28d54 Fix email sending to not fail if a single email fails, instead, flag it as failed and continue on 
Better track email sending as well, and add fields for tracking bounces (not implemented yet)
 2010-02-10 17:05:49 +00:00
dave
faa3742bda Support Highest, High, Indiffernt (short and long), and expertise 5,4,3 
(short and long) all with the same two functions.
 2010-02-04 17:55:07 +00:00
james
fd4e72e1f4 Fix judge invite only text on user_new to actually show up 2010-02-03 00:30:24 +00:00
dave
5c8bbe16b6 Remove the typepref selection, it turned into 
users_judge.special_award_only.
 2010-02-02 17:48:59 +00:00
dave
7d611e531f Add a 'per_fair' option to the awards, so an award can be treated as a 
separate award for each feeder fair, allowing the maximum prize
assignments from each fair.
 2010-01-27 20:24:17 +00:00
james
522ea8206d Change projects.projectdivisions_id and project.projectcategories_id from TINYINT to INT so they match what is allowed in the division and category configuration 2010-01-22 04:03:02 +00:00
james
684a7962f2 Set the database charset in the UPDATE script so the conversions will actually work - that only took 8 hours to figure out! 2009-12-03 20:55:16 +00:00
james
e51b7fc1b2 Move the email table updates to the PHP file, we need to fetch data, convert db, then update data 2009-12-03 19:52:59 +00:00
james
cb9e783071 Oops name the function properly 2009-12-03 19:43:18 +00:00
james
fde1debf6d COnversion script to convert all emails to UTF8, but still display properly on the site by back-encoding them to ISO-8859-1 (until such a time that we can switch the entire system to UTF8) 2009-12-03 19:41:25 +00:00
james
99114c7242 Completely convert the old communication module over to the new system... (almost). 
TODO: switch the "send" to the new dialog-style preview and confirmation, instead of the old one, but at least it works!
 2009-12-02 22:17:20 +00:00
james
838f61a948 Working email sending from fundraising module, and implement new emailqueue system. None of the existing emails are migrated to the new system yet, and both old and new work in parallel until we can finish migration 2009-12-01 22:02:03 +00:00
james
d954d148d6 Add all the missing judge registration fields, and let them be configurable. 
Notify user if invalid regexp's are entered in fields (there was no feedback as to why it wasnt saving!)
Also make the space in the postalcode optional

FIXME: still need to change the "incomplete" to "complete" message once everything is saved properly, it stays as incomplete right now until they navigate away and come back.
 2009-11-26 17:50:00 +00:00
james
471d0f7d78 Fix broken 151 db update 2009-11-13 21:25:40 +00:00
dave
f67b485d6d - Separate the icons out of the colour themes 
- Detect the theme directories and use dropdown boxes to select the theme and theme_icons, so no one can type in random stuff and screw their sfiab.
- Add 2 missing icons.
 2009-11-06 22:10:06 +00:00
james
e58ce49aed - These are fair-specific now, dont' need them as config options. 2009-11-06 02:11:58 +00:00
james
6e04220d36 Only foreach if something exists 2009-11-02 18:45:22 +00:00
james
2f670becf6 Of course, we cant re-use the old one, due to function name collisions, DUH! what the hell was i thinking, i just went through this. 2009-10-22 20:46:12 +00:00
james
101c3c7723 Check if they are alreayd a parent and dont re-add if they are 
Also fix levengshtein distances for mere and pere with UTF8
 2009-10-22 20:31:52 +00:00
james
f165f39870 Add a 149 update script to convert emergency contacts to parents 
And update the 146 user inc so we can just use that instead of having to make another new one
 2009-10-22 19:54:53 +00:00
james
e33c39a011 Add a FULL DB 148 version, so we dont need to upgrade from 52 everytime anymore! 2009-10-22 17:00:07 +00:00
james
c9db2c0f83 Update 131 update to properly create the sponsorship logs and award donations for past years 
Update the search results to LEFT JOIN the user, instead of JOINING
Add some missing i18n's and fix some typos
 2009-10-22 16:46:32 +00:00
james
a7041ea154 Switch 129 update to use the new db129 functions 
Copy over the 146 user inc and rename all its functions
Switch the 146 update to use the new db146 functions
 2009-10-22 16:20:17 +00:00
james
ed863286cd Fix 129 update user inc to avoid collisions in functions names 2009-10-22 16:14:29 +00:00
james
233ee6ca95 add the copied file 2009-10-20 20:42:05 +00:00
james
3bc56cb67a Include the appropriate version of user.inc 2009-10-20 20:41:39 +00:00
james
e23149dccc HOpefully fix the 118 update to convert sponsor_contacts to users_sponsor 2009-10-20 19:40:55 +00:00
james
ac3f5f9eb4 Add todo list for receipts and database to track receipts 2009-10-20 19:09:54 +00:00
dave
f73215fede - Enable maxyear user filtering. unfortunately it needs to be specified 
manually (done this way because i don't want to start integrating changes
  with the report system right now.)
 2009-10-16 18:39:39 +00:00
dave
7c6e52c8ef update the db code version too 2009-10-16 17:18:10 +00:00
dave
4efb335654 - Add a report for fundraising mail labels 
- Add the ability to specify a filter when calling for a report generation
  (e.g., so we can dynamically filter a report for a specific fundraising
  campaign)
 2009-10-16 17:17:45 +00:00
james
2eea87c350 Fix broken db update 2009-10-14 20:34:13 +00:00
james
027c03b297 - commit all outstanding changes 2009-10-14 19:53:09 +00:00
james
5486317f53 Add missing update 146 php file 2009-10-11 19:49:21 +00:00
james
bdf2ea7577 Donations tab for campaigns 2009-10-11 19:49:04 +00:00
james
663420b078 All of tonights wackload of changes 2009-10-11 03:32:14 +00:00
james
ff9d802b6e Database updates 2009-10-08 19:20:07 +00:00
jacob
a4d4cc11cc Updated fundraising_campaigns table to use "fundraising_goal" field instead of "fundraising_goal_id" 2009-10-06 20:49:37 +00:00
james
cf2affcc03 Update default fundraising goals, and insert defaults if none exist 2009-10-06 19:04:45 +00:00
james
9bb5465ac2 Oops commit the db files too 2009-10-02 17:24:53 +00:00
james
01fde584be Do a lot of database re-working, renaming and reorganization 
Database now refers to everything by donor/donation .. and apparently just as i complete this, carolyn has decided to go to both donor/sponsor instead of just donor.. ugh..
 2009-10-02 16:46:13 +00:00
james
15cf8e1401 Oops remove the database name from the query 2009-10-01 17:02:07 +00:00
james
3974636d1c DB update for donors add new fundraising main page 2009-10-01 16:52:36 +00:00
dave
21882281c0 - do it properly 2009-09-27 08:43:36 +00:00
dave
67bb3eed85 - Sneak in the report change for the last db change too 2009-09-27 08:40:35 +00:00
dave
e4c632a380 - Sneak a change into the db update, misnamed field 2009-09-27 08:25:22 +00:00
dave
9b1ea927e6 - Delete sponsor_confirmed entries from reports (it's in one system report), 
that field doesn't exist anymore.
 2009-09-27 02:55:08 +00:00
dave
0f31f72f07 - Add two more fields: 
- additional_materials: if there are additional materials required if a fair assigns a winner to this award.
	- register_winners: to tell the feeder fair that this award is for winners who will participate at the upstream fair
 2009-09-25 04:29:41 +00:00
dave
97c489646e - Turn the uploader into a popup window 
- Add the ability to select category/division mappings specific for each upstream server
- Add some auto-determining code if the cat/div mappings don't exist
 2009-09-23 05:53:33 +00:00
dave
5ec38a7314 - Server-side award uploading. Tag registrations, proejcts, and students with 
a fair_id.  This is ignored for regular operation, but now needed to have
  multiple students from multiple feeder fairs attached to the same award. (so
  we know which ones to delete when we update the winners)
 2009-09-21 07:20:49 +00:00
dave
9e348d9b0c - For the first time probably ever, DELETE a config variable :O 
- Rename the user/pass for fair type=ysc so it's more familiar (asks for YSC ID and pass)
- Convert cwsfregister to use the fair entry data.
 2009-09-19 06:53:49 +00:00
dave
ed04710018 - Rename YSF to YSC 
- Add the help websites we lost somewhere for STO and YSC
- Copy the $config ysf login data into the fairs data
 2009-09-19 06:12:48 +00:00