mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity
87,220 Commits 36 Branches 519 Tags
Commit Graph

124 Commits

Author SHA1 Message Date
Ann Adamcik
4b4280f3e8 MDL-58697: Only get group submission if enabled 2017-12-01 12:56:15 -07:00
Damyon Wiese
79ea89fea2 MDL-58047 assign: submission sorting 
Only exclude new submission records from the sorting, draft and reopened submission are valid.
 2017-11-03 15:55:10 +08:00
Daniel Thee Roperto
b8243e4164 MDL-58047 gradebook: fix sort by submission order. 2017-11-01 15:12:48 +11:00
Eloy Lafuente (stronk7)
84e3c97bb0 MDL-46322 database: alias sort fields to avoid ambiguous naming 2017-06-14 12:32:01 +01:00
Andres Melo
3ffd13827e MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-17 16:12:54 -05:00
Jun Pataleta
b5c24c99a0 MDL-58780 mod_assign: Remove AS keyword in table alias 
* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.
 2017-05-09 11:58:00 +08:00
Dan Poltawski
7bb2eafe9c Merge branch 'MDL-58262-master' of git://github.com/merrill-oakland/moodle 2017-03-20 15:19:55 +00:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon 
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
 2017-03-17 15:52:17 +08:00
Eric Merrill
28cdba9dcf MDL-58262 assign: Use unique sql parameter 2017-03-14 15:09:27 -04:00
Tony Butler
696bd4d68b MDL-57602 mod_assign: Add 'Granted extension' filter for grading table 2017-02-16 11:23:41 +00:00
Damyon Wiese
dd7de4ea82 MDL-57766 assign: Put back the manual marker filter 
I removed too much from gradingtable.php in the last patch.
 2017-02-14 10:16:56 +08:00
Eloy Lafuente (stronk7)
369df31150 Merge branch 'MDL-57708-master' of git://github.com/merrill-oakland/moodle 2017-02-13 23:32:35 +01:00
Damyon Wiese
230ae095b4 MDL-57766 mod_assign: Marker allocation fixes 
Marking allocation was only ever applied in the view for the grading table. It should
have been added to the list_participants function because that is used by webservices and
the new grading UI.
 2017-02-09 17:06:21 +08:00
Eric Merrill
7dfc65dbf9 MDL-57708 assign: Fix display of overridden submissions 2017-02-08 14:30:56 -05:00
Shamim Rezaie
05fdbe378a MDL-55915 mod_assign: let fullname() know if user has viewfullnames cap 
Instruct fullname() to format names on the assignment grading page with alternativefullnameformat when user
has moodle/site:viewfullnames capability.
 2017-01-20 20:28:57 +11:00
David Monllao
cf4019cf40 Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle 2016-11-07 09:20:59 +08:00
Brendan Anderson
c28c76450b MDL-54112 mod_assign: Add scale null grade filter 2016-10-27 09:58:56 -04:00
Kenneth Hendricks
a13f1f4996 MDL-29795 assign: Only display date columns if overrides 2016-10-27 14:10:35 +11:00
Ilya Tregubov
d685b95935 MDL-29795 mod_assign: Add user/group override assignment module 2016-10-24 11:03:49 +01:00
David Monllao
3ea1fa18cc Merge branch 'mdl56466-master' of https://github.com/tlock/moodle 2016-10-24 15:23:51 +08:00
Tim Lock
65b4dce6f8 MDL-56466 assign: fix database error with team submissions 
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:

ERROR: Incorrect number of query parameters. Expected 32, got 31.
 2016-10-18 12:11:45 +10:30
Tony Butler
23f2f64452 MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display 2016-10-12 17:33:23 +01:00
Andrew Nicols
eb4c466162 MDL-54872 assign: Order blindly marked assignments more blindly 2016-09-12 09:29:45 +08:00
Andrew Nicols
4ed4be4988 MDL-54873 assign: Fetch mapping id for blind marking grading 
This change modifies the grading table to pre-seed record ids where they
already exist.

Where they do not exist, they are still fetched.
 2016-08-30 11:46:20 +08:00
Cameron Ball
5e84acc2f3 MDL-53916 mod_assign: Point update grade link to new interface 2016-05-10 15:42:05 +01:00
Ryan Wyllie
1b2f9dc60c MDL-53821 mod_assign: Hide full name when blind marking 
Hide the student's full name in the new grading intferface when blind
marking is on.
 2016-05-10 02:07:02 +00:00
Damyon Wiese
c78e567c5a MDL-51142 assign: Fix for group assignments with NEW status 2016-05-02 16:41:10 +08:00
Clement Smith
232b26f021 MDL-51142 mod/assign: Fix erroneous submission status display 
This prevents display of submission time/date when the assignment
submission record is in a new state. It also keeps the display of
overdue assignments identical for those students who have viewed
the assignment yet not submitted, for those students who have
not viewed the assignment, and for those students who have not
viewed the assignment yet the instructor has accessed the grading
page.
 2016-05-02 16:36:39 +08:00
Damyon Wiese
6853cd5ed4 MDL-52954 assign: Fix the reasonable cibot warnings. 2016-03-30 14:07:28 +08:00
Damyon Wiese
bb690849c9 MDL-52954 assign: Rebuild the assignment single grade page. 2016-03-30 13:47:21 +08:00
Eric Merrill
002864cc37 MDL-48778 assign: Use proper latest attempt for quickgrading prechecks 
The code that stored lastmodified in gradingtable used a different
method to produce it than the processor used to generate the check
value. Fix that and also check that the attempt number has not changed.
 2016-02-08 10:34:24 +08:00
Michael Hughes
59e9548762 MDL-52270 mod_assign: Adapt unit tests 2016-01-15 10:04:04 +08:00
Michael Hughes
18b797347f MDL-52270 Assignment: Display Participant Number 
Display participant number when user holds mod/assign:viewblinddetails capability.
 2016-01-15 09:43:16 +08:00
David Monllao
c506af7786 Merge branch 'MDL-44330' of git://github.com/NeillM/moodle 2015-11-24 17:03:06 +08:00
Neill Magill
3fca693751 MDL-44330 Assign: Assignment grading may not display expected student 
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:

1) The user had the table ordered by a value that could be modified,
   for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
   between the user generating the table and clicking on a grade link.

If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.

This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
 2015-11-24 08:42:00 +00:00
Dan Poltawski
b58d059525 MDL-37834 assign: avoid newlines in status column of csv 
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
 2015-11-20 18:36:30 +00:00
Damyon Wiese
85d0696dfa MDL-51720 assign: Always fallback on userid as a default sort 
Even when the table has no userid column (this is normally the edit column).
 2015-11-05 15:33:19 +08:00
David Monllao
7d45554019 Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle 2015-10-19 17:21:58 +08:00
Damyon Wiese
ab848fea81 MDL-48861 assign: Make the requires grading filter consistent 
Consistently include submissions with a null grade (see MDL-47694).
 2015-10-13 14:52:50 +08: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
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
Nadav Kavalerchik
d19de800ed MDL-40592 assign/grading: Display default user picture, if none is set. 2015-05-22 10:35:47 +03:00
Tony Butler
2224f2c598 MDL-49933 mod_assign: Sort marker select lists alphabetically by name 2015-04-21 16:58:38 +01:00
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02:00
Andrew Hancox
e528997a4a MDL-48159 mod_assign: Added setting preventsubmissionnotingroup 
If enabled a user will be unable to make a submission unless they are a
member of a group.
 2015-04-07 14:30:40 +01:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Gregory Faller
24937b2c1e MDL-48428 mod/assign: Allow Grant extension option in offline assignment 2014-12-17 14:26:25 +10:30
Simey Lameze
274962a1e7 MDL-46986 mod_assign: Remove duplicate column identifier 2014-11-07 09:19:18 +08:00