Commit Graph

604 Commits

Author SHA1 Message Date
james
a352886ca6 And remove my print_r debug :) 2007-12-20 18:18:06 +00:00
james
a69ad4ae71 Oops use the right fields for type and stock 2007-12-20 18:17:40 +00:00
james
515a92dda7 Dont use JSON anymore, we really dont need the entire report object, we just need the 3 fields type, stock and desc, so return them on their own line, so we can just split on \n 2007-12-20 18:13:06 +00:00
dave
f17f07ff94 - Don't open the info window until it is requested. 2007-12-20 18:07:39 +00:00
james
87f1452919 Fix invalid type. type="" is valid because of custom reports.
Same for stock.
2007-12-20 18:00:30 +00:00
james
d9f6b8c330 Remove the warning about only being able to submit once.. it doesnt make sense for stats. 2007-12-20 16:01:39 +00:00
james
647456ae69 judges_data.php ?? how baout judges_schedulerconfig.php :) 2007-12-20 15:58:07 +00:00
james
e0a77c6fd6 Sort the 'Projects and Judges' listing by jdiv_id 2007-12-20 15:53:11 +00:00
james
93f610c214 Make judges_jdiv groupings obey the filterdivisionsbycategory config option and dont show div/cat's that shouldnt exist 2007-12-20 15:47:19 +00:00
dave
71166d3e6b - Add the easyparse student names option 2007-12-20 09:51:08 +00:00
dave
6c61595cb9 - Add an option to print ALL student names for a project (will work for more
than 2 students).
2007-12-20 09:43:22 +00:00
dave
49a19c9d44 - Fix report stock when the report stock keys were updated
- Add a missing stock number
- Fix a report where distinct was missing
2007-12-20 09:25:43 +00:00
dave
984c9776ef - Separte the action handler from the config emitter (but tie them together so
that the old functionality remains)
- Run the action handler separately in the tour annealer and judge annealer
  config so that the page can be refreshed immediately after an update, so
  the  config variables (that may have changed) are reloaded.
- Skip updating config variables that haven't changed.
2007-12-20 08:20:29 +00:00
dave
c8d01cb8fb - Handle the case where a student doesn't use all their tour rankings. 2007-12-20 04:29:16 +00:00
dave
1dd573ab63 - Add the tour annealer config/launcher 2007-12-20 01:14:21 +00:00
dave
7841190240 - Remove the old tour reports from the old report page 2007-12-20 01:13:24 +00:00
dave
5a3d7de0b6 - Return emergency contact info to a component in the query. 2007-12-20 01:09:16 +00:00
dave
998fe35d67 - Add a tour number to the database, and modify the tour editor to include the
number, and an option to create numbers automatically
- Completely remove all references (hopefully) to the Tour ID
- Add a Tour type report
- Rework the student report query so it actually makes sense.  It really should
  be a whole bunch of left joins based on the students.  Using comma (cross)
  joins creates situations where if the right side of the join doesn't have
  information, it wipes out the left side.  (Happened before with emergency
  contact info).
- Remove the (two) old custom tour reports
- Add 4 new tour reports to the database:
	- ALL tours for the committee, tour list for students, 
	student emergency contact info for tour coordinators, and 
	a list of tour assignments for students
2007-12-20 01:05:04 +00:00
dave
b0338f9fdf - Add 3 config variables: An effort for the tour annealer, and the updater
activity and percent.
- Add the status update and links to automatically start the "tour assigner".
  (Didn't want to call it a scheduler, because someone might thing it's for
  assigning tours to timeslots or something)
2007-12-19 21:12:57 +00:00
dave
5ad72acabf - Finish the cost function explanation 2007-12-19 19:58:15 +00:00
dave
c5887eb432 - A working tour annealer.. Now I just have to glue it all together. 2007-12-19 19:52:11 +00:00
dave
dba389618d - Move the tour manager into a tours subsection of admin
- Add a tour assignment editor, basically a copy of the judge team editor
2007-12-19 07:49:38 +00:00
justin
2363a38120 Add an actual form to the ceremony script setup page. 2007-12-17 23:20:21 +00:00
james
1d6c0c9530 Remove committee auth check and replace with commandline only check -- This allows the judges scheduler to actually run again! 2007-12-17 21:37:22 +00:00
justin
30072d182d Add support to omit unawarded awards and prizes from the awards ceremony script. Resolves RFE 136.
-Note: currently adds two configuration variables and a new category, they didn't seem to fit elsewhere.
2007-12-17 17:35:19 +00:00
james
13ef318f27 eliminate an array_keys warning if $$fieldvar isnt set 2007-12-14 15:28:54 +00:00
james
160acc97d0 Garrrrr, fix syntax error 2007-12-14 15:25:51 +00:00
dave
1dad6505eb - Select the first contact for each sponsor as the primary
- Prevent the user from setting zero, or more than one, primary contact.
- Add a primary column to the contacts table, so they can see the automatic
  set/unset operations on the primary contact.
2007-12-13 21:50:31 +00:00
dave
dcfcd358fc - Add a primary contact field to the award contacts
- Use the primary contact in award reports
2007-12-13 21:23:29 +00:00
dave
4c9d23e513 - Add sponsor information to the report generator awards report.
- Add a system report that dumps all sponsor info to a csv.
2007-12-13 19:56:44 +00:00
dave
c9fb9f1084 - Fix bug 0000128, the order of the languages in the judging team names 2007-12-13 19:21:41 +00:00
dave
57f349b1b1 - Add a year field to the users db, we'll need it eventually
- Add a designate field to the schools, to indicate an independent, standard,
  private, etc. school.  It's not editable yet, but.. eventually.
- Fix generatePassword to use proper string indexing, and remove the
  possibility of indexing beyond the end of the string.
- Add "Invite" and "SinglePassword" modes for volunteer registration.
- Update the admin section, add a new volunteers page to contain links to all
  volunteer options
2007-12-13 18:09:22 +00:00
james
89f074052c correct & combine same-size label templates 2007-12-13 17:03:35 +00:00
dave
d9135ec036 - Fix label names 2007-12-13 16:50:53 +00:00
james
7a7f87f892 Better statistics, less database queries 2007-12-12 23:35:51 +00:00
james
5207a0d6e2 Oops use the correct totalprojects variable 2007-12-12 21:00:12 +00:00
james
e99b57c4fa Breakout the stats for agecategory/division into a nicer-to-view table format 2007-12-12 20:57:51 +00:00
dave
9fffa6755d - Call them 'fair's not 'region's.. to assist linking fairs together.
- This patch references some config variables that don't exist yet, that's ok,
  we dont' want anyone turning these on yet.
2007-12-12 04:15:17 +00:00
james
5e4a31c50c Clarify wording "input received signature forms"
Remove redundantly redundant header heading
2007-12-11 19:44:18 +00:00
james
8a1a67f1be Error checking on judges_teams_timeslots when no teams/timeslots are selected to assign 2007-12-11 19:38:25 +00:00
james
5d81818815 Error adding report to list if no category is specified
ALWAYS exit; after a header("Location:");
2007-12-11 18:23:15 +00:00
james
53847c37bf Make this page more readable with the right css classes 2007-12-11 18:22:27 +00:00
james
16dfbc934c Fix the breadcrumb trail 2007-12-10 22:06:41 +00:00
james
cf594b7f42 Clear the comments for a custom report 2007-12-10 21:48:37 +00:00
james
a1208d205a Fix the JSON "invalid label" problem for firefox 2007-12-10 21:47:05 +00:00
james
5d8632b07e refactor the standard ajax stuff to a common file
implement an ajax report fetcher for the my reports editor page using JSON to select the right stock/type defaults
2007-12-10 20:53:41 +00:00
james
7bbea6351a 1) Properly handle "filterdivisionbycategory" checks for divisional awards
2) Properly handle cases where there's MORE than one award for a certain div/cat combo
2007-12-10 19:21:21 +00:00
james
b146a9c773 OOps border isnt supposed to be there, its overrridden by the class anyways, but no point having it there taking up bandwidth 2007-12-10 18:26:03 +00:00
james
a38cda2c05 Make the reports page much more real-estate friendly 2007-12-10 18:23:00 +00:00
dave
c1e0353ec2 - Add a separate file for award ceremony scripts. I doubt this will ever end
up in the report system, so it might as well have its own home.  Also, there
  will be lots of options added to this in the future.
2007-12-10 09:40:34 +00:00
dave
4eb5098d59 - Move admin/reports.php to admin/reports_old.php
- Move admin/committee_reports.php to admin/reports.php
- Add some text explaining how the new system works
- Fix all linkage
2007-12-10 09:38:54 +00:00
dave
9bd50a5e5a - Do a reload on report selection when adding a report. FIXME: I need to find
a way to make this page not jump back to the top after the reload.
2007-12-10 09:14:48 +00:00
dave
85c3ad8694 - Add an "All Reports" section to the My Reports page, just like the top of the
(soon to be old) reports.php
2007-12-10 08:05:57 +00:00
dave
d554e116fd - Add some avery labels, and another custom report 2007-12-10 08:00:15 +00:00
dave
e384a48ea6 - Instead of using big ugly "Generate" buttons, just make the report names
clickable.
2007-12-10 03:28:42 +00:00
dave
5b282980ee - Fix the fairname in the sql queries for students and volunteers 2007-12-10 03:08:08 +00:00
dave
c44803e365 - Do something more intelligent when the report query fails, like, print a
friendly message with the failed query.
2007-12-10 03:05:35 +00:00
dave
4cacf1b945 - Add a link to try each report before adding it, so the committee member can
see what it looks like.
2007-12-10 02:59:47 +00:00
dave
3e3c28268c - Implement "My Reports". Committee members (with admin access, because
reports require admin access) can define a list of reports out of all the
  reports, and tag each one with a category and comments.  
- Add all except the ceremony scripts as "Custom" reports.  The My Reports
  system can handle links to custom reports now, but not the ceremony scripts.
  They're too special.  I think they should be moved out of the Reports Area.
- Clean up some report variables to avoid collisions with local names
  ($options, and $stock)
- Implment a new screen for report generation that lets the user set the
  format, stock, and year of the report.
2007-12-10 02:50:53 +00:00
james
e00a3a9d4b Fix judge teams add page -award query for MySQL 5.x 2007-12-08 17:07:51 +00:00
dave
c61a0d3d36 - Delete the old custom report 2007-12-08 00:00:57 +00:00
dave
e6b7b3beb0 - Add the fields for the school access report
- Change the report generator to accept an 'sid' (system report id)
- Use the sid, not the report id, for the custom reports that aren't custom
  reports anymore.
- Use the generator's school access report, not the custom one.
2007-12-08 00:00:26 +00:00
james
17b10cc269 Fix a parse error - dave you need to check these when you commit!! 2007-12-06 17:38:29 +00:00
james
f1706322d7 Rename heading "# of Prizes" to just "Prizes" 2007-12-06 04:10:09 +00:00
james
79915dd278 Properly fix the crumbtrail on the award sponsor contacts page 2007-12-06 04:03:32 +00:00
james
e2c2ccd7e2 Make position field display bigger and increase maxlength (it was already bigger in the db) 2007-12-05 16:10:07 +00:00
james
e592098311 Add missing breadcrumb
BUG#0000187
2007-12-05 15:54:12 +00:00
james
9ea749ceb9 lol fix the ysf affiliation stats since dave moved the committee members over to the new system 2007-12-05 04:21:57 +00:00
dave
d65bf7642e - Make "Contact Phone" sorter, so it fits in the header of the PDF
- Add an "export" option to the report editor.. so any custom report can be
  exported.. and sent to us, and we can insert it as a system report.
2007-12-03 22:07:23 +00:00
dave
6d7f06bd0f - Add more columns to the school report generator 2007-12-03 21:04:35 +00:00
james
7a6294cb95 Handle error cases when uploading award data to external sources 2007-11-30 18:20:02 +00:00
james
389a3660c4 Add award winner uploader to send winners info back to external award sources 2007-11-29 22:30:35 +00:00
james
5ba77a6868 Fix a $_SESSION collision with a $variable when register_globals is ON 2007-11-29 18:49:34 +00:00
james
fab18eb0c7 Add enabled and website (for help) to external sources
Update source editor
Make downloader only check enabled source
Make downloader check for username/password before attempting
Add extra instructions
2007-11-29 18:38:06 +00:00
james
a70413b92d Distinguish externally imported prizes from manually added ones 2007-11-28 22:06:17 +00:00
james
566c1d1573 Show awards imported from external sources differently in the awards list
Better handle award identifiers
Add a missing <br /> on import
2007-11-28 21:55:14 +00:00
james
3f3d242f6d Dont try to process awards if there is no awards to process
Change the class on the prize edit page to be tableview and tableedit instead of summarytable and none (for consistency with the awards page)
2007-11-28 21:04:36 +00:00
james
325c909432 Dont check CURL support inside the loop and dont allow checking to be called without CURL support
Remove awards that were previously added but now dissappeared from the XML import
2007-11-28 18:46:32 +00:00
james
4917bc3a75 Fix postback field on award update 2007-11-27 23:02:40 +00:00
james
c7a3628f4a Update the sponsor if it changes for an existing award
Dont check year on the sponsors table
2007-11-27 22:55:45 +00:00
james
0f198346aa Update fake scripts for 2008
Add external award downloader functionality
2007-11-27 22:47:06 +00:00
dave
f6cc5d7326 - Cleanup how variables are handled/rolled/etc. Convert the require_vars
function in the config editor to one that checks where ALL variables marked
  with year=-1 exist for FAIRYEAR.  If it doesn't, it creates them.  This
  function gets called in three places:
 	- On installation
	- On rollover
	- Whenever the database is updated
 We should, now, be able to just insert new variables with year=-1, and they
 will be automatically updated for the current year with the default value.
 (no more going into the variable editor to make sure the copy is done).

- Fix the superuser account creation in the install script
2007-11-25 19:53:15 +00:00
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
dave
f83dcfebd0 - Add the award critera to the page where we input the winners, just so the
person doing the data entry has the option to sanity check the results.
2007-01-30 07:45:12 +00:00
dave
49c5704143 - Include the table editor before the judge class, this is in prep for PHP5
when we implmeent templates.
2007-01-30 01:52:55 +00:00
dave
3da0ba87e2 - Update the table editor, instead of doing all that funky stuff for listing
the table, we call a method in the table helper class.  That method returns 3
  things.. an array of SELECT columns, an array of FROM tables, and an array of
  WHERE clauses.  The table editor takes these, adds ORDER, LIMIT, etc, and
  runs the sql.
- Update the table editor to allow variables to be set.  THe helper class reads
  these variables to do pretty much anything it wants.. In this commit, it
  reads the judges_show_what variable, to determine how to format the SQL for
  selecting the table of judges (so the calling php can now know NOTHIGN about
  the database, it just sets a variable and expects the data to be formatted
  correctly.
- Update the judge manager, show all judges should now SHOW ALL JUDGES.
2007-01-28 07:53:14 +00:00
dave
94639c1278 - Allow a committee member to edit the password in their own profile (if they
have admin access to access the committee editor)
- Put a "My Profile" link on the main nav bar once a committee member logs in,
  so they don't have to find themselves thorugh the committee editor.  It takes
  them right to editing their own profile.
2007-01-21 05:43:29 +00:00
dave
82b8b75b25 - Add location and contact info for each tour. Dump this in the CSV dump of
the tours, but don't show it to the students at all.
2007-01-20 08:10:26 +00:00
dave
f7c430d712 - Allow a committee privateemail to be written as '' (nothing) without throwing
the "email address already exists" error.
2007-01-18 04:16:43 +00:00
james
932ce3731c remove some extra code from the tours manager
add a link to return to admin for translations
2007-01-12 20:45:52 +00:00
dave
900dab702d Add Tour selection.
- Admin can use the tour manager to add tours
- Admin can use the config variables to enable tours, and select the min/max number of tour choices.
- Students will see a "Tour Selection" section of registration, which is incomplete until the student has selected at least a minimum number of tours.... actually, this may be broken.. Need to look at it further..
2007-01-09 19:05:23 +00:00
james
0dd2da7145 Add configuration options to choose whether to ask the students if they require:
- table
	- electricity
2007-01-02 20:33:16 +00:00
james
9fc98fc288 Add a TCPDF version of the signature page, TCPDF does not require any extra PDF libraries (eg pdflib) to be installed
Create PNG versions of the uploaded logo image file
Detect which version of the signature page to use
Bump version to development series 2.0.5
2006-12-18 20:55:30 +00:00
james
0bd7ab8a93 Add an option to forcibly reset the judge scheduelr incase it gets stuck in an inconsistent state
Bump version number
Correct wording on judges expertise page
2006-12-15 21:18:27 +00:00
james
b38dfe33cc Update copyright headers to 2006 2006-12-15 19:51:32 +00:00
james
f36212f868 Add a project editor and a student editor, accessible by
clicking on the project or student links from the 
  "Registration List and Statistics" page

Add the project number to the registration list
2006-12-15 18:45:06 +00:00
james
1e7d9fcad9 Show access code in schools list
Add ability to create access codes for all schools and to remove access codes from all schools
Update generatePassword to accept a password length as a parameter, defaults to 8
2006-12-06 19:24:09 +00:00
james
319c5d6720 Add option to turn off the Mentor section for participant registration
Add two new projectnumber options:  c=category shortform,  d=division shortform, eg  (JLS01 = Junior, Life Science, Project #01)
Add shortform field for age category
Fix bug in config editor where it was updating values for ALL years, instead of just the current year!
Bump version number to development version
2006-12-06 17:58:40 +00:00
james
c951c58984 Only allow the Password: field in the committee manager to be shown/displayed/edited by someone with superuser access level
(i thought thats how it always was!, thats how it was meant to be at least!)
2006-11-21 20:20:25 +00:00
james
669ef1349c Add an ETA calculation to the status 2006-10-25 19:10:27 +00:00
james
b2c2fdb38b Add an option to DELETE a registration, removes everything to do with it from the database 2006-10-25 17:35:51 +00:00
james
95dc9eea5b Launch the scheduler with a lower priority (10) instead of hte default (0) 2006-10-25 03:25:31 +00:00
james
b65316c32e Changes to judging scheduler so the process runs smoothly
Dont let it start running if its already going
Properly handle the text when its done running
2006-10-25 03:19:54 +00:00
james
2bb5c2e2a4 Oops add the launcher 2006-10-25 02:41:56 +00:00
james
a871759129 Add the judges scheduler status page, updated automagically using AJAX
Redirect the scheduler link to a launcher link that lauches the scheduler then goes to the status page
2006-10-25 02:41:41 +00:00
james
5cf008adf6 s/precent/percent 2006-10-25 02:26:49 +00:00
dave
b883d2f389 - Fix the percent update in the judge scheduler 2006-10-25 02:23:53 +00:00
james
677132f307 Ooops, close php properly on the communication.inc.php file (sloccount told me so!) 2006-10-25 01:50:59 +00:00
james
cf1bf2cf9d change set_progress to set_percent 2006-10-25 01:48:32 +00:00
james
f687e4d889 Put the judge scheduler status in the "Judge Scheduler" category, instead of a new category (having it in a new category makes that new category show up on the configuration variables page, and since they are year=0 the page would be empty anyways. 2006-10-25 01:34:11 +00:00
dave
ea418624ba - Add status output to the judge scheduler in the form of 2 variables.
Completely untested because I don't have judge data here.  Will test when I
  get home and debug.
2006-10-25 00:53:02 +00:00
james
f3e8762f2e Only check if the cwsf division id is set once per project, not for each student 2006-10-19 23:31:28 +00:00
james
06cb40304b Add the link to the One-click CWSF registration
Also split the student display onto multiple lines
2006-10-19 23:12:11 +00:00
james
aa93c170db Actually send the data to the YSF server! 2006-10-19 22:54:26 +00:00
james
2019e24b89 Add the 'one click' CWSF registration code!
It current generates the XML but does not implement the sending to YSF (thats still to come!)
2006-10-19 21:39:30 +00:00
dave
9fbb3feb3b - A few simple fixes to make it work in default mode 2006-10-19 17:17:43 +00:00
dave
a9ca1718d1 - A new judge report generator.. it's completely broken and not done, but I
wanted to get it into the repository so maybe I can work on it elsewhere
  later today.
2006-10-19 17:16:31 +00:00
dave
9f9b612e5d - Added an option for the tableeditor to construct a LEFT JOIN when listing a
table
- Add complete and year options to the judge manager, filter by ALL, active and
  inactive for the current year, or active only.
- Add the "complete" status the the judge info page (the judge info popup page
  needs to be integrated with the new judge manager, somehow.. so we can remove
  the judges_judges list page).
2006-10-18 17:05:18 +00:00
dave
29a772ae5e - Add the judge manager to the judges admin page
- Put a total at the top of the judge manager list
- Add to the table editor:
	- Change the filter to accept a single argument, so we're not
	  restricted to the `$k`='$v' syntax, we want to be able to filter on a
	  table JOIN.
	- Add a additionalListTable variable, and additionalListTable()
	  function, to specify additional tables that should be part of the
	  table select statement.  I guess ideally the class would implmenent
	  their own if alternative behaviour was desired.  But this way is
	  pretty generic.  The table editor can now, for example, select judges
	  by year.
2006-10-18 07:50:23 +00:00
dave
29e14c2514 - Fix the tableeditor to do a string compare for determining if something
should be SELECTED in the select type.  If the keys are 0, and there is no
  data, PHP does a numeric compare and matches them, when they shouldn't
  actually be matched.
- Add Load/Save for the judge category preferences
- Enable saving to mysql.  It works.
- Update the tableeditor css to use the same colours as sfiab
2006-10-17 06:44:27 +00:00
james
b8f2e52401 Show inactive judges list - this will probably be replaced soon with the new
editor interface.  Fixes Bug #0000064
2006-10-16 17:50:28 +00:00
james
7143e9e01a Delete old school mailing labels and replace with a mailing label generator
that allows you to customize the size of the labels to suit _ANY_ label
stock paper.

Add to label generator the option to get judge mailing labels, and award
sponsor mailing labels, and make it easy to add more mailing labels
down the road (students? committee? etc?)

Add two default label stocks (Avery 1"x4" and Avery 2"x4")
2006-10-16 15:42:29 +00:00
james
4a5bc27532 Add salutation field to award contacts 2006-10-16 03:36:39 +00:00
james
83691b07b8 Add a header for "public email / private email" to the top of the committee list administration page. Fixes Bug #0000041 2006-10-16 02:36:20 +00:00
james
7e0720dffe Fix a typo 2006-10-15 21:52:58 +00:00
james
cbc01c020f Fix the filename of the awards ceremony CSV script - Fixes Bug #0000063 2006-10-15 21:33:32 +00:00
james
cb6f4a3dbb update database length of email field from 32 to 128
update maxlength attribute of phone/fax fields to 32 (from 16) to line up with the db fields
2006-10-15 20:42:02 +00:00
james
130f0f5786 Implement Bug #0000029 - Report to view school access codes and registration passwords 2006-10-15 20:07:18 +00:00
james
9eef488a5d Implement Bug #0000004 - Do not allow multiple committee members with the same email address 2006-10-15 19:36:33 +00:00
james
4ee617eb52 Add more school information to the schools database (school lanaguage, school level, principal and school email addresS) 2006-10-15 17:11:56 +00:00
dave
373b876b1b Hacked up the editor a bit more.
- Added a "multicheck" input type for languages (english, french)
- Added a proof of concept cross reference to the judge class, it pulls the
  languages out of the judges_language database
- Completely broke the save mechanism.
- Converted the tableeditor edit routines to read from the input class
- Converted the tableeditor edit routines to use assoc arrays, instead of ->
  (easier to pull from mysql and then add cross references to it.
2006-10-11 07:21:35 +00:00
dave
1e9f68a35e - Add the table editor class (not heavily modified for SFIAB yet)
- Add the table editor style sheet, and load it in the header (needs editing)
- Add a judge class (not complete)
- Add a judge manager php file that doesn't interfere with what's already in the system

THis is a proof of concept, it sorta works, but the table editor is still reading directly from the judges class.  It will be updated to make calls only into the calling class type, thus abstracting away all the SQL stuff, and allowing the group class (judge in this case) to hide
all the cross table references we need to make for loading, saving, deleting, etc.
2006-10-11 00:28:58 +00:00
james
952047cc11 Add a prize value field to award prizes, also add editor the the value, as well add editor for the contact position 2006-09-20 16:24:52 +00:00
james
951f801093 Add an AJAX powered translation dropdown to allow incorporation of single string translations in-line in any editor instead of having to manage the translations separately in the translation manager.
Add the translation dropdown to a few fields in teh award sponsors, awards and award prizes.
2006-09-19 22:40:46 +00:00
james
e6ed1c35b0 Account for spacing between labels when generating mailing labels for the schools
Also shrink the c/o line to better accomodate long names
2006-09-12 18:03:46 +00:00
james
a8d31a3603 Add report generation support for mailing labels
Add School Mailing Address Labels for Avery #05163 (4"x2" or 10.2 x 5.1 cm)
2006-09-11 18:05:35 +00:00
james
6ab58a1b8e Add a generic CSV reader that properly handles multi-line fields
Add a school importer to import school list from CSV file
2006-09-11 17:32:02 +00:00
james
050f2093fb Replace "Sex" with "Gender", and allow the db field to be null, instead of defaulting to "male"
BUG#105
2006-09-04 16:28:28 +00:00
dave
ebd4666f51 Add a function to the config editor to specify which variables the config
should contain.  If the config doesn't find those variables for the current
year, they are automatically copied in from year=-1.  This means that
we can update a database and add new config variables and not have to manually
add each variable to the current year.  It also means someone can't mess
up the system and accidentally delete config variables, because they 
will be recreated.
2006-09-03 21:36:28 +00:00
justin
808290f631 projects should be assigned a project number once registration forms have been received, whether or not they still owe money. Resolves issue 101. 2006-08-20 00:02:31 +00:00
justin
a169e422e6 Add support to choose what status a project must have to be used by the judge scheduler. Allows for any of open, payment pending or complete projects to be allowed. 2006-08-12 18:05:38 +00:00
dave
145c6f88ff If we manage to reach a 0 cost early, stop the annealer, there is no point
looking any further.  This significantly reduces the timeslot scheduling time.
In most cases we reach 0 in a couple thousand iterations, but we need high
effort because some timeslot scheduling problems are hard to assign.
2006-08-12 08:07:02 +00:00
dave
c247119663 Remove redundant config code. Use the judge scheduler options directly. 2006-08-11 21:10:33 +00:00
dave
7451483ddf Add he min teams requirement to the check too, not just the scheduler 2006-08-11 20:17:30 +00:00
james
14e93e0c12 Split the Configuration Variables page into separate 'Category' pages 2006-08-11 18:53:10 +00:00
dave
6d6dd8abb1 We must have a number of judging teams at least equal to the number
of times a project must be judged, to avoid assigning the same jteam to
the same project
2006-08-11 01:11:14 +00:00
dave
58e1b4a05e Really fix the problem this time... Stupid Typo 2006-08-09 02:06:36 +00:00
dave
e1c39dd0a3 This shoul dfix the case where there are no projects in a judging division 2006-08-09 02:01:43 +00:00
dave
be711441ea Recommend 15 minutes, not 10 for the php script run time. The annealer takes 12 minutes on my system with really high effort. 2006-08-08 07:03:03 +00:00
dave
dcefe6cdad Replaced the timeslot scheduler. This one is much faster, but it doens't actually compute cost for the number of judges the student has in a row. But, because it's totally random in layout multiple judges in a row should happen very infrequently. 2006-08-08 06:51:07 +00:00
dave
03acd9d8fc Use the annealer to assign projects and judges to timeslots. This should
prevent a project from getting too many judges in a row, and also a judge from
judging 2 projects at the same time (which would be more of a problem).

Still need to write a verifier to check all the results.  But the annealer
tests look pretty good.  Unfortunately it takes a pretty long time to run. :(
2006-08-08 03:21:08 +00:00