lams-github / lams_gradebook / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 14 Oct 2019
12:17 pm

Marcin Cieslak

LDEV-4776 Fix a query for fetching Lesson Gradebook data

Options
    • -2
    • +1
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
Thursday 04 Jul 2019
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -1
    • +1
    ./lams/gradebook/service/GradebookService.java
  2. … 50 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +1
    ./lams/gradebook/util/GradebookConstants.java
    • -5
    • +7
    ./lams/gradebook/web/controller/GradebookController.java
  3. … 53 more files in changeset.
Wednesday 05 Jun 2019
8:56 am

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -87
    • +83
    ./lams/gradebook/util/GradebookConstants.java
    • -341
    • +318
    ./lams/gradebook/util/GradebookUtil.java
    • -623
    • +623
    ./lams/gradebook/web/controller/GradebookController.java
  4. … 8 more files in changeset.
Tuesday 23 Apr 2019
2:05 pm

Marcin Cieslak

LDEV-4813 Use tables only if a condition is provided

If tables are used and no condition which uses them is provided, a full

outer join is run. It takes ages to complete on a large instance.

Options
    • -6
    • +9
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
Wednesday 03 Apr 2019
2:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -10
    • +14
    ./lams/gradebook/util/GradebookUtil.java
Monday 01 Apr 2019
5:55 pm

Marcin Cieslak

LKC-179 Descent into branching when displaying activities in gradebook

Options
    • -1
    • +1
    ./lams/gradebook/service/GradebookService.java
5:53 pm

Marcin Cieslak

LKC-179 Change activity soring in gradebook to reflect sequence in LD

Options
    • -0
    • +1
    ./lams/gradebook/util/GradebookConstants.java
    • -10
    • +14
    ./lams/gradebook/util/GradebookUtil.java
  3. … 1 more file in changeset.
Friday 29 Mar 2019
8:12 am

Marcin Cieslak

LDEV-4609 Prevent NPE when an activity progress was not found in archive

Options
    • -2
    • +2
    ./lams/gradebook/service/GradebookService.java
Thursday 21 Feb 2019
4:29 pm

Marcin Cieslak

LDEV-4776 Let monitors see course gradebook for their lessons

Group manager sees all lessons in a course. Monitor sees only ones he is

a monitor in.

Options
    • -2
    • +2
    ./lams/gradebook/dao/IGradebookDAO.java
    • -26
    • +32
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
    • -8
    • +11
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +3
    ./lams/gradebook/service/IGradebookFullService.java
    • -10
    • +12
    ./lams/gradebook/web/controller/GradebookController.java
    • -2
    • +2
    ./lams/gradebook/web/controller/GradebookMonitoringController.java
  7. … 1 more file in changeset.
Wednesday 13 Feb 2019
11:41 am

Marcin Cieslak

LDEV-4774 Fix role check for subcourse gradebook

Options
    • -1
    • +2
    ./lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 1 more file in changeset.
Thursday 10 Jan 2019
7:49 pm

Andrey Balan

LDEV-4678 Push some util methods to the service layer

Certain static util methods (mainly from LearningWebUtil.java) expect

service beans as a parameter. It was changed by pushing those methods to

the appropriate service layer.

Options
    • -7
    • +0
    ./lams/gradebook/util/GradebookUtil.java
  2. … 29 more files in changeset.
Friday 14 Dec 2018
9:10 am

Marcin Cieslak

LDEV-4609 Fix archived lesson mark formatting

Options
    • -1
    • +1
    ./lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
Monday 10 Dec 2018
7:54 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Options
    • -12
    • +16
    ./lams/gradebook/service/GradebookService.java
7:53 pm

Marcin Cieslak

LDEV-4609 Fix previous lesson attempts display in monitoring

Till now only archived activities with gradebook marks have been

processed. Now all activities get processed and only archived ones have

got marks.

Options
    • -12
    • +16
    ./lams/gradebook/service/GradebookService.java
Friday 07 Dec 2018
7:33 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Options
    • -75
    • +71
    ./lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
7:33 am

Marcin Cieslak

LDEV-4609 Fix previous lesson attempts export

Till now only archived activities with gradebook marks have been

processed. Now all activities get processed and only archived ones have

got marks.

Options
    • -79
    • +75
    ./lams/gradebook/service/GradebookService.java
Tuesday 04 Dec 2018
8:51 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    ./lams/gradebook/web/controller/GradebookController.java
    • -4
    • +4
    ./lams/gradebook/web/controller/GradebookMonitoringController.java
  3. … 25 more files in changeset.
Monday 26 Nov 2018
4:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -9
    • +10
    ./lams/gradebook/model/GradebookUserActivityArchive.java
    • -8
    • +9
    ./lams/gradebook/model/GradebookUserLessonArchive.java
  3. … 169 more files in changeset.
4:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -9
    • +10
    ./lams/gradebook/model/GradebookUserActivityArchive.java
    • -8
    • +9
    ./lams/gradebook/model/GradebookUserLessonArchive.java
  3. … 169 more files in changeset.
Tuesday 30 Oct 2018
3:57 pm

Andrey Balan

LDEV-4696 Migrate Gradebook to Hibernate annotations

Also update DAO to use Hibernate 5.3 features.

Options
    • -202
    • +108
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +28
    ./lams/gradebook/model/GradebookUserActivityArchive.java
    • -1
    • +26
    ./lams/gradebook/model/GradebookUserLessonArchive.java
  4. … 3 more files in changeset.
3:47 pm

Andrey Balan

LDEV-4440 Fix changing mark feature in jqGrid

Options
    • -56
    • +10
    ./lams/gradebook/web/controller/GradebookController.java
    • -3
    • +2
    ./lams/gradebook/web/controller/GradebookLearningController.java
    • -46
    • +20
    ./lams/gradebook/web/controller/GradebookMonitoringController.java
Friday 19 Oct 2018
11:38 am

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

Options
    • -0
    • +1
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +4
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +2
    ./lams/gradebook/web/controller/GradebookController.java
  4. … 15 more files in changeset.
9:30 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

Options
    • -1
    • +4
    ./lams/gradebook/service/GradebookService.java
    • -1
    • +3
    ./lams/gradebook/service/IGradebookFullService.java
    • -5
    • +5
    ./lams/gradebook/web/action/GradebookAction.java
  4. … 8 more files in changeset.
8:49 am

Marcin Cieslak

LDEV-4609 Adjust columns for previous attempts in monitor activity view

Options
    • -9
    • +20
    ./lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -5
    • +5
    ./lams/gradebook/web/action/GradebookAction.java
  3. … 1 more file in changeset.
Thursday 18 Oct 2018
10:59 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +1
    ./lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +39
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +7
    ./lams/gradebook/service/IGradebookFullService.java
  4. … 12 more files in changeset.
10:41 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4609'

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java

lams_gradebook/web/gradebookMonitor.jsp

Options
    • -2
    • +2
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
    • -4
    • +70
    ./lams/gradebook/service/GradebookService.java
  3. … 1 more file in changeset.
Tuesday 09 Oct 2018
3:24 pm

Andrey Balan

LDEV-4688 Center and change dimensions of Gradebook popups

Options
    • -4
    • +4
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -3
    • +3
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +1
    ./lams/gradebook/dto/GBUserGridRowDTO.java
  4. … 1 more file in changeset.
3:24 pm

Andrey Balan

LDEV-4440 Properly add parameters to url (account for ? or & delimiters)

Options
    • -3
    • +7
    ./lams/gradebook/service/GradebookService.java
Monday 08 Oct 2018
12:05 pm

Marcin Cieslak

LDEV-4440 Update learner's activity grade when edited in gradebook

Merge of gradebook service changes has not picket this up for some

reason.

Options
    • -4
    • +5
    ./lams/gradebook/web/controller/GradebookMonitoringController.java