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

76 Commits

Author SHA1 Message Date
james
ef46b5811b And fix the same bug with the prize order saving 2011-03-28 18:38:49 +00:00
james
497f6eddd7 fix a bug in saving the award order (we need to .load on a div that actually exists) 2011-03-28 18:36:58 +00:00
james
98f6a9f76d Update more communication emails (teachers, principals) 
Tweak award eligibility display
Add "Account" info to student reports (email, username, pendingemail)
Move some project identification stuff around and fix the groupings
 2011-03-23 19:44:08 +00:00
james
3af6933f73 hmm better implement the selection of eligibility - it wasnt working here for me, but was on some windows browsers.. so.. be explicit with what its doing and now it should work everywhere 2011-03-22 20:40:31 +00:00
james
a5bd01f621 Bunch of fixes 2011-01-26 23:15:58 +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
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
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
30d01eeb74 eligibility editor now checks that no two divisional awards have overlapping eligibility criteria (issue 249) 2010-07-12 23:11:07 +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
jacob
6504d09886 Added updates for converting from Latin1 to utf8 character encoding 2010-06-04 20:23:59 +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
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
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
james
b2c6729def Fix identification of externally downloaded awards in the awards list 2010-02-12 16:46:05 +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
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
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
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
dave
21d3dcd054 - Replace class "tableedit" with class "editor", undo the alignment on class tableedit 2009-10-01 04:42:55 +00:00
dave
51eaad76a5 - Fix the trophy printing 
- Fix the table updates on creating a new prize
 2009-09-26 08:11:34 +00:00
dave
d77616a438 - Fix award info saving 
- Fix clearing out divisons/categories
 2009-09-26 00:10:57 +00:00
dave
0f31f72f07 - Add two more fields: 
- additional_materials: if there are additional materials required if a fair assigns a winner to this award.
	- register_winners: to tell the feeder fair that this award is for winners who will participate at the upstream fair
 2009-09-25 04:29:41 +00:00
dave
25f19d9fbd - Enable the feeder_enable checkbox. There's no DB backend for it, it enables 
the feeder fair input on click, or if a feeder fair ul/dl is already
  selected.
 2009-09-24 01:39:05 +00:00
dave
b0e7715fb9 - Turn fair_save into an ajax query 
- Add notification area and debug to the popup window, still an ugly hack.
- Add a checkbox to the feeder fair config to enable/disable the whole thing (will confuse people less, needs to be implemented)
- Also add a checkbox for signaling the feeder fair if there are additional materials for an assigned award.
 2009-09-23 16:42:24 +00:00
dave
0ce215b8bc - Remove debug line 2009-09-21 01:34:42 +00:00
dave
39fa2de7bd - Fix eligibility save 2009-09-21 01:33:55 +00:00
dave
fdeef1f273 - Ok, so jquery does do the right thing, we just have to be careful not to read 
fields that may not exist.
 2009-09-20 21:50:51 +00:00
dave
e07d24102c - Well, disabling the fields was a good idea, exept that serialize() skips over 
the value but not the name, so it sets every disabled field to "" when
  passing the data to mysql.
 2009-09-20 19:25:42 +00:00
dave
1e1a7d6202 - Make the notice divs a bit easier to see (light yellow background) 
- Don't reload tabs all the times, remember the current award_id for each tab
  and only reload if necessary
- Add a little notice for downloaded awards, telling the user why they can't edit some fields.
 2009-09-20 18:45:32 +00:00
dave
5989a8c254 - More fixes for editting, we dont' actually download the description or award type, so let the user edit those. 2009-09-19 08:14:59 +00:00
dave
7a474046a5 - beginning of setting uneditable fields for downloaded awards. 2009-09-19 08:06:21 +00:00
dave
2762a12eb0 - Add a notice_ javascript function for testing, yup, it works 
- Reimplement the new award functionality
- Fix the reloading of the dialog by disabling all tabs and reselecting one.  It works properly now.
 2009-09-18 07:50:32 +00:00
dave
20fe1d8b13 - Switch to a global message status area 2009-09-18 03:29:13 +00:00
james
99f1d4726c Make the default prize template editor work when accessed directly from the awards.php page 2009-09-17 19:30:32 +00:00
james
cb5bb16953 Disable all the other tabs if editing the default prize template 2009-09-17 19:25:14 +00:00
james
7b068cd83f Load the information into the tab when the dialog is opened (fixes it not reloading the data when you close and reopen the dialog) 2009-09-17 18:50:37 +00:00
james
715e72c0c8 Fix the buttons to work, remove the links 2009-09-17 17:10:02 +00:00
dave
abd1fda6fe - Always scrub data before passing it to mysql 2009-09-17 05:53:47 +00:00
dave
0a9053181c - Fix a reference to the award external identifier 
- Move the nubmer of available prizes to the top so it's harder to miss.
 2009-09-14 05:34:31 +00:00
dave
a3f8957d96 - add the html for the registration linkage button. does nothing else yet. 2009-09-13 22:23:19 +00:00
dave
1e830e47bc - Add support for setting the external identifier 2009-09-13 21:58:50 +00:00
dave
d2535f46bc - Add status area on each page for award div 
- Redirect all ajax load output to a debug div (which can be turned on with
  debug=true).  The output has to go somewhere, and it can't go to the
  notification div, because it will overwrite what's already there.  The ajax
  methods emit javascript now to add notifications.
 2009-09-13 19:25:03 +00:00
dave
1f830c7845 - Proof of concept floating status messages that go away after a timeout, in 
the same approx. spot that SFIAB has always put status messages.
 2009-09-13 08:33:54 +00:00
dave
e9d3d4ce03 - Database update for feeder fair award info 
- Load/Save feeder fair awards in the award editor
- Fix all the POSTs in the award editor.   .load automatically does a POST if
  the data is an array, so we need to call .serializeArray() when we want a
  post to happen.
 2009-09-13 07:08:12 +00:00
dave
5d5c91766a - Remove the order from the ajax save too 2009-09-11 06:36:16 +00:00
dave
1c70110680 Remove the order box from the award info, the main table supports drag and drop. 2009-09-11 06:35:49 +00:00
dave
986b762f4e - Move some GETs to POSTs 
- Sort out the header sizes, I think.
 2009-09-11 06:12:17 +00:00
james
d17de3f6e6 Updated and working translations dropdown - simply add class="translatable" anywhere you want something translated 2009-09-11 05:16:37 +00:00