arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Commit Graph

  • 6e4ea2b912 Take website first/last name concent into account for the app as well james 2011-03-27 17:08:18 +00:00
  • ade9e1b876 Update confirmed participants page from students table to users table james 2011-03-27 16:49:22 +00:00
  • 8d9790e488 Okay lets update everyone with 173 barcode change now james 2011-03-26 16:27:41 +00:00
  • 2f9b62d671 Add french award name fields to reports Shrink barcode a bit james 2011-03-26 16:26:22 +00:00
  • 49cd9a28c3 Add options to email regular judges and special award judges separately james 2011-03-26 14:58:04 +00:00
  • 3e290af2dc Quick query fix jacob 2011-03-24 21:34:12 +00:00
  • 4a9e2ca163 Updated e-mail to accomodate custom e-mail address confirmation messages. jacob 2011-03-24 21:04:28 +00:00
  • 2d2546d46e Fix encoding with //TRANSLIT Add school separate students names with , instead of \n james 2011-03-24 18:23:19 +00:00
  • 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 james 2011-03-23 19:44:08 +00:00
  • 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 james 2011-03-22 20:40:31 +00:00
  • 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!) james 2011-03-22 04:37:51 +00:00
  • aa1ad291ac put the version back to 172, we dont want to do 173 update until the app is actually available, but now there's other updates we want to push out, so, this will let us push the other updateas without updating everyone with the new table label report james 2011-03-21 20:49:01 +00:00
  • c383ffef0e Add an updated project listing with more feedback (status error codes) and project photo information - make it a new file so the "old" app still works james 2011-03-21 20:10:19 +00:00
  • 5147b3a62b Fix daves commit from last night, we dont use year anymore, we use conferences_id james 2011-03-20 19:20:03 +00:00
  • 58af12c9cb Commit from branch2.3, match the categories/divs with the project year to avoid printing categories from previous years. dave 2011-03-20 00:09:00 +00:00
  • 4423acd4b0 Match the cat/div year with that of the project, so we don't print cats/divs from previous years. (Seriously, how long has this bug been here, and no one has complained until now!) james 2011-03-19 22:42:01 +00:00
  • 0d693b22cf Add update to convert "Label - Table Labels" (system report) to new TCPDF based report with barcode, so we can push that out to EVERY fair as soon as teh app gets approved (dont want them updated yet, incase the approval takes too long). james 2011-03-19 22:17:26 +00:00
  • 58e778035b Fix barcode function, auto-add static textbelow barcode, add fair logo code james 2011-03-19 22:10:12 +00:00
  • aedb61c286 Fix fair logo in tcpdf reports james 2011-03-19 22:08:47 +00:00
  • 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 james 2011-03-19 21:05:18 +00:00
  • 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 james 2011-03-19 20:49:06 +00:00
  • 6e0d3304b5 Add more missing translations james 2011-03-18 18:47:31 +00:00
  • f57fa82282 Add more translatiosn for Mariette james 2011-03-18 18:45:22 +00:00
  • 8e6da38509 Add regfee_items columns to student reports james 2011-03-18 18:35:19 +00:00
  • c493120128 INcrease the size of the barcode slightly. james 2011-03-17 23:16:44 +00:00
  • 047dd2c86f Oops missed one (IMPORTANT) barcode commit james 2011-03-17 23:13:51 +00:00
  • c338261abc Add iPhone app stuff to trunk/ james 2011-03-17 23:06:16 +00:00
  • 51553e0e61 Add barcode to tcpdf library james 2011-03-17 22:24:07 +00:00
  • 42f1185892 Add the barcode to the student report list james 2011-03-17 22:22:44 +00:00
  • 89bcf64399 UPdate to custom mailing label generator, been holding this for over a year in my tree -dont think its even used anymore, but it was useful for ottawa james 2011-03-17 22:22:20 +00:00
  • 8efb3f2bcf Add projectbarcode (only works with tcpdf) IF report has no items, still return the empty shell of the report (fix typo,. was returning $ret, instead of $report) james 2011-03-17 22:20:45 +00:00
  • 016f104a5d Make mailing labels for science dept head non-specific to single people "<personanne> OR science department head" james 2011-03-17 22:18:05 +00:00
  • 7bce69f8a5 Oops, add the common inc check for the /app folder to work james 2011-03-17 22:12:37 +00:00
  • 606937b8d9 Add files needed for iphone app james 2011-03-17 18:44:53 +00:00
  • 2e303635ea Changes to facilitate running in Windows OS IIS or Apache werb server dennis 2011-03-15 20:28:10 +00:00
  • 648d3f3e56 Dennis: Changes required for Windows OS IIS or Apache web servers. Windows with Apache needs more work. dennis 2011-03-15 18:25:10 +00:00
  • 3b2bf0a0e2 Oops, fix off-by-one in safetyquestion report editor fields james 2011-03-15 00:08:59 +00:00
  • 41085e2c46 Add fields for project safety question answers to report buildeir james 2011-03-14 22:04:30 +00:00
  • d182699702 shrink RegNum column, it doesnt need to be so big. fix project_details custom report for students->users james 2011-03-14 21:24:39 +00:00
  • 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!) james 2011-03-14 20:59:16 +00:00
  • 17f6feee93 Backport R2197 - registration stats by langauge, ticket #441 - for Mariette james 2011-03-14 19:26:44 +00:00
  • badc2e9378 forward port translation changes on participant special award pages james 2011-03-10 16:17:21 +00:00
  • 4a6f9d0e4e Fix some missing tranaslations on the special awards signup page james 2011-03-10 16:01:24 +00:00
  • 81fafb609c Add ability fo superuser to SEE anyones current password james 2011-03-10 15:01:17 +00:00
  • 6d189a907f If the email is already validated (like if they clicked the link more than once) just tell them thats the case instead of telling them its invalid (which it is) james 2011-03-09 23:43:19 +00:00
  • 369542ecde Make the buttons bigger and more spacing so its harder to hit the wrong thing by accident james 2011-03-09 20:18:58 +00:00
  • 91c2666940 Fix the t-shirt size column width james 2011-03-09 16:34:59 +00:00
  • a463b591cc Make participant invite table header clickable to sort james 2011-03-09 02:49:41 +00:00
  • f2d526deb8 Fix rowspan on judge special awards page james 2011-03-08 19:14:24 +00:00
  • ae8ec49388 Allow admin or superuser to uninvite students from any school james 2011-03-08 17:46:25 +00:00
  • 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 james 2011-03-07 22:34:28 +00:00
  • 5270935d3b A few tweaks to get the simcoe signature page back to 1 page - reduce some spacing - remove final <hr /> from bottom james 2011-03-07 20:05:26 +00:00
  • ef327f008b Update the javascript based count when the page loads james 2011-03-07 17:48:06 +00:00
  • d6ac7e36f5 Trim the summary before we count the words on it james 2011-03-07 16:47:33 +00:00
  • e47f65729d Trim the summary before splitting to count words (gets rid of leading and trailing whitespace causing extra 'words') james 2011-03-07 16:28:02 +00:00
  • 7583dc7dc6 More better output for school info on partifipant invite list (see whats going on!) james 2011-03-05 04:44:27 +00:00
  • caf1207fbf Put some superuser stuff on the participant invite page so alison can see whats going on james 2011-03-05 04:39:06 +00:00
  • b26d9a3dc4 Fix school list james 2011-03-05 03:13:15 +00:00
  • c995e226c7 Update registration_list Update registration_statistics Update registration_receivedforms Update student_editor james 2011-03-04 22:29:55 +00:00
  • 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 james 2011-03-04 21:52:37 +00:00
  • 9caa5b0a17 Fix the local sfiab side of special awards Add "numstudents" to top of participant main page james 2011-03-04 20:07:10 +00:00
  • c6ba56f57a Fix the -1 for the god damn last time james 2011-03-04 19:56:15 +00:00
  • af47f30aeb Fix special award nominations to work with "-1" special award (i dont want to nomiiated for special awradsa) james 2011-03-04 19:21:30 +00:00
  • afd81015eb Send the -1 award through for 'no special awards' james 2011-03-04 16:38:15 +00:00
  • a28ab561eb Properly handle award id = -1 for "i dont want special awards" james 2011-03-04 16:15:10 +00:00
  • c0299dc870 Update docs for account/edit, and tweak link_username_to_email james 2011-03-04 16:01:59 +00:00
  • 7d6d1851cd michael couldnt find the registration number becuase it was called 'num' so now give him both 'num' and 'registration_number' james 2011-03-04 05:51:23 +00:00
  • 133b41da5b Fix typo, argh james 2011-03-04 05:28:14 +00:00
  • 9a33f52e15 global $conference in joinproject james 2011-03-04 05:19:42 +00:00
  • 81f6702412 Wehn adding a project, get the WHOLE project object to return using getProject instead of simply quering it manually james 2011-03-04 04:54:50 +00:00
  • 0255fdbb88 Add firstname and lastname to the incomplete log for a better idea james 2011-03-04 04:45:21 +00:00
  • ac30e13078 Add teacher emaisl to communications tool james 2011-03-04 02:26:22 +00:00
  • acbd76aa03 FIx missing numstudents in project object james 2011-03-04 01:32:52 +00:00
  • 9efd7d89f9 UPdate teh numstudents API docs james 2011-03-04 01:05:47 +00:00
  • cbfd66bb28 add numstudents API to the project object also add a unique constraint on the user_roles table (user_id,role_id) james 2011-03-04 01:05:15 +00:00
  • 7254d983d8 FIx bug in special awards saving james 2011-03-04 00:49:25 +00:00
  • 5df66f4b7e Commit earlier fix to getProject returning invalid project object, im assuming this fixes michaels issue even though i havent heard yet... james 2011-03-04 00:18:39 +00:00
  • c87f23397f Add better debug messages to output james 2011-03-03 23:14:52 +00:00
  • 4c15b72a8b and finally, fix special awards registration in teh system james 2011-03-03 22:42:49 +00:00
  • 2d2b9f4ef2 Update project page and status james 2011-03-03 22:40:35 +00:00
  • 020bebc1ab Fix project saving when session registration id isnt set properly, but we have it from the user object james 2011-03-03 22:33:52 +00:00
  • b9d8a9c8c5 catch a few more role/add errors, and show more debug if it (by chance) hits the defualt case james 2011-03-03 22:17:05 +00:00
  • 3360fe95eb Tweak signature page james 2011-03-03 22:04:11 +00:00
  • 056d4d23bb Updates to old participant pages to work with new user system james 2011-03-03 21:55:05 +00:00
  • 4aced55922 Remove 'special awards' from participants user profile, it shoudlnt be there! james 2011-03-03 21:38:35 +00:00
  • f31cc5c5fa remove the not used special awards section james 2011-03-03 21:20:30 +00:00
  • b1940cbb9a Don't let students sign up for more special awards than tehy are allowed to james 2011-03-03 20:58:54 +00:00
  • 42ba7a3db9 Pass in the registrations id for the user james 2011-03-03 20:55:12 +00:00
  • 39dd0e6897 Some adjustments to student status, and make the old "main" page start to work again james 2011-03-03 20:52:17 +00:00
  • bd4eb9a9cc Reorder status array for Michael Remove registrations_id from field list Adjust remove dateofbirth in favour of birthdate james 2011-03-03 19:24:49 +00:00
  • 699e12523f make foodreq field based on configuration api registration/fields accepts both string (to json decode) or a post array, so the testapi page works james 2011-03-03 18:11:36 +00:00
  • 6ca366e1b8 Oosp actually put in the db update too james 2011-03-03 17:39:14 +00:00
  • d0702e9dc1 Add participant_fields and participant_required_fields james 2011-03-03 17:37:56 +00:00
  • 9b1e3fa964 Add judge completesections Fix typo in participant page james 2011-03-03 16:34:22 +00:00
  • 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 james 2011-03-03 16:24:09 +00:00
  • 17d15584d0 Only check single user complete status for their 'role' to be complete The overall registration status is now done completely separate james 2011-03-03 16:15:48 +00:00
  • 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 ) james 2011-03-03 05:44:49 +00:00
  • f58e53cdb8 Okay really completely get rid of the role if '{$type}_enable'=='no' Move account_list to main admin page james 2011-03-03 05:36:36 +00:00
  • 8588846591 Undo the roletype change, i think there's more going on here than i originally thought.. it hink we use the $_SESSION['roles'] in two different ways at some point, fixing one breaks the other, need to investigate more james 2011-03-03 05:32:46 +00:00
  • 5ce75f9a82 Allow uninviting participants james 2011-03-03 05:13:29 +00:00