lamsfoundation

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

    • -9
    • +8
    ./lams/gradebook/dto/GradebookGridRowDTO.java
  1. … 167 more files in changeset.
Merge lams2_3 into head

    • -0
    • +54
    ./lams/gradebook/dto/ExcelCell.java
    • -31
    • +98
    ./lams/gradebook/dto/GradebookGridRowDTO.java
    • -32
    • +400
    ./lams/gradebook/service/GradebookService.java
    • -1
    • +83
    ./lams/gradebook/service/IGradebookService.java
    • -3
    • +105
    ./lams/gradebook/util/GradebookUtil.java
  1. … 119 more files in changeset.
Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -1
    • +11
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +3
    ./lams/gradebook/dto/GradebookGridRowDTO.java
    • -19
    • +88
    ./lams/gradebook/service/GradebookService.java
    • -0
    • +1
    ./lams/gradebook/util/GradebookConstants.java
  1. … 2 more files in changeset.
Merging to head

LDEV-2214 Adding sorting algorithm so activities are sorted by start date in gradebook if the learner has attempted them

    • -0
    • +10
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +59
    ./lams/gradebook/dto/comparators/GBStartDateComparator.java
    • -0
    • +1
    ./lams/gradebook/util/GradebookConstants.java
    • -0
    • +3
    ./lams/gradebook/util/GradebookUtil.java
  1. … 2 more files in changeset.
Merging with head

LDEV-2189 Making links to learner only appear when the user has attempted or finished the activity. Also, tooloutputs are only fetched when the same criteria is fulfulled

    • -1
    • +1
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -1
    • +1
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -14
    • +20
    ./lams/gradebook/service/GradebookService.java
  1. … 1 more file in changeset.
LDEV-2212 displaying the appropriate lessons in the course views only if the user has permission

    • -49
    • +66
    ./lams/gradebook/service/GradebookService.java
  1. … 3 more files in changeset.
LDEV-2211 internationalising gradebook project, also adding some keys to central for links and admin for group gradebook settings

  1. … 13 more files in changeset.
LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

    • -0
    • +143
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +154
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -0
    • +114
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +138
    ./lams/gradebook/dto/GradebookGridRowDTO.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBAverageMarkComparator.java
    • -0
    • +44
    ./lams/gradebook/dto/comparators/GBRowNameComparator.java
    • -0
    • +47
    ./lams/gradebook/dto/comparators/GBTimeTakenComparator.java
    • -0
    • +35
    ./lams/gradebook/gradebookApplicationContext.xml
    • -0
    • +703
    ./lams/gradebook/service/GradebookService.java
    • -0
    • +127
    ./lams/gradebook/service/IGradebookService.java
    • -0
    • +32
    ./lams/gradebook/util/GBGridView.java
    • -0
    • +87
    ./lams/gradebook/util/GradebookConstants.java
  1. … 78 more files in changeset.