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

454 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