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

1041 Commits

Author SHA1 Message Date
james
98f6a9f76d Update more communication emails (teachers, principals) 
Tweak award eligibility display
Add "Account" info to student reports (email, username, pendingemail)
Move some project identification stuff around and fix the groupings
 2011-03-23 19:44:08 +00:00
james
3af6933f73 hmm better implement the selection of eligibility - it wasnt working here for me, but was on some windows browsers.. so.. be explicit with what its doing and now it should work everywhere 2011-03-22 20:40:31 +00:00
james
23d8765fa6 Fix all participant emails in communication module 
Make queries for communications easier, all you need is a users.id queried, the system will find everything else for you
Add ability to use [PASSWORD], [USERNAME], [EMAIL] (tries accounts.email first, if its not there, it uses accounts.pendingemail), in _ANY_ email.  [REGNUM] also added but will obviously only work for participants
Add "all" section to the tabs list for user editor, so a user without any roles can still get the basic pages like "account",  "roles", and "personal info"
Put count on participant invitations for teachers (and superusers)
Fix a bug where changing a password for a different user didnt work (it changed YOURS!)
 2011-03-22 04:37:51 +00:00
james
5147b3a62b Fix daves commit from last night, we dont use year anymore, we use conferences_id 2011-03-20 19:20:03 +00:00
dave
58af12c9cb Commit from branch2.3, match the categories/divs with the project year to avoid printing categories from previous years. 2011-03-20 00:09:00 +00:00
james
d59908033e Always put the app text under the barcode so people know what its for :p 
Fix the naming of the barcode function for consistency
 2011-03-19 21:05:18 +00:00
james
12bb399d48 Fix the conference logo not working on reports (FINALLY! god for such a stupid bug it took me forever to realize it), also tweaked the barcode code a bit 2011-03-19 20:49:06 +00:00
james
c493120128 INcrease the size of the barcode slightly. 2011-03-17 23:16:44 +00:00
james
047dd2c86f Oops missed one (IMPORTANT) barcode commit 2011-03-17 23:13:51 +00:00
james
c338261abc Add iPhone app stuff to trunk/ 2011-03-17 23:06:16 +00:00
dennis
2e303635ea Changes to facilitate running in Windows OS IIS or Apache werb server 2011-03-15 20:28:10 +00:00
james
3b2bf0a0e2 Oops, fix off-by-one in safetyquestion report editor fields 2011-03-15 00:08:59 +00:00
james
41085e2c46 Add fields for project safety question answers to report buildeir 2011-03-14 22:04:30 +00:00
james
d182699702 shrink RegNum column, it doesnt need to be so big. 
fix project_details custom report for students->users
 2011-03-14 21:24:39 +00:00
james
9c080c76f5 Add some trimming to username/passwords/emails (to prevent people from putting spaces before and/or after their email address causing it to be invalid) 
Updated report system to read students from users table instead of students table
Fix tcpdf tables spanning multiple pages spilling into the header area
Fix calling an invalid add_table function (its addTable yo!)
 2011-03-14 20:59:16 +00:00
james
43283059ae show pendingemail in school list if email isnt set (and let them know its unconfirmed) 
show "no name set" in school list if the name (firstname." ".lastname) is blank
 2011-03-07 22:34:28 +00:00
james
caf1207fbf Put some superuser stuff on the participant invite page so alison can see whats going on 2011-03-05 04:39:06 +00:00
james
c995e226c7 Update registration_list 
Update registration_statistics
Update registration_receivedforms
Update student_editor
 2011-03-04 22:29:55 +00:00
james
953e95ac3e Update student/project editor for admin 
Fix the registration_list.php to work again - temporarily disable "create new project" and the ability to ADD students to an existing project
 2011-03-04 21:52:37 +00:00
james
ac30e13078 Add teacher emaisl to communications tool 2011-03-04 02:26:22 +00:00
james
04283b7383 Add ability to edit users from the account_list 
TODO: force user to join a conference if they dont have a user record for the conference yet (then roles cna be added, like say, committee :p )
 2011-03-03 05:44:49 +00:00
james
f58e53cdb8 Okay really completely get rid of the role if '{$type}_enable'=='no' 
Move account_list to main admin page
 2011-03-03 05:36:36 +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
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
james
4ba97420ee Forward port the new 'custom - judges - all years' report 2011-02-23 23:12:42 +00:00
james
3ac1d9f92d Forward port translation changes 2011-02-23 23:05:27 +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
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
518472136d Update the account list with more details 2011-02-23 17:48:44 +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
a484939f1b Move openeditor() to sfiab.js common file, and update references to it 2011-02-23 16:40:17 +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
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
349af780ed Email address fix for user_list (now show accounts.username and accounts.email) 2011-01-28 18:01:31 +00:00
james
a5bd01f621 Bunch of fixes 2011-01-26 23:15:58 +00:00
james
97076cbe32 Add function to copy schools from a different conference. 
fix the user_load_by_uid calls, but im not sure if simply replacing them with user_load() is the 'right' fix.. but at least the page loads now :p
 2011-01-11 20:10:51 +00:00
james
e278505bc0 Simplify the user list and make it work again 2010-12-06 20:26:39 +00:00
james
39ff0dd2ce More fixes to (hopefully) allow a superuser to add admin/config roles 2010-12-06 19:33:38 +00:00
jacob
128fc6a3b5 Added logging to the API, and separated the log file creation into a common function 2010-12-02 17:25:23 +00:00
jacob
88c6d9a0dd Further updates in migrating to conference id 2010-11-03 20:59:03 +00:00
jacob
c3cf698524 Updates converting from year to conference id. 2010-11-03 17:18:02 +00:00
jacob
54070f1836 Several updates on migrating from fair years to conference id's 2010-11-02 20:35:47 +00:00
jacob
e4d94ffca2 Updated the communication queries in communication.inc.php to use the conferences system rather than fair years. 2010-11-01 21:23:17 +00:00
jacob
5e0886c812 Minor correction 2010-11-01 17:21:58 +00:00
jacob
ca0e700952 More conversions from fair year to conference id 2010-11-01 17:14:42 +00:00
jacob
21261a99af Many updates of queries, switching from usage of FAIRYEAR to conference_id. 2010-11-01 15:24:59 +00:00
jacob
b9bcb127a6 Updated these tables to include the conference id: 
award_awards
	award_prizes
	award_types
	award_awards_projectcategories
	award_awards_projectdivisions
	winners
	students
	projects
	registrations

Also modified all code that uses those tables to work with the conference id
instead of the year, with the exception of these files:
	communication.inc.php
	reports_students.inc.php
	rerollprizes.php
	remote.php
The "rerollprizes.php" probably doesn't matter, having been a one-time usage
file anyway.  The others will need to be modified in the future to correctly
use the conference id instead of the year.
 2010-10-20 21:58:26 +00:00
james
e55a6f901a fix schedule display boxes to be the same for FF/IE/Chrome 
Add min/max judges/volunteers/teams
Add defaults
Update science olympic tab display
Add Teams/Volunteers/Judges status to admin schedule view
 2010-10-14 15:11:52 +00:00