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
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
sam marshall
73ca5f01c5
MDL-29501 Gradebook should not show links to activities that aren't available to user
2011-10-13 10:29:45 +01:00
Marina Glancy
3bf7ef29a5
MDL-29481: filling rubric by teacher, first steps
2011-10-13 16:27:33 +08: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
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
Marina Glancy
c586d2bfd6
MDL-29481: start implementing rubric editor
2011-10-10 15:27:15 +08:00
David Mudrak
21d37aa623
MDL-29479 The draft of embedding the UI widgets into the page
...
The patch makes more sense when reviewed together with the parallel work
on gradingform_random (see MDL-29631) where the developed API is
actually tested.
2011-10-08 00:59:01 +02:00
David Mudrak
e8004aadc8
Merge remote branch 'origin/master' into rubric
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2011-10-07 22:01:38 +02:00
David Mudrak
3e43eff5dc
MDL-29479 Improved gradingform_controller base class
2011-10-05 03:51:41 +02:00
David Mudrak
8cd65f1657
MDL-29479 It is now possible to set the active method to null (simple direct grading)
2011-10-05 03:50:12 +02:00
David Mudrak
fb13a1484d
MDL-29479 Improved grading manager factory function
2011-10-05 03:49:21 +02:00
David Mudrak
9b8550f8d9
MDL-29479 Grading method plugins can extend module settings block
...
As a part of this, new class grading_controller is introduced and bunch
of smaller changes was done here and there.
2011-10-03 22:26:53 +02:00
David Mudrak
6440286719
MDL-29479 Active grading method can be set for the given area
2011-10-03 22:26:52 +02:00
David Mudrak
8a4acb3aca
MDL-29479 Cosmetic rename of some methods in grading manager API
2011-10-03 22:26:52 +02:00
David Mudrak
6c9e506ca5
MDL-29479 List of available grading methods returned properly
2011-10-03 22:26:52 +02:00
David Mudrak
f59f488a36
MDL-29480 Introducing new rubric plugin
2011-10-03 22:26:51 +02:00
Rajesh Taneja
c6aa3670d0
MDL-25937 Froms Library: Added server side validation for filepicker and filemanager
2011-09-29 09:39:44 +08:00
David Mudrak
4333580e80
MDL-29479 Added new core subsystem "grading"
2011-09-29 00:09:58 +02:00
Eloy Lafuente (stronk7)
e135797586
Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle
2011-09-27 00:00:20 +02:00
Eloy Lafuente (stronk7)
ac4a2a8c08
MDL-29512 Revert "MDL-25937 Froms Library: Added server side validation for filepicker and filemanager"
...
This reverts commit f03a17bb09bed83a29cda253c2049c937852dd38.
2011-09-25 17:13:40 +02:00
Petr Skoda
aff24313be
MDL-29401 introduce new frankenstyle PARAM types
...
New PARAM_COMPONENT, PARAM_AREA and PARAM_PLUGIN + fixing of hopefully all current incorrect parameter types. This should help with diagnosing of incorrectly named 3rd party plugins too.
2011-09-25 09:59:55 +02:00
Sam Hemelryk
7d6e26b49b
Merge branch 'MDL-29392' of git://github.com/timhunt/moodle
2011-09-20 11:58:04 +12:00
Eloy Lafuente (stronk7)
93eb27d4c0
Merge branch 'MDL-29126_export_separator' of git://github.com/andyjdavis/moodle
2011-09-19 23:38:07 +02:00
M Kassaei
5cd7869883
MDL-29392 grade/report/index.php should use $CFG->grade_profilereport
2011-09-19 11:30:49 +01:00
Rajesh Taneja
f03a17bb09
MDL-25937 Froms Library: Added server side validation for filepicker and filemanager
2011-09-16 09:17:19 +08:00
Aparup Banerjee
5433da6064
Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
...
- resolved conflicts.
2011-09-13 11:39:06 +08:00
Tom Lanyon
af9b14446d
MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory().
2011-09-10 10:43:49 +02:00
Tom Lanyon
7aa06e6ded
MDL-28701 Change all uses of $CFG->dataroot/temp to $CFG->tempdir
2011-09-10 10:35:39 +02:00
