mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 03:45:49 +01:00
Code Issues Projects Releases Wiki Activity
70,554 Commits 36 Branches 523 Tags
Commit Graph

114 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
7a811fb63a Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-24 11:47:59 +02:00
Damyon Wiese
fc9150cb0e MDL-47713 Grades: Change contribution column to a percent of grademax 2014-10-21 13:50:18 +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
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
6deb0344c5 MDL-47575 gradebook: Show weights and contribution by default. 2014-10-16 13:11:47 +08:00
Damyon Wiese
e9e3c0dcfd Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle 2014-10-15 10:19:05 +08:00
Zachary Durber
f4278326c0 MDL-47575 gradebook: Show weights and contribution by default. 2014-10-14 14:22:08 +08:00
Frederic Massart
87e1e53c97 MDL-47463 core_grades: Handle course contribution of scales 2014-10-13 15:54:58 +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
Frederic Massart
0b2e8ae07b MDL-47430 core_grades: Handle negative grademin with natural weighting 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
6077a4d43b MDL-47064 Grades: Final fix - set the grademax from the item, not the cat 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
ee07a54be0 MDL-47064 Grades: Peer review cleanups 
Changes include:
 * Search for existing items to reduce DB queries in grade_category::aggregate_grades
 * Comments improvements
 * Move brackets to be part of lang string
 * Convert aggregationhints to be a class variable instead of passing it around

Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
6070e53313 MDL-47064 Grades: Add comments to explain this tricky code. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
446467f0d3 MDL-47064 Grades: Make the contribution to total column work 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
53771c404f MDL-47064 Grades: Fix the contributed weights column for students and teachers. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Simey Lameze
3c46f7e1b9 MDL-47064 core_grades: fix the calculation of contribution towards total 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Damyon Wiese
5a59aeb14e MDL-47078 Grades: Allow users to have different max grades due to exclusions etc. 
This is about making this work with natural weightings.

Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
a1740d7b48 MDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight. 2014-10-03 13:48:55 +08:00
Damyon Wiese
dadc9d991d MDL-46139 Grades: Add contibution to course total column to user report 2014-10-03 13:47:42 +08:00
Damyon Wiese
65c2ac9334 MDL-46139 Grades: Show the aggregation details in the user report. 2014-10-03 13:47:42 +08:00
Damyon Wiese
bfe969e8b3 MDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated 2014-10-03 13:47:42 +08:00
Damyon Wiese
0db54b5ba2 MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies 
Includes a unit test for the dependency flattening function.
 2014-09-09 17:11:59 +08:00
Eloy Lafuente (stronk7)
f438b03fdc Merge branch 'wip-MDL-46874-master' of git://github.com/marinaglancy/moodle 2014-08-25 22:10:09 +02:00
Marina Glancy
cff613f040 MDL-46874 gradereport: replace usage of class hidden with dimmed_text 2014-08-19 12:53:22 +08:00
Frederic Massart
abbee05eb3 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:47:34 +08:00
Damyon Wiese
5232d3f2c9 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 15:53:47 +08:00
sam marshall
8d1f33e122 MDL-44070 Conditional availability enhancements (6): core changes 
Changes core code to use new API instead of the old one when
checking user access to activities and sections.

Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
 2014-04-07 20:11:48 +01:00
Adrian Greeve
1301a07a3e MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook. 2014-01-14 11:59:01 +08:00
Damyon Wiese
1196cc4d28 MDL-30852 grade report: More coding guideline cleanups. 2013-08-05 11:23:29 +08:00
Damyon Wiese
e1e9ade581 MDL-30852 grade: Coding style fix for user report. 2013-08-02 14:40:23 +08:00
Steve Bader
f19dd840ff MDL-30852 grade report: Add aria attributes 
Converted to git branch by Damyon
 2013-08-02 13:57:27 +08:00
Tim Hunt
9e1fe42150 MDL-40854 fix mod/...:view capabilities 
Prior to the fix, if you did not have a capability like mod/page:view,
then you woulds still see the link to the Page activity in the course
section, but when you clicked on it, you would run into a
require_capability error.

It is a principle that we never show users a link to a page they are not
allowed to access, therefore, when users do not have mod/...:view, they
should not see the link on the course page.

This patch implements this in the cm_info class, in a similar way to how
access restrictions by groups works.

It does not assume that the mod/...:view capability exists. If the
capability does not exist, then users are not prevented from seeing the
link.
 2013-07-26 11:44:43 +01:00
Mark Nelson
4e829d48d1 MDL-40468 libraries: removed usages of get_related_contexts_string() in core 
Also tidied up the functions by removing unused parameters.
 2013-07-19 15:17:50 +08:00
Andrew Davis
5df9bc3998 MDL-37475 core_grade:fixed the handling of show totals 2013-05-08 10:38:20 +12:00
Andrew Davis
10d8f0852b MDL-33117 grade: adding unit tests for the user report function inject_rowspans() 2013-01-07 11:57:04 +08:00
Andrew Davis
5e76227126 MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report 2012-11-05 09:35:10 +08:00
Dan Poltawski
f7e8f312ca Revert "MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability" 
This reverts commit 69c8bcec70f8ffacabb4ba228c5de674aa3520c7.
 2012-10-05 16:21:14 +08:00
Dan Poltawski
229f543881 Merge branch 'MDL-33117_grade_display' of git://github.com/andyjdavis/moodle 2012-10-02 09:32:58 +08:00
Andrew Davis
69c8bcec70 MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability 2012-09-28 12:06:44 +08:00
Frederic Massart
5fee56d5c3 MDL-34931 core_grade: Fixed grades hidden when activity is hidden 2012-09-28 11:39:46 +08:00
Adrian Greeve
d40604724b MDL-34463 - lib - Alteration of the get_context_instance function to utilize the new function context_XXXX::instance(). 2012-07-24 14:04:40 +08:00
Sam Hemelryk
49ddf4195c MDL-31510 grader report: Fixed whitespace 2012-04-30 12:13:00 +12:00
Andrew Davis
aee748d32c MDL-31510 grade: made the user report observe $cm->uservisible so that activities not available to a student because of groups do not appear on their user report 2012-04-26 16:31:56 +07:00
Andrew Davis
62a966ada0 MDL-31841 grade: prevented the feedback column on the user report from being centered 2012-03-08 15:19:17 +07:00
Andrew Davis
a153c9f2fe MDL-30999 grade: updated Grade API phpdocs 2012-02-14 14:04:19 +07:00
andrew
d3e303470d MDL-27703 gradebook: altered an sql query in the user report. join with no on clause causes an error in some DBs 2011-11-16 09:56:46 +08:00
Marina Glancy
c97933ffa3 MDL-30161: link from gradebook (grading analysis) only appears now in Grader report but for all items; in User report the link under activity name contains userid 2011-11-08 14:09:50 +08:00
David Mudrak
0455c99864 MDL-29920 User report may display the grade analysis link, too 
The original idea was to use the link in the row header (the activity
link). However, for both unified user experience and the overall patch
design reasons, I finally decided not to alter the activity link but to
append the analysis icon. The user experience should be the same as in
the grader report.
 2011-11-03 13:51:45 +01:00