Commit Graph

497 Commits

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