1313 Commits

Author SHA1 Message Date
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
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
sam marshall
e4aec5bed3 MDL-26647 (6) Support showuseridentity on grader report, quiz report, SCORM report 2011-11-04 13:57:17 +00: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
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
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
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
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
David Mudrak
25ab1d50e2 MDL-29920 The link from gradebook back to the activity contains itemnumber
The activity module must have a chance to display appropriate grades
report per itemnumber. Most activity modules have just one grade items
si they can ignore the param. Complex modules like the Workshop need this.
2011-11-01 18:18:45 +01:00
David Mudrak
49a537b356 MDL-29482 The rubric editor is now able to save the status of the form definition 2011-11-01 18:04:31 +01:00
David Mudrak
4d064218fb MDL-29794 Rename templates.php back to pick.php
We will need the general management page implemented in a separate
script. This one will be used for picking an existing form only.
2011-11-01 16:30:17 +01:00
David Mudrak
3f3ee7114e MDL-29794 Do not offer re-sharing of unmodified forms
The patch introduces a new field 'timecopied' that holds the timestamp
of when the given form was cloned last time. Using this field, we can
decide whether the form can be actually re-shared or not.

Note that the logic just hides the icon. It is meant as a usability
feature, not any real protection from sharing.
2011-11-01 16:10:12 +01:00
David Mudrak
86e9ccfd92 MDL-29794 Shared grading form templates can be deleted now
There is a new capability to manage all shared templates. Without this
capability, the user is allowed to delete just templates they previously
shared.

In the future, an option to edit the template directly might be added.
At the moment, the workaround is to pick the template into a temporary
assignment, edit it there and re-save it as a new template.
2011-11-01 14:05:11 +01:00
David Mudrak
7622ae95dc MDL-29108 Improved support for form definition status
Every grading form can be basically in either DRAFT state (currently
being edited) or READY state (available for usage). For shared
templates, the status is not relevant at the moment and they are
automatically in the READY state.
2011-11-01 12:32:06 +01:00
David Mudrak
20836db999 MDL-29794 Initial support for re-using a shared grading form
The patch introduces a new script templates.php that allows to search
for a previously shared form (template) and re-use it.

The patch also modifies the preview rendering of grading forms. Now
plugins are responsible for rendering the form itselft, without any
headers, descriptions etc (we need to embed the form preview into
various places so the caller looks after the frame).
2011-11-01 03:16:54 +01:00
Marina Glancy
39c6f4b625 MDL-29482, MDL-29481: better rendering, options for rubric display 2011-10-26 11:36:29 +08:00
Marina Glancy
8722a322db MDL-29794: fixed bug with description cloning 2011-10-25 09:49:10 +08:00
Marina Glancy
8df55bbe6a MDL-29481: rubric renderer now uses tables for smoother layout 2011-10-25 08:57:56 +08:00
Marina Glancy
fc5adc3b5d MDL-29481: phpdocs in renderer, renamed the main CSS class for rubric 2011-10-25 08:57:56 +08: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
David Mudrak
8b9ada5e19 Merge remote branch 'github/rubric' into rubric 2011-10-24 21:02:56 +02:00
David Mudrak
9c9cee4e33 Simplified manage.php initialization
For now, we support activity modules only anyway.
2011-10-24 21:02:05 +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
ed709412c2 MDL-29108: support for returnurl in rubriceditor 2011-10-24 13:36:42 +08:00
Marina Glancy
5060997ba5 MDL-29481: added support for remarks in rubric feedback 2011-10-24 13:36:33 +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
671ec8f50e Form definitions can be removed now 2011-10-19 13:25:47 +02:00
David Mudrak
fde3380443 Saving a form as a public template
There is a new API method get_definition_copy() that is expected to
return the definition structure as if the form was written from scratch
via the editor. Such a prepared structure is passed to
a controller's update_definition() method in the new target area.

The same mechanism will be used for copying definitions from a shared
area to a normal gradable area.
2011-10-19 01:17:43 +02:00
David Mudrak
71bd9d2066 Trivial rename of the active method selector param 2011-10-18 16:39:54 +02:00
David Mudrak
ac16cedf00 Fixed registering new form definition 2011-10-18 16:27:22 +02:00
David Mudrak
a990240b31 Fixed form cancellation handling
Previously, a cancelled form was processed as if all rubric definition
was removed.
2011-10-18 16:26:06 +02:00
David Mudrak
98a73bb7ac Improved management page's integration into the settings block (again) 2011-10-18 16:25:30 +02:00
David Mudrak
6832a10264 Initial support for the grading management screen
The user is sent to the new grade/grading/manage.php screen when an
advanced grading method is set in the activity mod form or via the
settings block.

The screen is supposed to (1) let the user change the currently active
grading method, (2) open the editor for the selected method, (3) create
new form from a template (4) display a preview of the form.
2011-10-18 01:05:07 +02:00
Marina Glancy
ab156741fc MDL-29481: implemented rubrics renderer, improved rubrics UI 2011-10-17 17:03:25 +08:00