Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-46484: fix issues with oracle conversion scripts (#9977)

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

  1. … 12 more files in changeset.
SAK-44967 - Oracle: Column names should use less than 30 characters

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. … 15 more files in changeset.
SAK-43022: Gradebook: Problem when overrides grades (#9223)

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

(cherry picked from commit 593fa8a99cd2f666de74091e99fe5b8458aa5ac3)

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

(cherry picked from commit 5ff84b860c76e0f916c542c7e4a090ba9d68b047)

  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)

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

  1. … 7 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.
SAK-40687 eduservices Add new EXTERNAL_DATA column (#6070)

* SAK-40687 eduservices Add new EXTERNAL_DATA column

* Missed a few api changes in webservices and gradebookng

(cherry picked from commit 28c021ec1131af426cd076665d789a99446d9103)

  1. … 11 more files in changeset.
SAK-40687 eduservices Add new EXTERNAL_DATA column (#6070)

* SAK-40687 eduservices Add new EXTERNAL_DATA column

* Missed a few api changes in webservices and gradebookng

  1. … 10 more files in changeset.
SAK-33464 allow on the fly calculation of course grades with a passed in schema (#5198)

* Remove unused code and cleanup other compiler warnings

* Add rebel.xml to gitignore so that JRebel project config is not committed

* SAK-33464 Refactor the gradebook service to add a stub for the course grades with a specified schema.

Fixed a stack of compiler warnings whilst there

Renamed the ridiculously named drop_lowest method. I have been dying to do that for ages.

Fix up gradebook classic and gradebookng

* SAK-33464 add the ability to recompute the course grades given an arbitrary grading schema

  1. … 30 more files in changeset.
SAK-33464 allow on the fly calculation of course grades with a passed in schema (#5198)

* Remove unused code and cleanup other compiler warnings

* Add rebel.xml to gitignore so that JRebel project config is not committed

* SAK-33464 Refactor the gradebook service to add a stub for the course grades with a specified schema.

Fixed a stack of compiler warnings whilst there

Renamed the ridiculously named drop_lowest method. I have been dying to do that for ages.

Fix up gradebook classic and gradebookng

* SAK-33464 add the ability to recompute the course grades given an arbitrary grading schema

(cherry picked from commit f99977fdce1ba12462bc057ed7f8d7f0b281ba34)

  1. … 29 more files in changeset.
SAK-32101 Assignments service refactor (#4712)

* SAK-32101 refactor PeerAssessment to use JPA

* SAK-32101 rename Assignment in edu service to GradebookAssignment

* SAK-32101 Persistence mostly completed

* SAK-32101 Add JSON/XML serialization to persistence

* SAK-32101 AssignmentService

* SAK-32101 AssignmentService 2

* Adapted service and persistence entities to work with existing services.

* AssignmentService Unit Tests setup with Repository

* More additions to assignment service

* Lots of new stuff but mostly Reference Reckoner.

* updated test

* remove assignmentReferenceUtil and use AssignmentReferenceReckoner

* Add test for removing assignments

* remove BaseAssignmentService after rebase

* updateAssigment test

* addSubmission implemented with test

* Rearrange persistence class inheritance

* Added removeSubmission and tests

* flush session after merge

* minor change

* updated persistence methods

* finished adding remaining methods to service

* AssignmentAction refactor part duo

* AssignmentsAction refactor part 3

* AssignmentAction refactor completed

* More AssignmentsAction refactor

* AssignmentAction builds

* Refactor around sakai in relation to AssignmentsService

* Assignment template fixes part 1

* More template fixes and content review added back

* Few more refactors after sync with master

* Rearrange project structure

* ReFormatting

* Code refactor

* AssignmentAction and template fixes

* Fixed hideduedate, modified dates, author is populated

* Reformatting

* Assignment to GradebookAssignment refactor

* Assignment to GradebookAssignment refactor 2

  1. … 362 more files in changeset.
SAK-32451 trying to reconcile changes between master and 11.x (#4259)

* SAK-32451 trying to reconcile changes between master and 11.x because of final grade mode #3451

* SAK-32451 85ca404dae2be0bb06d94701af44585d07e555b1

  1. … 6 more files in changeset.
#3431 remove final grade mode (#4095)

* Remove unused code and cleanup other compiler warnings

* #3431 move instructions about the course grade display to be after the options

* #3431 remove final grade mode

  1. … 26 more files in changeset.
KNL-945 Hibernate upgrade from 3.6 to 4.3 (#3719)

  1. … 481 more files in changeset.
Add 'grade points' grading scheme (#3748)

* Remove unused code and cleanup other compiler warnings

* #3432 refactor the existing grade mapping classes to fix compiler warnings

* #3432 Add the new gradebook mapping. Wire it in.

Update the comparators to deal with the first two characters only.

* #3432 Add the conversion to add grade points grading scale to existing sites

Disable the F (0) field in GradebookNG as per the other schemas

* #3432 Remove a couple of comments and fix the case sensitivity and sequences in MySQl conversion

  1. … 21 more files in changeset.
Add final grade mode to gradebook and allow importing course grades (#3730)

* Remove unused code and cleanup other compiler warnings

* Add a proper GradingType enum. Remove the GbGradingType enum that wrapped the values and switch GBNG over to use it.

Added the settings for Final Grade Mode and wired it all up in GBNG.

#3431

* Update components for when when final grade mode is activated

Add the pieces to the beans on the backend.

#3431

* #3431 do not do grading schema validation if final grade mode is enabled.

* #3431 Course grade override import WIP

* 3431 Add the ability to import course grade overrides

* #3431 Fix the heading display in the confirmation screen

Adjust the max length of the text allowed in the override panel

Properly check for both sakai.properties and gradebook setting for final grade mode

Refactor a long if/else statement in the import helper to be a case switch for better type checking

Add $ to the list of disallowed characters in gb item titles

* #3431 Fix javadoc

  1. … 34 more files in changeset.
SAK-31840 GradableObject to use Objects in POJO vs primitives (#3452)

(cherry picked from commit 029f7c9d4db588f190372870f4400f73febcc9ca)

Conflicts:

reference/docs/conversion/sakai_12_mysql_conversion.sql

reference/docs/conversion/sakai_12_oracle_conversion.sql

  1. … 3 more files in changeset.
SAK-31840 GradableObject to use Objects in POJO vs primitives (#3452)

  1. … 3 more files in changeset.
Provide a warning when changing the grading schema if there are unmappable course grade overrides (#3285)

* #3258 add a method to get all course grade overrides for the given gradebook

Remove unused column 'user_entered_grade'

* #3258 Add the exception handling into GradebookNG to present the warning

  1. … 8 more files in changeset.
Provide a warning when changing the grading schema if there are unmappable course grade overrides (#3285)

* #3258 add a method to get all course grade overrides for the given gradebook

Remove unused column 'user_entered_grade'

* #3258 Add the exception handling into GradebookNG to present the warning

Conflicts:

reference/docs/conversion/sakai_12_mysql_conversion.sql

reference/docs/conversion/sakai_12_oracle_conversion.sql

  1. … 8 more files in changeset.
1840: check for concurrent edits from database grade events (#2511)

* 1840: add new service method to return all grading events for a set of assignments after a given timestamp; and use this new API to check for concurrent changes instead of the using the notifications in memory

* 1840: hit the gradebookService directly to get the assignments for the current user to avoid 5 SQL selects

* 1840: add index to GB_GRADING_EVENT_T for DATE_GRADED

* 2511: rename userCache to users, as it's only a temporary 'cache' to avoid service calls within the lifespan of the method call

  1. … 9 more files in changeset.
1840: check for concurrent edits from database grade events (#2511)

* 1840: add new service method to return all grading events for a set of assignments after a given timestamp; and use this new API to check for concurrent changes instead of the using the notifications in memory

* 1840: hit the gradebookService directly to get the assignments for the current user to avoid 5 SQL selects

* 1840: add index to GB_GRADING_EVENT_T for DATE_GRADED

* 2511: rename userCache to users, as it's only a temporary 'cache' to avoid service calls within the lifespan of the method call

  1. … 9 more files in changeset.
1389: Refactor categorised order code to use a database column rather than the site property XML.

- add categorized_sort_order to the gb_gradable_object_t table and allow this value to be updated via the gradebook service; Also hook into GradebookNG drag and drop reordering and back out the XML property version of the code

- make updateAssignmentCategorizedOrder API consistent with both gradebookng and gradebook services; and also pre-sort assignments by categorized sort order when categories are enabled (to speed up page load/not move things around on the page after page load)

- attempt to replace TODOs in move left/right actions to support moving of an assignment with a null categorized sort order

- add CATEGORIZED_SORT_ORDER on GB_GRADABLE_OBJECT_T to sakai11 migration

  1. … 11 more files in changeset.
1389: Refactor categorised order code to use a database column rather than the site property XML.

- add categorized_sort_order to the gb_gradable_object_t table and allow this value to be updated via the gradebook service; Also hook into GradebookNG drag and drop reordering and back out the XML property version of the code

- make updateAssignmentCategorizedOrder API consistent with both gradebookng and gradebook services; and also pre-sort assignments by categorized sort order when categories are enabled (to speed up page load/not move things around on the page after page load)

- attempt to replace TODOs in move left/right actions to support moving of an assignment with a null categorized sort order

- add CATEGORIZED_SORT_ORDER on GB_GRADABLE_OBJECT_T to sakai11 migration

  1. … 10 more files in changeset.