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

585 Commits

Author SHA1 Message Date
james
27a3a273d7 Disable the rest of the award_sponsor.confirmed stuff until we figure out what to do with it 
Make the sponsor selector work when adding awards
 2008-11-03 05:09:04 +00:00
james
4b573c7224 Update the rest of the awards system to pull from sponsors instead of award_sponsors 2008-11-03 05:05:09 +00:00
james
8a3dbc9284 Rename award_contacts to sponsor_contacts 2008-11-03 04:49:36 +00:00
james
0f3f5dd26c Re-implement award_contacts as sponsor_contacts, will full editor using the new user system 2008-11-03 04:48:48 +00:00
james
b9253d4114 IE/Firefox consistency fixes (make IE not look screwed up) 2008-11-03 00:42:21 +00:00
dave
860de02d16 - remove unneeded line 2008-11-02 15:55:24 +00:00
dave
881d6b9be4 - fix the message in the config editor 
- add a convenience $user['name'] setting
- update the judge SA
 2008-11-02 06:15:05 +00:00
dave
1774225526 - fix the judge check in the scheduler 2008-11-02 05:29:36 +00:00
dave
f054ab69f9 - working judges_teams_members.php 2008-11-02 05:07:04 +00:00
james
2bd3201196 Add new fields to sponsor editor, dont let sponsor be edited on a sponsorship, and adjust the dialog box sizes a bit 2008-10-28 21:19:21 +00:00
james
82d9e16dea Add sponsors_logs logging to sponsorship adding/editing 2008-10-28 19:23:09 +00:00
james
585510ad87 Sort the sponsorships list 2008-10-25 04:33:18 +00:00
james
48ee8ee629 Oops fix typo, howd that happen! 2008-10-25 04:28:41 +00:00
james
d849040872 Add ability to delete funds and delete sponsorships 
Update some of the sponsors editor code to look a bit.. umm... better.... needs more work me thinks...
 2008-10-25 04:25:38 +00:00
james
1d09e7fb38 Factor form handler into separate files for each of the dialog forms 
Add form handling for fundraising types
 2008-10-24 22:46:35 +00:00
james
b62fa76aab Refactor dialog code into separate include file 
CSS changes for IE and for Dialog use
Switch fund types to use dialog (cant save yet)
 2008-10-24 22:29:14 +00:00
james
b7e72aa40c This file was renamed in the last commit 2008-10-23 21:33:06 +00:00
james
c100baef89 Add more fundraising module stuff, the SFIABDialog code will be refactored out into a separate library class eventually 2008-10-23 21:32:31 +00:00
james
f2101200b6 Add a start of the fundraising system's overview page and fund type editor 2008-10-22 21:46:31 +00:00
dave
d86ea6257f - partially working judges_teams_members 
- working judges_info, except for the configurable questions/answers
 2008-10-20 05:20:42 +00:00
dave
7f1331d401 - update the judge team editor. Not ideal, this shouldn't query the users 
table directly, but it works.  This will be reworked later when I add support
  for judges to select which timeslots they're available.
 2008-10-19 02:52:28 +00:00
dave
b021805246 - conversion of judges to new user system. Mostly works. 2008-10-17 19:34:11 +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