49559 Commits

Author SHA1 Message Date
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
David Mudrak
d1bc817832 Merge pull request #16 from marinaglancy/wip-MDL-29483-rubric
MDL-29483: advanced grading methods support on assignment module, grading
2011-10-24 11:59:08 -07: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
553af5fd6a New capability to share and publish a form as a template 2011-10-18 14:55:25 +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
David Mudrak
d80bb9bccd Initial version of a couple of big icons from Tango Desktop project 2011-10-17 21:42:04 +02:00
David Mudrak
6477706e9c Merge pull request #15 from marinaglancy/wip-renderer-rubric
MDL-29481: implemented rubrics renderer, improved rubrics UI
2011-10-17 02:54:53 -07:00
Marina Glancy
ab156741fc MDL-29481: implemented rubrics renderer, improved rubrics UI 2011-10-17 17:03:25 +08:00
David Mudrak
8168299d7e Improved integration into the settings block 2011-10-16 19:40:47 +02:00
David Mudrak
03d448e5ff Activity module's settings form redirects to the management screen when advanced grading method was selected to use 2011-10-16 19:40:47 +02:00
David Mudrak
3bd217aaa4 Grading manager's set_active_method() returns bool now 2011-10-16 19:40:46 +02:00
David Mudrak
6b5b05dc3b Fixing the nullability of levelid field in the gradingform_rubric_fillings table
Credit goes to Marina Glency for spotting this.
2011-10-16 19:40:46 +02:00
David Mudrak
44354f9e32 Adding a unique key to the gradingform_rubric_fillings table
Credit goes to Marina Glency for the suggestion.
2011-10-16 19:40:45 +02:00
David Mudrak
998085c9f7 Dropping the uq_rater_per_item from the table grading_instances
It was realized that we may need multiple instances per one rater/item
to be able to 1) implement a draft instance and 2) eventually keep the
history of advanced grading.
2011-10-16 19:40:34 +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
David Mudrak
ba2a25a816 Merge pull request #14 from marinaglancy/wip-MDL-29481-rubric
MDL-29481: Filling rubric by teacher (first steps)
2011-10-13 13:24:37 -07:00
Marina Glancy
3bf7ef29a5 MDL-29481: filling rubric by teacher, first steps 2011-10-13 16:27:33 +08:00
Eloy Lafuente (stronk7)
6731a04d93 weekly release 2.2dev 2011-10-12 23:46:36 +02:00
David Mudrak
a5c4c99b24 Merge pull request #13 from marinaglancy/wip-formvalidation-rubric
Initial prototype of integrating advanced grading methods into current forms

There is a new form element called 'grading', which receives grading_controller as an argument and uses it's functions to produce html and validate the value.

The biggest change in grading form is that I included call to new function validate_and_preprocess_feedback, which validates and also fills the xgrade field with value, calculated by controller

Another issue: when the teacher grades the student on offline assignment for the first time, there may be no entry in submission table (and therefore no id). So I create a submission if there is advanced grading otherwise we won't be able to save via AJAX the process of filling rubric, because normal grading will create an entry only on submit.

And as an example I created text field in rubric, that is saved as grade. There is validation that value can not be more than 100.
2011-10-12 01:06:27 -07: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
David Mudrak
6abcb0c21f Merge remote branch 'origin/master' into rubric 2011-10-12 03:13:55 +02:00
David Mudrak
fe817d8799 Various modifications and tweaks of the rubric editing page 2011-10-12 03:10:08 +02:00
David Mudrak
2824c44aec Merged Marina's recent work on rubric plugin
Conflicts:
	grade/grading/form/lib.php
	grade/grading/form/rubric/lib.php
	grade/grading/lib.php
2011-10-11 21:37:14 +02:00
Eloy Lafuente (stronk7)
f6e1809608 Merge branch 'MDL-29625' of git://github.com/timhunt/moodle 2011-10-11 12:10:51 +02:00
Tim Hunt
e4e0020ed6 MDL-29625 new helper function get_plugin_list_with_class.
Based on the existing get_plugin_list_with_function. As part
of implementing this, I refactored out a
get_plugin_list_with_file function, which may also be useful.
2011-10-11 10:46:23 +01:00
Aparup Banerjee
fc09870e0e Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict) 2011-10-11 13:37:34 +08:00
Aparup Banerjee
44d872b87e Merge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle 2011-10-11 11:19:14 +08:00
Aparup Banerjee
bdfb2b71b7 Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle 2011-10-11 09:46:16 +08:00
Aparup Banerjee
e6d80c1d3e Merge branch 'wip-MDL-28582-master' of git://github.com/samhemelryk/moodle 2011-10-11 09:26:30 +08:00
Eloy Lafuente (stronk7)
71e1a1f820 MDL-20306 Add course_category idnumber field: version bump and fix missing add_field() call 2011-10-10 23:54:40 +02:00
Andrew Robert Nicols
83cd9b163a MDL-20306 Add course_category idnumber field 2011-10-10 23:54:30 +02:00
Sam Hemelryk
d87ef08598 Merge branch 'MDL-29447' of git://github.com/timhunt/moodle 2011-10-11 10:25:33 +13:00
Sam Hemelryk
811cbdcfbf Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle 2011-10-11 10:15:46 +13:00
Aparup Banerjee
aabf13c240 Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle 2011-10-10 23:14:05 +08:00
Aparup Banerjee
f717586091 Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle 2011-10-10 22:45:01 +08:00
Kordan
2106024854 MDL-29640 fix for master 2011-10-10 13:19:15 +02:00
Eloy Lafuente (stronk7)
c676af9f72 MDL-29564 Assignment: whitespace fix 2011-10-10 13:08:48 +02:00