Damyon Wiese
d700fa463e
Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle
2014-10-24 11:48:25 +02:00
Zachary Durber
237f76ce14
MDL-47838 gradebook: Singleview fix for invalid links.
2014-10-24 11:48:24 +02:00
Sam Hemelryk
065448834c
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
2014-10-24 11:48:22 +02:00
Sam Hemelryk
fc91acc813
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
2014-10-24 11:48:22 +02:00
Dan Poltawski
276af2a44d
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
2014-10-24 11:48:15 +02:00
Dan Poltawski
f335c9a1f1
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
2014-10-24 11:48:15 +02:00
Dan Poltawski
fc533908b0
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
2014-10-24 11:48:12 +02:00
Frederic Massart
5dd0cb7bce
MDL-47762 gradereport_user: Hide contribution and weights when relevant
...
The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
2014-10-24 11:48:07 +02:00
Marina Glancy
65504187d8
Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
2014-10-24 11:48:06 +02:00
Damyon Wiese
edffadfd1c
MDL-47763 Grades: Handle the case when a grade category is hidden.
...
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
2014-10-24 11:48:05 +02:00
Marina Glancy
1e3dc6ed9c
Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle
2014-10-24 11:48:04 +02:00
Damyon Wiese
f01972d95e
MDL-47836 Grades: Fix the url for the upgraded grades warning page url.
2014-10-24 11:48:03 +02:00
Damyon Wiese
a7c37934cc
MDL-47713 Grades: Fix new behat test after conversion from points to %
...
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
2014-10-24 11:48:01 +02:00
Dan Poltawski
7a811fb63a
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
2014-10-24 11:47:59 +02:00
Andrew Nicols
4a8c380abb
MDL-47513 Fix RTL issues with grade report
2014-10-23 11:15:35 +08:00
Damyon Wiese
b0c5a9c491
MDL-47713 Grades: Update all the behat tests to use % in contribution column
2014-10-22 16:20:15 +08:00
Frederic Massart
6aeebc259a
MDL-47637 core_grades: Outcomes must not be weighted when non aggregated
2014-10-22 14:58:17 +08:00
Andrew Nicols
bedcf338dc
MDL-47706 gradebook: Update pageload time between changes
...
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.
Different errors were seen because the millisecond rollover occurred at
different time within the test.
Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
2014-10-22 12:56:07 +08:00
Damyon Wiese
53f26095c6
Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle
2014-10-22 10:45:57 +08:00
Juan Leyva
a7888487f0
MDL-46527 grades: grade_get_grades external function rewritten
2014-10-21 12:10:01 +02:00
Damyon Wiese
fc9150cb0e
MDL-47713 Grades: Change contribution column to a percent of grademax
2014-10-21 13:50:18 +08:00
Damyon Wiese
a9a02e9170
MDL-20367 Grades: Allow real numbers as grade boundaries
...
Patch by Huy Hoang (I just git-ified it).
2014-10-21 11:15:39 +08:00
Marina Glancy
8b2d85406a
Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle
2014-10-21 10:55:54 +08:00
Andrew Nicols
82e3440aec
MDL-47400 gradereport_history: Fix string notempty test for Oracle
2014-10-21 10:48:28 +08:00
Dan Poltawski
83b49754d3
Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle
2014-10-20 18:12:38 +01:00
Marina Glancy
2d2661e3d7
Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle
2014-10-20 17:08:20 +08:00
Damyon Wiese
eafab79941
MDL-47503 Grades: Display the notice about upgraded grades on all grade report pages.
...
Moved this to the print_grade_page_head function and added an access check so it only
displays for teachers.
2014-10-20 16:15:51 +08:00
Andrew Nicols
a07ec4565f
MDL-47400 gradereport_history: Ensure float precision is enforced
...
Format floats according to the grade item config.
2014-10-20 15:42:31 +08:00
Marina Glancy
f75f2ecdf4
Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle
2014-10-20 15:19:57 +08:00
Marina Glancy
1d67a8f209
Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle
2014-10-20 15:06:29 +08:00
Frederic Massart
263bf1a10f
MDL-47725 gradereport_user: Only hide grades when they were altered
...
The method blank_hidden_total_and_adjust_bounds() now checks for more
than just a grade change, and in that cause would hide the grade. We
added a condition to only hide the grade when it effectively changed,
not when its other properties have.
2014-10-20 14:19:02 +08:00
Marina Glancy
b3729c99aa
Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle
2014-10-20 14:08:06 +08:00
Frederic Massart
40f874ce29
MDL-47489 core_grades: Behat tests covering contributions with extra credit
2014-10-20 13:52:18 +08:00
Damyon Wiese
47d6e6a7d3
MDL-47503 Grades: Completely remove aggregationsubcats
...
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
2014-10-20 12:03:18 +08:00
Adrian Greeve
3275892c03
MDL-47757 events: Fixed doc block and missing string.
...
The language events were missing the @since tag and
the grade single view report was missing a language
string.
2014-10-20 09:55:09 +08:00
Dan Poltawski
cd2cfb5783
Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle
2014-10-17 14:46:30 +01:00
Dan Poltawski
624926e42c
NOBUG: Fixed file access permissions
2014-10-17 14:32:19 +01:00
Frederic Massart
2ccbcf0169
MDL-47738 gradereport_history: User selector handles broke with 0 user
...
It was impossible to reopen the dialogue when the last search result
did not return any user.
2014-10-17 19:34:16 +08:00
Barbara Ramiro
0947172dba
MDL-47290 Grades: Minified CSS and applied coding style standards
2014-10-17 15:03:53 +08:00
Barbara Ramiro
601af6666d
MDL-47290 Grades: Style for the Single view table
2014-10-17 15:01:20 +08:00
Barbara Ramiro
2c7a86eb7f
MDL-47363 Grades: Style for the User report
2014-10-17 14:56:31 +08:00
Marina Glancy
3279fe928f
MDL-18229 gradebook: missing 'use' in singleview
2014-10-17 12:25:44 +08:00
Zachary Durber
f86233a41e
MDL-18229 gradebook: Fixes for Singleview behat tests.
2014-10-17 11:56:39 +08:00
Jon Marthaler
a4bd536688
MDL-38065 gradebook: Fix issue with hidden categories breaking rowspan.
...
Hidden subcategories break the rowspan in the gradebook; this fix corrects
the calculation of the rowspan.
2014-10-16 22:27:52 -05:00
Zachary Durber
f548d49f01
MDL-18229 gradebook: Sesskey required for all actions.
2014-10-17 10:51:45 +08:00
Zachary Durber
900944385d
MDL-18229 gradebook: Fix for min/max grades and large numbers.
2014-10-17 09:40:01 +08:00
Dan Poltawski
e2270952c5
Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle
2014-10-16 17:30:27 +01:00
Dan Poltawski
f931c9245e
Merge branch 'MDL-47681-master' of git://github.com/FMCorz/moodle
2014-10-16 15:14:20 +01:00
Dan Poltawski
73f94e88ff
MDL-18229 gradereport_singleview: missing MOODLE_INTERNAL
2014-10-16 13:58:37 +01:00
Dan Poltawski
992159f450
MDL-18229 grade report: coding style fixes
...
global definitions must be at the top of functions.
2014-10-16 13:49:44 +01:00
