Commit Graph

2251 Commits

Author SHA1 Message Date
james
f58e53cdb8 Okay really completely get rid of the role if '{$type}_enable'=='no'
Move account_list to main admin page
2011-03-03 05:36:36 +00:00
james
8588846591 Undo the roletype change, i think there's more going on here than i originally thought.. it hink we use the $_SESSION['roles'] in two different ways at some point, fixing one breaks the other, need to investigate more 2011-03-03 05:32:46 +00:00
james
5ce75f9a82 Allow uninviting participants 2011-03-03 05:13:29 +00:00
james
a5eeefa195 Dont display anything for volunteer registration if its complete disabled
Tweak setting school id when inviting participants when an account is both a teacher AND an admin (still need to set the school!)
Disable registration_list for now, so Alison doesnt try it and see it broken and get frustrated
2011-03-03 05:03:44 +00:00
james
002704889b Add doc for nummentors to project object 2011-03-03 04:43:03 +00:00
james
22b4d119f6 Move nummentors to project object
Remove registration/edit (we dont need to post anything back... for now...)
2011-03-03 04:42:13 +00:00
james
26e4204015 Fix a bug in loading users (cant call user_load() within any function that is called within user_load itself, like all the individual page checks -- in this case, emergencycontactStatus()
Add special awards display to project/view
Add special awards saving to project/edit
2011-03-03 04:24:21 +00:00
jacob
b9fbc56372 A start on adding the special awards API 2011-03-03 03:00:35 +00:00
james
95bbdab5f6 Add safetyquestions as part of the project/view and project/edit API 2011-03-03 02:57:40 +00:00
james
4fe1b04db3 Few code touchups, emergencyContactStatus pulls from users not students 2011-03-03 02:23:47 +00:00
james
0b50b6b8f8 If a registration role type is completely disabled (via "{$type}_enable"="no") then report "not available" for that role, regardless of what the registration_type says 2011-03-03 02:18:15 +00:00
james
cd140c198a Add basic project info to registration/view 2011-03-03 01:53:04 +00:00
james
0d365bc731 mentors are also incomplete if we have less than we say we're gonna have 2011-03-03 01:46:37 +00:00
james
04dcd31b6a Oops registration_id not registrations_id
Also fix the roletype error on main page
2011-03-03 01:36:41 +00:00
james
53b155215d Add missing } 2011-03-02 23:58:38 +00:00
james
648e1bb031 Oops move registration into the righ tsection 2011-03-02 23:56:13 +00:00
james
9ff6a1cf58 Tweak doc 2011-03-02 23:53:35 +00:00
james
87940b54de Add API registration/view
Add API registration/edit
2011-03-02 23:52:44 +00:00
jacob
b955b01965 Erg - indeed, a fix for something I overlooked 2011-03-02 23:00:14 +00:00
jacob
0c6f1c3b70 Added the necessary code for updating the grade category that a project belongs in whenever it or it's participants are modified. 2011-03-02 22:41:26 +00:00
james
1749d8c67b Fix the contact form 2011-03-02 21:17:59 +00:00
jacob
902e45fe2e Missing function definition. Not sure why that didn't show up before... 2011-03-02 20:39:57 +00:00
jacob
c0b592dbd1 A quick catch to avoid errors on checking a students registration info when they have none 2011-03-02 20:28:20 +00:00
james
44ac9e6640 Remove registrations_id from one other place too 2011-03-02 17:46:53 +00:00
james
6f882b38b9 Remove registrations_id from the mentor object, it gets set when a mentor is added automatically, but should never be changed 2011-03-02 17:45:36 +00:00
james
693fb1e398 Oops fix is_array typo 2011-03-02 17:39:13 +00:00
james
46f292ba16 Switch mentors to only be "edit" instead of "add and edit"
If a id exists, it is updated
If no id exists, it is created

edit now returns the full mentor view array
2011-03-02 17:18:13 +00:00
jacob
e538262cc6 Update to user_load to ensure that the roles statuses are directly checked upon loading the user. 2011-03-02 17:12:13 +00:00
james
86ab58acac Fixes to maek signature page work 2011-03-02 16:50:28 +00:00
jacob
e7fac7406f Some user data that was expected in the session was not getting updated
on the user load.  Fixed.
2011-03-02 15:57:38 +00:00
james
5f289a6761 Update signature page to properly pull student info from users instead of students 2011-03-02 14:41:32 +00:00
james
5dba209aae Fix json_decode, we need the second parameter to specify an assoc array instead of an object 2011-03-02 14:26:18 +00:00
james
0e45df5df8 Add page_text's for participant and teacher invite only 2011-03-02 06:41:14 +00:00
james
1bc55cf742 Add two missing emails (for teachers and participants) 2011-03-02 06:26:33 +00:00
james
32b3d1d368 Add a quick and dirty participant_invite page to allow teachers to invite participants, since the teacher interface hasnt been created yet on the drupal side 2011-03-02 06:22:27 +00:00
james
963e1cdd31 Update wording on school info page to be more clear 2011-03-02 05:25:31 +00:00
james
0c3f01f238 Put a useful link on the main page, since there's nothing else 2011-03-02 05:25:00 +00:00
james
ead770775d Make sending emails with HTML work properly if there's no HTML yet 2011-03-02 05:24:09 +00:00
james
2b808e5e48 Make school feedback work 2011-03-02 05:23:38 +00:00
james
d6efd6749e Tweak the docs 2011-03-01 20:09:33 +00:00
jacob
e10d31f2c8 Updated the api for api/project/mentor/add and api/project/mentor/edit. Both now accept an array of
mentor arrays (now referred to as 'mentors' instead of 'mentor').  /edit will only accept an array,
but /add will accept that or no parameters to generate a fresh empty record.
2011-03-01 19:57:05 +00:00
james
3419f06b0b emergencycontact ORDER BY id 2011-03-01 17:59:08 +00:00
james
d3801e5a17 mentor/view ORDER BY id 2011-03-01 17:58:13 +00:00
james
ec5736c29f Return associated array instead of indexed on addMentor 2011-03-01 17:56:13 +00:00
james
3cf5b38994 Fix path of ajax script for user select autocomplete
Add label to the field so they know what to type in
2011-03-01 16:21:29 +00:00
jacob
143b255375 Oops - needed to move a line with some other modified code. 2011-02-28 21:54:21 +00:00
jacob
a773a76ed9 Quick touch-up on the user structure, adding a subset to the user role status for the participant role. Fixing also (I think) the problem with users always seeming to have the complete status 2011-02-28 21:45:51 +00:00
james
69bc561055 allow project/add and project/mentor/add to pass in an corresponding input array, and save that into the newly created project/mentor 2011-02-28 19:00:24 +00:00
jacob
2eeff8d688 Moved participant registration completion checks into participant.inc.php, and added the participant_status_update function to call them all and find get the total status.
Updated judge.inc.php and volunteer.inc.php - they were previously putting the complete status for a role into the user object as a separate value (eg. $user['judge_status'] = 'complete';).  Updated that to put it in the user's role list directly (eg. $user['roles']['judge']['status'] = 'complete').
Updated register_participants_namecheck.php to use the user table and check the session against the normal user_auth_required.
2011-02-25 22:30:50 +00:00
jacob
d10d5f3835 Quick fixes:
1) desk and outlet information no longer required when saving a project if they're not required in the config
 2) Updated the project/save api to have consistent return value with other api functions
2011-02-25 16:19:15 +00:00