arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,288 Commits 19 Branches 6 Tags
Commit Graph

80 Commits

Author SHA1 Message Date
james
9caa5b0a17 Fix the local sfiab side of special awards 
Add "numstudents" to top of participant main page
 2011-03-04 20:07:10 +00:00
james
c6ba56f57a Fix the -1 for the god damn last time 2011-03-04 19:56:15 +00:00
james
a28ab561eb Properly handle award id = -1 for "i dont want special awards" 2011-03-04 16:15:10 +00:00
james
7d6d1851cd michael couldnt find the registration number becuase it was called 'num' so now give him both 'num' and 'registration_number' 2011-03-04 05:51:23 +00:00
james
133b41da5b Fix typo, argh 2011-03-04 05:28:14 +00:00
james
9a33f52e15 global $conference in joinproject 2011-03-04 05:19:42 +00:00
james
81f6702412 Wehn adding a project, get the WHOLE project object to return using getProject instead of simply quering it manually 2011-03-04 04:54:50 +00:00
james
acbd76aa03 FIx missing numstudents in project object 2011-03-04 01:32:52 +00:00
james
cbfd66bb28 add numstudents API to the project object 
also add a unique constraint on the user_roles table (user_id,role_id)
 2011-03-04 01:05:15 +00:00
james
7254d983d8 FIx bug in special awards saving 2011-03-04 00:49:25 +00:00
james
5df66f4b7e Commit earlier fix to getProject returning invalid project object, im assuming this fixes michaels issue even though i havent heard yet... 2011-03-04 00:18:39 +00:00
james
c87f23397f Add better debug messages to output 2011-03-03 23:14:52 +00:00
james
020bebc1ab Fix project saving when session registration id isnt set properly, but we have it from the user object 2011-03-03 22:33:52 +00:00
james
b1940cbb9a Don't let students sign up for more special awards than tehy are allowed to 2011-03-03 20:58:54 +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
bca687a50e tweak studnet status, rename functions to make more sense 
particpants 'role' is now complete if their own personal info is complete
registration status is now separate and dictates whether the registrations overall status is complete or not
 2011-03-03 16:24:09 +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
james
95bbdab5f6 Add safetyquestions as part of the project/view and project/edit API 2011-03-03 02:57:40 +00:00
james
cd140c198a Add basic project info to registration/view 2011-03-03 01:53:04 +00:00
james
87940b54de Add API registration/view 
Add API registration/edit
 2011-03-02 23:52:44 +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
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
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
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
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
jacob
f22dfb3c93 Added project mentor management to the api, and functions for testing it 2011-02-21 19:42:13 +00:00
jacob
64ef61d88f Added api functionality for disconnecting a user from a registration : api/project/remove 2011-02-18 21:53:07 +00:00
jacob
f785a71be2 Oops - removed debug output from the project/new api. 
Updated getProject to take userId as a parameter, rather than the registration number.
 2011-02-18 20:48:56 +00:00
jacob
40e139b7a1 Fix for logical error in how I connected users to registrations. Had the wrong ID field connecting them. 2011-02-18 20:25:47 +00:00
jacob
e6dfe1c476 Added joinProject function in register_participants.inc.php, and added the api for it at /api/project/join 2011-02-18 19:19:56 +00:00
jacob
6519392bd5 Added getRegistrationsId() function, returning the registration ID for the specified user 2011-02-18 17:05:07 +00:00
james
96f36d4681 Implement project\/view 2011-02-18 16:56:35 +00:00
jacob
340a45127b Added code preventing users from creating more than one registration/project 2011-02-18 16:46:44 +00:00
james
3c0151263f Convert project/edit to pass a 'project' object as JSON instead of individual fields 2011-02-18 16:37:11 +00:00
jacob
ef4a14a386 modified the project/add API to not expect any data, but simply create the project. 2011-02-18 16:14:23 +00:00
jacob
3745d8cfd9 Added api functionality for creating and saving projects 2011-02-17 22:04:47 +00:00
jacob
21261a99af Many updates of queries, switching from usage of FAIRYEAR to conference_id. 2010-11-01 15:24:59 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
james
431c8d9036 Properly fix the summary required field for wordmin=0 (summary simply becomes a non-required field) 
Fixes the problem reported by waterloo, where the preg to count words was not counting words the same as the real word counter (602 vs 598 in the one i was looking at)
 2008-03-16 19:32:30 +00:00
dave
4587fd3c86 - When checking the project status, count the words and test that against the 
min/max number of words.  (fix 335).
 2008-03-12 00:28:44 +00:00
dave
735e5e0999 - Add a registration fee item editor 
- Allow students to choose items from the optional registration items
 2008-01-23 07:53:10 +00:00
dave
78fa4ad6ac - Add support for short project titles in addition to the regular project 
titles (defaults to off)
- Renumber the order of the config variables in Participant Registration, it's
  getting a bit crowded 
- Fill in some missing types for config variables
 2008-01-23 05:54:03 +00:00
dave
e8face39d6 - Update the project numbering system by also adding a sort field (defaults to 
the project number field if blank).
- Add a new number option 'X', which counts among ALL projects, not just the
  ones in the same division/cat.
- Add a padding argument to N or X  (N0...N9) defaults to 2 for N, and 3 for X.
- Adds 3 columns to the project table:
	- projectsort: for storing the expanded text
	- projectnumber_seq: for storing the N or X number for projects
	- projectsort_seq: for storing the N or X number for the sort order
- Add a new config option for sorting, and expand the text for the
  projectnumber.
- Change the default sorting for reports and project lists to use the
  projectsort category.
- Remove the gvrsf_tn option from the database, it's not needed now.
 2007-12-29 08:46:40 +00:00
dave
8ef21626f2 - Add a participant name check page for students to double check their name. 
- Fix a bug in tour printing after tours have been assigned (it would show both
  students in a pair project on the same tour, always.)
 2007-12-22 23:28:14 +00:00
dave
0d0e6bbb0f - Clean up the participant tour selection. Don't allow participants to select 
tours after the assignemnts are done 
- Always report the Tour status as complete if tour assignments have been done
  (rank 0 tours exist)
- Inform the participant of their tour assignment if assignments are done
 2007-12-22 04:03:17 +00:00