Commit Graph

544 Commits

Author SHA1 Message Date
David Mudrak 7ece4a0798 Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric 2011-10-13 22:45:30 +02:00
David Mudrak 20c207ab21 Merge branch 'master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-13 22:42:47 +02:00
Marina Glancy 3bf7ef29a5 MDL-29481: filling rubric by teacher, first steps 2011-10-13 16:27:33 +08:00
Marina Glancy 6798c63e20 Added form element grading and integrated it with grading_controller 2011-10-12 15:01:53 +08:00
Marina Glancy 18e6298c7b Added validation to grading form, implemented methods in advanced grading to return form contents and process and return the final grade 2011-10-12 11:48:06 +08:00
Eloy Lafuente (stronk7) c676af9f72 MDL-29564 Assignment: whitespace fix 2011-10-10 13:08:48 +02:00
Stephen Bourget 19f7391c50 MDL-29564 Assignment: Fixed a fatal error caused by a missing include 2011-10-10 11:54:53 +13:00
David Mudrak fba356f375 MDL-29483 Initial draft of advanced grading support in the Assignment module 2011-10-08 01:02:31 +02:00
David Mudrak fd04c5bd87 MDL-27857 Export to portfolio support in the assignment module improved
Portfolio API code in the assignment module expected that the current
user is the author of the submission. Therefore the "Export to
portfolio" button did not work when the submission was viewed by a
teacher (eg at the page with the list of all submissions in the Advanced
upload assignment).

This patch introduces a new callback argument 'submissionid' that holds
explicit ID of the submission the export deals with. With it available,
we do not need to expect the current user is the author of the
submission.

The patch also cleans some strings used for portfolio callback
exceptions.
2011-10-03 10:15:39 +02:00
David Mudrak b777c798b0 MDL-27857 Assignment does not use form tag to render portfolio export control widget
When this code was used as a part of the grading screen, the default
PORTFOLIO_ADD_FULL_FORM widget led to nested form elements. This patch replaces
the form widget with a plain text link that can be embedded safely.
2011-10-03 10:15:38 +02:00
Petr Skoda aff24313be MDL-29401 introduce new frankenstyle PARAM types
New PARAM_COMPONENT, PARAM_AREA and PARAM_PLUGIN + fixing of hopefully all current incorrect parameter types. This should help with diagnosing of incorrectly named 3rd party plugins too.
2011-09-25 09:59:55 +02:00
Aparup Banerjee 5433da6064 Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
- resolved conflicts.
2011-09-13 11:39:06 +08:00
Sam Hemelryk eb38d45b4e MDL-29189 course Minor fixups after code review 2011-09-13 11:17:18 +12:00
Tom Lanyon 7aa06e6ded MDL-28701 Change all uses of $CFG->dataroot/temp to $CFG->tempdir 2011-09-10 10:35:39 +02:00
Sam Hemelryk 8ebbb06adf MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently 2011-09-08 09:30:27 +12:00
sam marshall 3e4c243500 MDL-27001 'Show description' feature part 3: Implementation for all modules
For modules that still used the 'old' generic object return from _get_coursemodule_info instead of returning a cached_cm_info object, I changed them to use the new format as part of this. This made a few areas of code regarding onclick links slightly nicer.
2011-09-06 11:03:06 +01:00
Henning Bostelmann 7d8b217bca MDL-25872 View assignment submissions: show only students, not teachers
Fixing incorrect capability reference mod/assignment:view to ...:submit
2011-08-26 17:33:46 +01:00
Rajesh Taneja e9de1cf49c MDL-27896 context - Fixed editor context to observe filter status 2011-08-12 11:33:21 +08:00
Rossiani Wijaya 54c37fbd88 MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type. 2011-07-05 15:33:33 +08:00
Eloy Lafuente (stronk7) 282a0a713e Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle 2011-06-29 20:11:17 +02:00
Sam Hemelryk f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Andrew Davis (andyjdavis) 5daa7279d4 MDL-28087 assignment: made the jabber notification of assignment grading better 2011-06-29 11:29:11 +08:00
Eloy Lafuente (stronk7) cddb428722 Merge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis/moodle 2011-06-28 22:14:54 +02:00
Andrew Davis (andyjdavis) 83dfca3fa3 MDL-27990 assignment: removed a redundant retrieval of a user preference 2011-06-28 11:08:59 +08:00
Andrew Davis (andyjdavis) b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Andrew Davis (andyjdavis) 0f1751b01b MDL-28023_assignment_jabber assignment: added context url to improve the jabber notifications 2011-06-27 11:08:21 +08:00
Andrew Davis (andyjdavis) fa09b5a9a3 MDL-28023 assignment: assignment wasnt supplying all the data necessary to produce a meaningful jabber notification 2011-06-25 13:12:48 +08:00
Andrew Davis (andyjdavis) be34802d23 MDL-27990 assignment: Some small modifications to the assignment notification code
AMOS BEGIN
 MOV [enableemailnotification,mod_assignment],[enablenotification,mod_assignment]
 MOV [enableemailnotification_help,mod_assignment],[enablenotification_help,mod_assignment]
AMOS END
2011-06-24 14:19:40 +08:00
Eloy Lafuente (stronk7) 6057bf5b05 MDL-27810 portfolio: Added ->portfolioenabled check to one more place 2011-06-22 02:10:11 +02:00
Sam Hemelryk 6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Sam Hemelryk 46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Marina Glancy 13b3f4d4af MDL-26430 fixed appearance of one html form within another 2011-06-10 12:55:12 +08:00
Dongsheng Cai b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Sam Hemelryk e455bdb3d7 MDL-27638 Removed buggy status line from query as it is being calculated in php anyway 2011-05-31 17:02:17 +08:00
Sam Hemelryk 2b04c41c58 MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
* Added the component and ratingarea fields and implemented it throughout
  the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
  API.
2011-05-23 12:35:39 +02:00
Sam Hemelryk 870b8b0402 Merge branch 'MDL-27161_head' of git://github.com/rwijaya/moodle.git 2011-05-16 12:28:18 +08:00
Rossiani Wijaya e512715b89 MDL-27161: fixed optional setting for 'require grading' to prevent page lock out (head) 2011-05-12 17:32:00 +08:00
David Mudrak 29cbe43189 MDL-13481 Strings fullname and shortname are now deprecated
This is a final cleanup commit of fullname and shortname issue. All
places where these strings were detected yet have been replaced with
proper fullnamecourse or fullnameuser or some other context specific
string.

AMOS BEGIN
 CPY [fullname,core],[outcomefullname,core_grades]
 CPY [shortname,core],[outcomeshortname,core_grades]
 CPY [name,core],[rolefullname,core_role]
 CPY [shortname,core],[roleshortname,core_role]
AMOS END
2011-02-28 09:42:50 +01:00
Aparup Banerjee d042ff06b3 assignment MDL-26532 fixed regression in assignment_cron() while processing messaging. 2011-02-21 15:43:30 +08:00
Eloy Lafuente (stronk7) 6b1b1d0339 MDL-25708 recordsets - assignment and data modules 2011-01-25 19:59:00 +01:00
Eloy Lafuente 0f66acede0 MDL-22135 - logs restore, course and activities + cleanup 2010-11-11 19:46:04 +00:00
Aparup Banerjee 6217809c8c assignment MDL-24694 added contexturl and contexturlname properties to email_teachers() message object. 2010-10-26 09:04:12 +00:00
Aparup Banerjee 39e171ac93 assignment MDL-24694
- added message provider to manage assignment's messaging
- user_preferences.name length changed form 50 to 255 due to long messaging preference names.
2010-10-26 06:46:01 +00:00
Aparup Banerjee 6a41c6fe3a assignment MDL-24694 added time of update to assignment updates email notification 2010-10-20 03:02:48 +00:00
Aparup Banerjee 192bcd76da assignment MDL-24710 added component and name properties to Event object required by messaging framework. 2010-10-19 07:28:42 +00:00
Dan Marsden 44729427ab Plagiarism API MDL-13680 move update_status call untill after print header so it can also print to page if required. 2010-10-14 21:40:04 +00:00
Aparup Banerjee 9d1354b70d assignment MDL-24469 merged changes to head. 2010-10-11 08:27:50 +00:00
Petr Skoda 6bdfef5da9 MDL-24321 switching to standard stdClass() 2010-09-21 08:54:01 +00:00
Petr Skoda 39790bd805 MDL-24321 switching to stdClass in /mod/ 2010-09-21 08:37:36 +00:00
Dan Marsden bce59524ce Plagiarism API MDL-13680 add plagiarism support for user submitted files - currently only added to single and advanced Assignment types - other modules to come in future. 2010-09-20 07:32:31 +00:00