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

678 Commits

Author SHA1 Message Date
james
715e72c0c8 Fix the buttons to work, remove the links 2009-09-17 17:10:02 +00:00
dave
1513645e4a Put in a link to the fair stats 2009-09-17 07:56:06 +00:00
dave
cb6740fa6f - Update the fair stats to use the new list 
- Don't have curl dump debug info
 2009-09-17 07:13:51 +00:00
dave
6bd4d03941 - Selection screen to select what stats to download from feeder fairs 2009-09-17 07:00:09 +00:00
dave
abd1fda6fe - Always scrub data before passing it to mysql 2009-09-17 05:53:47 +00:00
dave
0a9053181c - Fix a reference to the award external identifier 
- Move the nubmer of available prizes to the top so it's harder to miss.
 2009-09-14 05:34:31 +00:00
dave
347d2d5a86 - Use the prize name, rather than the external_identifier to identify the prize. It only has to be unique within each award, which it will be (all prizes should have a name). 2009-09-14 05:33:49 +00:00
dave
a3f8957d96 - add the html for the registration linkage button. does nothing else yet. 2009-09-13 22:23:19 +00:00
dave
1e830e47bc - Add support for setting the external identifier 2009-09-13 21:58:50 +00:00
dave
d2535f46bc - Add status area on each page for award div 
- Redirect all ajax load output to a debug div (which can be turned on with
  debug=true).  The output has to go somewhere, and it can't go to the
  notification div, because it will overwrite what's already there.  The ajax
  methods emit javascript now to add notifications.
 2009-09-13 19:25:03 +00:00
dave
1f830c7845 - Proof of concept floating status messages that go away after a timeout, in 
the same approx. spot that SFIAB has always put status messages.
 2009-09-13 08:33:54 +00:00
dave
e9d3d4ce03 - Database update for feeder fair award info 
- Load/Save feeder fair awards in the award editor
- Fix all the POSTs in the award editor.   .load automatically does a POST if
  the data is an array, so we need to call .serializeArray() when we want a
  post to happen.
 2009-09-13 07:08:12 +00:00
james
99ad03654a switch the table class for the school list 2009-09-11 16:18:47 +00:00
dave
5d5c91766a - Remove the order from the ajax save too 2009-09-11 06:36:16 +00:00
dave
1c70110680 Remove the order box from the award info, the main table supports drag and drop. 2009-09-11 06:35:49 +00:00
dave
986b762f4e - Move some GETs to POSTs 
- Sort out the header sizes, I think.
 2009-09-11 06:12:17 +00:00
dave
0cd1876f0f - Update the main theme to be a little more sane with fonts (i hope) 
- remove all references to htabs, we dont' need them anymore.
 2009-09-11 06:03:00 +00:00
dave
1a2839b5b2 - Hack up the user editor window to use jquery ui tabs and ajax, sorta. More 
like a Frankenjax.  Needs MAJOR help.
 2009-09-11 06:01:01 +00:00
james
d17de3f6e6 Updated and working translations dropdown - simply add class="translatable" anywhere you want something translated 2009-09-11 05:16:37 +00:00
dave
8b9b029e31 - Use jqueryui's tab system instead of our own 
- Update the tab style so it doesn't look stupid.
 2009-09-10 22:52:04 +00:00
james
174d658f2d Start of a new trasnlation dropdown, commit so maybe dave can help :) 2009-09-10 21:31:51 +00:00
dave
074d39171f - Implement the generic prize template editor (not fully tested) 
- Doesn't launch from awards.php yet for some reason.
 2009-09-10 17:32:16 +00:00
dave
2270593d65 - Make eligibility saving work. 2009-09-10 08:56:58 +00:00
dave
74ec5fdcfb - don't need this file anymore, all the functionality (except validation) is 
implemented in award_awards.php
 2009-09-10 08:30:07 +00:00
dave
d50debde12 - Make the main award table sortable by dragging 
- Implement new/delete award (still needs some eyecandy)
- Update the order tables to recalc the order without fetching it from the server 
- Only thing left to do is make sure saving eligiblity works.
:
 2009-09-10 08:29:16 +00:00
james
f7bddf5beb Get rid of all occurences of viewtable and replace with tableview 2009-09-10 04:40:18 +00:00
dave
80c743eb1a remove a debug statement 2009-09-10 01:24:57 +00:00
dave
aa1d88f7d2 - Prize editor with movable tables. It's still a bit rough, more work needs to be done with turning on /offthings at the right time, but it's all there, and it all works. 2009-09-10 01:23:58 +00:00
dave
8b7a6e14b3 - Convert the popup to use the jquery ui popup 
- Theme the whole thing
- Remvoe the translation dropdown support for now, it's causing a spurious reload replacing the endire page with a clickable "translations" link
- Add code for the prize editor, not done yet.
 2009-09-09 17:06:11 +00:00
james
94ecb59321 Calculate the difference from the probability weighted totals 2009-09-09 03:12:53 +00:00
james
5ec6879149 A couple fundraising changes for readability 2009-09-09 02:39:22 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
james
dc4b197ce9 SSL NOVERIFY on ysf affiliation stats as well 2009-04-06 16:02:40 +00:00
james
a48b121e15 Only show the awards to upload for the current year, and turn off the ssl certificate checking 2009-04-05 16:00:36 +00:00
james
518c53bd82 Turn off the certifiicate validation for the SSL on cwsfregister 2009-04-05 15:45:43 +00:00
justin
eb795267d7 Add original score information to the csv view 2009-04-04 17:09:00 +00:00
justin
0a4223baf4 Sort projects by number instead of title in score entry 2009-04-04 13:59:43 +00:00
justin
e3b440d8da Fix problem if not all score entries are entered in score entry; and move send_headers earlier to avoid conflict 2009-04-04 13:43:07 +00:00
justin
2328f54721 Modify fix in r1448 to select project state based on the config variable for it 2009-04-04 04:03:05 +00:00
justin
b37f0ef9cc Attempt to fix issue with IE downloading files 2009-04-04 03:53:48 +00:00
james
02d8723ab6 Allow projects to be manually assigned to judges teams even if their status is paymentpending 2009-04-03 15:12:12 +00:00
james
2f6683d014 Show language problems when a judge is assigned to judge projects in a different language 2009-04-02 16:35:02 +00:00
james
4d0f607981 Avoid divide by 0 2009-04-01 17:30:31 +00:00
james
e2b78cc707 Add a mouseover tooltip to the delete icon, and add a "login" button to login as that student to see waht the studnet sees 2009-03-30 20:06:25 +00:00
james
65e4d29c58 Fix the total check, and rename a variable to not be stupidly named 2009-03-27 20:35:33 +00:00
james
32222526a8 Add judge language criteria to judge scheduler check before allowing the scheduler to run 2009-03-27 20:31:57 +00:00
james
1b6b245e37 Create (and protect) a logs data/logs folder and store annealer logs there incase they're needed down the road 2009-03-24 16:58:02 +00:00
james
b3bbd801ef Committing a comment to the annealer to look at down the road, ideas from Kris to speed up the scheduler when the cost isnt changing, instead of waiting for the temperature to fall slowly, speed it up when the acceptance rate is really good or really bad 2009-03-24 16:52:10 +00:00
james
4b3455f730 Increase email field size 
Fall back to projectnumber sorting after projectsort (incase people manually set the project numbers in the project number field, and leave the projectsort empty
 2009-03-24 15:08:51 +00:00
james
666f4ce720 Add type pref to the judges list, so it cna be filtered on to generate nametag lists for only special awards judges 2009-03-19 18:54:34 +00:00
james
69849468ce Fix judges query for judges not active this year 2009-03-17 18:42:12 +00:00
james
35276b7475 Don't export deleted judges 2009-03-09 17:26:00 +00:00
james
3880628596 Sort the list of years in the report generator screen 2009-03-09 16:50:58 +00:00
james
6db3c8ef37 Dont include deleted judges in reports, ever. 2009-03-09 16:38:06 +00:00
james
7674cf3fbe Fix a divide by zero when "scale columns" was set to yes, but there were no scalable columns to scale 2009-03-05 20:55:06 +00:00
james
2fafcfd844 double negatives ftw... now do it properly -- do not email deleted judges! 2009-02-16 23:34:03 +00:00
james
7cbd70577e Oops missed an AND 2009-02-16 23:32:02 +00:00
james
b8c9d10be0 Never email judges that have been deleted. This will all change once branch gets merged in, but fixes the fairs for this year at least. 2009-02-16 23:28:47 +00:00
james
91270b79ac Don't verify the SSL certificate - temporary workaround for CURL's ca-cert bundle not properly authetnicating the YSF SSL cert. 2009-02-11 22:41:18 +00:00
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