mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
70,398 Commits 36 Branches 519 Tags
Commit Graph

1896 Commits

Author SHA1 Message Date
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
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
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
Adrian Greeve
1464bcc8ed MDL-46547 gradebook: Update to print_grade_page_head 
Upgrade to print_grade_page_head to include help messages in the
title of the page.
 2014-10-06 09:14:04 +08:00
Adrian Greeve
aa60bda9f4 MDL-46547 gradebook: grade import plugin for drag and drop. 
This allows information to be dragged and dropped directly into a
form to be imported into the gradebook.
 2014-10-06 09:14:04 +08:00
Adrian Greeve
c3ba8429e1 MDL-46547 gradebook: Unit tests for new class importing csv files. 2014-10-06 09:14:04 +08:00
Adrian Greeve
b0147a652c MDL-46547 gradebook: Moving gradebook csv import into a class. 
This allows plugins such as drag and drop to use / extend the class
and saves on duplicating code.
 2014-10-06 09:14:04 +08:00
Marina Glancy
d75a2367c3 MDL-47520 core_grades: added CSS classes to the setup page 
Part of: MDL-46576
 2014-10-03 17:06:41 +08:00
Damyon Wiese
a9937aec06 MDL-47062 Grades: Add an upgrade step to warn about changes in upgrade. 
Puts a notice on the grader report about the change in aggregation method
from "Sum of grades" to "Natural".

Part of: MDL-46576
 2014-10-03 17:06:41 +08:00
Dave Cooper
3d8ef7c65d MDL-47353 gradereport_grader: Fix header offset logic for floating headers 
This is necessary for themes with non-fixed navbars to work with the
grader report, otherwise headers will be hidden.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-03 15:46:02 +08:00
Andrew Nicols
6821f7310c MDL-46658 gradereport_grader: Make page CSS more specific 2014-10-03 15:44:41 +08:00
Andrew Nicols
325e81d309 MDL-47124 gradereport_grader: Update row/column sizes when showing/hiding quickedit fields 
This makes use of Global YUI events to trigger the resized event handler.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-03 15:44:39 +08:00
Zachary Durber
eede44b54e MDL-46936 gradereport_grader: Restore AJAX editing to gradereport 
Removed id argument from AJAX code, no longer supplied.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-03 15:44:31 +08:00
Andrew Nicols
33bc816e89 MDL-47028 gradereport_grader: Add floating headers for other cells. 
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-03 15:44:28 +08:00