arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
1,468 Commits 10 Branches 6 Tags 31 MiB
75e721bb81
Commit Graph

719 Commits

Author SHA1 Message Date
justin
7bd94c3782 Add judging score entry for Renfrew County fair 2009-01-17 19:45:42 +00:00
james
544c6f4580 Allow upscaling widths as well as downscaling widths if they select "scale column widths to fit page width" 2008-11-20 18:21:56 +00:00
james
cc619e3422 Make summary scalable 2008-11-20 18:20:04 +00:00
james
3d30262af5 Only show the label layout if the type is label 2008-11-20 18:17:57 +00:00
james
065cb658bb Make the translations page much more compact 
Backport translations dropdown fix from branch
 2008-11-03 02:11:52 +00:00
james
b45ef040bb Make the translations manager much mroe user friendly: 
1) can edit more than one translation at a time
2) can delete more than one translation at a time
 2008-10-30 17:57:05 +00:00
james
fca6ce64b0 Show a sample of what the label is going to look like laid out using DIV's and HTML, this is the first start of implementing a full editor :) 2008-10-16 19:13:59 +00:00
james
b3bfb560f9 Add a bunch of missing i18n()'s 2008-10-06 19:09:00 +00:00
james
bfb471011a - Fix a bug where the special awards annealer would overwrite the last jteam 
- Add an alternative (but commented out) array population for the annealer
- Leave in some of the debug statements, they don't hurt anything.
 2008-09-17 18:04:50 +00:00
james
87841466e6 Hmm, re-add the "Internal Document Management" that somehow got left out from the conversion to icons! 2008-09-17 14:30:18 +00:00
james
642dac036f Add participants last year and participants all years to communications system 2008-09-17 14:23:30 +00:00
james
4d0ff8f327 properly fix the team naming/sorting issue 2008-09-16 19:38:27 +00:00
james
bed8cc9d9e If a jdiv has no projects, then it definitely doesnt need any judging teams to judge those 0 projects 2008-09-16 18:44:25 +00:00
james
de185f07f4 sort the divs and cats so the team names are consistent 2008-09-16 18:37:23 +00:00
james
c87ea3b37e Add administration and configuration icons 2008-08-26 21:42:17 +00:00
james
02e88f4f29 Re-order the admin page to make more sense. 2008-08-26 20:45:29 +00:00
james
ca5515a335 Put admin icons in the title of each page 2008-08-22 20:50:38 +00:00
james
32dfcda427 Fix website content management icon name 2008-08-22 20:48:50 +00:00
james
4f6749d5da Remove an extraneous <br /> 2008-08-22 20:18:17 +00:00
james
2d20b0887b Add about 1/2 the icons for the config page 2008-08-22 19:12:53 +00:00
james
cbf1c371ff Move cms from config to admin 
Add icon and link it into the admin index
 2008-08-22 17:21:35 +00:00
james
8b5fc1c905 Shrink the summarytable headers a bit in size 
Add the content management front-end file
Add the content management back-end file - its not quite done yet
 2008-08-20 20:25:42 +00:00
james
251138248d Show disabled icons 2008-07-24 17:27:59 +00:00
james
267d228aaf Add more icons 2008-07-24 17:15:42 +00:00
james
bfc32c305b Oops fix typos 2008-07-24 16:35:37 +00:00
james
cd24825e71 Add some more icons 2008-07-24 16:32:43 +00:00
james
517455ee13 Migrate css to a theme and setup to allow multiple themes 
Begin adding icons to the default theme and reorganizing the admin index
 2008-07-24 16:20:16 +00:00
james
a42812ce27 switch communication from using an echo to the at command now +1 minute to exec immediately piping the output to /dev/null and redirecrting stderr as well 2008-07-17 18:33:11 +00:00
james
651d6235a4 Add config options for Province/State and Postal Code/Zip Code 2008-07-16 17:23:53 +00:00
james
66ec01cd60 htmlspecialchars the text for the text box so things like <a href>'s work. 2008-07-02 15:52:51 +00:00
james
a8fadb3046 Fix the scheduler status in IE7 - the http readystate needs to be manually reset. 2008-04-14 00:16:52 +00:00
james
73972d676f Show judges language on the judge team members list - for quick verification of proper language team assignments. 
Fix 1x4 and 1x1.33 Avery stock to print properly.
 2008-04-03 20:34:42 +00:00
james
76966f0f62 Allow the admin to change the project sort as well as the project number. we dont care abotu checking for duplicates here with the project sort... its just a sort field.... 2008-04-02 17:27:10 +00:00
dave
d2868f3f45 - Updates to the tour annealer: 
- Add more verbose output for the terminal
	- Split the student load / tour preference load to capture student who
	  didn't select any tours
	- Allow students with no tour selection to be placed anywhere with no
	  penalty
	- Add a missing break; in cost computation (doesn't change the result)
 2008-04-02 06:25:50 +00:00
james
bbbd32a026 Dont include deleted judges in the number of available judges check 2008-03-30 16:06:08 +00:00
james
8b250c8997 Fix a bug where the scheduler was allowing deleted judges to be used 2008-03-29 20:59:14 +00:00
james
5458a5809e Fix a bug where judging teams containing apostrophe's wasnt being created, but it was using an old ID from a previous insert, so judges were being linked to teams that didnt exist... then the records became orphaned and couldnt be deleted. 2008-03-29 20:48:39 +00:00
james
572242bc14 Only consider judges teams from the current fair year when calculating what judging team number to start numbering at 2008-03-29 19:02:43 +00:00
james
63034a1d33 Check the name check status on deciding if a form is complete or not. 2008-03-27 22:12:27 +00:00
james
d190d4f0b7 Display errors if at least one age category and one division arent selected 2008-03-27 08:06:14 +00:00
james
6a1f51d3dd Re-work how it checks if someone is "unassigned" - the old way was causing problems with multi-year data, if a judge was assigned in a previous year it was getting picked up as assigned even though it wasnt assigned for the current year. 2008-03-27 07:46:52 +00:00
james
e41072e076 Make the table the full page width, 75% of my judging team names were getting cut off.. perhaps the team names should use shortforms for the divisions instead of the full spellings... "Senior Earth & Environmental Sciences/Health Sciences/Biotechnology (en fr) 2" seems... excesssive 2008-03-25 17:20:31 +00:00
james
c0026c75e5 If there are no jdiv's left, hide the multi-select box and all the "Add >>" buttons so the page looks much nicer (and better to print!) 2008-03-20 20:59:56 +00:00
james
560d799b4b Allow filtering the awards management interface by award sponsor status: any, confirmed only, unconfirmed only 2008-03-20 20:37:33 +00:00
james
ec66217a2b Split label_box into two separate options: label_box and field_box. label_box draws a border around the entire label, field_box draws a boarder around each field of text on the label 2008-03-20 20:07:13 +00:00
james
45a1bdd1e4 Only set the school if the school is posted through, this way we dont whipe out a students school. 
-This line, and those below, will be ignored--

M    student_editor.php
 2008-03-20 16:28:50 +00:00
dave
bb4997548c - Add medic alert and food req. info 
- Change the name of cshool teacher/email because these are really the values
  the student enters.
 2008-03-20 02:57:18 +00:00
james
06cb13d7e4 Oops, the _seq's cant be null, they need to be set to 0 2008-03-20 01:57:24 +00:00
james
3fc27ceb04 Set everything to do with the project number, project sort, and sequence numbers to null, not just the project number, when 
unregistering a project.
 2008-03-20 01:52:47 +00:00
james
e320230a3e Add a way to unregister projects. Simply re-enter their registration number, and click the link. 2008-03-20 01:19:35 +00:00
dave
6e8883b4a2 - Add pronunciation 2008-03-16 19:09:47 +00:00
dave
7651426f03 - Add a field for trophies 
- Fix a bug with the ordering of the sql statement.  Something I noticed fixing
  this bug: Tour info and award info will generate an error if used together.
 2008-03-12 01:18:29 +00:00
dave
2d052c056f - Add an option to the award ceremony script to show the pronunciation key (if 
the students entered it)
- Add an option to the award ceremony script to filter the awards by age
  category (the GVRSF needs one script for juniors, and another for
  intermediate/senior :)
 2008-02-29 07:10:08 +00:00
james
3a1b4cca15 - Ignore jdiv 0 in the annealer and in the check. jdiv 0 is what all unassigned divs/cats get, 
and if they're unassigned we don't want to schedule them.
- Fix a typo in the language selection
 2008-02-28 20:23:27 +00:00
dave
a8ed1d28e9 - Remove some old "Back to" links, the navbar does it now. 2008-02-28 19:34:39 +00:00
dave
07a7994d81 - When resetting the status of the scheduler, it is helpful to actually reset 
the status of the scheduler.
 2008-02-28 19:30:19 +00:00
dave
f70314653b - Only lookup _GET['showstatus'] once, for a minute speed increase and easier 
handling.
 2008-02-26 08:32:00 +00:00
dave
b1ed8e4b4a - Optimize away some code where I was trying something different. :) 2008-02-26 08:28:20 +00:00
dave
10bf90f0db - Fix the total count on the cat/div summary. Several fairs have emailed me to 
say the count is wrong.  It's not wrong, it's just not printing the number
  they expect.  This fixes that.

- Make it more obvious what status the stats are being displayed for.
 2008-02-26 08:19:38 +00:00
dave
343d777aab - Restrict data in a committee report to actual committee members 2008-02-23 03:42:51 +00:00
dave
15a56ce13f - Add First Aid and CPR data collection to the user table. 
- Modify the config so a committee can enable it for volutneers and committee
  members
 2008-02-23 03:28:43 +00:00
dave
1d3ee3f83e - Judge autocomplete function, there's no menu link to it. This should work 
for timmins and fraser valley
 2008-02-22 06:19:22 +00:00
james
52fb9faed8 special awards communications should contact this year's contacts only.wq 2008-02-13 22:42:02 +00:00
dave
6a766ac59d - fix copy/paste error in the tour annealer 2008-02-12 01:11:21 +00:00
dave
482f2e6d3a - Sort the tour num+name column by number 2008-01-30 07:56:47 +00:00
dave
414a85ccb2 - Add number checking (and parsing) to the config editor 
- Change the type of $config['regfee'] to 'number'
 2008-01-28 21:48:44 +00:00
dave
8980275627 - Add mentor info to the student report generator 2008-01-26 19:46:16 +00:00
dave
4af449a2c4 - Implemnt scalable columns in the report generator. 
- New report option to fit the width of the report to the page
- Columns in each reports_*.inc.php can be specified with
	'scalable' => true
  to indicate that they may be scaled if the report is too wide for the page
- Obviously, do no scaling if the option is off (off by default)
 2008-01-26 19:14:24 +00:00
dave
fddce24de3 - Fix the paper type in system report 44 
- Add 2 new paper types (Ledger 11x17 + landscape)
 2008-01-25 05:31:27 +00:00
james
6a2683d92d Add ability to get registration list for previous years (only via appending &year=year to the URL) there is currently no user interface to access this feature. Also add the school board in brackets after the school name 2008-01-24 18:51:05 +00:00
dave
125437dd55 - More GVRSF stuff that I missed. Add two fields to the award_awards: 
'self_nominate', and 'schedule_judges'.
- self_nominate defaults to 'yes' for all new and existing awards.  If turned
  off, the award will not appear in the student self-nomination pages.
- schedule_judges specifies whether an award should have judges or not, we have
  some special awards that students can nominate for but do not require judges
  to find the winner.  Similarly we have some awards students cannot nominate
  for but do require judges to determine a winner.  This allows both cases to
  be handled.
 2008-01-24 07:46:12 +00:00
dave
df38d87b40 - Columns for school report 2008-01-23 19:30:05 +00:00
dave
b14ec011d4 - use the correct limit 2008-01-23 18:42:35 +00:00
dave
3f3475d407 - fix the limit on the special awards self nomination query 
- add a rollover for regfee items
 2008-01-23 18:40:59 +00:00
dave
58df28ba9a - Fix drawing label boxes around text items 
- Add the ability to draw a static label box (without text)
- Add "self nominated award" 1 through 5 to the student reports
- Add a new report demonstrating how to use the above (this is of the format
  Sudbury sent us).
 2008-01-23 18:32:31 +00:00
dave
735e5e0999 - Add a registration fee item editor 
- Allow students to choose items from the optional registration items
 2008-01-23 07:53:10 +00:00
dave
78fa4ad6ac - Add support for short project titles in addition to the regular project 
titles (defaults to off)
- Renumber the order of the config variables in Participant Registration, it's
  getting a bit crowded 
- Fill in some missing types for config variables
 2008-01-23 05:54:03 +00:00
james
1464751fb7 If the registration list is sorted by project number, sneakily sort it by projectsort (then fall back to projectnumber) 2008-01-15 18:20:56 +00:00
james
1fed6629bd Use firstname for the names so they show in the "to" of the email 2008-01-09 17:28:11 +00:00
james
e7d436e409 Add ability to communicate (send emails to) 
- school principals (via schools.schoolemail)
- school science heads (via schools.scienceheademail)
- teachers (via students.teacheremail) - this year, last year, or all years
 2008-01-09 17:25:30 +00:00
dave
8c4b77cf41 - When saving committee orders, don't iterate through the order array if a 
committee has no members.  Doing so just generates a PHP error.
 2008-01-07 05:38:44 +00:00
dave
3cba628b51 - Disregard the year in award sponsors and contacts 2008-01-07 05:29:42 +00:00
dave
a364e9ea56 - Fix the Partner Name (first last) column 2007-12-30 23:02:41 +00:00
dave
f097559e9d - Fix some emergency contact headers 2007-12-30 22:32:58 +00:00
dave
7c5b53c268 - Fix the judges "Complete" header. Changed to "Cmpl" so it shows in the 
header.
 2007-12-30 22:30:28 +00:00
dave
e24bbb0bbc - Add a filter to the last commit, to not show the none tshirts. 
- Add a 'total' option to the report generator, to signal that this column
  should be added up.
- If total is != zero, it shows the total at the bottom of each table, else, it
  shows the number of rows (changed the text to Total: for a total, and Rows:
  to show rows, if the total is 0)
 2007-12-30 22:16:34 +00:00
dave
fcd6eedc1d - Add a new data field for counting the number of tshirts of each size 
- Add a system report that lists the number of tshirts of each size
 2007-12-30 21:45:04 +00:00
dave
d89c756427 - Add a grade column that uses the format "Grade x", instead of just the 
number.  Fix the YSF stats report to use this column and show "Grade x" in
  the titles, not just "x", which was a bit confusing.
 2007-12-30 21:20:36 +00:00
dave
eaad48d6d0 - Change how the num students report column works. It was failing when awards 
were added because of the row duplication.
 2007-12-30 21:05:54 +00:00
dave
ca52174cfe - Fix the grouping logic to handle the case where the group by column is also 
selected as part of the display columns
 2007-12-30 20:03:05 +00:00
dave
5bcd7cd1e1 - Obey the pagesize settings when generating actual reports, not just labels. 
This makes landscape reports work.  This still ignores the margins (just like
  regular reports ignore the margins on 8.5x11 pages anyway)
 2007-12-30 07:28:06 +00:00
dave
aa1be324ad - The project number needs a titch more space for the GVRSF. :) 
- Completely remove the old gvrsf_tablenumber report column.
 2007-12-29 09:04:48 +00:00
dave
e8face39d6 - Update the project numbering system by also adding a sort field (defaults to 
the project number field if blank).
- Add a new number option 'X', which counts among ALL projects, not just the
  ones in the same division/cat.
- Add a padding argument to N or X  (N0...N9) defaults to 2 for N, and 3 for X.
- Adds 3 columns to the project table:
	- projectsort: for storing the expanded text
	- projectnumber_seq: for storing the N or X number for projects
	- projectsort_seq: for storing the N or X number for the sort order
- Add a new config option for sorting, and expand the text for the
  projectnumber.
- Change the default sorting for reports and project lists to use the
  projectsort category.
- Remove the gvrsf_tn option from the database, it's not needed now.
 2007-12-29 08:46:40 +00:00
james
a5998ca3dd Text update BUG239 2007-12-27 00:47:23 +00:00
james
8e91b16b63 Text update BUG238 2007-12-27 00:45:31 +00:00
james
67f3c2eda3 Text update BUG265 2007-12-27 00:43:40 +00:00
james
a13303afe9 text update BUG266 2007-12-27 00:40:59 +00:00
dave
f3f2747118 - Replace reports_acpresentation with a report from the report generator. 
- Implementing a function call option to parse column data in the report
  generator as it comes out of the database.
 2007-12-25 05:13:42 +00:00
dave
a912b7df99 - Clean up the award query. 
- Fix a bug in the award query tha twas incorrectly linking judges teams with judges
- Add 'Judge Name' to the query so non mysql5 users can create an award report
  that lists the judge names for each award.
 2007-12-24 21:18:08 +00:00
dave
1b0835a47f - Make the default report type 'student'. And load the necessary fields for that 
- If the report type is changed, submit the form with a reload, to reload all the
  available fields.
 2007-12-24 19:38:06 +00:00
dave
7ff0b4b104 - Add more fields to the committee report type 
- Sort the report by the first field if no sort field is given
 2007-12-24 19:20:01 +00:00
dave
b47ac24ed1 - Decrease the cost of students not from the same school +5 could lead to a 
large penalty (5*20=100) which exceeds the cost of a 1st vs. 2nd choice tour.
  This could cause a student to be bumped to a 2nd choice tour for no reason
  other than to fix the schools.  The idea for duplicate schools is to only
  prefer to have 2 students from the same school on a tour if there's
  a choice that oculd go either way, this will break that tie.
 2007-12-23 19:15:50 +00:00
dave
60df636517 - Reorder/Rename some of the judge columns for clarity 
- Add an option to NOT filter a judge report by year if the report already
  includes a year filter.  This allows one to FITLER by judges.year!='0', and
  get every judge that has ever judged at the fair (should probably add a
  distinct(judges.name) or something, because a judge that has judged in two
  past years would appear twice in that list.
 2007-12-22 22:16:12 +00:00
dave
0b782d467d - Unclutter the judge query 
- Add project info, timeslots, and students to the judge query.
 2007-12-22 21:50:25 +00:00
dave
edf26caf1e - Avoid a divde by zero in label generation 
- Never allow the number of lines for text data to be zero in the first place.
 2007-12-22 20:49:33 +00:00
dave
801e70cb0c - Fix the awards query 
- Add prize amounts to the report editor
- Add a column to compute the number of students who worked on a project to the
  report editor
 2007-12-22 19:12:43 +00:00
dave
8ef6f7ea45 - Update the admin judge page to make the order of things a bit more clear. 2007-12-22 10:17:16 +00:00
dave
1aadc76ebc - The awards store whether to schedule judges for a special award 
(schedule_judges).  We should obey that even though it's always set to 'yes'
  and there's no way for a user to change it.. yet.
 2007-12-22 09:36:23 +00:00
dave
7b7c6c0db2 - Use pdf_fit_image instead of pdf_place_image. 
- The docs say pdf_place_image is deprecated (and so is
	  pdf_open_image_file.. apparently)
	- By using pdf_fit_image we can define a box where we would like the
	  image to fit, then use the highest quality image (logo.gif) and tell
	  pdflib to scale and center the image within that box.
 2007-12-22 03:31:02 +00:00
justin
2f443868d0 equality, not assignment operators would help I guess 2007-12-21 00:35:31 +00:00
james
e4fb689d58 Add prize value, and the trophy stuff to the generic prize template divisional awards creator 
When creating divisional awards using the generic prize template, obey config option to filter divisions by category
When managing jdivs, obey config option to filter divisions by category
Add an option to the jdivs (at the bottom) to completely whipe out all jdivs so they can be recreated (eg if age categories / divisions are deleted or changed, or if ones were created that shouldnt have been due to the filter divisions by category not being obeyed
 2007-12-20 20:45:18 +00:00
dave
0db1467da7 - Fix errors, crashes, infinite loops caused by jdivs with no projects. 2007-12-20 19:52:15 +00:00
dave
8c42e853af - Handle type/stock for custom reports properly 
- Convert reports.php to use SESSION based status messages.  Just to try it
  out.
 2007-12-20 18:44:28 +00:00
james
348647208f put the type and stock checks back in, to make sure we get the right stuff. 2007-12-20 18:38:17 +00:00
james
312808bc8f Dont disable the type & stock so the default values (selectedIndex=0) still gets POSTED, even though the dropdowns are not displayed. 2007-12-20 18:35:47 +00:00
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