Commit Graph

630 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) d8c9ff403b Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle 2012-03-01 00:25:18 +01:00
Gerard (Gerry) Caulfield 8caba22968 MDL-30724 Limit assignment_count_real_submissions() to only select real
submissions

I've also refactored some code so that it is more structured and allows
for easier overriding of function associated with counting submissions
and updated associated doc blocks.
2012-02-27 12:24:48 +08:00
Eloy Lafuente (stronk7) 2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Gerard (Gerry) Caulfield ad2d5eba0b MDL-30957 Adding a new method "is_complete" to assignment lib for
testing if a submission has actually been submitted and then adding a
call to it before displaying the the assignment submission date header

As recommended I've simplified the functions and split the logic out into appropriate upload classes.
2012-02-20 11:34:38 +08:00
Dongsheng Cai d2b7803e5a MDL-30973 Files API, check and update DocBlock 2012-02-15 12:48:57 +08:00
Sam Hemelryk e4082c4bad MDL-30709 mod_assignment: Renamed callback to mod_assignment_get_file_info 2012-02-15 11:26:49 +13:00
Andrew Davis a153c9f2fe MDL-30999 grade: updated Grade API phpdocs 2012-02-14 14:04:19 +07:00
Sam Hemelryk 49414a7746 MDL-30709 mod_assignment Fixed phpdocs for assignment_get_file_info 2012-02-14 17:15:17 +13:00
Sam Hemelryk d88f6dafdc Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle 2012-02-14 17:14:05 +13:00
Marina Glancy 7d3ebf4c19 MDL-30709: Fixed bug with inserting files from Recent files repository
Two parts of changes: in assignment module function assignment_get_file_info was missing
and when populating the list of recent files the function get_file_info was not called, which caused populating the list of recent files with the files that could not later be inserted
2012-02-09 13:55:41 +08:00
Dan Marsden 266540eb23 MDL-31461 Plagiarism - adjust api functions to allow better support for renderers 2012-02-03 11:37:51 +13:00
Henning Bostelmann 3367f14b0a MDL-29266 Assignment grading: save state of "send notifications" box 2011-12-15 17:17:37 +00:00
Aparup Banerjee cd8805448d Merge branch 'MDL-30350-master-1' of git://git.luns.net.uk/moodle 2011-12-08 14:19:46 +08:00
Andrew Robert Nicols 70eddb71cf MDL-30174 Assignment : Only increment submission offset if the current assignment was not saved 2011-11-22 02:20:16 +08:00
Andrew Robert Nicols 89a4471b97 MDL-30173 Assignment : Convert to use moodle_url and add missing filter param 2011-11-22 02:02:26 +08:00
Andrew Robert Nicols d50645ebca MDL-30350 Highlight late submissions in the submission overview page 2011-11-18 14:10:33 +00:00
sam marshall 24ad1d1feb MDL-30275 Assignment activity description not displayed on course page 2011-11-15 15:24:08 +00:00
Sam Hemelryk 1ae9aa2b8f Merged MDL-29108 Advanced grading 2011-11-14 22:01:05 +13:00
Marina Glancy 3c2b3cb3ee MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240 2011-11-14 14:53:14 +08:00
David Mudrak a3b37e4b6e MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level 2011-11-11 13:59:04 +01:00
Eloy Lafuente (stronk7) 8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
2011-11-11 03:37:55 +01:00
Stephen Bourget 8c93ab4e0f MDL-29529 Assignment: Fix regression caused by MDL-27638 2011-11-11 01:23:47 +01:00
Marina Glancy 8545f86cc9 Fixed small bug in displaying locked outcomes in assignment grade form 2011-11-08 10:34:23 +08:00
Marina Glancy 71380f2f14 MDL-30061: advanced grading evaluation freezes now if grade is locked or overriden 2011-11-08 10:06:33 +08:00
Marina Glancy 13926e735d MDL-30159: fixed bug: When evaluating by advanced grading extra entries are inserted in grading_instances 2011-11-07 14:37:58 +08:00
Mark Nielsen 92d0dd9fb8 MDL-30059: Assignment Submission Notification Should Use Teacher's Timezone Rather Than Server Time 2011-11-07 13:32:49 +08:00
sam marshall 02dd3b9fc0 MDL-26647 (7) Support showuseridentity on assignment report 2011-11-04 13:57:19 +00:00
Marina Glancy 0136124e21 MDL-30112: marking rubric filling instances for regrading
- If a used rubric being updated, teacher (moderator) is notified
- If the changes are significant, all instances automatically marked for regrade
- if the changes are minor (texts, options or sortorder), teacher can choose whether to mark for regrade or not
- The instances marked for regrade can be re-graded but students are not able to see the rubric
- when grading a message appears if the instance is marked for regrade and is not visible to students
2011-11-03 16:08:36 +08:00
David Mudrak d6d341d09b Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-11-02 23:17:08 +01:00
David Mudrak 9e4eb676e4 MDL-29483 The list of gradable areas is now obtained from the module
At the moment, only activity modules are supported.
2011-11-02 22:25:32 +01:00
Marina Glancy 0e2a1d755a MDL-29482: error message is displayed to graders if grading form is unavailable 2011-11-02 11:12:02 +08:00
Marina Glancy 156d6f4876 MDL-29920: now complete report properly calls view_feedback in assignment 2011-11-02 09:04:01 +08:00
Henning Bostelmann 4ac9f47051 MDL-29810 Assignment grading: don't include teachers in list of students 2011-10-27 22:16:03 +01:00
Marina Glancy fc05f22204 MDL-29483: allow the grading instance to exist without itemid until submitting (submission in assignment might not yet existed) 2011-10-24 13:36:51 +08:00
Marina Glancy 9e2eca0fde MDL-29483, MDL-29482 advanced grading in assignment, rubrics editor
- advanced grading plugins now return the grade in the specified range
- prohibited quick grading when advanced grading method is used
- fixed bug in processing description in rubric editor
- some improvements to rubric editor JS
2011-10-21 13:58:52 +08:00
Marina Glancy 36937f0264 MDL-29483: advanced grading methods support on assignment module, grading form element, rubrics
- gradingform API now has not only controller class but also instance class with functions and data related to the particular grading instance
- assignment grading form and grading form element deal with elements of gradingform_instance class instead of gradingform_controller
- implemented the class gradingform_rubric_instance
- added more phpdocs
2011-10-20 12:15:51 +08:00
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