Commit graph

13753 commits

Author SHA1 Message Date
David Monllao
424f56fc90 MDL-38817 behat: New test
According to MDLQA-50, in a survey activity
a teacher can set three types of survey
2013-04-01 13:57:01 +08:00
prateeksachan
f7884095de MDL-38361: Fixed typos in mod/assign/locallib.php 2013-03-30 23:39:56 +05:30
Tim Hunt
0561fdf167 MDL-38809 quiz manual grading: delete expensive unnecssary code. 2013-03-30 17:25:52 +00:00
Matteo Scaramuccia
fd10686843 MDL-38745 SCORM: fixed appending 'API logging is on|off', once per launch 2013-03-28 22:28:06 +01:00
Matteo Scaramuccia
cc351edaf0 MDL-38745 SCORM: fixed doubling double quotes for 'even' and 'odd' 2013-03-28 22:28:03 +01:00
Matteo Scaramuccia
fe104762c9 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-03-28 22:22:19 +01:00
Tim Hunt
595708884a MDL-38538 quiz auto-save front end.
1. There is a new admin setting to control whether this feature is
enabled. The admin can set the auto-save frequency to 1, 2 or 5 minutes,
or disable it.

2. When autosave is enabled, there is code in the quiz that monitors the
main quiz form, and does an ajax save call at the given frequency when
changes are being made by the student.

3. The ajax saves go to a new script that calls the question engine to
do the work.

4. To avoid simultaneous autosave + submit and finish, the auto-save
system shuts down shortly before time expires in a timed quiz.
2013-03-28 16:57:24 +00:00
Eloy Lafuente (stronk7)
35601d77f9 MDL-38633 folder: support show_expanded in backup. 2013-03-28 17:00:46 +01:00
Frederic Massart
8783e17b0f MDL-38590 data: Reformat settings form
AMOS BEGIN
 CPY [allowcomments,mod_glossary],[allowcomments,mod_data]
AMOS END
2013-03-28 10:53:58 +08:00
Dan Marsden
1de23b7fdc MDL-38715 SCORM fix missing calls to setType and remove old call to setMaxFileSize 2013-03-28 12:38:27 +13:00
David Monllao
2d9cbe8807 MDL-38477 behat: New test
According to MDLQA-16, teachers can edit
or delete any forum post.
2013-03-27 16:51:01 +08:00
David Monllao
22d56e46f1 MDL-38476 behat: New test
According to MDLQA-9, in a single
simple discussion forum only teachers
can start discussions.
2013-03-27 16:49:59 +08:00
David Monllao
a394e57849 MDL-38475 behat: New test
According to MDLQA-5, students can choose
from 4 discussion display options and their
choice is remembered.
2013-03-27 16:47:56 +08:00
David Monllao
68834d4a0d MDL-38475 behat: Step definition to reply a discussion 2013-03-27 16:47:55 +08:00
David Monllao
9449cf8e11 MDL-38439 behat: New test
According to MDLQA-3, a teacher can
set one of 3 possible options for
tracking read forum posts.
2013-03-27 16:46:41 +08:00
David Monllao
e6cb6aed64 MDL-38437 behat: Behat feature for mod_forum
Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).
2013-03-27 16:45:01 +08:00
David Monllao
279d86943b MDL-38437 behat: Step definition to add a discussion 2013-03-27 16:45:01 +08:00
Aparup Banerjee
8963212472 Merge branch 'MDL-38632' of git://github.com/stronk7/moodle 2013-03-27 13:07:10 +08:00
Damyon Wiese
ddeea94a35 Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle 2013-03-27 12:17:47 +08:00
Dan Poltawski
8bd1829310 MDL-38736 mod_choice: fix missing param type 2013-03-27 10:19:57 +08:00
Eloy Lafuente (stronk7)
49ef0c56ef Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle 2013-03-27 01:51:35 +01:00
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
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