49916 Commits

Author SHA1 Message Date
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
David Mudrak
1dea75b8d1 MDL-29108 Do not display grading method selector for non-privileged users
The patch checks the required capability before it displays the grading
method selectors in the modform.
2011-11-11 13:58:45 +01:00
David Mudrak
217116d414 MDL-29108 Improving get_grading_method() documentation
As a response to Sam's review (10)
2011-11-11 12:18:02 +01:00
David Mudrak
794cea253c MDL-29108 Fixing a typo
Spotted by Sam during the review (23)
2011-11-11 12:17:01 +01:00
David Mudrak
6f19a2a98b MDL-29108 Removing global variables where they are not needed
Spotted by Sam during the review (17.1 and 17.3)
2011-11-11 12:10:02 +01:00
David Mudrak
241d9463de MDL-29798 Final clean-up before submitting for the integration review 2011-11-09 22:08:09 +01:00
David Mudrak
9faf837fc0 Moved CSS into the base theme to make the UI friendly in all themes by default 2011-11-08 23:58:10 +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
David Mudrak
9b553d472e MDL-29793 Advanced grading forms attached to activity modules are included in the backup now 2011-11-08 16:25:58 +01:00
David Mudrak
3e5e7004c5 Merge pull request #24 from marinaglancy/wip-nov08-rubric 2011-11-08 00:23:45 -08:00
Marina Glancy
c97933ffa3 MDL-30161: link from gradebook (grading analysis) only appears now in Grader report but for all items; in User report the link under activity name contains userid 2011-11-08 14:09:50 +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
050125d47e fixed bug that appeared when teacher grades student with a rubric for the first time 2011-11-08 09:15:42 +08:00
David Mudrak
bb50c37651 MDL-30162 The grading method can be selected when creating new instance of the activity module 2011-11-08 01:54:36 +01:00
David Mudrak
b2c16c6e51 Files embedded into the form description are now served by the core itself
The grading form description is in the core scope so it should be served
by the core, not by the plugin.
2011-11-08 01:06:47 +01:00
David Mudrak
b02b7c5add MDL-30111 Rubric - reordered English strings by stringid 2011-11-07 23:23:38 +01:00
Martin Dougiamas
de2eb195fe MDL-30111 Rubric - some English strings rewording 2011-11-07 23:19:51 +01:00
David Mudrak
903198de7b Merge pull request #23 from marinaglancy/wip-nov07-rubric 2011-11-07 04:47:29 -08:00
Marina Glancy
188e840b99 MDL-29481: when student is being regraded we try to pick up the latest saved but not submitted version of grading
There are no visible changes yet because at the moment rubric is only saved when it is submitted but this is a base for AJAX saving
2011-11-07 15:55:08 +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
Marina Glancy
ffbf4370a2 MDL-30023: rubric editor usability - automatically set scores for added levels 2011-11-07 13:07:43 +08:00
Marina Glancy
2d41a9115b Fixed small bug resulting in a warning message when creating new rubric 2011-11-07 13:07:30 +08:00
David Mudrak
fa4cbd214b Merge pull request #22 from marinaglancy/wip-nov04_1-rubric 2011-11-04 00:42:52 -07:00
Marina Glancy
59be90119e MDL-30023: rubric editor usability - support for tab key and adding multiple levels 2011-11-04 14:58:05 +08:00
Marina Glancy
4f110c471a MDL-30023: rubriceditor usability - skip buttons for reorder and delete in tabindex 2011-11-04 11:30:06 +08:00
David Mudrak
0455c99864 MDL-29920 User report may display the grade analysis link, too
The original idea was to use the link in the row header (the activity
link). However, for both unified user experience and the overall patch
design reasons, I finally decided not to alter the activity link but to
append the analysis icon. The user experience should be the same as in
the grader report.
2011-11-03 13:51:45 +01:00
David Mudrak
f17bb885e9 MDL-29920 Grader report does not need to cache grade.php existence flags any more
This caching is now performed by the underlying methods.
2011-11-03 13:50:34 +01:00
David Mudrak
eff314b06a MDL-29920 Performance improvements in the gradebook reports
Both methods get_activity_link() and get_grade_analysis_url() now cache
the results of the check whether the activity module provides grade.php
or not. Previously, get_activity_link() called file_exists() in every
call and get_grade_analysis_url() did not check the existence at all.

Note that this solution is still sub-optimal as apparently both methods
do very similar job. This should be refactored one day by a brave
developer who works on gradebook. Meanwhile, even this suboptimal
solution is more effective than the previous one for most courses.
2011-11-03 13:44:41 +01:00
David Mudrak
e14e78abbf Merge pull request #21 from marinaglancy/wip-nov03-rubric
Display warnings if used rubric is being updated and mark instances for regrade
2011-11-03 02:52:53 -07: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
dd736a87ee Replaced deprecated get_system_context() with the new context_system::instance() 2011-11-02 23:35:05 +01: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
9e3d352dee Improved handling of occupied target issue
If the target area already contains a form, we can't pick anything to
use there. If the user works in two windows or there are several
teachers modifying the same course, it can happen that the form suddenly
appears in the target area while we have the form picker still open. In
such case, we simply redirects the user to the target area instead of
displaying the pooky exception.
2011-11-02 22:29:47 +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
967d346f72 MDL-29794 It is now possible to re-use a form without sharing it as a template
The patch also improves displaying tags-like status information next to
the grading form titles.
2011-11-02 21:57:24 +01:00
Eloy Lafuente (stronk7)
735de1c276 weekly release 2.2dev 2011-11-02 19:52:31 +01:00
Eloy Lafuente (stronk7)
77c5a59017 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-11-02 19:48:26 +01:00
Eloy Lafuente (stronk7)
799be36820 MDL-29213 - add clarification note + todo once MDL-30039 arrives 2011-11-02 19:07:52 +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
6184b84393 MDL-30037: fixed bug with grade calculation 2011-11-02 11:38:00 +08: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
3599b113a6 MDL-29482, MDL-29794, MDL-30037: supporting form status in rubriceditor and forms sharing; fixed bug with grade calculation 2011-11-02 10:45:32 +08:00
Marina Glancy
2ae7faf128 MDL-29482: added validation to rubric editor and the 'work in progress' status 2011-11-02 09:12:58 +08:00
Marina Glancy
37f391f00a MDL-29481: added css border around selected rubric level 2011-11-02 09:04:14 +08:00
Marina Glancy
156d6f4876 MDL-29920: now complete report properly calls view_feedback in assignment 2011-11-02 09:04:01 +08:00
David Mudrak
bb17ac1e32 MDL-29920 Gradebook grader report now supports grade analysis link
When grade analysis link is enabled, an icon is displayed next to each
grade of a module that supports grade.php file. The parameters needed to
identify the particular user and grade are passed to the grade.php
script.
2011-11-01 20:53:48 +01:00
Eloy Lafuente (stronk7)
5fbf87c802 Merge branch 'MDL-29879' of git://github.com/timhunt/moodle 2011-11-01 20:12:45 +01:00
Eloy Lafuente (stronk7)
313e048981 MDL-29283 import TCPDF to 5.9.133 - clean whitespace 2011-11-01 20:09:10 +01:00