1875 Commits

Author SHA1 Message Date
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
Dan Poltawski
bb29fe900e Merge branch 'wip-MDL-46819-master' of git://github.com/abgreeve/moodle 2014-10-13 11:02:59 +01: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
Frederic Massart
457a113e5e MDL-47063 gradereport_grader: Styles applied for overridden grades 2014-10-03 15:44:24 +08:00
Frederic Massart
78ec0bb3af MDL-47026 gradereport_grader: Removing the tooltips
They are not serving the same purpose as the one they had before,
and they were overlapping with the content of the cell. Positioning
them somewhere else made them more confusing than helpful.

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:23 +08:00
Frederic Massart
43998ad11c MDL-47025 gradereport_grader: Removing highlight feature
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:17 +08:00
Andrew Nicols
bc782f1f4c MDL-47053 gradereport_grader: Add a floating Footer Title cell
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:13 +08:00
Frederic Massart
8a9335075e MDL-47027 gradereport_grader: Removed floating save changes button
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:07 +08:00
Frederic Massart
d688ee6d33 MDL-47027 gradereport_grader: Styling when editing is turned on
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:04 +08:00
Frederic Massart
b0cade1103 MDL-46988 gradereport_grader: Fix styling issues for RTL
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:04 +08:00
Frederic Massart
62e11d37c2 MDL-46950 gradereport_grader: Prettier styling for base and clean
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:04 +08:00
Frederic Massart
31819e8961 MDL-46950 gradereport_grader: Consolidate styling of the elements
The grader table has been made entirely standalone from core or
theme styling. The floating divs have to share the exact same
rules, and so it was a lot easier and more maintainable to just
style them both using the same selectors, entirely ignoring the
table default styles.

And because the selectors are unique for both the floating elements
and the table cells, a themer can easily re-use them to style both,
without having to dig around to find all the selectors to overwrite.

Working on this highlighted some issues with the positioning. Those
have been fixed within the same patch. And even though it is still
not 100% correct on IE, the result is pretty decent.

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:01 +08:00
Frederic Massart
7dc48b4629 MDL-46962 gradereport_grader: Correct positioning when using RTL languages
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:49 +08:00
Frederic Massart
10ce95aae3 MDL-46951 gradereport_grader: Giving some love to IE
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:46 +08:00
Frederic Massart
1da29869aa MDL-46951 gradereport_grader: Handling of user cells when resizing
For some reason, the max-width/min-width/width of the table cell containing
the name of the users did not work, leading to very large columns but a very
narrow floating one. Handling the size of those columsn upon resize was
also necessary after with this fix.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:42 +08:00
Frederic Massart
b6ad809581 MDL-46951 gradereport_grader: Disable floating behaviour when table is empty
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:37 +08:00
Frederic Massart
f79776cb7f MDL-46951 gradereport_grader: Compatibility with base themes
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:32 +08:00
Frederic Massart
569c77e623 MDL-46951 gradereport_grader: Removing broken spinner logic
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:28 +08:00
Andrew Nicols
8c037a917b MDL-46663 gradereport_grader: Remove fixed column support
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:19 +08:00
Andrew Nicols
99b119c166 MDL-46663 gradereport_grader: Remove old scrollview code
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:18 +08:00
Andrew Nicols
feb0014b84 MDL-46731 gradereport_grader: Move tooltips to YUI module
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:16 +08:00
Andrew Nicols
d3eec1584a MDL-46774 gradereport_grader: Move row/column highlight code to YUI module
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:43:05 +08:00
Andrew Nicols
6ad1af094e MDL-47046 gradereport_grader: Update JS to meet coding style guidelines
This also moves the code into a set of separate files to allow for
additional components of the report to be migrated to the same YUI module,
adjusts some UI components, improves JS performance, and adds appropriate
documentation.

This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:42:03 +08:00
Alfonso Roman
2c4a3f7525 MDL-47045 gradereport_grader: Improve Grader report user interface
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
2014-10-03 15:12:36 +08:00