Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-46443 add missing licenses (#9949)

  1. … 247 more files in changeset.
SAK-46316 avoid unnecessary getCategory calls as the call is very expensive (#9859)

  1. … 2 more files in changeset.
SAK-46316 avoid unnecessary getCategory calls as the call is very expensive (#9859)

(cherry picked from commit 8635a3ee4c8ed546e2b2eea64e80cac65b95c8e5)

Conflicts:

edu-services/gradebook-service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java

edu-services/gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java

  1. … 2 more files in changeset.
SAK-45720 Gradebook: category drop settings remain applied (#9564)

  1. … 2 more files in changeset.
SAK-44967 Allow students to see the grades of their classmates

  1. … 12 more files in changeset.
SAK-44967 Allow students to see the grades of their classmates (#9326)

  1. … 17 more files in changeset.
SAK-43022: Gradebook: Problem when overrides grades (#9223)

(cherry picked from commit 593fa8a99cd2f666de74091e99fe5b8458aa5ac3)

  1. … 14 more files in changeset.
SAK-43022: Gradebook: Problem when overrides grades (#9223)

  1. … 14 more files in changeset.
SAK-43022: Gradebook: Problem when overrides grades (#9223)

(cherry picked from commit 593fa8a99cd2f666de74091e99fe5b8458aa5ac3)

  1. … 14 more files in changeset.
SAK-41502: Excusing an individual grade should be reflected in Grade Log scores (#8364)

(cherry picked from commit 5ff84b860c76e0f916c542c7e4a090ba9d68b047)

    • -0
    • +10
    ./sakaiproject/service/gradebook/shared/GradingEventStatus.java
  1. … 7 more files in changeset.
SAK-41502: Excusing an individual grade should be reflected in Grade Log scores (#8364)

(cherry picked from commit 5ff84b860c76e0f916c542c7e4a090ba9d68b047)

    • -0
    • +10
    ./sakaiproject/service/gradebook/shared/GradingEventStatus.java
  1. … 7 more files in changeset.
SAK-41502: Excusing an individual grade should be reflected in Grade Log scores (#8364)

    • -0
    • +10
    ./sakaiproject/service/gradebook/shared/GradingEventStatus.java
  1. … 7 more files in changeset.
SAK-43936 - Gradebook: no points validation when editing a Gradebook … (#8393)

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

(cherry picked from commit 926ae50404f0e8ff051786ae2499da04e3e2d4a2)

  1. … 6 more files in changeset.
SAK-43936 - Gradebook: no points validation when editing a Gradebook … (#8393)

Co-authored-by: Sam Ottenhoff <ottenhoff@longsight.com>

  1. … 6 more files in changeset.
NOJIRA Checking licenses (#8176)

  1. … 137 more files in changeset.
SAK-43008 round consistently using BigDecimal (#7772)

  1. … 3 more files in changeset.
SAK-43008 round consistently using BigDecimal (#7772)

(cherry picked from commit 62d7ea4739755bda03d4d3482f226b48bba6c91a)

  1. … 3 more files in changeset.
SAK-43008 round consistently using BigDecimal (#7772)

(cherry picked from commit 62d7ea4739755bda03d4d3482f226b48bba6c91a)

  1. … 3 more files in changeset.
SAK-42414 allow a gradebook category to equally weight all items in category (#7640)

* SAK-42414 allow a gradebook category to equally weight all items in category despite different point values

* SAK-42414 handle the course grade calculation

* SAK-42414 allow mismatched points when using equal weight items in a category

* SAK-42414 fix drop lowest/highest to use percentage

* SAK-42414 get equal weight flag to work properly

* SAK-42414 only reveal the checkbox when needed

* SAK-42414 default to enable if previously clicked

* SAK-42414 disable/enable drop lowest when using equal weight

  1. … 12 more files in changeset.
SAK-42414 allow a gradebook category to equally weight all items in category (#7640)

* SAK-42414 allow a gradebook category to equally weight all items in category despite different point values

* SAK-42414 handle the course grade calculation

* SAK-42414 allow mismatched points when using equal weight items in a category

* SAK-42414 fix drop lowest/highest to use percentage

* SAK-42414 get equal weight flag to work properly

* SAK-42414 only reveal the checkbox when needed

* SAK-42414 default to enable if previously clicked

* SAK-42414 disable/enable drop lowest when using equal weight

(cherry picked from commit f57a6879f81d045ddb496105bd69177787334bab)

  1. … 12 more files in changeset.
SAK-42689 Allow students to be messaged from gradebook (#7505)

  1. … 10 more files in changeset.
SAK-42613: Edu-services > ExternalAssessmentService > add api to retrieve internal id (#7422)

  1. … 1 more file in changeset.
SAK-41736 Don't show GB categories on Assignments if disabled (#6867)

* SAK-41736 Don't show GB categories on Assignments if disabled

* Update GradebookExternalAssessmentService.java

  1. … 2 more files in changeset.
SAK-41736 Don't show GB categories on Assignments if disabled (#6867)

* SAK-41736 Don't show GB categories on Assignments if disabled

* Update GradebookExternalAssessmentService.java

(cherry picked from commit fc0e25c05375afb252e181ca0bf62e835da53b5c)

  1. … 2 more files in changeset.
SAK-40339 Added associated data to assignment site import (#6921)

  1. … 7 more files in changeset.
SAK-41411 Highlight student grade within gradebook charts (#6606)

* #3432 Make sure mapped grades are not null when they are collected.

Mapped grades will be null if the student doesn't have a course grade yet.

* SAK-33855 add settings control for stats release to students

* SAK-33855 add in the hibernate and DTO parts for storage of the assignment and course grade stats settings.

Updated front end panel to use the new fields in GradebookInformation

Removed boilerplate cruft from backend classes

* SAK-33855 make new gradebooks get the stats enabled by default, as per upgrade scripts

Refactor logging blocks to add curly braces as they were missing

* SAK-33855 Added stats link in Student view for assignment statistics

WIP, needs permission to access gradebook service before adding content.

Also need to figure out why the icon isn't displaying, using text in the meantime.

* Delete GbBasicModalWindow.java

Not required

* SAK-33855 wrap calls for stats in a security advisor so students can view stats. Add security advisor to gradebook settings calls so a students session could get the info. Conditionally show stats based on the settings. Wire in the assignment chart for students

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* Feature/sak-33855 (#11)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* SAK-33855 Remove stats from student course grade stats window to prevent students from seeing max and min grades for other students, fixed highlighting of icon, turned off the assignment stats icon for instructor view (only in student view)

* SAK-33855 highlight bar in assignment chart that corresponds to student's grade

* SAK-33855 SAK-41411 Highlight student grade in course grade chart when viewed by a student

* SAK-33855 SAK-41411 Removed duplicate code accidentally added when fixing merge conflicts

* SAK-33855 SAK-41411 Fixed more merge conflict issues

* SAK-33855 SAK-41411 Another merge conflict fix

  1. … 13 more files in changeset.
SAK-41411 Highlight student grade within gradebook charts (#6606)

* #3432 Make sure mapped grades are not null when they are collected.

Mapped grades will be null if the student doesn't have a course grade yet.

* SAK-33855 add settings control for stats release to students

* SAK-33855 add in the hibernate and DTO parts for storage of the assignment and course grade stats settings.

Updated front end panel to use the new fields in GradebookInformation

Removed boilerplate cruft from backend classes

* SAK-33855 make new gradebooks get the stats enabled by default, as per upgrade scripts

Refactor logging blocks to add curly braces as they were missing

* SAK-33855 Added stats link in Student view for assignment statistics

WIP, needs permission to access gradebook service before adding content.

Also need to figure out why the icon isn't displaying, using text in the meantime.

* Delete GbBasicModalWindow.java

Not required

* SAK-33855 wrap calls for stats in a security advisor so students can view stats. Add security advisor to gradebook settings calls so a students session could get the info. Conditionally show stats based on the settings. Wire in the assignment chart for students

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* Feature/sak-33855 (#11)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* SAK-33855 Remove stats from student course grade stats window to prevent students from seeing max and min grades for other students, fixed highlighting of icon, turned off the assignment stats icon for instructor view (only in student view)

* SAK-33855 highlight bar in assignment chart that corresponds to student's grade

* SAK-33855 SAK-41411 Highlight student grade in course grade chart when viewed by a student

* SAK-33855 SAK-41411 Removed duplicate code accidentally added when fixing merge conflicts

* SAK-33855 SAK-41411 Fixed more merge conflict issues

* SAK-33855 SAK-41411 Another merge conflict fix

(cherry picked from commit d7b2f95faa50eb0abad9eca5979dd0eb62c048b7)

  1. … 13 more files in changeset.
Revert "SAK-33109 display total points of category (#6146)" (#6571)

This reverts commit e4798a5b738a7f85656bba3d23b09094240e3abc.

  1. … 3 more files in changeset.
SAK-33855 allow students to view assignment/course grade stats (#6506)

* SAK-33855 add settings control for stats release to students

* SAK-33855 add in the hibernate and DTO parts for storage of the assignment and course grade stats settings.

Updated front end panel to use the new fields in GradebookInformation

Removed boilerplate cruft from backend classes

* SAK-33855 make new gradebooks get the stats enabled by default, as per upgrade scripts

Refactor logging blocks to add curly braces as they were missing

* SAK-33855 Added stats link in Student view for assignment statistics

WIP, needs permission to access gradebook service before adding content.

Also need to figure out why the icon isn't displaying, using text in the meantime.

* Delete GbBasicModalWindow.java

Not required

* SAK-33855 wrap calls for stats in a security advisor so students can view stats. Add security advisor to gradebook settings calls so a students session could get the info. Conditionally show stats based on the settings. Wire in the assignment chart for students

* Feature/sak-33855 (#11)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* Feature/sak 33855 (#12)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* SAK-33855 Remove stats from student course grade stats window to prevent students from seeing max and min grades for other students, fixed highlighting of icon, turned off the assignment stats icon for instructor view (only in student view)

* SAK-33855 back out this change

* SAK-33855 address accesslint issues

* SAK-33855 a stack of code cleanup on GradebookFrameworkServiceImpl

* SAK-33855 migrated to @Data

* SAK-33855 fix codacy issues

* SAK-33855 move inside panel

* SAK-33855 make intent clearer to class members

  1. … 22 more files in changeset.
SAK-33855 allow students to view assignment/course grade stats (#6506)

* SAK-33855 add settings control for stats release to students

* SAK-33855 add in the hibernate and DTO parts for storage of the assignment and course grade stats settings.

Updated front end panel to use the new fields in GradebookInformation

Removed boilerplate cruft from backend classes

* SAK-33855 make new gradebooks get the stats enabled by default, as per upgrade scripts

Refactor logging blocks to add curly braces as they were missing

* SAK-33855 Added stats link in Student view for assignment statistics

WIP, needs permission to access gradebook service before adding content.

Also need to figure out why the icon isn't displaying, using text in the meantime.

* Delete GbBasicModalWindow.java

Not required

* SAK-33855 wrap calls for stats in a security advisor so students can view stats. Add security advisor to gradebook settings calls so a students session could get the info. Conditionally show stats based on the settings. Wire in the assignment chart for students

* Feature/sak-33855 (#11)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* Feature/sak 33855 (#12)

* SAK-33855 Fixed styling of assignment stats icon

* SAK-33855 Add course grade statistics panel to student page

Display a graph icon for viewing course grade statistics if the course grade has been released to students.

* SAK-33855 Remove stats from student course grade stats window to prevent students from seeing max and min grades for other students, fixed highlighting of icon, turned off the assignment stats icon for instructor view (only in student view)

* SAK-33855 back out this change

* SAK-33855 address accesslint issues

* SAK-33855 a stack of code cleanup on GradebookFrameworkServiceImpl

* SAK-33855 migrated to @Data

* SAK-33855 fix codacy issues

* SAK-33855 move inside panel

* SAK-33855 make intent clearer to class members

(cherry picked from commit e3d992a919f77563cb032cfe47677e2f4afc7a71)

  1. … 22 more files in changeset.