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
dave
510d4a7e5f
Add support for listing judges div/cat prefs in columns. This now
...
completes everything the judges csv could do. The downside ist hat each
fair could have different numbers of divs/cats, so each will have to
create the report (and keep it up to date if they change the number of
divs/cats)
2010-02-04 17:55:04 +00:00
dave
dc29349e7c
Fix all other (1) #content loads. We pretty much dont' need that now.
...
Maybe we should create a #content div. :p
2010-02-04 06:48:44 +00:00
dave
4aae875630
Apparently in IE7 you can't .load into an <iframe>. But you can .load
...
into a <div>. So there.
2010-02-04 06:48:42 +00:00
james
ebbfaf42bd
Fix spelling mistake: Bug #407
2010-02-03 19:10:29 +00:00
james
715afc8e59
Fix primary contact radio boxes checked status in IE7
2010-02-03 16:53:19 +00:00
james
879dc845d9
Fix Report dialogs in IE7
2010-02-03 16:02:45 +00:00
dave
c527e349c8
Disable question fields in the editor that aren't in use.
2010-02-02 19:40:56 +00:00
dave
16567265d6
remove a conflict with the $fields variable, wasn'ta bug, but was
...
overwriting the global valiable.
2010-02-02 19:40:55 +00:00
dave
e65f899731
Support custom judge questions in the report editor
2010-02-02 19:40:52 +00:00
dave
355447ac76
Add highest cat pref selection (for LRSF). Pass the $field into the
...
report column function so the same function can be used for multiple
fields with different return values.
2010-02-02 18:19:11 +00:00
dave
5c8bbe16b6
Remove the typepref selection, it turned into
...
users_judge.special_award_only.
2010-02-02 17:48:59 +00:00
james
45864af4af
(Commit from Dave): Fix the logic for saving the school teacher. If the user
...
is teacher,judge, and they delete their account, the teacher save in the school
editor silently fails (id exists, but user_load returns false).
Now it purges the teacher and creates a new one. The downside, is the teacher
can remove their contact info without the committee knowing about it. I guess
the real fix woudl be to either: Don't allow the account to be deleted if they
have a teacher,principal role, or duplicate the account on deletion to retain
the teacher contact info.
2010-02-01 19:31:03 +00:00
dave
6261919878
Add two columns for all divisions the judge selected 5-expert for
2010-02-01 06:30:48 +00:00
dave
34368908bc
Add willing chair, years exp, and highest psd to the judge report
2010-02-01 06:01:02 +00:00
dave
6f22c31be3
Don't show local "Download additional mateirals" link for external awards.
2010-01-31 22:07:14 +00:00
dave
a55dd4b9be
Implement additional materials download for fairs user
2010-01-28 19:05:35 +00:00
dave
7a2f4c0d3a
'notes' is in the user_sponsors table, not the users table.
2010-01-28 08:42:32 +00:00
dave
56cbd2dba5
Remove redundancy
2010-01-28 08:34:33 +00:00
dave
c8087c54c3
Fix a broken link
2010-01-27 20:40:54 +00:00
dave
68977533b2
And a missing space
2010-01-27 20:34:30 +00:00
dave
ee855e5f67
Fix a missing i18n
2010-01-27 20:34:01 +00:00
dave
505e1a8c91
Overhaul the winners entry (add ajax, mutliple fair support, fairs
...
loggin in and entering their own winners)
2010-01-27 20:24:19 +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
dave
7fc721b96f
Add support for URLMAIN and URLLOGIN replacement in communications
2010-01-27 20:24:16 +00:00
dave
29b95e97ac
Use the smarter name logic in admin/communicaiton.php for shorter code.
...
Add URLMAIN, URLLOGIN to the communicaiton as options, still have to
implement them.
2010-01-27 20:24:14 +00:00
dave
908e4d51ba
Use icons in the fair main, need to re-integrate the status checks
...
somehow
2010-01-27 20:24:09 +00:00
dave
e7afdccaaf
Rename 'Science Fair Management' to 'Feeder/Upstream Fair Management'
2010-01-27 20:24:05 +00:00
dave
83cd22a57c
Fix indentation
2010-01-24 06:47:19 +00:00
dave
547cb36a23
Fix the project editor for fairs
2010-01-24 06:47:17 +00:00
dave
436ac1ca7e
Handle the fair role in the student editor. Restrict to load/save the
...
fair.
2010-01-24 06:47:16 +00:00
dave
d333175a7b
Fix displaying lists for fairs
2010-01-24 06:47:14 +00:00
dave
dc326ccf86
fix indentation in student_editor
2010-01-24 06:47:12 +00:00
dave
8b3cd2a289
Only show fair projects if a fair logs in and uses the reg list
2010-01-24 06:47:11 +00:00
james
ff01502192
If there are no feeder fairs, dont let them choose any, infact, hide the option completely
2010-01-22 19:56:59 +00:00
dave
f695306f92
Add a "new project" feature.
2010-01-22 19:26:35 +00:00
dave
4739e3fdf0
Add a Registration tab to the student editor (regnum, fair, status)
2010-01-22 19:26:31 +00:00
james
eb2f9e769f
Fix the custom judge report -its the only way to get div/cat/lang prefs, and the answers to judge questions
2010-01-22 17:43:43 +00:00
dave
41347c1934
Add missing file
2010-01-21 21:58:02 +00:00
james
ca8ff11d71
More IE7 fixes (extra commas!)
2010-01-21 20:56:06 +00:00
james
7a9ead99ea
Fix registration list to work with IE7
2010-01-21 20:52:59 +00:00
james
b3db4fb5f6
Fix awards page to work with IE7 -- removed extraneous comma's at end of object/arrays
2010-01-21 20:48:18 +00:00
dave
931c9603b3
Save first, then fix the title
2010-01-21 20:33:04 +00:00
dave
45587ee2f4
Fix the title
2010-01-21 20:33:03 +00:00
dave
e53a7056e9
Change pointers to the stats list
2010-01-21 20:33:02 +00:00
dave
1f138e52ef
Save the file before committing
2010-01-21 20:33:01 +00:00
dave
997b54e854
New ajax reg list, prevents reloading the list on edit. Move all the stats stuff out.
2010-01-21 20:32:59 +00:00
dave
bc9bfde34f
Turn student_editor.php into a set of ajax calls
2010-01-21 20:32:58 +00:00
dave
b15ad9a7e0
Turn project_editor.php into ajax handlers
2010-01-21 20:32:57 +00:00
james
3ebb655d08
Hmmm, add some missins stripslashes.. stupid fucking magic quotes
2010-01-19 04:32:12 +00:00
james
de835bf5f5
Add some instructions to the judge divisions groupings page - nobody knows what the heck to do with jdiv groups
2010-01-19 04:14:53 +00:00
james
91cbf39f61
Use localized dates/times on judges pages
2010-01-19 03:42:25 +00:00
james
214df4ddbf
Fix a bug where awards that didtn have a sponsor set didnt show up in the list, also, do the same for award types, though award types hsould never be empty...
2010-01-19 03:29:29 +00:00
james
c67488d375
If availability is disabled, dont fail loading judges
...
Fix the team languages array
Fix the timeslots checks for schedulerconfig (need round AND timeslots, not just a round)
2010-01-18 16:24:34 +00:00
james
7e6795fd0d
Since the previous bug where judge complete status was wrong, we need a chance to recalculate them all, so lets just do it here for now.
2010-01-15 15:39:36 +00:00
james
c729e0f8da
Dont let the scheduler run if we have 0 judges available - timmins was in an endless loop since last nite
2010-01-15 14:53:24 +00:00
james
e6b24ff0ab
Remove the edit icon (you now click anywhere on the row) and fix disabling fields for non-downloaded awards (=0, not null)
2010-01-14 18:55:23 +00:00
james
357263a20b
Some extra debug info added while fixing northern bc
2010-01-12 06:43:22 +00:00
james
591f46b29d
Properly count the number of judges in each language to check if we have enough
2010-01-08 20:25:40 +00:00
james
d8ba3da289
Remove more debugging
2010-01-05 18:02:24 +00:00
james
35a247e225
remove debuging
2010-01-05 17:59:10 +00:00
james
3f94324aba
JOIN instead of LEFT JOIN on committee members link, incase a member has been deleted we dont want a blank record..
...
though.. if they have been deleted we should probably delete the link.. hmmm.. well.. this will hide it for now.
2010-01-04 17:51:55 +00:00
james
a6a7d6ffe2
More invalid backslashes
2009-12-16 19:11:00 +00:00
james
df0120dd0b
Special chars the stock (so & converts to &)
...
Add some newlines.. still trying to fix IE7...
2009-12-16 18:49:53 +00:00
james
3763f76ea9
Remove extra backslashes - trying to fix IE7....
2009-12-16 18:43:57 +00:00
james
b14b0eb356
Fix the dropdowns
2009-12-16 18:12:28 +00:00
james
c3ed887dca
I think this fixes the query, at least temporarily, until we really fix the whole user/year system
2009-12-04 17:22:55 +00:00
james
3da935eaff
Switch fundraising dashboard to be ajax'ed and add the ability to mark thankyou's as done.
2009-12-03 21:53:01 +00:00
