Commit graph

1255 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
91c10ddfa0 Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle 2011-12-22 09:48:23 +01:00
Gerard (Gerry) Caulfield
229278a71b MDL-29400 Fixing unset object bug encountered by Rajesh during testing 2011-12-22 14:00:44 +08:00
Eloy Lafuente (stronk7)
1af989f758 Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle 2011-12-20 22:53:12 +01:00
Henning Bostelmann
3367f14b0a MDL-29266 Assignment grading: save state of "send notifications" box 2011-12-15 17:17:37 +00:00
Marina Glancy
d021e5b40c MDL-30733: synchronizing view_feedback with parent function to work with advanced grading
assignment_upload::view_feedback was overriden. It is altered the same way as parent function was to work with advanced grading and so it is displayed correctly in user complete report
2011-12-15 16:44:14 +08:00
Gerard (Gerry) Caulfield
d6d8c49432 MDL-29400 Update the upload and uploadsingle assignment classes to so
that they only display the assignment submitted status when it has
actually been submitted.
2011-12-14 05:54:10 +08:00
Aparup Banerjee
46f2a9366a MDL-30604 Added upgrade lines to upgrade.php(s) 2011-12-09 01:28:59 +01: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
Eloy Lafuente (stronk7)
59e6df2883 MDL-30007 standardise assignment subplugin lang files 2011-12-01 00:42:25 +01:00
Petr Skoda
37c48acb45 MDL-30007 standardise assignment plugin version files 2011-11-29 22:15:28 +01:00
Petr Skoda
633d5a07af MDL-30007 standardise module version files 2011-11-29 21:38:14 +01:00
Nadav Kavalerchik
bc86c87261 MDL-30361 - mod/assignment, fix right margin of felement on Grading page that is linked from the user's submissions page (In RTL mode) Not sure what the previous fix was doing, (i made it on a previous commit) hope it does not break some other UI element when in RTL mode. 2011-11-23 01:31:54 +02: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
David Mudrak
37065c2e06 MDL-29793 Advanced grading forms attached to activity modules can be restored now 2011-11-08 23:33:40 +01:00
Aparup Banerjee
3730e077fc Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle 2011-11-08 15:18:22 +08: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
David Mudrak
ce7f5c8d3b Merge pull request #20 from marinaglancy/wip-nov02-rubric 2011-11-02 03:41:12 -07:00
Marina Glancy
63b9a6d07d MDL-29920: grade.php in assignment now can show submission/feedback for a particular user (also when submission did not exist yet) 2011-11-02 11:13:14 +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
Gerwood Stewart
2388e7ca7d MDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing a submission object that isn't one (in this case is a Boolean value). This will result in both methods now returning false. Kick on effect is that it corrects the bug described in MDL-27521 by removing the button if it isn't possible to finalize the submission. 2011-11-01 11:35:39 +08:00
Sam Hemelryk
243e3dd130 Merge branch 'MDL-29810' of git://github.com/bostelm/moodle 2011-10-31 17:11:08 +13:00
Sam Hemelryk
81ad059658 Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle 2011-10-31 12:59:35 +13:00
Henning Bostelmann
4ac9f47051 MDL-29810 Assignment grading: don't include teachers in list of students 2011-10-27 22:16:03 +01:00
David Mudrak
18dd4a69d0 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-27 21:58:45 +02:00
Dan Marsden
da69510f2a MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist 2011-10-26 10:59:13 +13:00
Stephen Bourget
d31a1ad808 MDL-29368 Assignment: Fixed a fatal error caused by a missing include 2011-10-25 19:19:02 +02:00
David Mudrak
01609c9ad9 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-10-24 22:13:01 +02: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
Stephen Bourget
e4784b616a MDL-29698 Assignment: Fix broken logentry 2011-10-16 18:26:38 +02: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