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

1047 Commits

Author SHA1 Message Date
jacob
e4d94ffca2 Updated the communication queries in communication.inc.php to use the conferences system rather than fair years. 2010-11-01 21:23:17 +00:00
jacob
5e0886c812 Minor correction 2010-11-01 17:21:58 +00:00
jacob
ca0e700952 More conversions from fair year to conference id 2010-11-01 17:14:42 +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
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
f0d1578ac3 Added generic "account" password recovery 2010-10-12 16:49:38 +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
8282ceaf96 need tbody for tablesorter 2010-09-23 17:21:47 +00:00
james
2292af3206 Use div_prefs and cat_prefs (make the scheduler work again) 
Give higher preference to not having leftover judges
Treat 'indifferent' cat_prefs as cost=0 even though its a 2 (on the 0-4 scale)
 2010-09-22 18:28:51 +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
dfb6112e66 Split committee management out 2010-09-03 16:59:05 +00:00
james
d871810065 fix alignment of the top table 2010-07-21 20:19:48 +00:00
james
9e3473dd33 Add another missing <tbody> ... </tbody> 2010-07-21 20:17:59 +00:00
james
71074eaf24 Get rid of the old (not used anymore) taskNav function 
Add some missing <tbody> tags so the tablesorter doesnt choke (every table with class=tableview MUST have a <tbody> element, even if there are no <tr>'s inside the body
 2010-07-21 20:14:05 +00:00
jacob
5cd3f22088 migration to new user system 2010-07-15 20:28:35 +00:00
jacob
bffcf724d8 Udated user_list to work with new account system 2010-07-15 20:00:10 +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
jacob
004c9b64d2 Partially modified to work with new user account system 2010-07-14 20:26:07 +00:00
justin
8a16a90c0e place pronunciation on one line in the default script (issue 372) 2010-07-13 19:46:51 +00:00
justin
f3403c901c fix some syntax errors, that should be the last of them 2010-07-13 14:39:47 +00:00
dave
4d8e359049 Fix award ceremony script. 2010-07-13 05:20:38 +00:00
justin
6e464998b5 fix typo 2010-07-13 04:47:47 +00:00
dave
ad0468e4e1 Convert to new user_auth_required. Some report edits too that I don't 
feel like filtering out
 2010-07-13 03:30:17 +00:00
dave
54fd1cf19c More judge fields 2010-07-13 03:30:00 +00:00
justin
78f4bcb43a resetting prize form appropriately now (issue 411). Also fixed unreported issue preventing checkboxes in this form from being properly set. 2010-07-13 02:02:31 +00:00
justin
e69e6bc64e fix prize saving so the description is actually saved (issue 478) 2010-07-13 01:03:39 +00:00
justin
4a148a415f allow multiple awards to be marked as cwsf awards (issue 226) 2010-07-13 00:26:39 +00:00
justin
9ef983c671 change "Reports Editor" to "Report Management" (issue 366) 2010-07-12 23:23:52 +00:00
justin
30d01eeb74 eligibility editor now checks that no two divisional awards have overlapping eligibility criteria (issue 249) 2010-07-12 23:11:07 +00:00
justin
ac450aefdf Add ability to remove all current divisional awards when running this script (bug 233) 2010-07-12 19:47:29 +00:00
justin
8c12e443b0 enable deleting of fundraising campaigns under certain conditions 2010-07-12 19:02:49 +00:00
justin
54b258e793 remove # from every row 2010-07-11 18:18:56 +00:00
justin
b80a3e0772 add table for project languages. 2010-07-11 18:09:00 +00:00
justin
4cba8caa3c enter salutations using a textfield, not a dropdown. 2010-07-11 13:52:28 +00:00
justin
343f0f8acd fix spelling error 2010-07-11 02:27:00 +00:00
jacob
2563f8295e Fixes for bugs 418 and 412 
- when editing awards, the list now gets refreshed upon update
  - increased size of donors notes fields
 2010-07-09 21:54:06 +00:00
james
054c62dfa8 Couple small tweaks - science olympics event rename to science olympics activity, sort events by eventtype first 2010-06-17 19:31:50 +00:00
james
d45ababbbb Dont insert blank events into the schedule 2010-06-17 16:07:27 +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
james
bbf46aa47f Don't let admin remove scheduled events if they have teams registered 2010-06-16 17:09:42 +00:00
james
dd230b2cdf Show registered teams on admin schedule 
Move more stuff to common include
 2010-06-16 16:15:17 +00:00
james
3b0ad48451 Fix crumbtrails 2010-06-15 15:44:25 +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
76652861d4 Added conference filter to event location editor 2010-06-14 20:12:54 +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
james
bd7e107c0e Again :p 2010-06-14 16:58:58 +00:00
james
3b7d24c823 Adjust the schedule default start/end times 2010-06-14 16:58:33 +00:00
james
7e4a3af95d Put back int judges -- we'll need them for science olympics yet - but in a different capacity 2010-06-14 16:57:16 +00:00
james
23142cf01a Hide events that are not in the time frame defined by the schedule 2010-06-14 16:20:25 +00:00
james
49f127dbd1 Properly set the width of each event when its placed on the schedule based on the size of the table cell its going into, and re-place all the events on window.resize :) 2010-06-11 20:39:29 +00:00
james
d7be4a15dc Oops commit the missing file :) 2010-06-11 20:20:46 +00:00
james
a928b97396 Add a fixme to deleting events from the schedule to make sure we dont forget :) 2010-06-11 20:08:27 +00:00
james
badea469f6 Switch hour and minute in the editor to dropdowns 
Fix passing extra parameters to emit_hour_selector
Allow emit_minute_selector to work with different minute intervals
 2010-06-11 20:04:51 +00:00
james
4edd9baad3 Working schedule event editor for adding, editing and removing events from the schedule. 2010-06-11 19:36:50 +00:00
james
80fc39bf7f Implement start hour and end hour for schedule view 
Implement event duration height calculations
 2010-06-11 15:55:16 +00:00
jacob
44fd9bea1f Added function for saving submitted settings when science fair/olympic inclusion is chosen 2010-06-11 14:48:29 +00:00
jacob
7d38b43cfc school management partially updated 2010-06-10 22:10:20 +00:00
james
df3af58ffa Place already scheduled events on the schedule table, still doesnt do duration, messing with the stupid arrays now... gotta go 2010-06-10 20:35:02 +00:00
jacob
4b95aebe8f Added an event editor 2010-06-10 19:50:49 +00:00
james
6a24618359 Event scheduling start - shows times and locations and lets you click about in the table 2010-06-10 19:40:50 +00:00
james
78e311322c Set the record type and default sort 2010-06-10 18:45:38 +00:00
jacob
dab613b746 Added locations table and editor 2010-06-10 18:09:16 +00:00
james
6ab03749f5 Rework admin page for science olympics 
Add stubs for events & scheduling and event locations
 2010-06-09 20:40:04 +00:00
dave
cb51fef47d Name column consistently 2010-06-09 07:44:02 +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
dave
a46cb110ca Add logo and fairname to labels (still doesn't scale the contents of the 
label).
 2010-06-09 05:21:42 +00:00
dave
76e8f8c3e2 Convert everythign to millimeters 2010-06-09 05:21:40 +00:00
dave
8438c48e4b Remove lpdf setup routines 2010-06-09 05:21:35 +00:00
dave
180550f15e Fix load/save now that face and lines are gone. Change TCPDF report 
types to use the old types.
 2010-06-08 18:57:01 +00:00
dave
d67500fe1a Mostly working TCPDF conversion for both labels and reports 2010-06-08 18:49:20 +00:00
dave
1f1691167c Convert all width to millimeters 2010-06-08 18:49:14 +00:00
jacob
6504d09886 Added updates for converting from Latin1 to utf8 character encoding 2010-06-04 20:23:59 +00:00
justin
a586ad8e93 enhance reporting capabilities for judging score entry 2010-05-27 21:55:10 +00:00
dave
f7532e8ebc Add address to the primary contact in an awards report 2010-05-07 07:29:31 +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
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
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
a5a431605a Support Multiple uploads for SFIAB targets 2010-04-18 22:39:55 +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
jacob
f6a68bc53a Undoing a minor change on div size 2010-04-13 20:38:24 +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