arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Commit Graph

  • c3b532b161 Move awards management to the top - its what will be used the most from here Rename award sponsors to just sponsors, as it now does all types of sponsors Remove the sponsor contacts, they will shortly be accessible via a tab of the sponsors editor james 2009-09-17 19:31:32 +00:00
  • 99f1d4726c Make the default prize template editor work when accessed directly from the awards.php page james 2009-09-17 19:30:32 +00:00
  • cb5bb16953 Disable all the other tabs if editing the default prize template james 2009-09-17 19:25:14 +00:00
  • 8269821a69 blank line james 2009-09-17 19:06:31 +00:00
  • b88e10120a Set the datepicker z-indez so its above the dialogs (so when used within a dialog it wont be below it) Change the width of the translations dialog, so when used from within another dialog (at 0.8) it looks more distinctly a different dialog (at 0.6) james 2009-09-17 19:05:17 +00:00
  • 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) james 2009-09-17 18:50:37 +00:00
  • 715e72c0c8 Fix the buttons to work, remove the links james 2009-09-17 17:10:02 +00:00
  • 1513645e4a Put in a link to the fair stats dave 2009-09-17 07:56:06 +00:00
  • 38d3711ace - Send the stats gathering list from the fair info dave 2009-09-17 07:14:12 +00:00
  • cb6740fa6f - Update the fair stats to use the new list - Don't have curl dump debug info dave 2009-09-17 07:13:51 +00:00
  • 6bd4d03941 - Selection screen to select what stats to download from feeder fairs dave 2009-09-17 07:00:09 +00:00
  • 792a581357 Put the debug DIV in a sensible location dave 2009-09-17 06:48:52 +00:00
  • abd1fda6fe - Always scrub data before passing it to mysql dave 2009-09-17 05:53:47 +00:00
  • 0a9053181c - Fix a reference to the award external identifier - Move the nubmer of available prizes to the top so it's harder to miss. dave 2009-09-14 05:34:31 +00:00
  • 347d2d5a86 - Use the prize name, rather than the external_identifier to identify the prize. It only has to be unique within each award, which it will be (all prizes should have a name). dave 2009-09-14 05:33:49 +00:00
  • 6a3eacaf9a - typo dave 2009-09-14 04:41:49 +00:00
  • a3f8957d96 - add the html for the registration linkage button. does nothing else yet. dave 2009-09-13 22:23:19 +00:00
  • 38fdd32f3a - Update xmltransport, which isn't really XML anymore, to use the fairs_awards_link table. Also send the upload_winners status (do I need to update an API spec somewhere?) dave 2009-09-13 22:04:27 +00:00
  • 1e830e47bc - Add support for setting the external identifier dave 2009-09-13 21:58:50 +00:00
  • 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. dave 2009-09-13 19:25:03 +00:00
  • 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. dave 2009-09-13 08:33:54 +00:00
  • 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. dave 2009-09-13 07:08:12 +00:00
  • 60146110b2 - Restore the admin table font size. dave 2009-09-11 17:52:30 +00:00
  • 99ad03654a switch the table class for the school list james 2009-09-11 16:18:47 +00:00
  • 5d5c91766a - Remove the order from the ajax save too dave 2009-09-11 06:36:16 +00:00
  • 1c70110680 Remove the order box from the award info, the main table supports drag and drop. dave 2009-09-11 06:35:49 +00:00
  • 986b762f4e - Move some GETs to POSTs - Sort out the header sizes, I think. dave 2009-09-11 06:12:17 +00:00
  • 8f29090c38 - Load .js for popups too, but pretty soon we won't need this popup function at all. dave 2009-09-11 06:11:43 +00:00
  • 34c3cb64db - Use existing classes instead of inventing new ones dave 2009-09-11 06:11:08 +00:00
  • 0cd1876f0f - Update the main theme to be a little more sane with fonts (i hope) - remove all references to htabs, we dont' need them anymore. dave 2009-09-11 06:03:00 +00:00
  • 1a2839b5b2 - Hack up the user editor window to use jquery ui tabs and ajax, sorta. More like a Frankenjax. Needs MAJOR help. dave 2009-09-11 06:01:01 +00:00
  • 29f0d1ac07 Helps if you use the right filename, definitely almost 2am james 2009-09-11 05:47:58 +00:00
  • 3d4f12117b oops, properl close the script tag james 2009-09-11 05:44:10 +00:00
  • dd51217bc0 Remove the old translationsdropdowns james 2009-09-11 05:38:29 +00:00
  • bef9c279ec rework/rename the translationeditor james 2009-09-11 05:33:41 +00:00
  • d17de3f6e6 Updated and working translations dropdown - simply add class="translatable" anywhere you want something translated james 2009-09-11 05:16:37 +00:00
  • 54739b72b5 Make the row being dragged a different colour dave 2009-09-11 04:18:12 +00:00
  • f260f5bf94 We don't need this file now dave 2009-09-10 22:52:48 +00:00
  • 8b9b029e31 - Use jqueryui's tab system instead of our own - Update the tab style so it doesn't look stupid. dave 2009-09-10 22:52:04 +00:00
  • 174d658f2d Start of a new trasnlation dropdown, commit so maybe dave can help :) james 2009-09-10 21:31:51 +00:00
  • 074d39171f - Implement the generic prize template editor (not fully tested) - Doesn't launch from awards.php yet for some reason. dave 2009-09-10 17:32:16 +00:00
  • 2270593d65 - Make eligibility saving work. dave 2009-09-10 08:56:58 +00:00
  • 74ec5fdcfb - don't need this file anymore, all the functionality (except validation) is implemented in award_awards.php dave 2009-09-10 08:30:07 +00:00
  • d50debde12 - Make the main award table sortable by dragging - Implement new/delete award (still needs some eyecandy) - Update the order tables to recalc the order without fetching it from the server - Only thing left to do is make sure saving eligiblity works. : dave 2009-09-10 08:29:16 +00:00
  • 0f16a90efc - Don't need to do this, the tabs will do it themselves dave 2009-09-10 08:26:24 +00:00
  • 860693eb14 add a tr:hover to the tableview class to make it easier to see what row you're hovering over james 2009-09-10 04:46:50 +00:00
  • f7bddf5beb Get rid of all occurences of viewtable and replace with tableview james 2009-09-10 04:40:18 +00:00
  • a2018771e7 Implement jquery datepicker! woohoo james 2009-09-10 04:24:47 +00:00
  • 80c743eb1a remove a debug statement dave 2009-09-10 01:24:57 +00:00
  • aa1d88f7d2 - Prize editor with movable tables. It's still a bit rough, more work needs to be done with turning on /offthings at the right time, but it's all there, and it all works. dave 2009-09-10 01:23:58 +00:00
  • 8b7a6e14b3 - Convert the popup to use the jquery ui popup - Theme the whole thing - Remvoe the translation dropdown support for now, it's causing a spurious reload replacing the endire page with a clickable "translations" link - Add code for the prize editor, not done yet. dave 2009-09-09 17:06:11 +00:00
  • 94ecb59321 Calculate the difference from the probability weighted totals james 2009-09-09 03:12:53 +00:00
  • 1c99f624e5 Fix contact to actually work with the new user code james 2009-09-09 03:05:45 +00:00
  • eb05b3eaa5 Add a nice notice about maybe making a backup before doing the rollover james 2009-09-09 02:50:00 +00:00
  • 5ec6879149 A couple fundraising changes for readability james 2009-09-09 02:39:22 +00:00
  • 183531ada0 Fix 131 james 2009-09-09 02:38:57 +00:00
  • 00d43f0e9a Fix two bugs in the rollover james 2009-09-09 01:57:22 +00:00
  • 2f0deca246 Update rollover script to roll sponsors & awards properly Switch all mysql_escape_string to mysql_real_escape_string james 2009-09-09 01:44:55 +00:00
  • 8ef4d37327 Lol oops i updated the version in the branch instead of head - now the version is bumped correctly james 2009-09-09 01:19:36 +00:00
  • 0e9334eaa1 change teh version to 2.2.9 for development in preparation of 2.3.0 james 2009-09-09 00:35:33 +00:00
  • f963dbf276 Merge all changes from branch r1284:1498 into trunk james 2009-09-09 00:26:12 +00:00
  • 2b10dc2131 - Add an example for how to use a draggable sortable list to the prize tag. - Add jquery-ui to the scripts, it has support for drag and drop, as well as windows, will convert the popup window to the jquery-ui version next, so we don't have to maintain our own. dave 2009-09-08 22:02:14 +00:00
  • daf3314c03 - Fix the sql database for hte last commit - move code around in curl for less indentation dave 2009-09-08 17:39:57 +00:00
  • 62941df880 - new htabs - beginnings of a jquery award editor - sfiab->sfiab award downloading - move most javascript into a sfiab.js file, so it can be cached and only pulled from the server once (instead of inline with the code each time) dave 2009-09-08 17:34:52 +00:00
  • d91ac62015 - Convert award sources to fair users dave 2009-09-06 00:07:26 +00:00
  • dbff1e0bbc - Move the curl query to its own file, and modify the two spots that it's used to just call the function - Rework the fair editor for user friendliness. - Beginnings of sfiab->sfiab award download (and winner upload) dave 2009-09-05 23:04:14 +00:00
  • fd95489426 hopefully the last test james 2009-08-20 14:37:15 +00:00
  • 968d30a448 Testing stupid encoding on commit emails james 2009-08-20 14:34:51 +00:00
  • 8f344d2f8b test five james 2009-08-20 14:03:54 +00:00
  • 14e0d624d8 test four james 2009-08-20 14:02:54 +00:00
  • 4115d2993e itest threee james 2009-08-20 14:01:46 +00:00
  • c2205f7def Testi two james 2009-08-20 13:59:02 +00:00
  • 88936f52af Test james 2009-08-20 13:56:34 +00:00
  • a7e2d840bc commit daves changes from earlier today james 2009-05-13 02:25:50 +00:00
  • 86d4e37448 fix for timeslot check james 2009-05-11 16:30:05 +00:00
  • 74d0c53dd3 - Update the printing of the user list, if it's a fair, print the fair name too. dave 2009-05-06 04:46:08 +00:00
  • 036cf2c295 - And the server side of the JSON stats. We should probably rename this file since it has nothing to do with XML anymore. dave 2009-05-05 07:27:38 +00:00
  • 687d4ea875 - Convert fair stats to JSON dave 2009-05-05 07:27:02 +00:00
  • ee978816b2 - More accurate info in fair_stats - Enable the new fields in the fair editor dave 2009-05-04 06:41:02 +00:00
  • 4eea632521 - Sneak in a database update. We can use the fairs table to enable stats, awards, and winners. For a feeder fair specifying the upstream fair, this means the feeder fair will request to download stats, download awards, and upload winners. For the upstream fair specifying feeder fairs, this means the feeder fair is allowed to upload stats, download awards, and upload winners. dave 2009-05-04 06:32:36 +00:00
  • f58fd10749 - Serverside for the stats gathering. dave 2009-05-04 06:13:44 +00:00
  • 66fe2ed34f - Add remaining stats gathering info for SFFBC, try to make them generic so anyone could use them. dave 2009-05-04 06:13:15 +00:00
  • 0f450e4426 - Remove the XML print from the stats upload, we can add that back in later as something like "view/edit xml". - Add a master list of all the stats we understand - Map stats into YSF stats, so this file can be used as the YSF uploader too (going to need to convert the $config options into a fair user entry) - Enable downloading manual entry stats, so it all appears seamless. (note, we don't download auto-generated stats, like the number of students, well, we do, but we just overwrite it with what's in the local SFIAB, it would be a lot of work to keep it separate if it changes). dave 2009-05-03 06:31:03 +00:00
  • 3d15473906 - And uncomment the communication.... :) dave 2009-04-23 04:39:24 +00:00
  • 566c5aecff - Fix some of the stats reporting dave 2009-04-23 04:38:29 +00:00
  • 2aab58b28d - Fix a typo in the last db file dave 2009-04-23 03:53:41 +00:00
  • cfdcfb7c9d - More data, more stats dave 2009-04-20 05:27:06 +00:00
  • b5745656c1 - Add user/pass support to the fair info - Add a generic fair stats uploader, can't do YSF stats yet, but it will soon (and when it does it can replace the YSF specific stats uploader) - Add better authentication to the incoming xml transport. dave 2009-04-20 05:02:23 +00:00
  • d2e9a4e64e - Partial DB updates, and an xml transport script for feeder fairs to communicate dave 2009-04-20 04:34:37 +00:00
  • f3f9e1c342 - Updates for editting the fair dave 2009-04-20 04:33:49 +00:00
  • 9f80a3fd81 - Another missing file, oops dave 2009-04-16 06:51:13 +00:00
  • 56a6305570 - Add a science fairs manager dave 2009-04-16 06:49:40 +00:00
  • 64d3d6022f Update winners list to properly show more than one school if needed james 2009-04-14 18:36:34 +00:00
  • db76fa01f7 Use -resize instead of -sample - gives MUCH nicer image resizing james 2009-04-14 17:11:48 +00:00
  • 2c6e90d37b - Handle multisel config options with <= 5 items dave 2009-04-14 06:25:55 +00:00
  • 255adde40a - Update the designate field, make it editable by everyone - Add an "at risk" field, to flag schools. This is purely for stats gathering. - Add a fairs_stats page to gather stats from sub-fairs. This will be used when linking SFIABs together so the feeder fairs can upload statistics to, say, a provincial body (both runnign SFIAB). dave 2009-04-12 21:38:51 +00:00
  • 6bd52d6ff2 - Add the basics for a science fair "user". dave 2009-04-12 03:13:09 +00:00
  • 38effb78ee - Add a basic, but funcitonal, new user option for any type of user. dave 2009-04-12 02:40:32 +00:00
  • b5a9ca07d8 - Fix a typo dave 2009-04-12 02:39:48 +00:00
  • dc4b197ce9 SSL NOVERIFY on ysf affiliation stats as well james 2009-04-06 16:02:40 +00:00