Commit Graph

372 Commits

Author SHA1 Message Date
james
33471e80ee Add award source configuration
Add stub for award downloader
2007-11-23 22:07:55 +00:00
james
0551a65e93 Add trophy selection (student keeper, student return, school keeper, school return) to prizes
Add description to award & update awards ceremony script to include description if available
2007-11-23 21:21:37 +00:00
dave
68f52562e5 - Fix the header and top navbar on the awards management/editor page 2007-11-23 20:23:46 +00:00
dave
30d944f968 - Fix a typo 2007-11-21 22:31:34 +00:00
dave
44205d5039 - Disable the save and delete option for system reports, and print a message
saying that the report can only be saved as a new report.
- Add checks to the report_save and report_delete fucntions to ensure system
  reports cannot be saved/deleted.
2007-11-21 22:30:19 +00:00
dave
ac3e50f94e - Fix a bug in the student report generation
- Simplify the report generation logic for report types.
2007-11-21 21:55:31 +00:00
dave
0ff8489d58 - include user.inc.php before using user_auth_required() 2007-11-21 17:02:09 +00:00
dave
f61dbd294e - Fix another one 2007-11-21 16:46:19 +00:00
dave
5eb9c81f36 - Add a missing header 2007-11-21 16:44:50 +00:00
dave
9a2c37f7f0 - Add text boxes for order and title for each member on each committee 2007-11-20 20:46:05 +00:00
james
cf2c345e03 cannot use $users_id since its a session variable, and with register_globals ON $users_id overwrites $_SESSION['users_id'] 2007-11-19 21:45:08 +00:00
james
25de3ace41 only go through the columns if there are columns to go through 2007-11-19 21:14:56 +00:00
dave
04e70ceb33 - Use user_auth_required() for authentication to check for committee access
(needed for multirole users)
- Add the top navbar to all pages
2007-11-18 23:50:23 +00:00
dave
9882ca09c6 - Fix a missing ')' 2007-11-18 23:20:00 +00:00
dave
2715d67aef - Fix login check for an expired password
- Allow user_personal.php to handle committee members
- Add password field if the editer in user_personal has access_super
- Allow a committee member to edit anyone in user_personal.php
- Convert auth_required to user_auth_required, and check for both a user type
  and an access level (if committee)
- Convert the committee to the new user system (BIG change :)
- Remove the ^M from admin/committees.php
2007-11-17 21:59:59 +00:00
james
40fe6cb88c Do some checks for system() and error out where applicable 2007-11-16 17:58:59 +00:00
dave
dfd0371d92 - Add the volunteer positions editor
- Add the report type for volunteers
2007-11-16 05:32:04 +00:00
james
347d46b86d Add sponsor organization to awards ceremoney script
Add ability to specify an award type to only generate a script for that type
Add ability to specify a year to get the awards ceremony script for that year
Add links to the new options on the main reports page
2007-11-15 20:25:05 +00:00
james
cb23d603f3 MySQL5 Fix for Report 17 (Emergency Contacts) 2007-11-15 17:35:04 +00:00
james
abe32b69ae Fix report to work with mysql5 -- need to join tables in the correct order. 2007-11-14 22:44:01 +00:00
james
1cc99b4ef9 Add document manager, and update tableeditor to allow setting of a downloadlink for documents 2007-10-31 20:00:23 +00:00
james
1de8f94516 Add "committee members" to available email recipients in the communication system 2007-10-31 15:22:30 +00:00
james
6d635e89f7 Only get the recipients list once
Oh, the last commit also fixed a couple multi-year registrationnumber uniquedness problems, as well as a few register_global dependencies
2007-10-30 22:37:18 +00:00
james
4378f966ce Add an email address verification function so we dont need to keep duplicating the regex everywhere
Add a function to get the email recipients for a given registration id, for now, it just gets the students, but downt eh road it should check if teachers, parents, emergency contacts, mentors, etc should receive fair updates as well.
Implement the code/replacement tags for the two new emails, one for 'forms received, with payment' and the other for 'forms received, without payment'
2007-10-30 22:35:00 +00:00
james
ab5180ef9e Add two new emails: registration complete, registration payment pending
Whipe out all 'from' of info@sfiab.ca (the old default, we dont want others using it!)
When sending emails, if 'from' is empty, use the $config['fairmanageremail']
Add a warning on the communication page if the fair manager email has not been set
Set the default 'from' for new emails to be the fair manager email

NOTE/FIXME: i added the hooks for the two new emails to be sent, but still 
need to fill in the substitution values as well as the "to" - no time now, 
will do that tomorrow
2007-10-29 20:21:40 +00:00
james
d1c626e2b6 Add the award sponsor to the winners entry page 2007-10-29 19:13:52 +00:00
james
b8e4c38c2b Make sure we have an ID and a Year before trying to make the report 2007-10-25 20:30:58 +00:00
james
213004783b s/awarded/available 2007-10-25 20:23:28 +00:00
james
c5b2ae9f4c Add "label" to list of report formats 2007-10-25 19:54:10 +00:00
james
54ca3a0eef in mysql5, projects needs to be joined before the projectdivisions/projectcategories 2007-10-25 19:48:20 +00:00
james
e8aeb731ec Clear some ambiguity in the term "# of prizes" vs "# awarded" 2007-10-25 18:48:35 +00:00
james
091c2ceffd Judge list - delete now unlinks the judge from the current year
Judge manager - delete now deletes the judge completely

Judge list only shows judges active for current fairyear
Clarify a few issues on the judge registration page
2007-10-25 18:20:55 +00:00
dave
186c0525b7 - Add an option to view reports from previous years 2007-10-20 04:04:14 +00:00
james
1c0c51c7fc Update all Avery templates, add new avery template for 1 1/3" x 4"
Fix a register_globals reliance
2007-10-09 17:42:00 +00:00
dave
f922adb9af - Implement vertical alignment for labels
- Implement boxes around text for testing (and maybe for a purpose?)
2007-10-05 20:12:19 +00:00
james
30df2c8af8 Add "back to admin" links
Rename item in main admin menu to be more reflective of what it actually does
2007-10-05 18:44:48 +00:00
james
02a5ef7811 Add the xml.inc.php common file 2007-10-05 18:40:32 +00:00
james
dbcd4e955f Update admin index to include One-Click Affiliation Stats
Factor XML functiosn out of cwsfregister into separate xml.inc.php
Add xml functionality to ysfstats, and fudge the male/female stats to include "not specificed" genders
Add submit functionality to ysfstats to actually send data to YSF
2007-10-05 18:40:07 +00:00
james
29f545f80f The rest of the stats required for regional affiliation with YSF 2007-10-05 17:34:06 +00:00
james
c82126150e Add a file to calculate stats required for YSF Regional Affiliation
(not complete yet)
2007-10-03 21:03:46 +00:00
james
4a3aaac8af Properly address french mailing labels to schools 2007-09-27 15:29:48 +00:00
james
c4c57fde2b Make sure the FAIRYEAR is 2008, and bump version number to 2.1.2 2007-09-20 17:31:43 +00:00
james
7f3a0ff528 Add a fix to re-roll award prizes that werent properly rolled over due to the rollover bug in 2.1.0 2007-09-20 17:26:18 +00:00
james
1e947cba16 - Add a school based report query, so things like mailing labels can be created for ALL schools, not just the ones attached to a student. 2007-09-13 18:57:56 +00:00
james
0de2bfeef0 Add a few more missing "exit" calls after a header("Location"); 2007-05-10 19:18:01 +00:00
dave
878a29a9d1 - Another case where we depend on register_globals = 1 2007-04-11 22:09:17 +00:00
dave
9c1a16acc2 - Add assigned tour to the report generator
- Add prize names to the report generator
- Change award name to sort by name, if you want to sort by order, use the
  Award--Order column. (Specifying a sort by prize name, and it actually
  sorting by order doesn't make sense)
2007-04-10 15:53:48 +00:00
james
3f8d70d47d Add a bunch of fields that allow you to create all the information on a single form for Sci-Tech Ontario award winners to submit to sci-tech ontario 2007-04-05 21:33:39 +00:00
james
6088779b37 Properly handle "quote" marks in the title if the page gets resaved after the initial save 2007-04-03 21:07:44 +00:00
james
f3ad2c7f26 Oops need to global $config for that last patch to work 2007-04-03 20:17:32 +00:00
james
31aebc743f Only count a huge penalty for the team if there's no chair on the team if the minimum number of judges per team is greater than 1. If the minimum is 1, then essentially the "willing chair" stuff should get ignored. 2007-04-03 20:16:48 +00:00
james
eff30a5adb Add an option on the winners selection page, to show all ELIGIBLE projects for a special award, not just the nomiated ones. Helps in teh case that an award was added last minute that nominations didnt happen for, or in a caase that the judges decided to choose a winner that didnt nominate to begin with.
Update the winners page to not duplicate students names :p
2007-04-03 20:10:00 +00:00
james
e7776a6b9c CSV of award winners - we used this at ORSF to do a Mail-Merge into a MS publisher template which export to a PDF to create a presentation for the awards ceremony... Next year we should automate this to create an OpenDocument Presentation (.odp) 2007-04-03 20:05:39 +00:00
dave
35ccf2a2ad - Fix an instance where we rely on register_globals to be on 2007-04-03 19:53:30 +00:00
dave
526db97052 - Update the custom tour selection report to:
- Only report complete students
	- Use tour names instead of numbers
	- Not use $email as a temp varaible because that actually overwrites the
	  $_SESSION['email'], and logs us out, wtf?
	- Sort by first tour selection
2007-04-03 18:49:29 +00:00
james
daa3f4bb51 Rename the entry to "Website Consent" 2007-03-31 01:10:56 +00:00
james
c95df2b912 Implement web consent restrictions, settable by the admin (under the admin->participant registration menu) to prevent firstname and or lastname (and or photos once they are implemented) of students, on a per studnet basis, from being displayed on the website. It currently affects the confirmed participants page, and the winners page (the only two public places where sutdent info is available thorugh the system) 2007-03-31 01:10:08 +00:00
james
97c2b65a93 Require >1 judge div grouping 2007-03-29 20:33:45 +00:00
james
d209b0648f Add new CUSTOM report: Program Awards List (used for ORSF printed program)
Add award criteria to getJudgingTeams() result
Modify CUSTOM report judges teams proejcts, to show each award and the criteria/eligibility for each award that the team is assigned to judge.
More ease of use cleanups to awards interface
Add new field award order to student report generator
2007-03-28 22:32:57 +00:00
james
6fa1a01fe6 Remove much of the awkwareness of the awards management interface 2007-03-28 18:03:15 +00:00
dave
1bdba54ed5 - Add a special awards feature (off by default) to the judge scheduler. It:
- Creates a judging team for each special award
	- Assigns judges to special awards based on the number of students self
	  nominated.
	- Obeys the judges special award preferences (if enabled), and also
	  judges that specify if they are a judge for a specific special award
	  (if enabled).

- Add 2 new config variables.
	- Enable the special award scheduler
	- Specify the max. number of projects each special award judge can
	  handle (default: 20)

- Delete an extra blank line in register_participants_students.php
2007-03-28 06:16:41 +00:00
dave
cc2e6b5bce - Add fullpage (no margin) reports for the full pages, we need them for our
certificate generator
2007-03-27 05:01:51 +00:00
james
fb1ddd4775 Clarify what the 'prize' field should be used for. (eg, only if the prize is non-cash/non-scholarship) 2007-03-26 17:06:44 +00:00
dave
a979f158eb - Add a 0.75" page margin to the full page labels 2007-03-26 16:49:15 +00:00
dave
336ec2f75c - Don't generate PDF table reports for things that should be labels.. generate
"label" reports.
2007-03-26 06:20:43 +00:00
dave
efc7ae411d - BAM!
- Overhauled the report generator.. It's more versatile now
- Added 'filter' option to the generator, so you can filter any column by (=,
  <=, >=, <, >, IS, IS NOT, LIKE, NOT LIKE).  It doesn't support AND or OR
  combinations, but that should cover what we need for now.  Example: We can
  filter "Award Name" LIKE "%Gold%" to generate a report of just the Gold medal
  projects.
- Wipe out the report database, and create it again from scratch.
  update.48.sql contains an example of how to add additional reports to the
  system without knowing the report_ids, because after regions start adding
  their own reports, we won't be able to just wipe out the whole report system
  to add one.
- We handle more reports now, specifically nametags and table labels, so remove
  those files, and update the reports.php file to link the old links to the new
  report generator (so people don't get too confused in this transition).
- Beginnings of moving the report generator to proper LEFT JOIN style
  constructs instead of just one big massive EQUALS JOIN.
2007-03-26 06:15:41 +00:00
dave
80ca088be2 - This will break things, but I need to get these home so I can work on 'em.
WIth luck, I'll have a new report generator commiteed witha proper DB update
  tonight.
2007-03-26 01:54:18 +00:00
james
c22b3fa86b Add some extra fields to the awards report 2007-03-22 14:55:24 +00:00
dave
c64d7445e9 Update the selector so it works 2007-03-20 20:50:14 +00:00
dave
23934f080a - Fix the report selector for browers that can't seem to do javascript 2007-03-20 18:49:44 +00:00
dave
77eee9dcdd - Add options for nametags to be generated
- Add committee member generator
- It is now possible to generate ALL nametags the old system could generate
  (needs a DB update before that happens... actually, the report generator
  isn't as stable as I hoped.. I'll probably just nuke the report tables the
  next upgrade and recreate them all.. I'm probably the only one who has tried
  generating a custom report. :)
2007-03-20 06:24:18 +00:00
dave
18d2bfa0d3 - The generator needs these to be arrays 2007-03-19 16:47:01 +00:00
dave
2f23e31a40 - Update the generator, it can do labels and nametags now, almost ready to
deprecate all the mailing list/nametag/table label/etc. files.
2007-03-19 06:51:44 +00:00
dave
3f737b3270 - Replace two judging reports.. The second isn't quite a perfect match, but it's close
enough..  Currently we can't produce both a list of judges and a list of awards for each
  team with the generator (how the heck would we express that with an SQL statement)
2007-03-19 00:13:12 +00:00
dave
d659999339 - Update the judge and award report generators 2007-03-18 21:48:36 +00:00
dave
7b04204ede - Add judge and award type report generators (not nearly complete)
- Migrate generic code into reports.inc.php
2007-03-18 19:59:02 +00:00
dave
f3129e7a39 - Add date of birth to the student report field list so we can close a bug on
bugtracker.
2007-03-18 07:24:52 +00:00
dave
857cb6aa7b - Fix the CSV generator 2007-03-18 07:19:00 +00:00
dave
331bedc7e7 - Delete reports that the new report generator now duplicates 2007-03-18 07:12:49 +00:00
dave
b3978c7dae - Add a new student report generator
- Add an editor for that generator.. it's not flawless, but it's not hard to
  use either.
- Add 19 default reports
- Replace several reports on the report page with the new generator versions
  (they pretty much look the same, same info, same sort order, same pagination)
- Add a pulldown menu to the report pages so any report can be generated
2007-03-18 07:10:54 +00:00
james
a318e2d1fa Always for the project number position, incase the project title wraps onto two lines, this prevents the table labels from spilling over to two pages.
Also fix it so it doesnt have a final blank page at the end
2007-03-14 01:18:18 +00:00
james
faceec20ed In the judges division groupings, only show the count of projects that are complete or paymentpending 2007-03-13 22:11:18 +00:00
james
174490b752 Auto focus on the input box on the input received forms page, so you dont have to click on the box every time before you start typing in the registration number. 2007-03-13 21:34:24 +00:00
dave
453a3666f1 - Commit the report generator.. it still needs work, but it's quite usable now. 2007-03-13 06:10:27 +00:00
dave
cb992b8819 - Add the "none" tshirt option to the admin student editor 2007-03-12 17:27:55 +00:00
james
3519bc5e0e Add three new email recipients to the communications module:
1) special award sponsors (confirmed only)
2) special award sponsors (unconfirmed only)
3) special award sponsors (all)
2007-03-12 14:23:44 +00:00
dave
57ff84c563 - Move registration fee computation into the include file
- Add the required registration fee to the received forms checkoff, so the
  amount of the cheque can ben checked too.
2007-03-12 02:05:40 +00:00
dave
f0bb80a866 - Fix the name of the generate project number function
- Hardcode add a special award to the top of the list "I do not wish to
  nominate for any special awards".  Allow the
  project_specialawards_link.award_awards_id field to become NULL, and set it
  to NULL if the student selects this award.
- Fix the display of the award status based on whether the student has or has
  not specified that they do not wish to nominate for special awards.
2007-03-05 04:27:44 +00:00
james
4789d78e2f - Move the project number generation into a header
- Add an option to the project editor to regenerate the project number
- Fix a bug in the project number generation.  Include YEAR in the project
  number check (and in the number generation) so we don't find a project from
  last year (that already has a number), and decide not to generate one for a
  project from this year.  The $checkNumQuery was returning 2 rows.. one from
  2006, one from 2007.  Two projects from different years had the same
  registrations.num (665983) in my test.. about 10% of the projects at the VDSF
  collided with numbers from previous years.
2007-03-04 20:28:51 +00:00
james
2ff20effc2 Respect page margins on the school access codes report 2007-03-04 16:38:45 +00:00
james
fe2627faec Fix the wording on Jesse's table labels and nametags field section pages. 2007-03-04 16:36:28 +00:00
james
659bc11066 Put the email address in the registration list, so when someone calls and says "i never got my registration number!" you can easily look it up for them! Sorry this didnt get into 2.0.10, im going to update everyones version with this patch anyways 2007-03-02 15:02:14 +00:00
james
fea05546d1 Fixed the reports_schoolprojects report to not error when there are no projects 2007-02-26 21:43:39 +00:00
jesse
4c08f9c517 This now prompts for which fields to display in the name tag (pdf). 2007-02-24 20:24:22 +00:00
jesse
5edba483e3 This will prompt for which fields to display on the project table label. By default all of the checkboxes are ticked. 2007-02-24 19:59:55 +00:00
james
2d6257715e Fix text on one configuration variable
Fix judge manager to keep the 'show_what' persistent when performing other actions on the table (editing, sorting, etc).
2007-02-21 20:42:48 +00:00
jesse
8830c1be99 added another column "school boards". This allows us to sort our list and quickly distribute the school access codes because we do not have email addresses for all of our schools. 2007-02-18 17:38:48 +00:00
james
8a009b71e1 Add a "Presented by: " to the awards ceremony script
Closes Bug #0000113
2007-02-12 22:30:43 +00:00
james
952a4d3c29 Fix a bug where if no $table is passed to addTable it will now return gracefully instead of spitting out error messages
Add email field to the judge list, and the judge manager list
2007-02-09 14:57:07 +00:00
james
1d203535ee Add 1x4" judging sheet stickers for use on the CWSF judging sheets. It contains the project number, title, and category/division. 2007-02-07 22:05:59 +00:00