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

841 Commits

Author SHA1 Message Date
james
3ebb655d08 Hmmm, add some missins stripslashes.. stupid fucking magic quotes 2010-01-19 04:32:12 +00:00
james
de835bf5f5 Add some instructions to the judge divisions groupings page - nobody knows what the heck to do with jdiv groups 2010-01-19 04:14:53 +00:00
james
91cbf39f61 Use localized dates/times on judges pages 2010-01-19 03:42:25 +00:00
james
214df4ddbf Fix a bug where awards that didtn have a sponsor set didnt show up in the list, also, do the same for award types, though award types hsould never be empty... 2010-01-19 03:29:29 +00:00
james
c67488d375 If availability is disabled, dont fail loading judges 
Fix the team languages array
Fix the timeslots checks for schedulerconfig (need round AND timeslots, not just a round)
 2010-01-18 16:24:34 +00:00
james
7e6795fd0d Since the previous bug where judge complete status was wrong, we need a chance to recalculate them all, so lets just do it here for now. 2010-01-15 15:39:36 +00:00
james
c729e0f8da Dont let the scheduler run if we have 0 judges available - timmins was in an endless loop since last nite 2010-01-15 14:53:24 +00:00
james
e6b24ff0ab Remove the edit icon (you now click anywhere on the row) and fix disabling fields for non-downloaded awards (=0, not null) 2010-01-14 18:55:23 +00:00
james
357263a20b Some extra debug info added while fixing northern bc 2010-01-12 06:43:22 +00:00
james
591f46b29d Properly count the number of judges in each language to check if we have enough 2010-01-08 20:25:40 +00:00
james
d8ba3da289 Remove more debugging 2010-01-05 18:02:24 +00:00
james
35a247e225 remove debuging 2010-01-05 17:59:10 +00:00
james
3f94324aba JOIN instead of LEFT JOIN on committee members link, incase a member has been deleted we dont want a blank record.. 
though.. if they have been deleted we should probably delete the link.. hmmm.. well.. this will hide it for now.
 2010-01-04 17:51:55 +00:00
james
a6a7d6ffe2 More invalid backslashes 2009-12-16 19:11:00 +00:00
james
df0120dd0b Special chars the stock (so & converts to &) 
Add some newlines.. still trying to fix IE7...
 2009-12-16 18:49:53 +00:00
james
3763f76ea9 Remove extra backslashes - trying to fix IE7.... 2009-12-16 18:43:57 +00:00
james
b14b0eb356 Fix the dropdowns 2009-12-16 18:12:28 +00:00
james
c3ed887dca I think this fixes the query, at least temporarily, until we really fix the whole user/year system 2009-12-04 17:22:55 +00:00
james
3da935eaff Switch fundraising dashboard to be ajax'ed and add the ability to mark thankyou's as done. 2009-12-03 21:53:01 +00:00
james
df3cd54701 Fix escaping on one-off emails 2009-12-03 21:12:13 +00:00
james
684a7962f2 Set the database charset in the UPDATE script so the conversions will actually work - that only took 8 hours to figure out! 2009-12-03 20:55:16 +00:00
james
fde1debf6d COnversion script to convert all emails to UTF8, but still display properly on the site by back-encoding them to ISO-8859-1 (until such a time that we can switch the entire system to UTF8) 2009-12-03 19:41:25 +00:00
james
c0f6031904 FCKEditor always does UTF8, so force the Rmail encoding into that 
Also calculate the email TEXT from the email HTML, its not perfect but pretty darn good.

TODO: need to do an update script that converts the encoding of ALL existing emails in the databse from ISO-8859-1 to UTF-8
DO NOT UPDATE TO THIS VERSION UNTIL I CAN ADD THAT CONVERSION SCRIPT
 2009-12-02 23:11:25 +00:00
james
148bc61320 Don't need this file anymore :) 2009-12-02 22:19:42 +00:00
james
99114c7242 Completely convert the old communication module over to the new system... (almost). 
TODO: switch the "send" to the new dialog-style preview and confirmation, instead of the old one, but at least it works!
 2009-12-02 22:17:20 +00:00
dave
06d9e74190 - Pull the science head user properly for the school table display. 2009-12-02 01:22:47 +00:00
james
e9e04ad944 Add a link to the status page from the main communication page, since it now has history as well 2009-12-01 22:07:50 +00:00
james
01b05576b5 Remove some debug 2009-12-01 22:04:23 +00:00
james
838f61a948 Working email sending from fundraising module, and implement new emailqueue system. None of the existing emails are migrated to the new system yet, and both old and new work in parallel until we can finish migration 2009-12-01 22:02:03 +00:00
james
9bad26096d Tweak the avery 5162 template a bit, lines up perfectly now 2009-11-30 18:46:48 +00:00
dave
2adc23658f - Explain that option a bit more. 2009-11-06 09:00:02 +00:00
dave
bf3485c24a - Add an advanced options tab to the report generator 
- Add an advanced option: Include Incompelete Registrations - Ignores the
  registrations.status and just includes everyone.  Downside: registrations
  must have a division and category selected because the mysql query matches on
  cat.year and div.year too.
 2009-11-06 08:57:13 +00:00
dave
ba808050d0 - Use the report generator dialog all the time 2009-11-06 08:24:54 +00:00
james
62fc1a9cb2 - Add stats to the user editor window 
- Go right to the fair editor from the Admin panel.
 2009-11-06 07:32:51 +00:00
james
2de42b9377 Dont' change the font size on the my reports list, it's small enough now. 2009-11-06 04:26:30 +00:00
dave
59942138d9 - Download trohpy status from the server 2009-11-02 05:45:08 +00:00
james
1e0f079c01 use UID not ID when posting title and sort orders, now saving acgtually works 2009-10-29 21:02:17 +00:00
james
a4fbff953c Add a link to reload list (we severly need to fix this whole page!) 
Show email addresses in the management list as well, so when we add users and dotn give them names they wont just show blank.
 2009-10-29 17:16:47 +00:00
james
ec5ab0a26b Fix a few other popup windows for IE 2009-10-29 17:07:56 +00:00
james
bb7cfe3629 Second arg for popup windows cant have spaces, its an internal window name, IE errors out when it sees a space 
Also, focus the popup window once its loaded, incase they have it open still in behind
 2009-10-29 17:05:15 +00:00
james
cf6bea5727 stripslashes 2009-10-22 20:40:35 +00:00
james
45e18745ba Don't display my debugging stuff in the communication module 2009-10-22 17:12:23 +00:00
james
85adcf0594 Revert the body of the normal communication module to plain text, until the html sending is implemented 2009-10-22 17:10:38 +00:00
james
a3ab3b8b74 Add a note that sending isnt enabled yet 2009-10-22 17:08:50 +00:00
james
c9db2c0f83 Update 131 update to properly create the sponsorship logs and award donations for past years 
Update the search results to LEFT JOIN the user, instead of JOINING
Add some missing i18n's and fix some typos
 2009-10-22 16:46:32 +00:00
james
ac3f5f9eb4 Add todo list for receipts and database to track receipts 2009-10-20 19:09:54 +00:00
james
ee995654b3 Add missing fields to dashboard 2009-10-20 18:55:17 +00:00
james
395ed4d084 Uncommitted changes to fundraising reports 2009-10-16 21:19:37 +00:00
dave
f73215fede - Enable maxyear user filtering. unfortunately it needs to be specified 
manually (done this way because i don't want to start integrating changes
  with the report system right now.)
 2009-10-16 18:39:39 +00:00
james
9e0ea3bafd - Properly specify the filter for reports 2009-10-16 18:18:38 +00:00
james
1d92fd27f0 Working first report 2009-10-16 17:53:59 +00:00
james
c20b474b1c - Different downloading method 2009-10-16 17:46:26 +00:00
dave
4efb335654 - Add a report for fundraising mail labels 
- Add the ability to specify a filter when calling for a report generation
  (e.g., so we can dynamically filter a report for a specific fundraising
  campaign)
 2009-10-16 17:17:45 +00:00
james
5da58aeb12 Add a fundraising reports MOCKUP page so carolyn can take screenshots and link it into the menu 2009-10-16 15:43:26 +00:00
james
b240e36f19 htmlspecialchars the from and subject of communications 2009-10-16 15:23:21 +00:00
james
5d9824a5a6 Rework the donors search/landing page so it shows top 10 donors if no search is performed yet 
Fix a few typo's and make the fundingselection/proposalsubmissiondate save properly
 2009-10-16 15:22:54 +00:00
james
7b4e7cd55f Remove references to 'Email' -- communication could be a snail mail generated pdf letter 
Make the field list insert work :)
 2009-10-16 15:21:58 +00:00
dave
52b7580dcb - Replacement for PDF generation. 2009-10-16 06:16:48 +00:00
dave
345729523e - Commit all of TCPDF for now 
- A working bare-bones letter generator.  Not done (no variable substitutions yet), but it does work.
 2009-10-16 05:22:43 +00:00
james
b2e7797a24 Fix saving with apostrophes 2009-10-15 21:58:51 +00:00
james
566ae2d67f Fix saving of city and province and address info 2009-10-15 18:36:50 +00:00
james
ff7ab6f079 Oops disabled position at the wrong place - its now properly disabled for individuals not organizations 2009-10-15 18:03:54 +00:00
dave
cf5c31464e - Add a #content iframe to the toplevel, hidden, width,hight=0,0 
- Add a report generator dialog box that uses the content iframe for file downloads
- The content iframe also works for creating dynamic content
- Try to make FCKEditor work with jquery, it still doesn't.  The content of FCKEditor isn't passed
  through serializeArray it seems.
 2009-10-15 07:11:43 +00:00
james
8737163202 - tweak the editor a bit 2009-10-14 19:48:40 +00:00
james
0d6c0610c3 Fix a bug causing donations to not show up 2009-10-14 16:17:49 +00:00
james
547d30d490 Reenable FCK editor in the email editor 2009-10-14 04:58:52 +00:00
james
2ef6d527d3 - Remove debug line 2009-10-14 04:57:22 +00:00
james
51f95911ad - pass fundraising ids and keys into the editor. 
- create new communication, clone, and save now work
 2009-10-14 04:56:28 +00:00
james
03032c1d54 - Use empty() to empty out the div for the dialog 
- Implement saving, properly close the comm dialog
- Remove unnecessary buttons from fckeditor (may need to dump the cache and reload, shift-reload isn't smart enough to catch the updated config)
 2009-10-14 03:25:47 +00:00
james
60d8922ff2 Implement adding donations and add some misisng i18ns 2009-10-13 01:02:17 +00:00
james
ebf6c0e79b Update fundraising dashboard and colourchange overdue thankyous 2009-10-13 01:01:48 +00:00
james
f4829bfd9e Mostly working communications tab - now need to make the stuff on it work. 
Also almost working donations entyr, which im going to finish right now
 2009-10-12 20:25:02 +00:00
james
724c627db4 Implement current/past donations for donors on the donors/sponsorships tab, and a way to switch between this year, and ALL years history 2009-10-11 20:20:52 +00:00
james
bdf2ea7577 Donations tab for campaigns 2009-10-11 19:49:04 +00:00
james
c9062e127b Implement working prospect list, and ability to remove indidivuals from the list or empty the entire list 2009-10-11 18:19:04 +00:00
james
663420b078 All of tonights wackload of changes 2009-10-11 03:32:14 +00:00
james
9a62fbc26d Updates to donor manager, auto populate individual contacts and disable fields that shouldnt be used for individuals 2009-10-10 23:36:48 +00:00
james
f6fcb2d728 Fix document downloader with spaces in the filenames (put quotes around the filename in the http headers) 2009-10-09 20:27:32 +00:00
james
8ea2823bf1 bloody hell.. more renaming Campaign->Appeal, Goal->Purpose 
Begin the actual donations/sponsorships page for donors
Remove students from prospecting, set it to alumni, which wont be active for a while
 2009-10-09 20:25:01 +00:00
james
081bc1b187 Really make sure they cant add auser with an email address that already exists 2009-10-09 15:47:25 +00:00
james
1f244c8375 Detect exact email address matches regardless of the name that goes with it, and dont let them submit 2009-10-09 15:04:45 +00:00
james
5aa7cf541a Remove debugging from user.inc 
Begin the searching in the prospecting tool
 2009-10-09 00:42:47 +00:00
james
0015d2bcd7 Implement live search for adding existing users to a contact 2009-10-08 22:42:38 +00:00
james
51191eec4f Add donor name above tabs on editor 
Add fundraising module setup tab
Add select's for campaign type and for salutation
Other misc fixes
 2009-10-08 19:13:14 +00:00
james
2fd187e753 Fix a bug in the campaign target percentage display 2009-10-07 22:10:52 +00:00
james
7e559461f8 Link fundraising dashboard campaign table to the campaign manager 2009-10-07 22:00:56 +00:00
james
77c3498fc1 Fixing i18n's 2009-10-07 21:52:39 +00:00
james
30171370e0 Setup the other tabs, empty so far 2009-10-07 21:49:49 +00:00
james
cdc93de3bd Overview tab implementation 2009-10-07 21:44:32 +00:00
james
7d42f697e7 Split otu campaign management to create/modify, and management 
Add tabs for the management
 2009-10-07 21:22:23 +00:00
james
087e89248a Working campaign editor 2009-10-07 19:43:58 +00:00
james
f01eac5b7b Add a date class for all date entry boxes to use 
Update fundraising dashboard to pull all To-Do list items from the corresponding database tables/fields
Update donor contacts code to not be crazy
Update donor organization info page as per carolyn's suggestions
 2009-10-07 17:58:11 +00:00
jacob
511562b5b7 Getting started on building the "Manage Campaigns" forms 2009-10-06 21:32:13 +00:00
james
6c61b26b1f Update fundraising dashboard tables to be live 
Add a colour_to_percent converter to calculate colour ranges between 0 and 100, ranging from red to green through yellow
Remove the query output from donors search results
 2009-10-06 21:00:12 +00:00
jacob
562f758c89 Moved the "new contact" form to the bottom of the accordion for ease of usage 2009-10-06 19:12:53 +00:00
james
cf2affcc03 Update default fundraising goals, and insert defaults if none exist 2009-10-06 19:04:45 +00:00
jacob
27b2c26c54 Removed an unnecessary i18n call 2009-10-06 16:49:18 +00:00
jacob
6396ca85f3 implemented activity logging in a few spots 2009-10-06 16:22:41 +00:00
jacob
0283036dc2 Updated the activity logging function for more generic use. 2009-10-06 15:09:13 +00:00
jacob
1da21bea9e Updated the activity log tab. Now in working order. 2009-10-06 14:44:27 +00:00
jacob
e3633a3cf4 Started on writing form viewing log files on the "Activity Log" tab 2009-10-05 22:01:06 +00:00
jacob
50eebd3245 Updated to allow the deleting of contacts 
Cleaned up the layout of the contact info form to be smaller and more aesthetic
 2009-10-05 19:00:00 +00:00
jacob
bfb4c1c586 Multiple contacts implemented in donors 2009-10-05 15:19:50 +00:00
james
abd5f1fcca Implement the fundraising goals editor on the setup screen 2009-10-02 20:47:04 +00:00
jacob
ce9446d66a Updated to use an accordion style form for entering contacts. There is an issue with the wrong data being submitted from the form. Working on that next 2009-10-02 20:39:34 +00:00
james
1fa368293f Create fundraising setup page 
Move fundraising levels editor into the setup
Remove the old level editor
 2009-10-02 19:21:43 +00:00
jacob
f140ce05a0 A rudimentary start on adding contacts 2009-10-02 18:10:55 +00:00
james
4f588a5859 show the search results div when you do a search 2009-10-02 18:08:32 +00:00
james
01fde584be Do a lot of database re-working, renaming and reorganization 
Database now refers to everything by donor/donation .. and apparently just as i complete this, carolyn has decided to go to both donor/sponsor instead of just donor.. ugh..
 2009-10-02 16:46:13 +00:00
jacob
55751e5da8 hide the list of donors after finding one 
starting a form for adding contacts
 2009-10-02 13:32:21 +00:00
james
1df3acd13d mockup of fundraising dashboard as provided by carolyn 2009-10-02 03:04:35 +00:00
james
2c316a1365 Start of the fundraising files 
Switch background of the #main div to white instead of crappy light blue
 2009-10-01 21:03:56 +00:00
james
3974636d1c DB update for donors add new fundraising main page 2009-10-01 16:52:36 +00:00
dave
21d3dcd054 - Replace class "tableedit" with class "editor", undo the alignment on class tableedit 2009-10-01 04:42:55 +00:00
james
40a49c8567 More renaming sponsors to donors and sponsorships to donations 
Start on the donor management interface
Try to make the donor tab 'look pretty'
 2009-09-30 22:38:38 +00:00
james
97887153b6 Start renaming sponsor to donor 2009-09-30 20:29:34 +00:00
james
9cee85a4f0 - chairemail -> chair_email 2009-09-27 08:38:44 +00:00
dave
5180c14b22 - Don't need this file either. 2009-09-27 03:08:05 +00:00
dave
aadf84754a - Rework the My Reports editor. with jquery it's 200 lines shorter now. :P 2009-09-27 03:07:39 +00:00
dave
fd045a51b4 - Make the report generator interface look a little saner 2009-09-27 01:20:12 +00:00
dave
c23ce973b1 - Change the default user list to show all users from all years 
- Change the SQL query to use MAX(year), so that we really only show a single
  (non-deleted) entry for each user.
 2009-09-26 17:59:50 +00:00
dave
22f75ffd1f Fix sponsor creation 2009-09-26 08:50:16 +00:00
dave
51eaad76a5 - Fix the trophy printing 
- Fix the table updates on creating a new prize
 2009-09-26 08:11:34 +00:00
dave
d77616a438 - Fix award info saving 
- Fix clearing out divisons/categories
 2009-09-26 00:10:57 +00:00
dave
74629b8b5b - Client side support for downloading additional materials (in generated PDF 
form) from an upstream server.
 2009-09-25 19:15:43 +00:00
dave
40789fc92c - remove the download all link.. for now, upload all as well. 
- support the new 2 fields downloading awards
- send the download output into a div ont he same screen, rather than on a whole new screen.
 2009-09-25 07:11:43 +00:00
dave
0f31f72f07 - Add two more fields: 
- additional_materials: if there are additional materials required if a fair assigns a winner to this award.
	- register_winners: to tell the feeder fair that this award is for winners who will participate at the upstream fair
 2009-09-25 04:29:41 +00:00
dave
25f19d9fbd - Enable the feeder_enable checkbox. There's no DB backend for it, it enables 
the feeder fair input on click, or if a feeder fair ul/dl is already
  selected.
 2009-09-24 01:39:05 +00:00
dave
b0e7715fb9 - Turn fair_save into an ajax query 
- Add notification area and debug to the popup window, still an ugly hack.
- Add a checkbox to the feeder fair config to enable/disable the whole thing (will confuse people less, needs to be implemented)
- Also add a checkbox for signaling the feeder fair if there are additional materials for an assigned award.
 2009-09-23 16:42:24 +00:00
dave
97c489646e - Turn the uploader into a popup window 
- Add the ability to select category/division mappings specific for each upstream server
- Add some auto-determining code if the cat/div mappings don't exist
 2009-09-23 05:53:33 +00:00
dave
32752f6e4e Rename the xmltransport to remote.php, we're not using XML at all. 2009-09-22 06:35:49 +00:00
dave
b7a30542d9 - Pretty it up a bit 2009-09-21 07:48:54 +00:00
dave
91338e7590 - Client-side award uploader for sfiab-sfiab. Hopfully I didn't break the YSC 
XML transport (too badly).  Still needs client status messages, but it works,
  and matches projects and schools.  
--This line, and those below, will be  ignored--

M    admin/award_upload.php
M    admin/award_download.php
 2009-09-21 07:18:39 +00:00
dave
0ce215b8bc - Remove debug line 2009-09-21 01:34:42 +00:00
dave
39fa2de7bd - Fix eligibility save 2009-09-21 01:33:55 +00:00
dave
fdeef1f273 - Ok, so jquery does do the right thing, we just have to be careful not to read 
fields that may not exist.
 2009-09-20 21:50:51 +00:00
dave
e07d24102c - Well, disabling the fields was a good idea, exept that serialize() skips over 
the value but not the name, so it sets every disabled field to "" when
  passing the data to mysql.
 2009-09-20 19:25:42 +00:00
dave
1e1a7d6202 - Make the notice divs a bit easier to see (light yellow background) 
- Don't reload tabs all the times, remember the current award_id for each tab
  and only reload if necessary
- Add a little notice for downloaded awards, telling the user why they can't edit some fields.
 2009-09-20 18:45:32 +00:00
dave
5989a8c254 - More fixes for editting, we dont' actually download the description or award type, so let the user edit those. 2009-09-19 08:14:59 +00:00
dave
7a474046a5 - beginning of setting uneditable fields for downloaded awards. 2009-09-19 08:06:21 +00:00
dave
9e348d9b0c - For the first time probably ever, DELETE a config variable :O 
- Rename the user/pass for fair type=ysc so it's more familiar (asks for YSC ID and pass)
- Convert cwsfregister to use the fair entry data.
 2009-09-19 06:53:49 +00:00
dave
e141676259 - Implement the last 2 missing warnings from ysfstats.php 
- Change the YSF 1click affiliation to point to fair_stats.php
- Add a hack in fair_stats.php to make it find and load the YSF stats on entry (on request).
- No need for ysfstats.php anymore.  The YSF fair has been added to everyone's
  SFIAB.  The last update ensures the password is there too. Verified that this
  works witht he GVRSF.  We could delete the YSF regionID and password now if we wanted from the config.
 2009-09-19 06:36:22 +00:00
dave
b5430b08b3 - change ysf to ysc in the code too 2009-09-19 06:13:22 +00:00
james
8aabd98fe0 Use the happy_ and error_ functions and load the ajax into the debug div 2009-09-18 19:25:26 +00:00
james
c1d7b8fc24 Commit working stuff for fundraising so i can update on lightbox 2009-09-18 17:06:44 +00:00
james
17c3e4a732 Start fixing hte sponsor queries, add some debugging so we can see who's in the lists, commit so i can get daves help :) 2009-09-18 15:57:35 +00:00
james
51d3f692c7 Fix committee query in communication module 2009-09-18 15:16:39 +00:00
dave
2762a12eb0 - Add a notice_ javascript function for testing, yup, it works 
- Reimplement the new award functionality
- Fix the reloading of the dialog by disabling all tabs and reselecting one.  It works properly now.
 2009-09-18 07:50:32 +00:00
dave
7a2e0b2b7e - Add a feeder fair statisics report type and report 2009-09-18 05:35:13 +00:00
dave
6fb6b9b25f - Fix the two broken communication queries 2009-09-18 04:04:20 +00:00