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
Aparup Banerjee
0a55da571a
MDL-18229 gradereport: updated index.php test to calculate navigation based on new class name 'gradereport_selectable_items'
2014-10-14 10:26:46 +08:00
Zachary Durber
8ec7b088ef
MDL-18229 gradereport: Fixes and improvements from review.
...
Added pagination back in with some general fixes.
AMOS BEGIN
CPY [override,mod_quiz],[override,gradereport_singleview]
AMOS END
2014-10-14 10:26:46 +08:00
Zachary Durber
2fd9718d8b
MDL-18229 gradereport: Behat tests added.
2014-10-14 10:26:46 +08:00
Zachary Durber
7bd3932e76
MDL-18229 gradereport: Labels for table items added.
2014-10-14 10:26:46 +08:00
Zachary Durber
65c134f98a
MDL-18229 gradebook: Updating code to Moodle standard.
2014-10-14 10:26:46 +08:00
Zachary Durber
92c61fee64
MDL-18229 gradebook: Links to Single view via icons on Grade Report.
2014-10-14 10:26:45 +08:00
Zachary Durber
d124a60b33
MDL-18229 gradebook: Renaming of Single_view to Single view
2014-10-14 10:26:45 +08:00
Zachary Durber
edd8b27923
MDL-18229 gradebook: Fix for loading activities.
...
Was using local variable iteminstance rather than cmid.
2014-10-14 10:26:45 +08:00
Zachary Durber
6a555b99f7
MDL-18229 gradebook: Linking activities and usernames correctly.
...
Activities to their course page and usernames to their
profile page as per standard.
2014-10-14 10:26:45 +08:00
Aparup Banerjee
7cdbf79dd9
MDL-47347 added basic navigation to top and bottom of gradereport_singleview
...
Part of MDL-18229
2014-10-14 10:26:45 +08:00
Zachary Durber
508f23f1e5
MDL-18229 gradebook: Single view navigation corrected.
...
Usernames link to user profiles.
Activities to their activity page.
2014-10-14 10:26:45 +08:00
Zachary Durber
4229e9fa8d
MDL-18229 gradebook: Added filter icons for activities and users.
...
Corrected CSS for grades column, was far too large.
2014-10-14 10:26:45 +08:00
Zachary Durber
7bd4a361b3
MDL-18229 gradebook: Initial commit of LSUs Quick Edit Plugin
...
Renamed to Single View in MDL-47289.
2014-10-14 10:26:45 +08:00
Simey Lameze
372997907f
MDL-46599 gradebook: Unit tests for last exported date and force import option
2014-10-14 09:30:04 +08:00
Dan Marsden
711910ec0d
MDL-33939 gradingform_guide: use correct max grade for scales.
2014-10-14 08:42:30 +13:00
Frederic Massart
1d65db8b39
MDL-47463 core_grades: Behat checks the contribution of single item scales
2014-10-13 18:23:03 +08:00
Dan Poltawski
bb29fe900e
Merge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle
2014-10-13 11:02:59 +01:00
Frederic Massart
21dd684207
MDL-47463 core_grades: Behat checks the contribution of scales
2014-10-13 16:01:32 +08:00
Frederic Massart
87e1e53c97
MDL-47463 core_grades: Handle course contribution of scales
2014-10-13 15:54:58 +08:00
Adrian Greeve
a2809ae2c9
MDL-46546 core_grades: Notice display for bad import.
...
If the initial import of csv data is bad, a notification
will be displayed to the user.
2014-10-13 10:36:38 +08:00
Adrian Greeve
0cf122171b
MDL-46819 core_grades: Negative weights are changed to 0
...
Negative weights in the natural aggregation are not currently permitted.
Any figure below zero is changed to a zero.
2014-10-13 08:19:24 +08:00
Andrew Nicols
72ece42858
MDL-46658 gradereport_grader: Remove max-width for RTL
...
For some reason, Safari behaves incorrectly when dealing with RTL content
where the table has a max-width of 100%.
This issue is a part of the MDL-25544 Epic.
2014-10-10 12:24:03 +08:00
Andrew Nicols
1bd4817ada
MDL-46658 gradereport_grader: Fix minor RTL style issues
...
This issue is a part of the MDL-25544 Epic.
2014-10-10 11:20:44 +08:00
Andrew Nicols
b55d37f08b
MDL-46658 gradereport_grader: Style the ajax editing error
...
This issue is a part of the MDL-25544 Epic.
2014-10-10 10:29:16 +08:00
Andrew Nicols
1e646afd3c
MDL-47353 gradereport_grader: Only respect fixed headers
...
Even if the navbar is in a static header, it should only be respected if it
is fixed still.
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-10 09:02:57 +08:00
Dan Poltawski
66689366a0
Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
2014-10-08 15:49:58 +01:00
Dan Poltawski
da88accb5f
Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
2014-10-08 15:33:46 +01:00
Dan Poltawski
e462093201
Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
2014-10-08 10:26:13 +01:00
Marina Glancy
9f1088d482
MDL-47543 core_grades: behat changes, also MDL-47541
2014-10-08 15:03:37 +08:00
Marina Glancy
eb84b77923
MDL-47543 core_grades: improve navigation menu in grade administration
2014-10-08 15:03:36 +08:00
Marina Glancy
2be0d5c3ed
MDL-47541 core_grades: hints about aggregation settings on setup page
...
Also do not indicate 'Natural' aggregation method
2014-10-08 15:03:32 +08:00
Mark Nelson
c09e6fa3e3
MDL-40697 core_grades: removed existing user_graded event triggers
2014-10-07 19:04:10 -07:00
Andrew Nicols
7feac0aab6
MDL-46658 gradebook: Fix gradebook behat tests
...
This issue is a part of the MDL-25544 Epic.
2014-10-08 09:31:57 +08:00
Dan Poltawski
15b57a34df
MDL-46576 grade: fix trailing whitespace
2014-10-06 18:11:25 +01:00
