Commit graph

482 commits

Author SHA1 Message Date
Dan Poltawski
b721d502e4 Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle 2014-12-16 13:52:52 +00:00
Eloy Lafuente (stronk7)
2da9d573c3 Merge branch 'MDL-47694-master' of git://github.com/zbdd/moodle 2014-12-16 11:18:08 +01:00
Zachary Durber
a4b10a5244 MDL-46442 mod_assign: Notify users when grades are changed 2014-12-16 14:49:52 +08:00
Dan Poltawski
dda9997250 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-12-15 16:10:15 +00:00
Dan Poltawski
3a299d82e0 Merge branch 'MDL-45324' of git://github.com/jonof/moodle 2014-12-15 14:59:34 +00:00
David Monllao
edf938687f Merge branch 'MDL-48235-assign-reopen-until-pass' of git://github.com/mpetrowi/moodle 2014-12-15 17:30:40 +08:00
David Monllao
bc006a666c MDL-38128 mod_assign: Fixing count teams and submissions with status
We should restrict the groups to the activity active group. Also
improving performance caching get_submission_group() results.
2014-12-12 13:14:53 +08:00
David Monllao
184f3b6814 MDL-38128 mod_assign: Adding group selector to grading summary page
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
2014-12-12 13:14:53 +08:00
Jonathon Fowler
70cfc878b9 MDL-45324 assign: notify when workflow is Off, or if state is Released
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.

Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.

Credit to Steve Upton and David Balch for the basis of this patch.
2014-12-10 22:29:08 +10:00
Zachary Durber
8c1050f87d MDL-47694 mod_assign: Grades require a grade to show as graded
Special thanks to Howard Miller.
2014-12-09 15:55:29 +08:00
Gregory Faller
b288570463 MDL-46172 mod/assign: Stop suspended users getting assign group emails 2014-12-06 08:24:08 +10:30
Matt Petro
e77bacab4f MDL-48235 mod_assign: Fix reopen until pass behavior 2014-12-02 14:01:22 -05:00
Damyon Wiese
3e116130b0 Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle"
This reverts commit 861a0fd92a.

This reverts commit f376c2ffd7, reversing
changes made to abe9be7240.
2014-11-28 15:07:31 +08:00
David Monllao
861a0fd92a MDL-38128 mod_assign: Changes in grading summary page using team submissions
If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.
2014-11-27 18:08:43 +08:00
Ashley Holman
e629bd3ff3 MDL-46356 assign: remove unnecessary get_area_files call 2014-11-25 14:27:17 +00:00
Dan Poltawski
f376c2ffd7 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-11-25 11:07:50 +00:00
David Monllao
ec802d8ef6 MDL-38128 mod_assign: Adding group selector to grading summary page
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
2014-11-25 10:44:36 +08:00
Dan Poltawski
e1a826e205 Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle 2014-11-24 11:53:53 +00:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
Frederic Massart
ab14ab741e MDL-48180 mod_assign: By default do not count 'new' submissions 2014-11-17 15:14:37 +08:00
Damyon Wiese
225fa27fc2 MDL-47793 assign: trivial fix for inconsistent use of get_instance() 2014-11-05 14:27:58 +08:00
Damyon Wiese
43db479d51 Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle 2014-11-05 14:25:22 +08:00
Michael Aherne
48242bf33f MDL-47793 assign: Reset reveal identities 2014-10-29 11:18:06 +00:00
Damyon Wiese
e562a1b25b Merge branch 'MDL-46219' of https://github.com/dkns/moodle 2014-10-29 15:37:47 +08:00
Dan Poltawski
0645eb6866 Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle 2014-09-30 08:03:40 +01:00
Dan Poltawski
79cf14b327 MDL-47378 mod_assign: prevent debugging notice
Parameters come out of get_user_preferences as strings.
2014-09-24 15:41:04 +01:00
Damyon Wiese
9e3eee671f MDL-46171 Assign: Always require a submission record if there is a grade
Also - update unit tests to match the new expectations.
2014-09-24 15:07:36 +08:00
Damyon Wiese
ad030ab4a5 MDL-46171 assign: And here is the benefit of the new column - simplify the SQL 2014-09-24 15:07:36 +08:00
Damyon Wiese
1523f9e0fb MDL-46171 Assign: Update code so latest field on assign_submission table is always set correctly 2014-09-24 15:07:36 +08:00
Eloy Lafuente (stronk7)
9bdb64681f Merge branch 'MDL-39929' of https://github.com/bostelm/moodle 2014-09-03 00:13:53 +02:00
sam marshall
c13ac85db8 MDL-44725 Availability: Replace groupmembersonly - assign (10)
Updated code to restrict list of users. Also includes changes to
ensure that a cm_info object is available (required for availability
checks).

There is a tweak to upgradelib to reflect the different fields used.
(Note that upgradelib is not used during upgrade, but only when
converting assignments from the old assignment module.)
2014-09-02 13:03:27 +01:00
Henning Bostelmann
7faf78cbae MDL-39929 Assignment: provide file upload area for assignment description 2014-09-02 11:02:16 +01:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00
Jon Marthaler
abd0f0aec6 MDL-46539 assign calendar: Fix lastcron value for assign cron 2014-08-27 11:17:28 -05:00
Damyon Wiese
ab38cb2833 MDL-46842 assign: Fix for unit tests - previous patch was completely ignoring manually reopening attempts. 2014-08-26 10:30:14 +08:00
Gregory Faller
767fda9bce MDL-46842: Reopen assignment submissions when using offline grading worksheet 2014-08-20 19:13:49 +09:30
Dan Poltawski
62e30bfbcd Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign 2014-08-12 11:02:18 +01:00
Gregory Faller
cfdd3e5cac MDL-46718: Return user to last accessed page when quick grading 2014-08-08 14:01:02 +09:30
Daniel Kosinski
43fb9ced67 MDL-46219 assignment: delete files when resetting assign activities 2014-08-05 23:31:20 +02:00
Damyon Wiese
0672e056dc MDL-44149 Assign: Reopen attempts from quick grading (reopenuntilpass) 2014-08-04 15:52:53 +08:00
Sam Hemelryk
6df4025b2c Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle 2014-07-29 15:50:50 +12:00
Dan Poltawski
d4a89aa500 Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle 2014-07-28 12:47:30 +01:00
Sam Hemelryk
db28260c29 Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle 2014-07-28 08:46:03 +12:00
Damyon Wiese
cbec30d4de MDL-46485 Assign: Fix when submitting to a group assignment from the default group 2014-07-25 15:18:40 +08:00
Tony Butler
f33be9eb36 MDL-43908 mod_assign: Order submissions by course id then cm id
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-24 17:20:19 +01:00
Tony Butler
86dced433e MDL-43908 mod_assign: Remove redundant code and improve SQL query
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-24 17:20:19 +01:00
Tony Butler
c681f7a083 MDL-43908 mod_assign: Prevent notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-24 16:59:24 +01:00
Tony Butler
ccd6839a7b MDL-43908 mod_assign: Defer notifications for unavailable assignments
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-07-24 16:59:24 +01:00
Damyon Wiese
9f65f9c332 MDL-46506 Assign: fix php warning on grant extension page
This code was missed when the extensionduedate was moved to the userflags table.
2014-07-24 11:25:22 +08:00