science-ation/science-ation
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 002704889b Add doc for nummentors to project object james 2011-03-03 04:43:03 +00:00
  • 22b4d119f6 Move nummentors to project object Remove registration/edit (we dont need to post anything back... for now...) james 2011-03-03 04:42:13 +00:00
  • 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() james 2011-03-03 04:24:21 +00:00
  • b9fbc56372 A start on adding the special awards API jacob 2011-03-03 03:00:35 +00:00
  • 95bbdab5f6 Add safetyquestions as part of the project/view and project/edit API james 2011-03-03 02:57:40 +00:00
  • 4fe1b04db3 Few code touchups, emergencyContactStatus pulls from users not students james 2011-03-03 02:23:47 +00:00
  • 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 james 2011-03-03 02:18:15 +00:00
  • cd140c198a Add basic project info to registration/view james 2011-03-03 01:53:04 +00:00
  • 0d365bc731 mentors are also incomplete if we have less than we say we're gonna have james 2011-03-03 01:46:37 +00:00
  • 04dcd31b6a Oops registration_id not registrations_id Also fix the roletype error on main page james 2011-03-03 01:36:41 +00:00
  • 53b155215d Add missing } james 2011-03-02 23:58:38 +00:00
  • 648e1bb031 Oops move registration into the righ tsection james 2011-03-02 23:56:13 +00:00
  • 9ff6a1cf58 Tweak doc james 2011-03-02 23:53:35 +00:00
  • 87940b54de Add API registration/view Add API registration/edit james 2011-03-02 23:52:44 +00:00
  • b955b01965 Erg - indeed, a fix for something I overlooked jacob 2011-03-02 23:00:14 +00:00
  • 0c6f1c3b70 Added the necessary code for updating the grade category that a project belongs in whenever it or it's participants are modified. jacob 2011-03-02 22:41:26 +00:00
  • 1749d8c67b Fix the contact form james 2011-03-02 21:17:59 +00:00
  • 902e45fe2e Missing function definition. Not sure why that didn't show up before... jacob 2011-03-02 20:39:57 +00:00
  • c0b592dbd1 A quick catch to avoid errors on checking a students registration info when they have none jacob 2011-03-02 20:28:20 +00:00
  • 44ac9e6640 Remove registrations_id from one other place too james 2011-03-02 17:46:53 +00:00
  • 6f882b38b9 Remove registrations_id from the mentor object, it gets set when a mentor is added automatically, but should never be changed james 2011-03-02 17:45:36 +00:00
  • 693fb1e398 Oops fix is_array typo james 2011-03-02 17:39:13 +00:00
  • 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 james 2011-03-02 17:18:13 +00:00
  • e538262cc6 Update to user_load to ensure that the roles statuses are directly checked upon loading the user. jacob 2011-03-02 17:12:13 +00:00
  • 86ab58acac Fixes to maek signature page work james 2011-03-02 16:50:28 +00:00
  • e7fac7406f Some user data that was expected in the session was not getting updated on the user load. Fixed. jacob 2011-03-02 15:57:38 +00:00
  • 5f289a6761 Update signature page to properly pull student info from users instead of students james 2011-03-02 14:41:32 +00:00
  • 5dba209aae Fix json_decode, we need the second parameter to specify an assoc array instead of an object james 2011-03-02 14:26:18 +00:00
  • 0e45df5df8 Add page_text's for participant and teacher invite only james 2011-03-02 06:41:14 +00:00
  • 1bc55cf742 Add two missing emails (for teachers and participants) james 2011-03-02 06:26:33 +00:00
  • 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 james 2011-03-02 06:22:27 +00:00
  • 963e1cdd31 Update wording on school info page to be more clear james 2011-03-02 05:25:31 +00:00
  • 0c3f01f238 Put a useful link on the main page, since there's nothing else james 2011-03-02 05:25:00 +00:00
  • ead770775d Make sending emails with HTML work properly if there's no HTML yet james 2011-03-02 05:24:09 +00:00
  • 2b808e5e48 Make school feedback work james 2011-03-02 05:23:38 +00:00
  • 2fd5ab6a47 Upgrade TCPDF 4.8.039 to 5.9.059 james 2011-03-01 21:04:05 +00:00
  • d6efd6749e Tweak the docs james 2011-03-01 20:09:33 +00:00
  • 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. jacob 2011-03-01 19:57:05 +00:00
  • 3419f06b0b emergencycontact ORDER BY id james 2011-03-01 17:59:08 +00:00
  • d3801e5a17 mentor/view ORDER BY id james 2011-03-01 17:58:13 +00:00
  • ec5736c29f Return associated array instead of indexed on addMentor james 2011-03-01 17:56:13 +00:00
  • 3cf5b38994 Fix path of ajax script for user select autocomplete Add label to the field so they know what to type in james 2011-03-01 16:21:29 +00:00
  • 143b255375 Oops - needed to move a line with some other modified code. jacob 2011-02-28 21:54:21 +00:00
  • 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 jacob 2011-02-28 21:45:51 +00:00
  • 69bc561055 allow project/add and project/mentor/add to pass in an corresponding input array, and save that into the newly created project/mentor james 2011-02-28 19:00:24 +00:00
  • 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. jacob 2011-02-25 22:30:50 +00:00
  • 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 jacob 2011-02-25 16:19:15 +00:00
  • 82746f754b Added the emergencycontact info to the code describing the structure of the user object (user_get_fields). jacob 2011-02-24 18:42:46 +00:00
  • d1b7fb2306 Dennis. Changes allow 'installation' in windows servers (and others) Complete functionality in windows servers still 'in work' dennis 2011-02-24 18:12:03 +00:00
  • 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 jacob 2011-02-24 17:44:12 +00:00
  • 0968725a5f Adjust Dennis's conferences editor commit slightly james 2011-02-23 23:18:06 +00:00
  • 4ba97420ee Forward port the new 'custom - judges - all years' report james 2011-02-23 23:12:42 +00:00
  • b9c95e8719 Oops remove the second unneeded parameter james 2011-02-23 23:06:20 +00:00
  • 3ac1d9f92d Forward port translation changes james 2011-02-23 23:05:27 +00:00
  • 947a11ca1c Adjust translation for headings on winners page to be fully translated, instead of having the type substituted (differnet types should have different translatiosn aparently) james 2011-02-23 22:59:42 +00:00
  • b8be2f4ad4 Add committee names to translations Bug #503 james 2011-02-23 22:53:14 +00:00
  • b2ecf1cdb9 Make email field bigger james 2011-02-23 22:50:44 +00:00
  • 56119710a0 Upgrade TCPDF from 5_3_00 to 5_9_056 james 2011-02-23 22:42:29 +00:00
  • 4f319cea75 tcpdf supports png's internally as well, and png's give better color results in the final pdf (see simcoe county logo!) james 2011-02-23 22:33:30 +00:00
  • 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 james 2011-02-23 21:57:33 +00:00
  • 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 jacob 2011-02-23 21:12:12 +00:00
  • ab07f45767 Oops and add it to the array so its available james 2011-02-23 19:40:23 +00:00
  • 11a4facc6c Add report to get ALL judge data for ALL years james 2011-02-23 19:38:04 +00:00
  • 0320f662dd remove the student table from the register_participants_signature auth add 'participant' to the auth requirement for projects in the API james 2011-02-23 19:30:50 +00:00
  • 06fdbe1621 Fix commmittee member management page to work with new user system (and to force committee rollover since we didnt do it on rollover) james 2011-02-23 18:50:46 +00:00
  • 22a46874ee Misc login/invite fixes james 2011-02-23 17:50:06 +00:00
  • 518472136d Update the account list with more details james 2011-02-23 17:48:44 +00:00
  • 74cfb14bf4 minor touch-up: don't need to load the emergency contact's id when loading it as part of the user object. jacob 2011-02-23 17:35:50 +00:00
  • fa3a661b62 Allow superuser to edit other peoples accounts Show pending email if there is one james 2011-02-23 17:09:39 +00:00
  • 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) james 2011-02-23 16:45:00 +00:00
  • 79baaa37b6 Make password optional for create account (it'll pick a random one if not specified) james 2011-02-23 16:42:08 +00:00
  • a484939f1b Move openeditor() to sfiab.js common file, and update references to it james 2011-02-23 16:40:17 +00:00
  • ee657d49a1 Dennis. Changes allow 'installation' in windows servers (and others) Complete functionality in windows servers still 'in work' dennis 2011-02-22 21:54:34 +00:00
  • 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. jacob 2011-02-22 20:52:54 +00:00
  • ab566836e7 Upgrade jquery and jqueryui, so we can use built-in autocomplete james 2011-02-22 17:50:14 +00:00
  • a451a47a94 Fix displaying science head emails, and add them to the list-view as well for convenience james 2011-02-22 15:49:06 +00:00
  • 7eb89d98a2 use addTable instead of add_table for consistency between interfaces james 2011-02-22 15:24:19 +00:00
  • 1d2642527e Add a simple index to the top of the APIDOC page james 2011-02-21 22:17:58 +00:00
  • 8d7eb7ca72 add api/project/signatureform API james 2011-02-21 22:07:06 +00:00
  • 3c3a76d8ac Add missing ; to end of old db update 161.sql james 2011-02-21 21:52:06 +00:00
  • 8aaff3cbd7 Add another missing semi-colon james 2011-02-21 21:40:52 +00:00
  • f22dfb3c93 Added project mentor management to the api, and functions for testing it jacob 2011-02-21 19:42:13 +00:00
  • e06eb7dbd8 Add missing ; to 194 Remove duplicate INSERT of roles (its in 193, no need to do it again?!) james 2011-02-21 16:22:29 +00:00
  • 64ef61d88f Added api functionality for disconnecting a user from a registration : api/project/remove jacob 2011-02-18 21:53:07 +00:00
  • f785a71be2 Oops - removed debug output from the project/new api. Updated getProject to take userId as a parameter, rather than the registration number. jacob 2011-02-18 20:48:56 +00:00
  • 40e139b7a1 Fix for logical error in how I connected users to registrations. Had the wrong ID field connecting them. jacob 2011-02-18 20:25:47 +00:00
  • e6dfe1c476 Added joinProject function in register_participants.inc.php, and added the api for it at /api/project/join jacob 2011-02-18 19:19:56 +00:00
  • c1d248dbd3 Added the soulmate for a lonely opening brace. jacob 2011-02-18 17:12:32 +00:00
  • 6519392bd5 Added getRegistrationsId() function, returning the registration ID for the specified user jacob 2011-02-18 17:05:07 +00:00
  • 96f36d4681 Implement project\/view james 2011-02-18 16:56:35 +00:00
  • 340a45127b Added code preventing users from creating more than one registration/project jacob 2011-02-18 16:46:44 +00:00
  • 3c0151263f Convert project/edit to pass a 'project' object as JSON instead of individual fields james 2011-02-18 16:37:11 +00:00
  • ef4a14a386 modified the project/add API to not expect any data, but simply create the project. jacob 2011-02-18 16:14:23 +00:00
  • 3745d8cfd9 Added api functionality for creating and saving projects jacob 2011-02-17 22:04:47 +00:00
  • ca48277fb0 Remove 2501 and 2502 commits - they're still messed up :( james 2011-02-17 18:53:39 +00:00
  • 5dcdb5029a dennis 2011-02-17 18:07:10 +00:00
  • 6925d88b16 dennis 2011-02-17 18:03:28 +00:00
  • b71a0dc994 email_send should send html version of email if we have it, also dont translate the subject & body thorugh i18n() james 2011-02-17 16:36:17 +00:00
  • 31f29b7f84 email_send should send html version of the email if we have it james 2011-02-17 16:35:44 +00:00
  • 0b57eb2edd Whoa, guess this divs/cats adjustment never made it into branch! scheduler is complete b0rked without it. james 2011-02-16 20:28:55 +00:00