Commit Graph

1316 Commits

Author SHA1 Message Date
dave
5bae61bb04 Allow existing parents, principals, mentors, and alumni to create mutlirole accounts. 2010-02-10 14:58:10 +00:00
james
0e9334eaa1 change teh version to 2.2.9 for development in preparation of 2.3.0 2009-09-09 00:35:33 +00:00
dave
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.
2009-09-08 22:02:14 +00:00
dave
daf3314c03 - Fix the sql database for hte last commit
- move code around in curl for less indentation
2009-09-08 17:39:57 +00:00
dave
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)
2009-09-08 17:34:52 +00:00
dave
d91ac62015 - Convert award sources to fair users 2009-09-06 00:07:26 +00:00
dave
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)
2009-09-05 23:04:14 +00:00
james
fd95489426 hopefully the last test 2009-08-20 14:37:15 +00:00
james
968d30a448 Testing stupid encoding on commit emails 2009-08-20 14:34:51 +00:00
james
8f344d2f8b test five 2009-08-20 14:03:54 +00:00
james
14e0d624d8 test four 2009-08-20 14:02:54 +00:00
james
4115d2993e itest threee 2009-08-20 14:01:46 +00:00
james
c2205f7def Testi two 2009-08-20 13:59:02 +00:00
james
88936f52af Test 2009-08-20 13:56:34 +00:00
james
a7e2d840bc commit daves changes from earlier today 2009-05-13 02:25:50 +00:00
james
86d4e37448 fix for timeslot check 2009-05-11 16:30:05 +00:00
dave
74d0c53dd3 - Update the printing of the user list, if it's a fair, print the fair name too. 2009-05-06 04:46:08 +00:00
dave
036cf2c295 - And the server side of the JSON stats. We should probably rename this file
since it has nothing to do with XML anymore.
2009-05-05 07:27:38 +00:00
dave
687d4ea875 - Convert fair stats to JSON 2009-05-05 07:27:02 +00:00
dave
ee978816b2 - More accurate info in fair_stats
- Enable the new fields in the fair editor
2009-05-04 06:41:02 +00:00
dave
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.

--This line, and those	below, will be ignored--

M    db/db.update.128.sql
2009-05-04 06:32:36 +00:00
dave
f58fd10749 - Serverside for the stats gathering. 2009-05-04 06:13:44 +00:00
dave
66fe2ed34f - Add remaining stats gathering info for SFFBC, try to make them generic so
anyone could use them.
2009-05-04 06:13:15 +00:00
dave
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).
2009-05-03 06:31:03 +00:00
dave
3d15473906 - And uncomment the communication.... :) 2009-04-23 04:39:24 +00:00
dave
566c5aecff - Fix some of the stats reporting 2009-04-23 04:38:29 +00:00
dave
2aab58b28d - Fix a typo in the last db file 2009-04-23 03:53:41 +00:00
dave
cfdcfb7c9d - More data, more stats 2009-04-20 05:27:06 +00:00
dave
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.
2009-04-20 05:02:23 +00:00
dave
d2e9a4e64e - Partial DB updates, and an xml transport script for feeder fairs to communicate 2009-04-20 04:34:37 +00:00
dave
f3f9e1c342 - Updates for editting the fair 2009-04-20 04:33:49 +00:00
dave
9f80a3fd81 - Another missing file, oops 2009-04-16 06:51:13 +00:00
dave
56a6305570 - Add a science fairs manager 2009-04-16 06:49:40 +00:00
dave
2c6e90d37b - Handle multisel config options with <= 5 items 2009-04-14 06:25:55 +00:00
dave
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).
2009-04-12 21:38:51 +00:00
dave
6bd52d6ff2 - Add the basics for a science fair "user". 2009-04-12 03:13:09 +00:00
dave
38effb78ee - Add a basic, but funcitonal, new user option for any type of user. 2009-04-12 02:40:32 +00:00
dave
b5a9ca07d8 - Fix a typo 2009-04-12 02:39:48 +00:00
dave
52bd4ae2b7 - List schools by city first, then school name 2009-04-06 05:42:25 +00:00
dave
8af5de9625 - Also do the SSL trick for YSF stats 2009-04-05 19:22:09 +00:00
dave
e766945fcb Update the stats for the nwe user system 2009-04-05 19:20:43 +00:00
dave
6c32f2c2d7 - Merge the last 2 commits into the users makeover branch 2009-04-05 18:02:07 +00:00
dave
46178ca051 - Fix the list of all judges 2009-04-02 00:10:18 +00:00
dave
b2e1b1e74f Fix a typo 2009-04-01 23:41:05 +00:00
dave
57017cccc0 Add time availability to the judge info popup 2009-04-01 23:40:08 +00:00
dave
241d9ad1c1 - Fix printing the judge languages beside each judge 2009-04-01 23:24:54 +00:00
dave
411361e351 - Add active and delete checks to the judges/volunteers 2009-03-31 17:44:35 +00:00
dave
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.
2009-03-31 17:12:08 +00:00
dave
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.
2009-03-30 20:15:42 +00:00
dave
bd8ce272b1 Undo the last patch 2009-03-30 20:14:44 +00:00