Commit Graph

141 Commits

Author SHA1 Message Date
james
ae8ec49388 Allow admin or superuser to uninvite students from any school 2011-03-08 17:46:25 +00:00
james
4aced55922 Remove 'special awards' from participants user profile, it shoudlnt be there! 2011-03-03 21:38:35 +00:00
james
39dd0e6897 Some adjustments to student status, and make the old "main" page start to work again 2011-03-03 20:52:17 +00:00
james
bd4eb9a9cc Reorder status array for Michael
Remove registrations_id from field list
Adjust remove dateofbirth in favour of birthdate
2011-03-03 19:24:49 +00:00
james
699e12523f make foodreq field based on configuration
api registration/fields accepts both string (to json decode) or a post array, so the testapi page works
2011-03-03 18:11:36 +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
04dcd31b6a Oops registration_id not registrations_id
Also fix the roletype error on main page
2011-03-03 01:36:41 +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
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
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
3419f06b0b emergencycontact ORDER BY id 2011-03-01 17:59:08 +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
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
82746f754b Added the emergencycontact info to the code describing the structure of the user object (user_get_fields). 2011-02-24 18:42:46 +00:00
jacob
2ec08b64d9 Adding additional student fields to the users table
Added name confirmation to the api in api/user/displayname/get and pi/user/displayname/confirm
2011-02-24 17:44:12 +00:00
james
22a46874ee Misc login/invite fixes 2011-02-23 17:50:06 +00:00
jacob
74cfb14bf4 minor touch-up: don't need to load the emergency contact's id when loading it as part of the user object. 2011-02-23 17:35:50 +00:00
james
6b37f4b721 Move user_editor_window to the root, so it can share a common user_edit_tabs.inc between user_edit (for the logged in user) and user_editor_window (for admins to edit users)
Start fixing the school editor (not done yet)

Update jqueryui (1.8.9) and jquery (1.4.4 - NOT 1.5 - 1.5 causes conflicts with autocomplete and validaotor plugins)
2011-02-23 16:45:00 +00:00
jacob
6c0e0cb0ca Added emergency contact info as an array member of the user object.
Updated register_participants_emergencycontact.php to link emergency contacts directly to the users, and allow multiple emergency contacts for a single user.
Added the users_id field to the emergencycontact table, allowing that direct link.
2011-02-22 20:52:54 +00:00
james
ab566836e7 Upgrade jquery and jqueryui, so we can use built-in autocomplete 2011-02-22 17:50:14 +00:00
jacob
3745d8cfd9 Added api functionality for creating and saving projects 2011-02-17 22:04:47 +00:00
jacob
dfb54ec9df Added date of birth, food requriements, t-shirt size and medical alert info to the users table as student fields 2011-02-16 19:08:58 +00:00
james
93f4703b71 Add account_list (temporary hack)
user_invite can find users by username OR by email address
if the account is found, but user_load fails, thats okay, it just means that they dont have any roles yet
2011-02-16 18:39:59 +00:00
james
221213e1d8 Add grade to participant required fields 2011-02-02 23:19:15 +00:00
james
ebc7d7ad1d Fix the other two places that used the array_diff_assoc incorrectly (by simply removing it) 2011-02-01 21:59:06 +00:00
james
b4d018f771 Fix user_save to properly update the status of all roles that the user has
Fix special awards tab to load&save properly
Fix volunteer positions tab to load&save properly
2011-02-01 20:10:11 +00:00
james
cb6796b95d Languages group fix 2011-01-28 18:12:30 +00:00
jacob
552ce74d96 Couple of quick fixes:
- the "languages" field needed to be regrouped when applied to a Science Olympics account
 - Modified account/create api to test all errors and return them as a group, rather than exiting on the first error
2011-01-27 22:55:42 +00:00
james
a5bd01f621 Bunch of fixes 2011-01-26 23:15:58 +00:00
james
e0f0a5dd90 Re-do user_invite to allow users to be invited by admin/config's - its not complete, but its working, it still needs to send emails though to tell the user of their new role, but i need to think on how to do that because if its a new account then it could be just a username/password without an email, but if its invited then the email __IS__ the username, but we shouldnt rely on the email being valid until its been confirmed via the email confirmation.. ugh?!?! 2010-12-21 23:16:20 +00:00
james
39ff0dd2ce More fixes to (hopefully) allow a superuser to add admin/config roles 2010-12-06 19:33:38 +00:00
james
0acf5a5661 Allow superuser to always access admin/config even if its not in their session roles 2010-12-06 18:33:02 +00:00
jacob
8817e5eb86 Updated the user loading to only include fields that are relevant to the roles, accounting for the fact that certain roles (eg. juge) have different fields for different conference types. 2010-12-02 20:28:19 +00:00
jacob
336cec80e0 Quick fix for an error showing up in some field types for the api
Added an error catch, re-indexing the languages array when a user is saved, to ensure that the indecies are numeric
2010-12-02 18:43:35 +00:00
jacob
a6544f40c4 Added an error check in saving the user, avoiding duplicate keys on an insert if bad data is passed in. Touched up the error output to make finding errors a pinch easier. 2010-12-02 16:33:04 +00:00
jacob
6b94ef5c76 Added abillity to uninvite a user from a particular role where allowed, and api function (/user/uninvite)
Added function user_list_modifiable, which returns a list of user info that the current user is allowed to modify (users.inc.php)
Added api for calling user_list_modifiable (/user/list)
2010-12-01 19:40:45 +00:00
jacob
39f53e4168 Added teacher abillity to add/remove students
Updated the user_save to output more meaningful errors
Updates on 'questions' and 'pagetext' tables to change the 0 conference ID to -1, matching the -1 year
2010-11-29 22:54:12 +00:00
jacob
1e1fa0097a Updated super/conferences.php, adding a rollback if there are errors in copying a conference.
Added compvars.php, which is a test script for comparing data after it's been rolled over from one conference to another - used to test the rollover in super/conferences.php.
Updated usage of the role "student", replacing it with "participant".
2010-11-26 16:50:17 +00:00
jacob
e9f46edb0e Added code for inviting users, access to it through the api 2010-11-23 20:58:38 +00:00
jacob
8f255f4eb8 Added an icon for conference management. Added fields in the config for teachers 2010-11-18 22:46:46 +00:00
jacob
8b15620f69 Added the api/registration/dictionary functionality 2010-11-18 17:00:26 +00:00
jacob
31baeaa715 SQL error fix 2010-11-18 15:59:22 +00:00
james
a8b0adce05 fix typo 2010-11-17 23:47:37 +00:00
jacob
1b098f85b3 The API depends on a return value from the user_save function, which was not being generated.
Updated user_save to return 'ok' on success, and an error message otherwise.
Updated api.php to make use of user_save's retun value.
2010-11-17 21:02:32 +00:00
jacob
6c5669c3f4 Arg - accidentally committed with a data dump... 2010-11-17 16:37:44 +00:00
jacob
1972323a65 Correction on how the multiselect fields are described 2010-11-17 16:12:10 +00:00
jacob
2848ed177d Quick correction on how lang is described in the user_get_fields function 2010-11-17 15:52:02 +00:00
jacob
0ff766175b Updates on the data that gets returned when describing the user structure
Modified user code to properly save the volunteer availability data
Updated the UI to properly use the user_save function to update judge and volunteer info
2010-11-16 22:51:42 +00:00