Add more flexibility to the Survey helper for use with the new Survey types. This includes using the new SurveyLogic methods from an earlier commit. And passing on the Logic from the view where necessary.

Added getRecordLogic method to SurveyLogic. This is used to retrieve the SurveyRecordLogic that belongs to a certain SurveyLogic.

Removed setting of the scope in the ProjectSurvey init. This is because it is not possible to query for another entity outside your entity group in the __init__ fucntion.

Added getSurveyForContent method to SurveyLogic. This method returns a Survey for a given content. The backreferenceproperty will not work because of inheritance.

Calling the correct super in Project and Grading Survey Logic.

merged upstream

Add paver script that will replace our current build.sh from scripts folder. Until I update the wiki to describe how this new paver build script works I'm leaving the old one in the repository. Reviewed by: Pawel Solyga

Add checkHasSurveyAccess access check To-be-reviewed, untested code

fixed critical errors related to survey subclassing and renaming of deadline and opening properties, and surveys in sidebar are now marked as such and have a red color if untaken

Removed survey_kind from Survey model. The inheritance structure should make this obsolete.

Set the correct base_model and scope_logic for extended Survey logic.

Added two missing imports to the Project and Grading Surveys views.

Added SurveyContentSchema to improve readability for the survey helper. Reviewed by: Lennard de Rijk

Added tag v0-5-20090629 for changeset 0dee663d6582

et new Melange version number to 0-5-20090629 in app.yaml.template.

Added skeleton view for ProjectSurvey and GradingProjectSurvey.

Prepared Survey access controls to deal with multiple logics. Also added a TODO to move a method to another view.

Extracted the ProjectSurvey and ProjectGradingSurvey records to a new module.

Removed unused import from Survey model.

Separated two survey types out of the main survey model. These models are ProjectSurvey and GradingProjectSurvey.

Seperated Logic for ProjectSurvey and GradingProject surveys. These changes also include their respective records.

Start on adding ProjectSurvey and GradingProjectSurvey. New classes still need to be made for logic and views so the appropriate methods can be overwritten. Reviewed by: Lennard de Rijk

Added .settings to hgignore. Eclipse IDE uses this map to store some settings. Since this is widely used I decided to add it to the ignore list.

Renamed opening to survey_start and deadline to survey_end. Symmetry seems to be both pleasing and helpful when understanding the code.

Put ResultsLogic in its own Logic module named survey_record.

Removed non-existing import in Survey Logic. James don't get ahead of yourself :D.

Added Survey menu items to the Program menu. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added Surveys to the sitemap. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added View for Surveys. Patch by: James Levy, Daniel Diniz Reviewed by: to-be-reviewed

Added redirect for use in Surveys. Also some minor style changes. Patch by: Daniel Diniz Reviewed by: Lennard de Rijk

Added Access checks for Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Lennard de Rijk

Added Survey Views Helper for rendering several widgets. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added logic for Survey and SurveyRecord. The logic for the SurveyRecord will be seperated within the upcoming days. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added SurveyRecordGroup for the use in evaluation surveys. Patch by: James Levy, Daniel Diniz Reviewed by: Lennard de Rijk

Added SurveyRecordModel. Lennard: On top of the orginial patch I've added several comments to the fields and two TODO's for further subclassing. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Added Survey and SurveyContent model. They are currently located in a single file this can be undone later on. Patch by: James Levy, Daniel Diniz, Lennard de Rijk Reviewed by: Lennard de Rijk

Fixed docstring in Document Logic.

Renamed css due to previous changes in previous commit.

Edited stylesheet for use in Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Mario Ferraro

Renamed JavaScript files in templates to match the correct files using prefixes.

Adding JS files for use in Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Mario Ferraro

Added templates considering Surveys. Patch by: Daniel Diniz, James Levy Reviewed by: Lennard de Rijk

Renamed jquery.growfield.js to jquery-growfield.js. Reviewed by: Lennard de Rijk

Patch that adds the JS and CSS files for surveys. The only update is in app/jquery/jquery-ui.core.js, from a non-release (added by Paweł for the date picker) to a slightly updated released version. Reviewed by: Lennard de Rijk, Mario Ferraro Patch by: Daniel Diniz, James Levy

Patch that touches 'upstream' templates, for use in surveys. Consists out of three changes. 1 - Move the </head> placement in base.hmtl to after the closing of scripts_block, so templates that extend base.html can add scripts to the <head>. 2 - Add tooltips for checkboxes inside fieldsets. 3 - Comment out an empty table row in templatetags/_as_table.html, which probably has an arcane reason to stay empty :) Reviewed by: Lennard de Rijk, Pawel Solyga Patch by: Daniel Diniz, James Levy

Fixes an issue where the organization home page would throw a 505 when no projects where accepted. This only happens after the project announced deadline because only then would the project list be constructed.

Added tag v0-5-20090621 for changeset 96ff51144dca

Set new Melange version number to 0-5-20090621 in app.yaml.template

jQuery Spin plugin updated to version 1.1.1 Former version had a bug if max was not specified

Use build-in django 1.0.x on deployed version of Melange. Using SDK (Development server) right now we are still using django.zip when running from build folder and django folder when running from app folder. django.zip file is still uploaded when deploying the app but it's not used. We might totally get rid of django folder and django.zip soon (discussion needed).

Update GAE to 1.2.3 in thirdparty folder.

Added tag v0-5-20090608 for changeset 19e9fdde919e

Set new Melange version number to 0-5-20090604 in app.yaml.template

Temporary fix for Issue 636 by turning off the caching of the page's entities. This also means that pagination is turned back on because querying all 1000 projects every time will take too long.

fix copy/paste fail in homepage caching

Added group attribute to each GHOPProgram property so it is grouped on edit/create forms. Added 3 new groups, "Contest Rules" group, "Prize Information" group and "Task Settings" group to organize the properties in a useful manner on the edit/create forms. Reviewed by: Lennard de Rijk

Changed GHOP module imports to be consistent with rest of Melange code. The imports used the from <module-path> import <module> as <local_module_name> syntax. These kinds of imports are changed to import <module_path.module_name> syntax to be consistent with the Melange code base. Reviewed by: Lennard de Rijk

Changed the property that holds the minimum age required for Students to participate in a GHOP based program. Added a new property student_min_age_as_of to hold the DateTime from when the minimum age should be reached. Changed student_min_age property to now store the student minimum age as an integer. This all feel more user friendly then letting the program admin calculate the required DateTime. Storing the two properties is then still needed in this case since information might be lost otherwise when the program admin brings up the edit view. Reviewed by: Lennard de Rijk

Remove now unneeded getCallback from ghop.__init__

Remove getCallback indirection in modules Instead, assume that the imported module contains the Callback class that was previously returned by getCallback. This is done to prevent a circular import (caused by the __init__ importing a submodule).

Removed authors from 'empty' __init__.py files.

Add HTTP_HOST to environ variables mocked. Also add license headers to run.py.

Added logic for every GHOP specific model. Defined logic for every model defined for GHOP. These logics do nothing special now. They are just inherited from their parent classes. Necessary GHOP specific logic will be added later as necessary. Reviewed by: Lennard de Rijk

Added licenses and fixed the authors of __init__.py for the GHOP module.

Changed imports in models to comply with recent GHOP code move. Reviewed by: Lennard de Rijk

Removed unused import.

Moved the GHOP module into the modules package. This also includes moving the templates and content into their respective place inside the Soc folder. This is to avoid adding every folder to the app.yaml file. Patch by: Madhusudan C.S. and Lennard de Rijk Reviewed by: Lennard de Rijk

also rename batch_size in cron.py

Added tag v0-5-20090604 for changeset 1dc8d7f9458e

Set new Melange version number to 0-5-20090604 in app.yaml.template

Display caught errors on the page itself Similar to the previous commit, show directly rather than redirect.

Make the maintenance page a hardcoded response Show the maintenance message on the requested page, instead of redirecting to a specific url which then displays a page with the maintenance notice.

Merge with Pawel's tip.

Partial fix for displaying mentors and students on Organization home page. Connections between mentors and students are not yet displayed and also there is some probably with displaying markers in Safari for some reason, everything works fine in FF.

Comment out GMaps support in Organization home page template.

Small indentation fix.

Add missing if statement in organization list row template.

Fixed an issue where some access checks would fail due to missing arguments. This happens when an org document is being checked for write access when trying to show the edit link on the document's show page.

Introduced 'module_package' key in params dict to support modules in melange

Now showing link to edit the home page document on the home page. This will only show up if you have the right to edit the document. Update issue 271 Now also working for home pages.

Temporary turn off GMaps support on Organization home pages until it's fixed. Currently not all markers and polyline connections between students and mentors show up.

Added link to edit the Document on the Document's public page. This link will only show if the user is allowed to edit the document. Fixes issue 271. Update issue 271 Owner: ljvderijk

Rename soc-090421.css and update base.html template.

Clarified docstring for document read/write access check.

Small changes in #extra_left, #extra_right tags in css file. Google Maps and Student Project List on Organization home page now doesn't lay on page footer if too high.

Added a link to the website where the user has registered to the welcome email. Fixes Issue 630.

Add taggable-mixin and gviz to build script.

Extend taggable-mixin to support different Tag models. Usage is pretty simple. Tag model is default in Taggable constructor but you can call it with different model like GHOPTaskType that inherits from Tag model. Both Taggable and Tag models have been updated and they don't use hardcoded Tag model anymore and instead use cls of class methods or self.__class__. In case of Taggable it's self.__tag_model.

Make taggable-mixin tests working by updating GAE path.

Merge with Pawel's head.

Add google-visualization-python project to Melange repository. This python module will be used with our Statistics module to leverage Google Visualization API and python as a data source.

Removed unecessary use of %.

Changed University Student expected graduation date to be a dynamic dropdown. The range of choices is dynamically made by taking the current_year-1 to the current_year+20. It does not start at the current year because a Student might need to change it's profile during a Program that runs across multiple years.

Added GHOP specific Mentor and Org Admin Models.

Add missing __init__.py file in taggable-mixin module.

Add taggable-mixin to Melange repository.

Add some missing docstrings to Seeder classes in seed_db.py

Style fixes and pylint: disable-msg comments in different modules.

Add pylint: disable-msg= where needed in Melange modules.

Rename bathSize variable to batch_size in soc.logic.models.base module.

Style fixes and wrong function call fix in soc.views.helper.lists module.

Remove unused variable from soc.view.models.cron module.

Some more pylint fixes in different Melange modules.

Style and pylint fixes in Melange modules.

Style and variable names fixes in soc.modules.core module.

Remove unused imports in Melange modules.

Remove unused imports from main.py.

Some small fixes to unique_user_id_adder module.

Fixed typo in org_prize_assignment model.

remove accidental head

Fixed the notification list to show a properly formatted date and time column.

Link id and key name fixes for Organization And OrgApplication in seed_db.

Add Organization Application seeding. Fix the seeding in seed_db so that a consistent linkid for organization applications is used. Use the last entry in the split array instead of the 2nd.

Make user_id property in User model not required.

Merged with Sverre

Fixed model name and comment typo's in task model. Also changed the corresponding reference properties.

Added several models related to the GHOP workflow. These models will form the base of the GHOP infrastructure together with the already commited task model. Reviewed by: Lennard de Rijk

Do not die on NeedIndexErrors

Add helper functions, model update and jobs for unique user ids.

Add missing django.template import to shell.py.