arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,161 Commits 9 Branches 6 Tags 30 MiB
b71a0dc994
Commit Graph

118 Commits

Author SHA1 Message Date
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
james
61fba8a93c json_decode always returns an object unless you tell it to give you an associative array (2nd parameter) 
give multi-select-lists as full object's where appropriate (might be more too? special awards?)
 2010-11-16 21:19:16 +00:00
jacob
a0c64963e0 small mod on user save function 2010-11-16 20:54:46 +00:00
jacob
cf2e2eb6db Modified some of the user preference data as it's stored in the user array 2010-11-16 20:42:40 +00:00
jacob
1e2340beb1 Some updates on the interface for creating conferences 
Modified the user object, correcting some issues with judging availability and volunteer availability.
 2010-11-16 19:53:26 +00:00
jacob
a7a7735347 Added grouping to the list of user information fields 2010-11-10 18:47:01 +00:00
jacob
c3cf698524 Updates converting from year to conference id. 2010-11-03 17:18:02 +00:00
jacob
d8df2be109 Quick patch on my last commit. 2010-11-01 15:28:51 +00:00
jacob
4f35702bbf Added API function for modifying account information 2010-10-28 21:22:12 +00:00
jacob
d0d3c7b7c4 Separated the functionality of school selection from the pages, implemented it in the API 2010-10-27 16:40:17 +00:00
jacob
f1b9123835 Added a couple of field descriptions in the user fields 2010-10-26 19:38:08 +00:00
jacob
92d46976f7 Separating judging timeslot selection into the user object 2010-10-26 18:15:04 +00:00
james
3971df267f Add registration field roles to testapi.php page 
Fix char(2) field detection
 2010-10-25 23:55:38 +00:00
jacob
bb40bf4da1 Updated the user_load and user_save functions to handle judges special awards selection. 
Updated judge_special_awards.php to use that method rather than direct SQL queries.
 2010-10-25 18:07:55 +00:00
jacob
cee52c6b67 Updated function for getting user info structure. Used it in the user_load function. 2010-10-22 18:43:17 +00:00
jacob
bae700dead Starting on code for getting relevant field descriptions for user data depending on 
the roles for that user.
 2010-10-21 21:56:09 +00:00
jacob
3867b9b539 Fixes on the modified user_load function 2010-10-21 16:08:41 +00:00
jacob
78bf0c8751 Modified user_load to load only fields relevant to the roles that the user has 2010-10-20 19:44:18 +00:00
james
a792b763a1 remove username from the standard user fields 
add 'required_fields' array to the user object so the API users know which fields are needed
 2010-10-20 17:25:43 +00:00
james
c367656d02 also load committee whether its active or not 2010-10-15 01:46:53 +00:00
james
ab068fdfbb Fix updateSessionRoles once and for all 2010-10-15 01:31:07 +00:00
james
759ecc0a1a Oops its user_load not users_load 2010-10-14 23:06:21 +00:00
james
f225787e39 Properly update the session roles from the API side 
Allow (u) to be empty if we dont have it, we can get it from the session users_id
 2010-10-14 20:38:48 +00:00
james
241618c74f Fix saving active/deactive roles 
Fix the session roles when roles are modified and only put 'active' ones into the session roles array
 2010-10-14 20:31:10 +00:00