Commit graph

1758 commits

Author SHA1 Message Date
Dan Poltawski
37029775f9 Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle 2015-10-12 16:53:18 +01:00
Andrew Hancox
ce449f6307 MDL-50724 mod_assign: show issues with groups in grading table
Where a user is in multiple or no groups show and group membership
is required show an appropriate error in the gradding table rather
than 'Default Group'
2015-10-12 12:04:28 +01:00
Mark Nelson
607021c14b MDL-46455 events: added more mapping
Also fixed a few bugs.
2015-10-11 18:52:36 -07:00
Mark Nelson
0bfafc5ba0 MDL-46455 mod_*: added restore mapping to events 2015-10-11 18:14:57 -07:00
Damyon Wiese
64f6ef1f3a MDL-48861 mod_assign: use >= for requires grading filter
If the grade and submission were modified at exactly the same time,
assume that this means the grade was automatically created for the submission
and is not a real grade from a teacher interaction.
2015-10-09 15:08:06 +08:00
Adrian Greeve
858d457d61 MDL-49515 libraries: Update FPDI to 1.5.4 2015-10-09 14:46:12 +08:00
Damyon Wiese
dc40503680 MDL-51628 assign: invalid hardcoded capability check
Use existing function to do the check instead.
2015-10-09 14:09:33 +08:00
Damyon Wiese
c38a3bf3a2 MDL-51686 assign: Apply admin default for comment inline 2015-10-09 13:38:24 +08:00
rajesh Taneja
ac40984241 MDL-50524 behat: Fixed multiple when then and use of generator 2015-10-07 14:47:01 +08:00
Andrew Hancox
08a54173d8 MDL-50526 mod_assign: Highlight error message when user has no group
If I set the "Require group to make submission" setting in an assignment
activity to yes, students who are not in any group are prevented from submitting
their assignment and are presented a warning instead that they should contact
their teacher. This message is now presented in an alert box.
2015-10-06 16:41:25 +01:00
Dan Poltawski
a059ef2e9f MDL-50524 assign: improve method visibility and upgrade.txt 2015-10-06 16:32:57 +01:00
Dan Poltawski
1a5f8df5c0 Merge branch 'MDL-50524' of https://github.com/andrewhancox/moodle 2015-10-06 16:32:57 +01:00
Jun Pataleta
418a0d0465 MDL-43594 mod_assign: Fix calendar update on course reset
This patch fixes the updating of calendar events when the course
is reset and its start date is changed.
2015-09-29 13:46:27 +08:00
David Monllao
10fea1efb1 Merge branch 'MDL-51191-master' of git://github.com/StudiUM/moodle 2015-09-14 13:58:55 +08:00
Mark Nelson
53914e4465 MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup' 2015-09-14 08:23:32 +08:00
Jean-Philippe Gaudreau
286d6c81bf MDL-51191 assign: Optimizing slow SQL query for MySQL 2015-09-11 11:10:03 -04:00
Tim Lock
d89dc6daa5 MDL-42670 mod_assign: Fix recent activity block when blind marking is on 2015-09-07 22:41:41 +02:00
Damyon Wiese
9d3c6b95c7 MDL-48861 assign: Fix the "needs grading" filter
When auto-creating a new grade record - do not set the timemodified > than the submission timemodified
2015-09-04 11:05:57 +08:00
Andrew Hancox
ee5d4eef08 MDL-50524 mod_assign: preventsubmissionnotingroup for multiple groups
When preventsubmissionnotingroup and a user is in multiple groups, display
relevant error messages to the user and teacher
2015-09-03 14:54:46 +01:00
Eloy Lafuente (stronk7)
5d60665bef Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle 2015-08-19 18:30:36 +02:00
Jun Pataleta
0bf75ff15f MDL-49864 mod_assign: Fix missing annotations when viewing PDF
Added 'draft = 1' criteria for the delete query in
page_editor::set_annotations in order to prevent the deletion of non-draft
annotations while the PDF is being edited.
2015-08-03 09:07:03 +08:00
Damyon Wiese
5ce0f749a6 MDL-46078 Assign: Completion is not using assignment API.
Should not be directly querying the DB to get the submission, use the API!
2015-07-28 10:19:59 +08:00
Andrew Nicols
50834fa15f Merge branch 'MDL-50525' of https://github.com/andrewhancox/moodle 2015-07-22 08:55:05 +08:00
Andrew Hancox
c3f38fa686 MDL-50523 mod_assign: Conditionally disable activity setting
On activity settings form if "Students submit in groups" is set to no then
disable "Require group to make submission" setting.
2015-07-20 19:45:02 +01:00
Andrew Hancox
b11e24ba7d MDL-50525 mod_assign: Moved preventsubmissionnotingroup
Moved preventsubmissionnotingroup to between teamsubmission and
requireallteammemberssubmit to keep all settings related to
group submissions together.
2015-07-20 19:43:26 +01:00
Juan Leyva
1c2b788256 MDL-49796 webservices: Fix the functions description 2015-07-14 11:31:57 +02:00
Juan Leyva
91a12bc64c MDL-49796 assign: Unit texts for view_grading_table 2015-07-13 09:25:24 +02:00
Juan Leyva
e0d6d10a83 MDL-49796 assign: New external function view_grading_table 2015-07-13 09:25:23 +02:00
Nelson Moller
b73eed1249 MDL-49323 mod_assign: Fixed numeric validation in grade form.
The behat test for another decimal separator was incorporated.
2015-06-01 10:54:12 -04:00
Nadav Kavalerchik
d19de800ed MDL-40592 assign/grading: Display default user picture, if none is set. 2015-05-22 10:35:47 +03:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Rajesh Taneja
f84a0d49c1 MDL-50154 behat: Resize pdf window so toolbar is always visible 2015-05-08 11:17:39 +08:00
Rajesh Taneja
0ce090c09a MDL-50154 behat: Click on Grades link under navigation 2015-05-08 10:06:39 +08:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
David Monllao
84d83fe7e1 Merge branch 'MDL-49998' of git://github.com/stronk7/moodle 2015-05-01 15:05:42 +08:00
Eloy Lafuente (stronk7)
46686eafeb MDL-49998 editpdf: Clean code to make it more readable.
There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.

Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.
2015-04-30 10:55:08 +02:00
David Monllao
388b0beec1 MDL-49637 mod_assign: Fixing behat test
The participant number is dynamically generated so it is not possible to
match known values.

Match on the submission text instead.
2015-04-30 14:03:50 +08:00
David Monllao
5c012a7426 Merge branch 'MDL-49637' of git://github.com/NeillM/moodle 2015-04-29 12:04:43 +08:00
Eloy Lafuente (stronk7)
a916d557cf MDL-49998 unit tests: Close the pdf objects when needed.
When a pdf object is instantiated and any file is loaded
with set_pdf() or load_pdf(), the files remain open until
the pdf is saved with pdf_save() or outputted with Output()..

In that cases is needed to perform an explicit Close() in
order to free resources, parsers and, ultimately, fclose()
the files.

Note that only the uses detected in the editpdf unit tests have
been fixed. I'd recommend to analyse every instance of the tcpdf
libs.

Also, there was one incorrecly reused pdf instance in then
generate_combined_pdf_for_attempt() method. Apparently it was not
leading to problems, but better use a separate instance (#246).
2015-04-28 19:46:50 +02:00
Eloy Lafuente (stronk7)
095ecde727 MDL-49998 unit tests: files left open are our fault.
Get rid of the gc_collect_cycles() that only was
hiding incorrectly left open files. This must be fixed
in code when possible. And pdf libs allow us to do so.

Note that a lot of gc_collect_cycles() were added
in MDL-47675, I'd recommend to take a look to all them,
being replaced by fixes in code when possible.
2015-04-28 19:46:50 +02:00
Neill Magill
129d26aac4 MDL-49637 assign: Workflow & blind marking do not always show feedback
Before this patch if an assignment has workflow and blind marking enabled if a teacher
sets a submission to have its grades released to students before they reveal student
identities the feedback they have given is not displayed to the student.

The patch causes the reveal_identities() method to pass the correct value to the
get_feedback_plugin_by_type() function in the assign class.
2015-04-28 09:05:05 +01:00
Neill Magill
6e972bdd34 MDL-49637 assign: Behat test for blind marking with workflow
This test checks that that if reveal student identities is used before or after the submissions grades have
been set released that the teacher's feedback is displayed to students.
2015-04-28 09:04:57 +01:00
Dan Poltawski
2be9a45389 Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle 2015-04-27 10:46:08 +01:00
Mark Nelson
ccc1bc7e2e MDL-49977 mod_assign: added missing page titles 2015-04-23 16:24:18 -07:00
David Monllao
e5c5ced912 Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle 2015-04-22 17:02:19 +08:00
Tony Butler
2224f2c598 MDL-49933 mod_assign: Sort marker select lists alphabetically by name 2015-04-21 16:58:38 +01:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Dan Poltawski
8da277ea96 Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle 2015-04-16 16:10:23 +01:00
Juan Leyva
6d28e2cfa6 MDL-49894 webservices: Add missing API changes in upgrade.txt 2015-04-16 15:19:42 +02:00