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
Marina Glancy
82c662d347
MDL-47760 grades: dim category name if hidden
2014-10-20 14:02:25 +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
Dan Poltawski
d65eefdbf1
Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle
2014-10-16 13:44:48 +01:00
Frederic Massart
f8c8f980c7
MDL-47681 core_grades: Ignore weights of grade items 'none' or 'text'
...
It can happen that some grade items with the type 'None' have a max
grade different than 0, in which case we would have set a weight for
them which is wrong as they must not have any. This patch always
ignores the grade items 'None' and 'Text' when calculating the
weights and locks the weight UI fields for those items too.
2014-10-16 18:42:27 +08:00
Dan Poltawski
7829a6d1ca
Merge branch 'MDL-47392-master' of git://github.com/xow/moodle
2014-10-16 11:12:01 +01:00
John Okely
044a298e6f
MDL-47392 core_grades: Consolidate grade item weight setting location
2014-10-16 15:21:53 +08:00
Damyon Wiese
973840f7d5
MDL-47575 Whitespace fix.
2014-10-16 15:20:07 +08:00
Zachary Durber
6deb0344c5
MDL-47575 gradebook: Show weights and contribution by default.
2014-10-16 13:11:47 +08:00
Adrian Greeve
b9cafe3b40
MDL-46599 gradebook: Added a time exported column to grade export via csv.
...
This will be useful for checking if a csv import is trying to overwrite
new grade updates.
2014-10-16 10:31:10 +08:00
Simey Lameze
a5240a82a6
MDL-46599 gradebook: Add force import option on CSV file and direct importing
2014-10-16 10:22:45 +08:00
Simey Lameze
ce8f9c9b87
MDL-46599 gradebook: Add last exported date column on ODS and XLS export formats
2014-10-16 10:22:20 +08:00
Dan Poltawski
33ccfc1f13
Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle
2014-10-15 16:56:43 +01:00
Dan Poltawski
560b04b408
Merge branch 'MDL-47243-master' of git://github.com/xow/moodle
2014-10-15 16:14:39 +01:00
Dan Poltawski
22caa080f9
Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
2014-10-15 08:41:23 +01:00
John Okely
3087835ae3
MDL-47243 core_grades: Add behat tests for outcomes in Natural
2014-10-15 14:33:31 +08:00
John Okely
5e18456631
MDL-47243 core_grades: Allow extra credit on outcome grade items
2014-10-15 14:33:31 +08:00
John Okely
c53708d9c0
MDL-47243 core_grades: Add weight settings to outcome edit page
2014-10-15 14:33:31 +08:00
Frederic Massart
e813b7286e
MDL-38732 gradereport_grader: Undefined variable in unit tests
2014-10-15 12:22:35 +08:00
Dave Cooper
c8eb1fae64
MDL-47560 Grades: Unset config when gradebook upgrade acknowledged.
2014-10-15 11:00:57 +08:00
Damyon Wiese
e9e3c0dcfd
Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
2014-10-15 10:19:05 +08:00
Dan Poltawski
4f639ec86b
Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle
2014-10-14 19:11:57 +01:00
Dan Poltawski
1b07195b28
Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
2014-10-14 19:00:28 +01:00
Dan Poltawski
3be2f6ac0b
Merge branch 'MDL-47649' of git://github.com/timhunt/moodle
2014-10-14 13:14:19 +01:00
Tim Hunt
a866538b9b
MDL-47649 csvlib: must not leave files open
...
I added a destructor to csv_import_reader ensure the file is closed.
I also ensured that the gradeimport_csv unit tests did not hold onto a
reference to the csv_import_reader object while the phpunit framework
tries to tidy up moodledata.
Finally, to stop CiBoT complaining, I fixed up the PHP4-style
declarations in the CSV import class.
2014-10-14 10:36:25 +01:00
Zachary Durber
f4278326c0
MDL-47575 gradebook: Show weights and contribution by default.
2014-10-14 14:22:08 +08:00
Frederic Massart
09171b955e
MDL-38732 gradereport_grader: Handle simultaneous graders
2014-10-14 13:52:42 +08:00
Zachary Durber
1b2c1ccb4c
MDL-18229 gradebook: Fixes for bulk insert and checkboxes.
2014-10-14 13:18:45 +08:00
Damyon Wiese
57fac09a40
MDL-18229 Grades: singleview report mega cleanup.
...
Fix all the things, including:
* Fix $PAGE->url
* Fix coding style.
* Add event for reportviewed
* Removed broken callback gradereport_singleview_profilereport
* Removed vertical-align-middle
* Changed prefixes in css
* phpcs fixes
* moodlecheck fixes including phpdocs
* Move classes to use autoloading
* Remove all smelly code tricks like func_get_args, scandir etc (lots).
2014-10-14 10:26:46 +08:00
Zachary Durber
5f3decb5cb
MDL-18229 gradebook: Additional fixes.
...
Random foo left in options. (test code)
Allowed editing link for Course total.
Fixes based on Apu's review.
2014-10-14 10:26:46 +08:00
