13679 Commits

Author SHA1 Message Date
David Mudrák
5106aab30c MDL-38733 Fix the workshop rubric CSS 2013-03-26 22:32:07 +01:00
David Mudrák
e36942b716 MDL-37602 Include the overall feedback in the workshop backup and restore 2013-03-26 21:33:22 +01:00
David Mudrák
77d746a2f5 MDL-37602 Clean up and improve the overall feedback rendering
In order to use the overall feedback in assessments of example
submissions and in the assessment form preview, significant improvements
in the rendering machinery were done.

Workshop class provides two new methods overall_feedback_content_options()
and overall_feedback_attachment_options() as they are needed at various
scripts and libraries.

Overall feedback is displayed as a part of the workshop_assessment_form
only if the form is in editable mode (not frozen). If the form is
displayed in read-only (frozen) mode, the caller is expected to render
the overall feedback and list of attachments (the editor and filemanager
elements do not support frozen mode). To do so, the renderable
workshop_assessment now loads overall feedback data and provides two new
methods get_overall_feedback_content() and
get_overall_feedback_attachments() to be used by the renderer.

Renderable workshop_submission, workshop_assessment and related classes
now accept the workshop instance as the first parameter in their
constructors. This way, these renderable classes have access to the
workshop API.

In the future, the rendering of submission files should be improved in
the same way as is done in this patch (i.e. moving the logic and data
preparation out of the renderer into the renderable classes).
2013-03-26 21:25:46 +01:00
David Mudrák
88e79d8adb MDL-37602 Add support for browsing the overall feedback files 2013-03-26 21:25:45 +01:00
David Mudrák
05837ba355 MDL-37602 Serve files embedded or attached to the overall feedback 2013-03-26 21:25:45 +01:00
David Mudrák
c6a793d5a2 MDL-37602 Put the overall feedback fields to the bottom of the assessment form
The assessment form can be displayed as editable or read-only (frozen).
Neither the editor element nor the filemanager element support
displaying frozen content themselves so we need to pre-format and inject
static texts.

The list of attachments should be ideally generated by the renderer and
probably improved a bit - just quick and dirty solution must be enough
for now though (2.5 coding freeze is just behind the corner...).

AMOS BEGIN
 CPY [submissionattachment,mod_workshop],[feedbackauthorattachment,mod_workshop]
AMOS END
2013-03-26 21:25:00 +01:00
Dan Poltawski
1f0cd6ee98 MDL-38712 mod_glossary: fix missing PARAM type 2013-03-26 17:05:10 +08:00
Frederic Massart
a59bbb6e12 MDL-38611 page: Reformat settings form 2013-03-26 15:40:24 +08:00
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Frederic Massart
2c1065f7a9 MDL-38610 label: Module settings have a general section 2013-03-26 14:02:11 +08:00
Damyon Wiese
8af0dffb50 Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/moodleform_mod.php
	lib/upgrade.txt
2013-03-26 13:46:29 +08:00
Damyon Wiese
1e425d185b Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle 2013-03-26 12:59:53 +08:00
David Mudrák
3ac58f227a MDL-37602 Add feedbackauthorattachment field into the workshop_assessments table
This is a flag to quickly see if some files are expected to be attached
to the overall feedback for the submission author.
2013-03-25 22:31:32 +01:00
David Mudrák
1c6b484dab MDL-37602 Overall feedback can be configured in the workshop settings form
Three new fields are added into the into the Assessment settings section
of the form. The default value for the overallfeedbackmaxbytes is the
same as the maximum size for submission attachments (which seems to be a
reasonable value). If there is a demand and a strong use case, these
values can became per-site configurable (I can see no big benefit of
doing so right now).

AMOS BEGIN
 CPY [maxbytes,mod_workshop],[overallfeedbackmaxbytes,mod_workshop]
AMOS END
2013-03-25 13:23:02 +01:00
David Mudrák
7426229f12 MDL-37602 Add new fields into the workshop table to hold the feature settings
These three fields hold the per-instance settings for the new Overall
feedback feature. Expected values in the new overallfeedbackmode fields are:
0 - the feature is disabled in this workshop instance
1 - overall feedback is optional (default)
2 - overall feedback is required (i.e. the reviewer must put some text
into the overall feedback field).

Files can be attached to the overall feedback text field, if the field
overallfeedbackfiles > 0 and the feature is enabled (i.e. it is optional
or required). The actual number of attached files is not checked in the
required mode (i.e. attaching files is always optional, if it is
allowed).
2013-03-25 12:58:15 +01:00
Frederic Massart
f3aadb1cd0 MDL-38599 glossary: Reformat settings form 2013-03-25 18:05:43 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
	lang/en/admin.php
2013-03-25 14:02:31 +08:00
Roman Tsukanov
1b58651681 MDL-38429: lesson report - Improve lesson statistics code. 2013-03-25 13:58:13 +08:00
Rossiani Wijaya
41e2a9591f MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no. 2013-03-25 11:26:50 +08:00
Dan Poltawski
b716cd2b70 MDL-34311 mod_url: Missing setType on the external url 2013-03-25 09:39:30 +08:00
Frederic Massart
5c5317aedc MDL-38612 url: Reformat module settings form 2013-03-25 08:17:59 +08:00
Matteo Scaramuccia
724dc929c7 MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:02:41 +01:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
2013-03-22 16:57:55 +01:00
Tim Hunt
a7a031a4e4 MDL-38651 quiz settings: fix layout of review options. 2013-03-22 15:30:48 +00:00
Eloy Lafuente (stronk7)
d86db37c44 MDL-38632 folder: observe show_expanded on course page 2013-03-22 15:53:53 +01:00
Petr Škoda
c3f31a3ded MDL-38581 move forum discussion and post generators to proper place 2013-03-22 13:21:35 +01:00
Tim Hunt
2515be0e80 MDL-38647 quiz review question issues
1. Page URL should contain 'step=0' if necessary, but not 'step='.
2. Review specific step was not using the right display options.
2013-03-22 11:16:02 +00:00
Tim Hunt
7dbde4ed3b MDL-38557 quiz install.php code should actually be in reports.
I think it is worth moving this code to its correct home in master.
2013-03-22 10:36:15 +00:00
Tim Hunt
30461b0066 MDL-38557 quiz manual grading should check mod/quiz:grade 2013-03-22 10:36:14 +00:00
Tim Hunt
0559a72aa3 MDL-38557 fix quiz version number mess from MDL-31983 2013-03-22 10:36:13 +00:00
Frederic Massart
b7fc9d5a26 MDL-38552 forms: IMS CP content section expanded by default 2013-03-20 14:31:33 +08:00
Eloy Lafuente (stronk7)
b35dd05521 Merge branch 'MDL-38370-master' of git://github.com/ankitagarwal/moodle 2013-03-20 00:30:49 +01:00
Eloy Lafuente (stronk7)
044566f001 Merge branch 'MDL-38166-m' of git://github.com/andrewnicols/moodle 2013-03-20 00:13:51 +01:00
Eloy Lafuente (stronk7)
e73ac7692e Merge branch 'MDL-38433_master' of git://github.com/dmonllao/moodle 2013-03-19 23:27:50 +01:00
Eloy Lafuente (stronk7)
1d790031c2 Merge branch 'MDL-38411_master' of git://github.com/dmonllao/moodle 2013-03-19 23:26:01 +01:00
Eloy Lafuente (stronk7)
eb8a3eeaac Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle 2013-03-19 23:20:31 +01:00
Eloy Lafuente (stronk7)
bf2d2aa983 Merge branch 'MDL-38412' of git://github.com/timhunt/moodle 2013-03-19 18:20:47 +01:00
David Monllao
6b6303d9a1 MDL-38411 behat: New test 2013-03-19 16:44:55 +08:00
David Monllao
b7d6c48589 MDL-38433 behat: New tests
According to MDLQA-48
2013-03-19 16:44:20 +08:00
David Monllao
4b61cc91ac MDL-38410 behat: Adding basic step and test for mod_choice 2013-03-19 16:42:59 +08:00
Damyon Wiese
43087d02dd Merge branch 'MDL-38368-master' of git://github.com/FMCorz/moodle 2013-03-19 16:17:41 +08:00
Damyon Wiese
20139cbcef MDL-30790 folder : Whitespace fixes 2013-03-19 15:59:41 +08:00
Damyon Wiese
0cabeada65 Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle 2013-03-19 15:47:35 +08:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
	version.php
2013-03-19 15:18:13 +08:00
Damyon Wiese
08f5b90bb7 Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle 2013-03-19 14:36:43 +08:00
Damyon Wiese
8fe55f6862 Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle 2013-03-19 11:13:23 +08:00
Damyon Wiese
23477802b7 Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle 2013-03-19 09:31:07 +08:00
Jerome Mouneyrac
dd5d933f30 MDL-37079 create/update_module() 2013-03-18 14:41:35 +08:00