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

2325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
0968725a5f Adjust Dennis's conferences editor commit slightly 2011-02-23 23:18:06 +00:00
james
4ba97420ee Forward port the new 'custom - judges - all years' report 2011-02-23 23:12:42 +00:00
james
b9c95e8719 Oops remove the second unneeded parameter 2011-02-23 23:06:20 +00:00
james
3ac1d9f92d Forward port translation changes 2011-02-23 23:05:27 +00:00
james
56119710a0 Upgrade TCPDF from 5_3_00 to 5_9_056 2011-02-23 22:42:29 +00:00
james
4f319cea75 tcpdf supports png's internally as well, and png's give better color results in the final pdf (see simcoe county logo!) 2011-02-23 22:33:30 +00:00
james
ac334f2534 Add working school editor -- some things in it will need to be refactored out, but for now, just leave it as is so alison can get to editing her schools 2011-02-23 21:57:33 +00:00
jacob
19676aa403 Modified the authentication api to store project registration id and registration number in the session. 
Updated the project api's to use project id/number stored in the session
 2011-02-23 21:12:12 +00:00
james
0320f662dd remove the student table from the register_participants_signature auth 
add 'participant' to the auth requirement for projects in the API
 2011-02-23 19:30:50 +00:00
james
06fdbe1621 Fix commmittee member management page to work with new user system (and to force committee rollover since we didnt do it on rollover) 2011-02-23 18:50:46 +00:00
james
22a46874ee Misc login/invite fixes 2011-02-23 17:50:06 +00:00
james
518472136d Update the account list with more details 2011-02-23 17:48:44 +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
fa3a661b62 Allow superuser to edit other peoples accounts 
Show pending email if there is one
 2011-02-23 17:09:39 +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
james
79baaa37b6 Make password optional for create account (it'll pick a random one if not specified) 2011-02-23 16:42:08 +00:00
james
a484939f1b Move openeditor() to sfiab.js common file, and update references to it 2011-02-23 16:40:17 +00:00
dennis
ee657d49a1 Dennis. Changes allow 'installation' in windows servers (and others) Complete functionality in windows servers still 'in work' 2011-02-22 21:54:34 +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
james
a451a47a94 Fix displaying science head emails, and add them to the list-view as well for convenience 2011-02-22 15:49:06 +00:00
james
7eb89d98a2 use addTable instead of add_table for consistency between interfaces 2011-02-22 15:24:19 +00:00
james
1d2642527e Add a simple index to the top of the APIDOC page 2011-02-21 22:17:58 +00:00
james
8d7eb7ca72 add api/project/signatureform API 2011-02-21 22:07:06 +00:00