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

1039 Commits

Author SHA1 Message Date
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
james
da17e3461c Show the report name instead of the report id in the dialog title 2010-03-29 20:46:53 +00:00
james
6d4186182e Show the total number of prizes available for the award, instead of the number of prize records for the award (a single prize record can have mutliple prizes available). 2010-03-29 20:10:27 +00:00
james
ad7051a6c9 Add Project -- Rank to student reports too, so it can be in the Special Award Nominations list given to judges. 2010-03-29 19:48:12 +00:00
dave
74ea0b7050 Only consider complete/paymentpending for tour scheduling. 2010-03-29 07:50:49 +00:00
jacob
6ecfb4ab42 Fix for bug #457 - Error in generating report that included the sponsor DB ID field 2010-03-26 17:41:44 +00:00
jacob
6e4d1018f8 Fix for bug #460, missing column prevented the Judges report from generating successfully 2010-03-26 15:52:03 +00:00
dave
14ea96dddc fix typo 2010-03-26 06:12:42 +00:00
dave
149cc6551f Clarify the "go ahead anyway" message to include "the scheduelr may not 
work at all"
 2010-03-26 06:03:37 +00:00
dave
5052234670 Check for special award timeslots if the scheduler is configured to 
schedule special award judges
 2010-03-26 06:03:31 +00:00
james
9afcd82523 Oops revert part of the last commit - that wasnt supposed to be there 2010-03-25 22:11:19 +00:00
james
096287908d Dont show weird infinity / nan messages 2010-03-25 21:22:40 +00:00
james
a3417c7a50 Add a parameter to the launcher just so we can tell which fair its running for 2010-03-25 20:52:40 +00:00
james
bf0d2bb1de Add //TRANSLIT to the conversion fields on the administrator's student editor as well 2010-03-25 14:29:09 +00:00
james
c9f5c0164f Fix smart quotes and funky ms characters in the new administrator's project editor (for title and summary) as well 2010-03-25 14:27:13 +00:00
james
07902b107e Fix smart-quotes and other funky characters in email messages - need to //TRANSLIT convert _before_ escaping for the query 2010-03-25 14:23:25 +00:00
dave
9b10cdcdc0 Don't let anyone even turn on this option 2010-03-25 04:34:22 +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
be6c5a27c9 Ignore email addreses that start with a * 2010-03-25 04:27:31 +00:00
james
a28b0e8444 Formatting cleanups and style cleanups 
Also moved the school to be beside the first students name instead of beside the project title -- i was seeing a LOT of projects with long titles overlapping with the school name.
 2010-03-23 17:30:19 +00:00
james
ea58b4b6a8 Add a "setDefaultFontSize" function to lpdf, and set it to something reasonable for backwards compatability 
Update lpdf's table functions to honour the default font size setting.

(this works great, except for the column widths -  if you choose a font-size too big, its not oging to fit in the pre-defined column widths.)
 2010-03-23 16:42:59 +00:00
james
b34ad909b5 Add an empty "Rank" column for judges to specify the rank of a project 2010-03-23 16:03:28 +00:00
idziak
c5420a82b9 added nicely formatted output option for awards script 2010-03-22 02:22:20 +00:00
idziak
10f41e00f9 added nicely formatted output option for awards script 2010-03-22 02:22:04 +00:00
dave
d3c0746949 Allow committee to save xsmall tshirts too 2010-03-19 16:12:41 +00:00
dave
76eefdf3cd Put custom reports back in 2010-03-15 06:02:25 +00:00
dave
adf606f0d3 Backout the patch, but leave the complete status removal there 2010-03-12 08:05:44 +00:00
dave
a4e5761788 Remove the sub-query from the user list, significantly speeds it up. 
And, dont' show complete status for user types that don't need it.
 2010-03-12 05:53:03 +00:00
james
b99f730a71 Fix character encoding problems in student editor and project editor 2010-03-03 20:13:46 +00:00
james
6def9680bc Fix translations for awards and award prizes 
Also fix translations editor when the first language has an accent
 2010-03-03 19:25:19 +00:00
dave
05fe375d3a Multipart commit because I messed up part of my git tree. Implement 
including award criteria in AC script, off by default
 2010-03-02 22:50:49 +00:00
james
3832e64600 Filter by team id so we don't print all teams 2010-02-25 21:23:11 +00:00
james
0fbf664f67 Change JOIN to LEFT JOIN for donation/sponsorship list in the case that they don't specify an appeal. 
Add ability to REMOVE a donation
Add activitylog for both adding and removing donations
 2010-02-25 15:44:04 +00:00
james
ab60a0f389 Get rid of the debug for now, it breaks functions that return json. 2010-02-24 01:24:13 +00:00
dave
cf19eacd43 Remvove the data dump at the bottom of the send stats 2010-02-23 20:00:54 +00:00
dave
09f1984987 Fix saving next_chair stats 2010-02-23 19:58:09 +00:00
dave
c284fed0f5 Add a debug_() routine and use it in curl 2010-02-23 19:58:06 +00:00
james
f4d2d636d8 By default, turn ON all eligibility in divs/cats for downloaded awards.. so 
fairs don't wonder why they can't assign any winners to these awards.  In other
words, make it "just work".  :p
 2010-02-22 20:26:23 +00:00
dave
de761c8b3e Update the annealer to recompute the cost of multiple affected buckets 
on a move if necessary.  Add the annealer to compute floor locations
(but don't link it to anything yet because there's no editor, we're
testing it with GVRSF this year).
 2010-02-22 18:45:58 +00:00
dave
1849d0362c Not sure where these came from, maybe a bad merge from old code? 2010-02-22 18:13:14 +00:00
dave
538c2ae066 Use array_splice to compute new lists... much shorter code, and probably 
a lot faster.
 2010-02-22 18:13:11 +00:00
james
910c9e85b0 Allow an override to start the scheduler even if things dont look good 2010-02-18 16:44:42 +00:00
james
21ea57a661 Remove debug and properly pluralize hours/minutes/seconds 2010-02-18 16:01:46 +00:00
james
1a2fc19fca convert judges scheduler status AJAX to JQuery 2010-02-18 15:54:31 +00:00
james
8e650a104d Higher preference for having the right languages on a team 2010-02-17 18:59:56 +00:00
dave
573a580e3a Add a small cost for judge teams with no experience, try to avoid that. 2010-02-17 18:34:35 +00:00
dave
d4782758aa Don't use round2 scoring in the cost funciton if there is no round2 2010-02-17 18:34:29 +00:00
dave
147655171c Skip round2 judge scheduling if no round2 timeslots are defined. 2010-02-17 18:24:07 +00:00
james
4c79d7482d Change wording on the button to 'Generate Report' instead of 'Generate PDF' - report could be CSV, etc 2010-02-16 22:07:46 +00:00
james
1768fffb2b Properly escape the email name in the javascript function, and htmlspecialchars the name in the output 2010-02-12 18:24:22 +00:00
james
0f746fb914 Re-organize the main index page - move feeder/upstream fairs down to where the upload stats is 2010-02-12 17:19:29 +00:00
james
47a8a3019a Remove one click ysc affiliation - they can use the upload fair statistics icon 2010-02-12 17:16:05 +00:00
james
b362099af3 If the xml parse doesnt return an array, then the server must have sent back plain text, so set the message and error field to that and return it. This is what the YSC Stats server does - So stats uploading to YSC works again now. 2010-02-12 17:05:18 +00:00
james
b2c6729def Fix identification of externally downloaded awards in the awards list 2010-02-12 16:46:05 +00:00
dave
71509f3f16 Fix the downloaded prize array for awards with >1 prize. For STO this 
actually doesn't matter there's only one prize for each award.
 2010-02-12 14:16:19 +00:00
dave
1ab43fef68 Recover missed commit for YSC awards downloading and winners upload. 2010-02-12 05:34:12 +00:00
dave
615c265d00 Allow the addition of a committee role to an existing user. 2010-02-11 22:39:15 +00:00
james
8b4c8297b1 Use Youth Science Canada (or YSC) instead of YSF 2010-02-11 22:35:57 +00:00
james
f558a5d8b8 If a group by column has a exec_function, call the exec_function on the table group heading before outputting it 2010-02-11 21:36:11 +00:00
james
90d9d0a01d Fix reports that show the language of judges when judges havent specified any languages 2010-02-11 21:16:26 +00:00
james
a42e042bcc Fix once and for all the communication module with french/accented characters -- since fckeditor only does utf8, do the conversion immediately to ISO when its submitted, and then allow the system to use ISO everywhere from there on out 2010-02-11 16:41:17 +00:00
james
a1865e267b When sending, make sure we check to make sure result is NULL as well, becuase if its cancelled, sent will be NULL but result will be cancelled 2010-02-11 15:59:41 +00:00
james
d8375c0c5f Add ability to cancel emails in the queue to be sent 2010-02-11 15:58:26 +00:00
james
e077912d9e Clarify some fields, add 3 more: captain name, all team members, all team members except captain. 2010-02-10 18:52:45 +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
james
496c0400aa Don't include deactivated judges in the judge list 2010-02-10 16:15:12 +00:00
dave
1aa759047a Fix the link to the materials 2010-02-10 05:36:16 +00:00
dave
33a9ee5401 Show a disabled button for awards with additional materials that have no 
winners.
 2010-02-10 05:36:15 +00:00
dave
d38c57de79 Delete entries in the winners table when a project is deleted. 2010-02-10 05:36:14 +00:00
james
b1033e2369 Fix communication sending when replacements have apostrohpe's in them 2010-02-06 22:05:39 +00:00
dave
fb6da3764f southern kentucky has 35 divisions. So support up to 50. 2010-02-06 01:13:45 +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