49895 Commits

Author SHA1 Message Date
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
Dan Marsden
a5ba44f93c MDL-29213 - fix for bug with flash player and IE 9
(cherry-picked and amended with 1-line whitespace)
2011-11-01 19:59:05 +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
Eloy Lafuente (stronk7)
e785b0f3ca MDL-29283 import TCPDF to 5.9.133 - fix permissions 2011-11-01 17:27:26 +01:00
Eloy Lafuente (stronk7)
e686d11257 Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle 2011-11-01 17:23:20 +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
Eloy Lafuente (stronk7)
302f45e8de Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle 2011-11-01 12:26:31 +01:00
Tim Hunt
78f8261f6e MDL-29879 qbehaviour missing. Fix bad lang string. 2011-11-01 10:37:48 +00:00
Aparup Banerjee
ddba89cc2a Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-11-01 15:18:44 +08:00
Petr Skoda
0775152ff0 MDL-30005 regression fix for non http/ftp urls 2011-11-01 07:56:33 +01:00
Aparup Banerjee
203683e415 Merge branch 'MDL-29983' of git://github.com/timhunt/moodle 2011-11-01 13:23:03 +08:00
Sam Hemelryk
21e7d4c5fc MDL-28720 calendar: Quick fix of a regression in set.php 2011-11-01 17:50:01 +13:00
Sam Hemelryk
f94d606f1f Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle 2011-11-01 17:36:50 +13:00
Aparup Banerjee
d29f4e055d Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle 2011-11-01 12:15:40 +08:00
Aparup Banerjee
b68c077632 Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle 2011-11-01 12:00:57 +08:00
Sam Hemelryk
5f3abf0a42 Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle 2011-11-01 16:52:02 +13:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
Sam Hemelryk
bc454be746 Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle 2011-11-01 16:11:58 +13:00