Commit graph

60052 commits

Author SHA1 Message Date
Damyon Wiese
3a9dc7f22f MDL-36804 Assign submission history - One language string change. 2013-04-02 13:37:51 +08:00
Damyon Wiese
7b647abcb8 MDL-36804 Assignment submisison history - fix width column
Fix the width of the left column in the history and submission tables so
they all line up on the page.
2013-04-02 13:37:51 +08:00
Damyon Wiese
a13fbf5fe8 MDL-36804 Assignment - Make sure webservice only returns the last submission/grade. 2013-04-02 13:37:51 +08:00
Damyon Wiese
df211804f1 MDL-36804 mod_assign - allow students to resubmit work and display a submission + grading history
This is based on work by Davo Smith with input from Fernando Oliveira (Thanks guys!).
2013-04-02 13:37:51 +08:00
Damyon Wiese
bf6c1d0997 Merge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle 2013-04-02 13:23:00 +08:00
Damyon Wiese
9ab0aece49 Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/tests/courselib_test.php
2013-04-02 12:48:08 +08:00
Dan Poltawski
08e5aed273 Merge branch 'MDL-38825' of git://github.com/stronk7/moodle 2013-04-02 11:49:24 +08:00
Dan Poltawski
bf9613dd41 Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle 2013-04-02 11:27:32 +08:00
Dan Poltawski
cbaeabbe47 Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle 2013-04-02 10:04:26 +08:00
Eloy Lafuente (stronk7)
a5efbe6161 Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle 2013-04-02 03:30:30 +02:00
Eloy Lafuente (stronk7)
51cae58998 Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:44 +02:00
Eloy Lafuente (stronk7)
d6dc3019b6 Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:33 +02:00
Eloy Lafuente (stronk7)
1c49f7ad19 Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle 2013-04-02 02:41:25 +02:00
Eloy Lafuente (stronk7)
49b902f858 MDL-38621 behat: whitespace fix 2013-04-02 02:28:40 +02:00
Eloy Lafuente (stronk7)
342c3f3e6c Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle 2013-04-02 02:27:10 +02:00
Eloy Lafuente (stronk7)
3e27548431 Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle 2013-04-02 02:26:54 +02:00
Eloy Lafuente (stronk7)
12879418e9 Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
Conflicts:
	mod/forum/tests/behat/behat_mod_forum.php
2013-04-02 01:47:40 +02:00
Eloy Lafuente (stronk7)
23726a43d4 Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle 2013-04-02 01:45:43 +02:00
Eloy Lafuente (stronk7)
cd4c7e9af4 Merge branch 'MDL-38804_master' of git://github.com/dmonllao/moodle 2013-04-02 01:44:59 +02:00
Eloy Lafuente (stronk7)
0f8fd3a7eb Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:18 +02:00
Eloy Lafuente (stronk7)
2bb24f16e0 Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle 2013-04-02 01:06:05 +02:00
Eloy Lafuente (stronk7)
55a2081d28 Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:44 +02:00
Eloy Lafuente (stronk7)
c1bccc8ef5 Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle 2013-04-02 01:04:31 +02:00
Eloy Lafuente (stronk7)
9f0700fb6c Merge branch 'MDL-38437_master' of git://github.com/dmonllao/moodle 2013-04-02 01:03:26 +02:00
Eloy Lafuente (stronk7)
62eb5c466e MDL-38547 behat: coding style fixes. 2013-04-01 22:40:50 +02:00
Eloy Lafuente (stronk7)
54e48dc32d Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle 2013-04-01 22:32:06 +02:00
Eloy Lafuente (stronk7)
c57c57c575 Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle 2013-04-01 22:23:58 +02:00
Eloy Lafuente (stronk7)
0251a62500 Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle 2013-04-01 22:17:12 +02:00
Eloy Lafuente (stronk7)
c5f6371f04 MDL-38825 behat: fix composer install url 2013-04-01 18:55:34 +02:00
Eloy Lafuente (stronk7)
d4a5896f8a Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle 2013-04-01 13:25:31 +02:00
Eloy Lafuente (stronk7)
68adfee6d4 Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle 2013-04-01 13:17:20 +02:00
Eloy Lafuente (stronk7)
b216376811 Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle 2013-04-01 13:12:08 +02:00
David Monllao
be0e1825d3 MDL-38823 behat: New test
According to MDLQA-521, a teacher can set a certain
number of discussions as a completion condition for
a forum.
2013-04-01 17:52:46 +08:00
David Monllao
7bc7625e04 MDL-38823 behat: Make default form field manage different HTML elements 2013-04-01 17:51:54 +08:00
David Monllao
125765ed18 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-04-01 16:27:16 +08:00
David Monllao
74508a5ddb MDL-38437 behat: Step definition to add a discussion 2013-04-01 16:27:09 +08:00
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
David Monllao
f076b0d43f MDL-38805 behat: Steps definitions to check students completed activities 2013-04-01 12:32:25 +08:00
David Monllao
abc38a9738 MDL-38805 behat: New test
According to MDLQA-511, a teacher can
enable students to manually mark an activity
as complete.
2013-04-01 12:32:25 +08:00
David Monllao
3a4d76ac3d MDL-38805 behat: Externalized behat_form_field loader 2013-04-01 12:32:25 +08:00
David Monllao
e7a0600b88 MDL-38804 behat: Step definition to set site administration settings 2013-04-01 12:31:48 +08:00
David Monllao
4569bc7ce8 MDL-38804 behat: New test
According to MDLQA-1780, a teacher can
set completion conditions to restrict
the availability of a section
2013-04-01 12:31:47 +08:00
David Monllao
5bc64b0fab MDL-38814 behat: Deleting old files 2013-04-01 12:22:43 +08:00
David Monllao
95932c376b DML-38814 behat: Split steps definitions tests into features 2013-04-01 12:22:40 +08:00
David Monllao
d87bbb3d3d MDL-38814 behat: Move filepicker steps definitions to repository/ 2013-04-01 12:16:57 +08:00
David Monllao
1c00d6f636 MDL-38788 behat: Add a block and add an activity steps definitions compatible with JS disabled 2013-04-01 11:18:33 +08:00
David Monllao
cd7ea8f0cc MDL-38788 behat: Generic form elements interaction compatibile with JS disabled 2013-04-01 11:18:33 +08:00
David Monllao
c94a0d1890 MDL-38788 behat: New tests with Javascript disabled
Add a block and add an activity/resource
tests. The add an activity with JS disabled
test includes MDLQA-2446 automation.
2013-04-01 11:17:45 +08: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
Tim Hunt
0a606a2be2 MDL-38538 question auto-save back end.
1. Autosave works in some ways just like a normal save. We ultimately
call $behaviour->process_save() to do the work, and create a new step to
hold the data.

2. However, we come in through a completely different route through the
API, starting with separate auto-save methods. This keeps the auto-save
changes mostly separate, and so reduced the chance of breaking existing
working code.

3. When the time comes to store the auto-save step in the database, we
save it using a negative sequence number.

This is a clever trick that not only distinguises these steps, but also
avoids unique key errors when an auto-save and a real action happen
simultaneously. (There are unit tests for these tricky edge cases.)

4. When we load the data back from the database, most of the time the
auto-save steps are loaded back as if they were a real save, and so the
auto-saved data is used when the question is then rendered.

5. However, before we process another action, we remove the auto-saved
step, so it does not appear in the final history.
2013-03-28 16:51:59 +00:00