Commit Graph

448 Commits

Author SHA1 Message Date
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