Commit Graph

Select branches

Hide Pull Requests

database

errors_warnings

master

pdf-manager-setup

school-imports

science-ation

science-ation-format-code

science-ation-misc

science-ation-pre-release

science-ation_address-complete

science-ation_tours

sfiab-1.0

sfiab-2.1

sfiab-2.2

sfiab-2.3

sfiab-users-makeover

sfiab_3

sqlerrors

ui-2.0

sfiab-0.9.4

sfiab-0.9.6

sfiab-0.9.8

sfiab-1.0.0

sfiab-2.1.6

sfiab-2.2.0

Mono Color

• 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
• 52bd4ae2b7 - List schools by city first, then school name dave 2009-04-06 05:42:25 +00:00
• 8af5de9625 - Also do the SSL trick for YSF stats dave 2009-04-05 19:22:09 +00:00
• e766945fcb Update the stats for the nwe user system dave 2009-04-05 19:20:43 +00:00
• 6c32f2c2d7 - Merge the last 2 commits into the users makeover branch dave 2009-04-05 18:02:07 +00:00
• a48b121e15 Only show the awards to upload for the current year, and turn off the ssl certificate checking james 2009-04-05 16:00:36 +00:00
• 518c53bd82 Turn off the certifiicate validation for the SSL on cwsfregister james 2009-04-05 15:45:43 +00:00
• eb795267d7 Add original score information to the csv view justin 2009-04-04 17:09:00 +00:00
• 0a4223baf4 Sort projects by number instead of title in score entry justin 2009-04-04 13:59:43 +00:00
• e3b440d8da Fix problem if not all score entries are entered in score entry; and move send_headers earlier to avoid conflict justin 2009-04-04 13:43:07 +00:00
• 2328f54721 Modify fix in r1448 to select project state based on the config variable for it justin 2009-04-04 04:03:05 +00:00
• b37f0ef9cc Attempt to fix issue with IE downloading files justin 2009-04-04 03:53:48 +00:00
• 02d8723ab6 Allow projects to be manually assigned to judges teams even if their status is paymentpending james 2009-04-03 15:12:12 +00:00
• 2f6683d014 Show language problems when a judge is assigned to judge projects in a different language james 2009-04-02 16:35:02 +00:00
• 46178ca051 - Fix the list of all judges dave 2009-04-02 00:10:18 +00:00
• b2e1b1e74f Fix a typo dave 2009-04-01 23:41:05 +00:00
• 57017cccc0 Add time availability to the judge info popup dave 2009-04-01 23:40:08 +00:00
• 241d9ad1c1 - Fix printing the judge languages beside each judge dave 2009-04-01 23:24:54 +00:00
• 4d0f607981 Avoid divide by 0 james 2009-04-01 17:30:31 +00:00
• 411361e351 - Add active and delete checks to the judges/volunteers dave 2009-03-31 17:44:35 +00:00
• 288410457d - Fix (almost all) judge communicaiton for this year, need to merge James' change from vanilla trunk to fix the last one. - Add volunteer communicaiton. dave 2009-03-31 17:12:08 +00:00
• c11967a9df Add missing i18n calls to winners page james 2009-03-31 15:20:48 +00:00
• 466927a822 Ok, now the file i was tryign to commit. This one add components to the filter options, in case the report filters on something that is not being displayed. dave 2009-03-30 20:15:42 +00:00
• bd8ce272b1 Undo the last patch dave 2009-03-30 20:14:44 +00:00
• ebb323dcb9 - Do compoenent in the filter field too, just in case the report filters on something that isn't being displayed. dave 2009-03-30 20:09:48 +00:00
• e2b78cc707 Add a mouseover tooltip to the delete icon, and add a "login" button to login as that student to see waht the studnet sees james 2009-03-30 20:06:25 +00:00
• 601bc4be68 Sched. judges on >1 SA team if they request dave 2009-03-29 06:42:08 +00:00
• 2e2b6910dc Only print the award name for SA only judges, so it makes sense visually. dave 2009-03-29 05:56:29 +00:00
• 29d2f5b333 Remove the requirement for a judge to only select one special award if they are SA only. dave 2009-03-29 05:54:22 +00:00
• f39ffeced4 - Create one round2 team for each jdiv, instead of just one big team - Fix the judge cost funciton a bit. dave 2009-03-29 05:43:22 +00:00
• f98b3b70b2 New judge scheduler, deals with multiple rounds of judging. Not quite ready for general consumption (there is no way to turn OFF the 2nd round yet), and the 2nd round scheduler needs a bit of work. dave 2009-03-29 04:31:16 +00:00
• 65e4d29c58 Fix the total check, and rename a variable to not be stupidly named james 2009-03-27 20:35:33 +00:00
• 32222526a8 Add judge language criteria to judge scheduler check before allowing the scheduler to run james 2009-03-27 20:31:57 +00:00
• 4185558e4b If there's a regfee, and we show a red * then there's no point showing "complete" becuase everyone is "complete" and only some will have a red star. saves bandwidth and real-estate on the page. james 2009-03-24 18:21:26 +00:00
• 1b6b245e37 Create (and protect) a logs data/logs folder and store annealer logs there incase they're needed down the road james 2009-03-24 16:58:02 +00:00
• b3bbd801ef Committing a comment to the annealer to look at down the road, ideas from Kris to speed up the scheduler when the cost isnt changing, instead of waiting for the temperature to fall slowly, speed it up when the acceptance rate is really good or really bad james 2009-03-24 16:52:10 +00:00
• 4b3455f730 Increase email field size Fall back to projectnumber sorting after projectsort (incase people manually set the project numbers in the project number field, and leave the projectsort empty james 2009-03-24 15:08:51 +00:00
• 03f1bf3299 Fix javascript error for missing onclick handler james 2009-03-19 19:15:35 +00:00
• 666f4ce720 Add type pref to the judges list, so it cna be filtered on to generate nametag lists for only special awards judges james 2009-03-19 18:54:34 +00:00
• 69849468ce Fix judges query for judges not active this year james 2009-03-17 18:42:12 +00:00
• 35276b7475 Don't export deleted judges james 2009-03-09 17:26:00 +00:00
• 3880628596 Sort the list of years in the report generator screen james 2009-03-09 16:50:58 +00:00
• 6db3c8ef37 Dont include deleted judges in reports, ever. james 2009-03-09 16:38:06 +00:00
• 7674cf3fbe Fix a divide by zero when "scale columns" was set to yes, but there were no scalable columns to scale james 2009-03-05 20:55:06 +00:00
• 2fafcfd844 double negatives ftw... now do it properly -- do not email deleted judges! james 2009-02-16 23:34:03 +00:00
• 7cbd70577e Oops missed an AND james 2009-02-16 23:32:02 +00:00
• b8c9d10be0 Never email judges that have been deleted. This will all change once branch gets merged in, but fixes the fairs for this year at least. james 2009-02-16 23:28:47 +00:00
• a39fd80264 - Show "personal information complete/incomplete" to committee too. - TODO: make it actually update the {$type}_complete columns. dave 2009-02-16 05:03:25 +00:00
• 91270b79ac Don't verify the SSL certificate - temporary workaround for CURL's ca-cert bundle not properly authetnicating the YSF SSL cert. james 2009-02-11 22:41:18 +00:00
• 959f45d725 - Make the user list a little cleaner for multiple-role users. It makes the code ugly however :( dave 2009-02-11 08:07:04 +00:00
• 1b4e596a0f - Make the time selection look a little better dave 2009-02-11 05:53:23 +00:00
• 2112dca205 Filter registration fee items by year too dave 2009-02-11 05:40:54 +00:00
• c158b9aad1 - Judge timeslot selection page, default: disabled. The scheduler doesn't use it yet, but here it is. dave 2009-02-09 07:09:09 +00:00
• e508efece9 - Only show positions for the current year dave 2009-02-09 00:25:23 +00:00
• 10bac6ca24 This isn't needed now, all user editors are in a popup window dave 2009-02-08 08:27:12 +00:00
• d3acfa1fe9 - Fix the create user, ask for an email, not a name (because need to insert a unique username,year pair now). Make it a popup window. - TODO: use AJAX to give feedback as to whether the username already exists. dave 2009-02-08 08:23:27 +00:00
• cb39440d16 Fixup all other uses of user_create dave 2009-02-08 07:51:03 +00:00
• 6a1de0f2f3 - Fix the new user function, the user table is now UNIQUE in (username,year), so we need to insert both. dave 2009-02-08 07:40:36 +00:00
• eecb099e9b Add the registrations number to the field list dave 2009-02-07 15:35:51 +00:00
• 934c8b4ef0 - Don't need this one either dave 2009-02-06 08:05:38 +00:00
• 48424d9f31 - Don't need this anymore. dave 2009-02-06 08:04:02 +00:00
• cac041186a - Fixup the timeslot assignment editor to deal (primitively) with rounds dave 2009-02-06 07:05:29 +00:00
• c8705bc70d - Update judges_timesltos. to match dave 2009-02-06 06:56:39 +00:00
• 799c014b6c - Use name, not round_name. Name will never confict dave 2009-02-06 06:55:32 +00:00