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

1010 Commits

Author SHA1 Message Date
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
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
james
81461c0601 Add "complete or paymentpending" dropdown as options when viewing the registration list or registration stats 2010-04-08 20:03:21 +00:00
dave
9d79e2fe98 Add TCPDF label, but call it experimental to discourage use. 
Convert ISO-8859 -> UTF-8 before printing text on the TCPDF label... happily only the GVRSF is using this right now so we don't need to update everyone.
 2010-04-08 07:38:22 +00:00
dave
e3cda665c2 Half implement temporary saving divs/cats for single uploads. That's 
going to be a lot of work.  For now, always save the div/cat preferences
when they hit next.  Fixes a bug where the divs/cats have never been
saved, but the award proceeded to upload with a div/cat id=0.  Also, the
uploader made a temp change to the div/cat, the change wouldn't get
picked up by the upload, now it will.
 2010-04-07 16:17:26 +00:00
james
8ffb710715 Add option for only showing ACTIVE judges in reports (like nametags) 
we dont care about inactive judges.
 2010-04-07 14:25:33 +00:00
james
9dfa523bb5 Adjust the timeslot column width if the date is being displayed, becuase now it can be formatted to be slightly longer than standard database format 2010-04-06 19:00:52 +00:00
james
6d8c74e8ae Format the date/time according to the localization in the custom projects/judges and judges/projects reports 2010-04-06 18:49:49 +00:00
james
123cee67d3 Check for minimum teams based on language as well.... this causes things to not "add up" properly but 
that is kind of intended..., ie the "total" doesnt equal  "english + french"... but its a lot better
than it was (it now tells ottawa that we dont have enough french judges, which is correct.)
 2010-04-06 18:30:23 +00:00
james
fcccfd16c0 Add a bunch of missing i18n's on the judges teams projects 
Make the timeslot/project listings not be stupidly tiny
Highlight more errors in big bold red for language mismatches
 2010-04-06 17:05:59 +00:00
jacob
2afa6a5ec8 Added language tags to the available judges in the team member editing form. 2010-04-06 16:29:21 +00:00
james
00e1743aed The languages for a team should also be based on which PROJECTS are assigned to the team 
Update the judges_teams_members list to show "BAD" judges (judges assigned to a team in
a language that they dont speak)
 2010-04-06 16:15:48 +00:00
jacob
28db0a6871 might as well sort by first name as well... 2010-04-06 15:56:38 +00:00
jacob
e3751ea733 Added sorting of judges by last name when listing them in the team member editor (Mantis #470) 2010-04-06 15:54:06 +00:00
james
534981a0b9 Make division preferences have slightly higher priority than category preferences. 
Add an additional (fairly large) cost for creating a completely empty team

Change the experience to use a weighted experience instead of a sum, and give a
weighted cost to teams for less than 5 years weighted experience, but onyl if there's 
more than 1 person on the team (1 person teams are not penalized for not having any experience)
 2010-04-06 15:41:29 +00:00
jacob
e2b5208aee Fix for bug number 471. Tallies weren't adding up on the user list summary table at the bottom. 2010-04-06 15:19:47 +00:00
james
951b7209d9 Add a cost for judges assigned to a team that speak more languages than they need for that team 
(ie, a bilingual judge being used for an english-only team)
 2010-04-06 14:42:51 +00:00
james
015b04a81a Add two columns for the feeder fair info in the student report. 2010-04-05 19:19:53 +00:00
dave
e07f22995b Add fields to the award report 2010-04-04 18:57:30 +00:00
dave
6e245a4c52 Add option group support, and as a test implement it for awards report. 
It would be nice to remove the  "Award -- " off the front of each field
name, but if we do that it only displays "Name" after its' selected,
which can be confusing if there's an "Award -- Name" and a "Prize --
Name".  But the division into optgroups still look nice.
 2010-04-04 18:57:27 +00:00
dave
c1433e8a7d Typo... wonder how long that's been there. 2010-04-04 15:55:32 +00:00
dave
0dd1637415 Show round+time with each team on the team editor 2010-04-04 01:38:50 +00:00
dave
0661224a0b Don't duplicate SA-only judges for all rounds for all special awards (only duplicate them enough to satisfy their special awards requests in the specific rounds the award is judges). Fix a bug where the last jduges would get replcaed by a duplicate of the 2nd last judge for multi-round special awards. 2010-04-03 23:10:05 +00:00
dave
8f063c1ec1 My what a difference an equal sign makes. 2010-04-03 20:54:57 +00:00
dave
9a00ce4877 Properly do timeslot->project->jteam linking for special awards 2010-04-03 19:16:11 +00:00
dave
6bdbc85829 Download schedule_judges and self_nominate for awards too 2010-04-03 16:46:43 +00:00
jacob
a738ad1a26 Some touch-ups as per bugs logged 2010-03-31 22:03:07 +00:00
james
12086fc9c9 Send project language in award upload 2010-03-31 19:31:42 +00:00
jacob
4ad5ec9d68 Made tables of the "tableview" class sortable 2010-03-31 18:44:42 +00:00
dave
c42748989b Add xsmall to report too 2010-03-31 04:50:55 +00:00
dave
8d8bcdad94 Add available in round1,round2 to the judge report 2010-03-31 04:07:26 +00:00
jacob
b632b6c932 Adding sortable columns to tables 2010-03-30 21:59:04 +00:00
james
dcd9e825ea Make the message look a bit nicer (output the message if we have it, instead of print_r'ing the whole result) 2010-03-30 17:22:55 +00:00
james
c238997eed Only show fairs in the fair upload stats that have enable_stats turned on 2010-03-30 17:01:27 +00:00
james
80ff166203 Set prize external_identifier on award download properly. Send proper xml array (prizes[0]prize[0], not prizes[0]prizes[0]) to ysc servers. Handle postback url properly (typo) 2010-03-30 16:47:30 +00:00
jacob
7cd9f21434 Small wording fix for bug #461 2010-03-30 16:08:57 +00:00
dave
8aec6a23e6 Typo 2010-03-29 21:47:25 +00:00
james
1e0c502de8 reload the report list in the callback after the report list is saved, otherwise the reload causes a race condition with the json and (in my case) usually the reload wins. 2010-03-29 20:57:04 +00:00