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

1774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
james
c53e9611e5 Fix for adding users that have been deleted.... i think. 2011-01-19 19:46:48 +00:00
james
f47f2c4ceb prepare version 2.3.0 2011-01-17 18:34:42 +00:00
james
c048e33f6a Fix access codes for schools 2011-01-05 21:05:31 +00:00
james
54a5cc8da4 Add school access code to email replacement tags 2011-01-05 20:35:31 +00:00
james
e6cd95ebfc Fix science head and principal queries in branch 2011-01-05 20:25:14 +00:00
james
afc836e214 Add the 16 char username truncate fix to the update script too 2011-01-03 17:17:18 +00:00
james
79513c6d29 Add a fix for new MySQL 5.1 where it doesnt truncate at 16 characters before comparing, so all our long usernames were failing (mysql internally only supports 16 characters) 2010-12-30 13:56:50 +00:00
james
c1afa5f00f Start with all the divisions set to "novice", this way, they dont specifically need to put something in every row, they only need to change the ones that they know. 2010-12-16 16:49:41 +00:00
james
c098354179 Add the warnings back in! eeek! 2010-11-22 19:00:41 +00:00
james
d0d9fe4d60 Add ability to see WHO the recipients of a communication will be 2010-11-22 18:40:50 +00:00
james
4f388734a9 Add special award subset of sponsors that can be contacted 2010-11-22 18:14:03 +00:00
james
6e955082e9 Re-Add some report fields that were added in 2077 (after the 2072 branch) 2010-11-19 15:34:23 +00:00
jacob
2c9baf185a Added code for a fiscal year rollover, as well as an icon for linking to it. 2010-11-17 22:53:40 +00:00
james
65ecdcac05 Add branch for 2.3 starting at trunk 2072 
We'll probably use this for 2011 fairyear and will have to svnswitch every sfiab install to this branch.
ONLY BUGFIXES TO THIS BRANCH and ALL COMMITS should go to TRUNK as well
 2010-11-17 19:21:46 +00:00
dave
b957a965c9 Add position field. 
James: I havne't tested this, Don't have any sponsors in my local DB, if
you could run a test on it that'd be great :)
 2010-05-07 07:29:28 +00:00
dave
250b717db6 Add salutation, switch to optiongroups. 2010-05-07 07:10:11 +00:00
dave
05be59f62b Delete JPG images too. 2010-05-06 17:13:56 +00:00
dave
2a93723a45 On second thought, move the award delete and award prize delete into a 
separate file, since they're used in two places (by the downloader and
by the editor).   Update the award and prize delete routine to also
delete the winner linkage.
 2010-04-22 05:09:50 +00:00
dave
a809f80087 Also delete the division and category linkage 2010-04-22 05:09:48 +00:00
dave
c3fe929796 THe ID of the award to delete is the key, not the value (which is always 
'true').
 2010-04-22 04:39:27 +00:00
dave
c91e488940 typo 2010-04-21 07:05:00 +00:00
dave
aa314974c1 Switch to the "All Eligible" list by default if there are no 
nominations.
 2010-04-19 06:07:52 +00:00
dave
9388c571ae Send IDs for divs/cats as part of the array data, not just as the index. 2010-04-18 22:41:28 +00:00
dave
e791a7c1d4 Typo 2010-04-18 22:41:27 +00:00
dave
ec5327f7ac Put back in email sending for new registraitons 2010-04-18 22:41:25 +00:00
dave
6fa1c6d266 Only download awards from the specified year 2010-04-18 22:41:24 +00:00
dave
6242b9ef5e Handle multiple awards in the winner postback 2010-04-18 22:41:23 +00:00
dave
f0515a93bd Fix uploading to STO: Make YSC targets use the same upload screen, but 
disable division selection.  Count the number of winners on the main
upload page and disable the send button if there are 0 winners.  (also
helps the user know which awards need uploading).
 2010-04-18 22:40:10 +00:00
dave
8a5436a3b2 Put the award upload on one page. Make the default mappings a modal 
dialog (so it's not ALWAYS on the screen).  Implement "upload all" for
SFIAB targets.
 2010-04-18 22:40:08 +00:00
dave
530788e1c5 Require that magic_quotes is OFF. 2010-04-18 22:40:07 +00:00
dave
5e9ee05606 Apache/PHP seems to let us turn off magic quotes in the .htaccess. Yay. 
magic quotes DEPRECATED as of PHP 5.3.0, REMOVE as of 6.0, on by
default for any PHP < 5.3.0.  Pain in the ASS.  php is running the
urldecode for us,  seeing that the string has quotes, then adding quotes before we
can json_decode().   It only does this in POST and GET
 2010-04-18 22:40:05 +00:00
dave
a5a431605a Support Multiple uploads for SFIAB targets 2010-04-18 22:39:55 +00:00
dave
14df5adc39 Remove debug line 2010-04-16 09:46:03 +00:00
dave
29db8ac071 Make the roll() function able to determine all fields to roll, and 
properly handle fields that could be NULL.  Use the roll() to roll
awards and prizes, both had potential NULL fields that were rolling to
'0', causing downloaded awards/prizes to be unrecognized after rollover.

This also means we can add fields and rollover will continue to work properly.
 2010-04-16 09:43:26 +00:00
justin
afc353bdb9 age category options should work properly again now 2010-04-14 14:59:17 +00:00
justin
a890fa299d resolve minor award ceremony script issues 398, 373, 397, 371 2010-04-14 14:26:11 +00:00
justin
8b4dfb23c5 modify to only show awards actually given out 2010-04-14 14:10:47 +00:00
jacob
f6a68bc53a Undoing a minor change on div size 2010-04-13 20:38:24 +00:00
jacob
d6fa48f85a Reverting some changes that I inadvertently committed. 2010-04-13 20:33:27 +00:00
jacob
0cd172c48b Modified the info pop-up for judges in the team members editing form. The info now comes 
up in a compact div within the page rather than a separate window.  When the info div is
clicked on, the user editor opens up that user.
 2010-04-13 20:11:15 +00:00
james
21bb3ec994 Add communication query for "CWSF Students for this year" so its easy to send an email to all the CWSF winners 2010-04-13 15:00:03 +00:00
dave
072e07a06f Add optgroup headers and shuffle some fields around for student reports 2010-04-12 00:23:21 +00:00
dave
3597f83ee9 Updates to the exhibit hall annealer (still no front end so no one can use it ) 2010-04-12 00:08:28 +00:00
dave
536fec616f Add a school principal field. 2010-04-12 00:07:33 +00:00
justin
cbbb0ebca0 When setting a score to zero, really make it null. 2010-04-10 17:03:29 +00:00
justin
384efa3363 need to do same fix in score entry, moved name extractor to common file 2010-04-10 16:51:43 +00:00
justin
876899d17f fix names list to use new judging team code 2010-04-10 16:03:24 +00:00
dave
37ae79c363 Add an option to group divisional results by prize so all the HMs are first, then bronze, etc. (based on the order of the prizes of the first divsional award encountered). 
Won't work quite right if the first divsional award doesn't have any winners for a prize.wq
 2010-04-10 07:09:07 +00:00
dave
02244937d2 Don't do a newpage for empty awards if we're not showing them. Move the pronunciation key to a new line so it doesn't overlap the school. 2010-04-10 03:56:53 +00:00
dave
8c83a9a755 Handle > 2 students on a project. Print schools for all students in the formatted report. 2010-04-10 03:45:03 +00:00